mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-05-12 22:10:25 +00:00
51d0188533
`Option[T]` currently exposes a method `Value()` which is permitted to be called on an option that has a value, and an option that doesn't have a value. This API is awkward because the behaviour if the option doesn't have a value isn't clear to the caller, and, because almost all accesses end up being `.Has()?` then `OK, use .Value()`. `Get() (bool, T)` is added as a better replacement, which both returns whether the option has a value, and the value if present. Most call-sites are rewritten to this form. `ValueOrZeroValue()` is a direct replacement that has the same behaviour that `Value()` had, but describes the behaviour if the value is missing. In addition to the current API being awkward, the core reason for this change is that `Value()` conflicts with the `Value()` function from the `driver.Valuer` interface. If this interface was implemented, it would allow `Option[T]` to be used to represent a nullable field in an xorm bean struct (requires: https://code.forgejo.org/xorm/xorm/pulls/66). _Note:_ changes are extensive in this PR, but are almost all changes are easy, mechanical transitions from `.Has()` to `.Get()`. All of this work was performed by hand. ## 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 - I added test coverage for Go changes... - [ ] in their respective `*_test.go` for unit tests. - [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - 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. - [x] I did not document these changes and I do not expect someone else to do it. ### Release notes - [ ] 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. - [x] 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/11218 Reviewed-by: Otto <otto@codeberg.org> Reviewed-by: Gusted <gusted@noreply.codeberg.org> Co-authored-by: Mathieu Fenniak <mathieu@fenniak.net> Co-committed-by: Mathieu Fenniak <mathieu@fenniak.net>
89 lines
2.2 KiB
Go
89 lines
2.2 KiB
Go
// Copyright 2022 The Gitea 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 ActionJobList []*ActionRunJob
|
|
|
|
func (jobs ActionJobList) GetRunIDs() []int64 {
|
|
return container.FilterSlice(jobs, func(j *ActionRunJob) (int64, bool) {
|
|
return j.RunID, j.RunID != 0
|
|
})
|
|
}
|
|
|
|
func (jobs ActionJobList) LoadRuns(ctx context.Context, withRepo bool) error {
|
|
runIDs := jobs.GetRunIDs()
|
|
runs := make(map[int64]*ActionRun, len(runIDs))
|
|
if err := db.GetEngine(ctx).In("id", runIDs).Find(&runs); err != nil {
|
|
return err
|
|
}
|
|
for _, j := range jobs {
|
|
if j.RunID > 0 && j.Run == nil {
|
|
j.Run = runs[j.RunID]
|
|
}
|
|
}
|
|
if withRepo {
|
|
var runsList RunList = make([]*ActionRun, 0, len(runs))
|
|
for _, r := range runs {
|
|
runsList = append(runsList, r)
|
|
}
|
|
return runsList.LoadRepos(ctx)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (jobs ActionJobList) LoadAttributes(ctx context.Context, withRepo bool) error {
|
|
return jobs.LoadRuns(ctx, withRepo)
|
|
}
|
|
|
|
type FindRunJobOptions struct {
|
|
db.ListOptions
|
|
RunID int64
|
|
RepoID int64
|
|
OwnerID int64
|
|
CommitSHA string
|
|
Statuses []Status
|
|
UpdatedBefore timeutil.TimeStamp
|
|
RunNeedsApproval optional.Option[bool]
|
|
}
|
|
|
|
func (opts FindRunJobOptions) ToConds() builder.Cond {
|
|
cond := builder.NewCond()
|
|
if opts.RunID > 0 {
|
|
cond = cond.And(builder.Eq{"run_id": opts.RunID})
|
|
}
|
|
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.Statuses) > 0 {
|
|
cond = cond.And(builder.In("status", opts.Statuses))
|
|
}
|
|
if opts.UpdatedBefore > 0 {
|
|
cond = cond.And(builder.Lt{"updated": opts.UpdatedBefore})
|
|
}
|
|
if has, value := opts.RunNeedsApproval.Get(); has {
|
|
cond = cond.And(builder.Exists(builder.Select("id").From("action_run", "outer_run").
|
|
Where(builder.Eq{
|
|
"outer_run.need_approval": value,
|
|
"outer_run.id": builder.Expr("run_id"),
|
|
})))
|
|
}
|
|
return cond
|
|
}
|