From 9dfa69509661a6873bf599b468c3e5f951630af4 Mon Sep 17 00:00:00 2001 From: Jeff Ortel Date: Mon, 8 Jul 2024 21:31:07 -0700 Subject: [PATCH 1/2] :sparkles: add application ref to analysis (list) resources. Signed-off-by: Jeff Ortel --- api/analysis.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/api/analysis.go b/api/analysis.go index 667ca828..07879b34 100644 --- a/api/analysis.go +++ b/api/analysis.go @@ -147,7 +147,7 @@ func (h AnalysisHandler) List(ctx *gin.Context) { // Find db := h.DB(ctx) db = db.Model(&model.Analysis{}) - db = db.Preload("Application") + db = db.Joins("Application") db = db.Omit("Summary") db = filter.Where(db) db = sort.Sorted(db) @@ -279,7 +279,7 @@ func (h AnalysisHandler) AppList(ctx *gin.Context) { db := h.DB(ctx) db = db.Model(&model.Analysis{}) db = db.Where("ApplicationID = ?", id) - db = db.Preload("Application") + db = db.Joins("Application") db = db.Omit("Summary") db = sort.Sorted(db) var list []model.Analysis @@ -2114,6 +2114,7 @@ func (h *AnalysisHandler) archive(ctx *gin.Context, q *gorm.DB) (err error) { // Analysis REST resource. type Analysis struct { Resource `yaml:",inline"` + Application Ref `json:"application"` Effort int `json:"effort"` Commit string `json:"commit,omitempty" yaml:",omitempty"` Archived bool `json:"archived,omitempty" yaml:",omitempty"` @@ -2128,6 +2129,12 @@ func (r *Analysis) With(m *model.Analysis) { r.Effort = m.Effort r.Commit = m.Commit r.Archived = m.Archived + r.Application = Ref{ + ID: m.ApplicationID, + } + if m.Application != nil { + r.Application.Name = m.Application.Name + } } // Model builds a model. From f373ce5c0578a4c1c57cd6010316e7d947da9ec9 Mon Sep 17 00:00:00 2001 From: Jeff Ortel Date: Mon, 8 Jul 2024 21:37:42 -0700 Subject: [PATCH 2/2] checkpoint Signed-off-by: Jeff Ortel --- api/analysis.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/api/analysis.go b/api/analysis.go index 07879b34..dfc38529 100644 --- a/api/analysis.go +++ b/api/analysis.go @@ -2126,15 +2126,10 @@ type Analysis struct { // With updates the resource with the model. func (r *Analysis) With(m *model.Analysis) { r.Resource.With(&m.Model) + r.Application = r.ref(m.ApplicationID, m.Application) r.Effort = m.Effort r.Commit = m.Commit r.Archived = m.Archived - r.Application = Ref{ - ID: m.ApplicationID, - } - if m.Application != nil { - r.Application.Name = m.Application.Name - } } // Model builds a model.