mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-03-26 00:53:02 -04:00
The new filters are especially useful for status monotoring like kuma to have more relevant results. The wrong status check seems to be a regression of #6300 ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Tests for Go changes (can be removed for JavaScript changes) - I added test coverage for Go changes... - [x] in their respective `*_test.go` for unit tests. - [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I ran... - [x] `make pr-go` before pushing ### Tests for JavaScript changes (can be removed for Go changes) - I added test coverage for JavaScript changes... - [ ] in `web_src/js/*.test.js` if it can be unit tested. - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)). ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [ ] I did not document these changes and I do not expect someone else to do it. ### Release notes - [x] This change will be noticed by a Forgejo user or admin (feature, bug fix, performance, etc.). I suggest to include a release note for this change. - [ ] This change is not visible to a Forgejo user or admin (refactor, dependency upgrade, etc.). I think there is no need to add a release note for this change. *The decision if the pull request will be shown in the release notes is up to the mergers / release team.* The content of the `release-notes/<pull request number>.md` file will serve as the basis for the release notes. If the file does not exist, the title of the pull request will be used instead. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/11584 Reviewed-by: Mathieu Fenniak <mfenniak@noreply.codeberg.org> Co-authored-by: Michael Kriese <michael.kriese@visualon.de> Co-committed-by: Michael Kriese <michael.kriese@visualon.de>
97 lines
2.4 KiB
Go
97 lines
2.4 KiB
Go
// Copyright 2022 The Gitea Authors. All rights reserved.
|
|
// Copyright 2026 The Forgejo Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package actions
|
|
|
|
import (
|
|
"context"
|
|
|
|
"forgejo.org/models/db"
|
|
"forgejo.org/modules/container"
|
|
"forgejo.org/modules/optional"
|
|
"forgejo.org/modules/timeutil"
|
|
|
|
"xorm.io/builder"
|
|
)
|
|
|
|
type TaskList []*ActionTask
|
|
|
|
func (tasks TaskList) GetJobIDs() []int64 {
|
|
return container.FilterSlice(tasks, func(t *ActionTask) (int64, bool) {
|
|
return t.JobID, t.JobID != 0
|
|
})
|
|
}
|
|
|
|
func (tasks TaskList) LoadJobs(ctx context.Context) error {
|
|
jobIDs := tasks.GetJobIDs()
|
|
jobs := make(map[int64]*ActionRunJob, len(jobIDs))
|
|
if err := db.GetEngine(ctx).In("id", jobIDs).Find(&jobs); err != nil {
|
|
return err
|
|
}
|
|
for _, t := range tasks {
|
|
if t.JobID > 0 && t.Job == nil {
|
|
t.Job = jobs[t.JobID]
|
|
}
|
|
}
|
|
|
|
// TODO: Replace with "ActionJobList(maps.Values(jobs))" once available
|
|
var jobsList ActionJobList = make([]*ActionRunJob, 0, len(jobs))
|
|
for _, j := range jobs {
|
|
jobsList = append(jobsList, j)
|
|
}
|
|
return jobsList.LoadAttributes(ctx, true)
|
|
}
|
|
|
|
func (tasks TaskList) LoadAttributes(ctx context.Context) error {
|
|
return tasks.LoadJobs(ctx)
|
|
}
|
|
|
|
type FindTaskOptions struct {
|
|
db.ListOptions
|
|
RepoID int64
|
|
OwnerID int64
|
|
CommitSHA string
|
|
Status []Status
|
|
UpdatedBefore timeutil.TimeStamp
|
|
StartedBefore timeutil.TimeStamp
|
|
RunnerID int64
|
|
LogExpired optional.Option[bool]
|
|
LogInStorage optional.Option[bool]
|
|
}
|
|
|
|
func (opts FindTaskOptions) 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})
|
|
}
|
|
if opts.CommitSHA != "" {
|
|
cond = cond.And(builder.Eq{"commit_sha": opts.CommitSHA})
|
|
}
|
|
if len(opts.Status) > 0 {
|
|
cond = cond.And(builder.In("status", opts.Status))
|
|
}
|
|
if opts.UpdatedBefore > 0 {
|
|
cond = cond.And(builder.Lt{"updated": opts.UpdatedBefore})
|
|
}
|
|
if opts.StartedBefore > 0 {
|
|
cond = cond.And(builder.Lt{"started": opts.StartedBefore})
|
|
}
|
|
if opts.RunnerID > 0 {
|
|
cond = cond.And(builder.Eq{"runner_id": opts.RunnerID})
|
|
}
|
|
if has, value := opts.LogExpired.Get(); has {
|
|
cond = cond.And(builder.Eq{"log_expired": value})
|
|
}
|
|
if has, value := opts.LogInStorage.Get(); has {
|
|
cond = cond.And(builder.Eq{"log_in_storage": value})
|
|
}
|
|
return cond
|
|
}
|
|
|
|
func (opts FindTaskOptions) ToOrders() string {
|
|
return "`id` DESC"
|
|
}
|