From 581a2ca34118a8ac7658d9e87cbf03d01d024401 Mon Sep 17 00:00:00 2001 From: Gusted Date: Fri, 31 Jan 2025 12:00:21 +0100 Subject: [PATCH] chore: Remove `ScheduleList` - Introduced in 0d55f64e6cd3de2e1e5c0ee795605823efb14231 and removed in df1e7d0067bb39913eb681ccc920649884fb1938. --- .deadcode-out | 6 --- models/actions/schedule.go | 24 ++++++++++ models/actions/schedule_list.go | 83 --------------------------------- 3 files changed, 24 insertions(+), 89 deletions(-) delete mode 100644 models/actions/schedule_list.go diff --git a/.deadcode-out b/.deadcode-out index e0d158d709..348941965d 100644 --- a/.deadcode-out +++ b/.deadcode-out @@ -16,12 +16,6 @@ code.gitea.io/gitea/models IsErrSHANotFound IsErrMergeDivergingFastForwardOnly -code.gitea.io/gitea/models/actions - ScheduleList.GetUserIDs - ScheduleList.GetRepoIDs - ScheduleList.LoadTriggerUser - ScheduleList.LoadRepos - code.gitea.io/gitea/models/auth WebAuthnCredentials diff --git a/models/actions/schedule.go b/models/actions/schedule.go index 8b7e6ec44f..f14625c740 100644 --- a/models/actions/schedule.go +++ b/models/actions/schedule.go @@ -14,6 +14,8 @@ import ( "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" webhook_module "code.gitea.io/gitea/modules/webhook" + + "xorm.io/builder" ) // ActionSchedule represents a schedule of a workflow file @@ -140,3 +142,25 @@ func CleanRepoScheduleTasks(ctx context.Context, repo *repo_model.Repository, ca } return nil } + +type FindScheduleOptions struct { + db.ListOptions + RepoID int64 + OwnerID int64 +} + +func (opts FindScheduleOptions) ToConds() builder.Cond { + cond := builder.NewCond() + if opts.RepoID > 0 { + cond = cond.And(builder.Eq{"repo_id": opts.RepoID}) + } + if opts.OwnerID > 0 { + cond = cond.And(builder.Eq{"owner_id": opts.OwnerID}) + } + + return cond +} + +func (opts FindScheduleOptions) ToOrders() string { + return "`id` DESC" +} diff --git a/models/actions/schedule_list.go b/models/actions/schedule_list.go deleted file mode 100644 index 5361b94801..0000000000 --- a/models/actions/schedule_list.go +++ /dev/null @@ -1,83 +0,0 @@ -// Copyright 2023 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package actions - -import ( - "context" - - "code.gitea.io/gitea/models/db" - repo_model "code.gitea.io/gitea/models/repo" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/container" - - "xorm.io/builder" -) - -type ScheduleList []*ActionSchedule - -// GetUserIDs returns a slice of user's id -func (schedules ScheduleList) GetUserIDs() []int64 { - return container.FilterSlice(schedules, func(schedule *ActionSchedule) (int64, bool) { - return schedule.TriggerUserID, true - }) -} - -func (schedules ScheduleList) GetRepoIDs() []int64 { - return container.FilterSlice(schedules, func(schedule *ActionSchedule) (int64, bool) { - return schedule.RepoID, true - }) -} - -func (schedules ScheduleList) LoadTriggerUser(ctx context.Context) error { - userIDs := schedules.GetUserIDs() - users := make(map[int64]*user_model.User, len(userIDs)) - if err := db.GetEngine(ctx).In("id", userIDs).Find(&users); err != nil { - return err - } - for _, schedule := range schedules { - if schedule.TriggerUserID == user_model.ActionsUserID { - schedule.TriggerUser = user_model.NewActionsUser() - } else { - schedule.TriggerUser = users[schedule.TriggerUserID] - if schedule.TriggerUser == nil { - schedule.TriggerUser = user_model.NewGhostUser() - } - } - } - return nil -} - -func (schedules ScheduleList) LoadRepos(ctx context.Context) error { - repoIDs := schedules.GetRepoIDs() - repos, err := repo_model.GetRepositoriesMapByIDs(ctx, repoIDs) - if err != nil { - return err - } - for _, schedule := range schedules { - schedule.Repo = repos[schedule.RepoID] - } - return nil -} - -type FindScheduleOptions struct { - db.ListOptions - RepoID int64 - OwnerID int64 -} - -func (opts FindScheduleOptions) ToConds() builder.Cond { - cond := builder.NewCond() - if opts.RepoID > 0 { - cond = cond.And(builder.Eq{"repo_id": opts.RepoID}) - } - if opts.OwnerID > 0 { - cond = cond.And(builder.Eq{"owner_id": opts.OwnerID}) - } - - return cond -} - -func (opts FindScheduleOptions) ToOrders() string { - return "`id` DESC" -}