mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-04-21 20:26:56 -04:00
`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>
117 lines
3.5 KiB
Go
117 lines
3.5 KiB
Go
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package db
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"forgejo.org/models/db"
|
|
issues_model "forgejo.org/models/issues"
|
|
"forgejo.org/modules/container"
|
|
"forgejo.org/modules/indexer/issues/internal"
|
|
"forgejo.org/modules/optional"
|
|
)
|
|
|
|
func ToDBOptions(ctx context.Context, options *internal.SearchOptions) (*issues_model.IssuesOptions, error) {
|
|
var sortType string
|
|
switch options.SortBy {
|
|
case internal.SortByCreatedAsc:
|
|
sortType = "oldest"
|
|
case internal.SortByUpdatedAsc:
|
|
sortType = "leastupdate"
|
|
case internal.SortByCommentsAsc:
|
|
sortType = "leastcomment"
|
|
case internal.SortByDeadlineDesc:
|
|
sortType = "farduedate"
|
|
case internal.SortByCreatedDesc:
|
|
sortType = "newest"
|
|
case internal.SortByUpdatedDesc:
|
|
sortType = "recentupdate"
|
|
case internal.SortByCommentsDesc:
|
|
sortType = "mostcomment"
|
|
case internal.SortByDeadlineAsc:
|
|
sortType = "nearduedate"
|
|
default:
|
|
sortType = "newest"
|
|
}
|
|
|
|
// See the comment of issues_model.SearchOptions for the reason why we need to convert
|
|
convertID := func(id optional.Option[int64]) int64 {
|
|
has, value := id.Get()
|
|
if !has {
|
|
return 0
|
|
}
|
|
if value == 0 {
|
|
return db.NoConditionID
|
|
}
|
|
return value
|
|
}
|
|
|
|
opts := &issues_model.IssuesOptions{
|
|
Paginator: options.Paginator,
|
|
RepoIDs: options.RepoIDs,
|
|
AllPublic: options.AllPublic,
|
|
RepoCond: nil,
|
|
AssigneeID: convertID(options.AssigneeID),
|
|
PosterID: convertID(options.PosterID),
|
|
MentionedID: convertID(options.MentionID),
|
|
ReviewRequestedID: convertID(options.ReviewRequestedID),
|
|
ReviewedID: convertID(options.ReviewedID),
|
|
SubscriberID: convertID(options.SubscriberID),
|
|
ProjectID: convertID(options.ProjectID),
|
|
ProjectColumnID: convertID(options.ProjectColumnID),
|
|
IsClosed: options.IsClosed,
|
|
IsPull: options.IsPull,
|
|
IncludedLabelNames: nil,
|
|
ExcludedLabelNames: nil,
|
|
IncludeMilestones: nil,
|
|
SortType: sortType,
|
|
IssueIDs: nil,
|
|
UpdatedAfterUnix: options.UpdatedAfterUnix.ValueOrZeroValue(),
|
|
UpdatedBeforeUnix: options.UpdatedBeforeUnix.ValueOrZeroValue(),
|
|
PriorityRepoID: 0,
|
|
IsArchived: optional.None[bool](),
|
|
Org: nil,
|
|
Team: nil,
|
|
User: nil,
|
|
}
|
|
|
|
if has, value := options.PriorityRepoID.Get(); has {
|
|
opts.SortType = "priorityrepo"
|
|
opts.PriorityRepoID = value
|
|
}
|
|
|
|
if len(options.MilestoneIDs) == 1 && options.MilestoneIDs[0] == 0 {
|
|
opts.MilestoneIDs = []int64{db.NoConditionID}
|
|
} else {
|
|
opts.MilestoneIDs = options.MilestoneIDs
|
|
}
|
|
|
|
if options.NoLabelOnly {
|
|
opts.LabelIDs = []int64{0} // Be careful, it's zero, not db.NoConditionID
|
|
} else {
|
|
opts.LabelIDs = make([]int64, 0, len(options.IncludedLabelIDs)+len(options.ExcludedLabelIDs))
|
|
opts.LabelIDs = append(opts.LabelIDs, options.IncludedLabelIDs...)
|
|
for _, id := range options.ExcludedLabelIDs {
|
|
opts.LabelIDs = append(opts.LabelIDs, -id)
|
|
}
|
|
|
|
if len(options.IncludedLabelIDs) == 0 && len(options.IncludedAnyLabelIDs) > 0 {
|
|
labels, err := issues_model.GetLabelsByIDs(ctx, options.IncludedAnyLabelIDs, "name")
|
|
if err != nil {
|
|
return nil, fmt.Errorf("GetLabelsByIDs: %v", err)
|
|
}
|
|
set := container.Set[string]{}
|
|
for _, label := range labels {
|
|
if !set.Contains(label.Name) {
|
|
set.Add(label.Name)
|
|
opts.IncludedLabelNames = append(opts.IncludedLabelNames, label.Name)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return opts, nil
|
|
}
|