From 34777376d68bcc15debc8ebb4e4dbf0912e809c1 Mon Sep 17 00:00:00 2001 From: chesterip Date: Thu, 18 Apr 2024 22:19:35 -0400 Subject: [PATCH] Use GetListOptions() and panic() --- routers/api/v1/repo/actions.go | 14 ++------------ services/convert/convert.go | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/routers/api/v1/repo/actions.go b/routers/api/v1/repo/actions.go index 67d858f02c..2930091ffc 100644 --- a/routers/api/v1/repo/actions.go +++ b/routers/api/v1/repo/actions.go @@ -9,6 +9,7 @@ import ( actions_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/models/db" api "code.gitea.io/gitea/modules/structs" + "code.gitea.io/gitea/routers/api/v1/utils" "code.gitea.io/gitea/services/context" "code.gitea.io/gitea/services/convert" ) @@ -52,18 +53,7 @@ func ListActionTasks(ctx *context.APIContext) { // "$ref": "#/responses/error" // "422": // "$ref": "#/responses/validationError" - page := ctx.FormInt("page") - limit := convert.ToCorrectPageSize(ctx.FormInt("limit")) - - opts := actions_model.FindTaskOptions{ - RepoID: ctx.Repo.Repository.ID, - ListOptions: db.ListOptions{ - Page: page, - PageSize: limit, - }, - Status: actions_model.StatusUnknown, // Unknown means all - IDOrderDesc: true, - } + opts := utils.GetListOptions(ctx) tasks, total, err := db.FindAndCount[actions_model.ActionTask](ctx, opts) if err != nil { diff --git a/services/convert/convert.go b/services/convert/convert.go index f23c0b853a..b51db0ea34 100644 --- a/services/convert/convert.go +++ b/services/convert/convert.go @@ -183,7 +183,7 @@ func ToTag(repo *repo_model.Repository, t *git.Tag) *api.Tag { // ToActionTask convert a actions_model.ActionTask to an api.ActionTask func ToActionTask(ctx context.Context, repo *repo_model.Repository, t *actions_model.ActionTask) *api.ActionTask { if err := t.LoadAttributes(ctx); err != nil { - log.Warn("LoadAttributes of ActionTask: %v", err) + panic(fmt.Sprintf("failed to execute ActionTask.LoadAttributes(): %v", err)) } return &api.ActionTask{