From 4310284a80e744e37a5a97d6984d3e4b59b12085 Mon Sep 17 00:00:00 2001 From: chesterip Date: Wed, 3 Apr 2024 11:50:24 -0400 Subject: [PATCH] Reducing queries --- routers/api/v1/repo/actions.go | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/routers/api/v1/repo/actions.go b/routers/api/v1/repo/actions.go index f3c7bb0154..3326f4e5c0 100644 --- a/routers/api/v1/repo/actions.go +++ b/routers/api/v1/repo/actions.go @@ -54,29 +54,20 @@ func ListActionTasks(ctx *context.APIContext) { Status: actions_model.StatusUnknown, // Unknown means all IDOrderDesc: true, } - tasks, err := db.Find[actions_model.ActionTask](ctx, opts) + + tasks, total, err := db.FindAndCount[actions_model.ActionTask](ctx, opts) if err != nil { ctx.Error(http.StatusInternalServerError, "ListActionTasks", err) return } res := new(api.ActionTaskResponse) + res.TotalCount = total res.Entries = make([]*api.ActionTask, len(tasks)) for i := range tasks { res.Entries[i] = convert.ToActionTask(ctx, ctx.Repo.Repository, tasks[i]) } - opts = actions_model.FindTaskOptions{ - RepoID: ctx.Repo.Repository.ID, - Status: actions_model.StatusUnknown, // Unknown means all - IDOrderDesc: true, - } - tasks, res.TotalCount, err = db.FindAndCount[actions_model.ActionTask](ctx, opts) - if err != nil { - ctx.Error(http.StatusInternalServerError, "ListActionTasks", err) - return - } - ctx.JSON(http.StatusOK, &res) }