From 5363c0bf81164a223f8baa3c93d75648f766673e Mon Sep 17 00:00:00 2001 From: Manfred Touron <94029+moul@users.noreply.github.com> Date: Tue, 28 Apr 2020 11:20:08 +0200 Subject: [PATCH] feat: preload more nested fields in /api/build-list --- pkg/yolosvc/api_buildlist.go | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkg/yolosvc/api_buildlist.go b/pkg/yolosvc/api_buildlist.go index 1fe32a06..5f92f3e0 100644 --- a/pkg/yolosvc/api_buildlist.go +++ b/pkg/yolosvc/api_buildlist.go @@ -21,9 +21,7 @@ func (svc service) BuildList(ctx context.Context, req *yolopb.BuildList_Request) resp := yolopb.BuildList_Response{} query := svc.db. - Model(&yolopb.Build{}). - Limit(req.Limit). - Order("created_at desc") + Model(&yolopb.Build{}) switch { case len(req.ArtifactKinds) > 0: @@ -39,6 +37,17 @@ func (svc service) BuildList(ctx context.Context, req *yolopb.BuildList_Request) Preload("HasArtifacts") } + query = query. + Preload("HasCommit"). + Preload("HasProject"). + Preload("HasProject.HasOwner"). + Preload("HasMergerequest"). + Preload("HasMergerequest.HasProject"). + Preload("HasMergerequest.HasAuthor"). + Preload("HasMergerequest.HasCommit"). + Limit(req.Limit). + Order("created_at desc") + err := query.Find(&resp.Builds).Error if err != nil { return nil, err