mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-05-17 00:06:35 +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>
70 lines
1.9 KiB
Go
70 lines
1.9 KiB
Go
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package nuget
|
|
|
|
import (
|
|
"context"
|
|
"strings"
|
|
|
|
"forgejo.org/models/db"
|
|
packages_model "forgejo.org/models/packages"
|
|
|
|
"xorm.io/builder"
|
|
)
|
|
|
|
// SearchVersions gets all versions of packages matching the search options
|
|
func SearchVersions(ctx context.Context, opts *packages_model.PackageSearchOptions) ([]*packages_model.PackageVersion, int64, error) {
|
|
cond := toConds(opts)
|
|
|
|
e := db.GetEngine(ctx)
|
|
|
|
total, err := e.
|
|
Where(cond).
|
|
Count(&packages_model.Package{})
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
|
|
inner := builder.
|
|
Dialect(db.BuilderDialect()). // builder needs the sql dialect to build the Limit() below
|
|
Select("*").
|
|
From("package").
|
|
Where(cond).
|
|
OrderBy("package.name ASC")
|
|
if opts.Paginator != nil {
|
|
skip, take := opts.GetSkipTake()
|
|
inner = inner.Limit(take, skip)
|
|
}
|
|
|
|
sess := e.
|
|
Where(opts.ToConds()).
|
|
Table("package_version").
|
|
Join("INNER", inner, "package.id = package_version.package_id")
|
|
|
|
pvs := make([]*packages_model.PackageVersion, 0, 10)
|
|
return pvs, total, sess.Find(&pvs)
|
|
}
|
|
|
|
// CountPackages counts all packages matching the search options
|
|
func CountPackages(ctx context.Context, opts *packages_model.PackageSearchOptions) (int64, error) {
|
|
return db.GetEngine(ctx).
|
|
Where(toConds(opts)).
|
|
Count(&packages_model.Package{})
|
|
}
|
|
|
|
func toConds(opts *packages_model.PackageSearchOptions) builder.Cond {
|
|
var cond builder.Cond = builder.Eq{
|
|
"package.is_internal": opts.IsInternal.ValueOrZeroValue(),
|
|
"package.owner_id": opts.OwnerID,
|
|
"package.type": packages_model.TypeNuGet,
|
|
}
|
|
if opts.Name.Value != "" {
|
|
if opts.Name.ExactMatch {
|
|
cond = cond.And(builder.Eq{"package.lower_name": strings.ToLower(opts.Name.Value)})
|
|
} else {
|
|
cond = cond.And(builder.Like{"package.lower_name", strings.ToLower(opts.Name.Value)})
|
|
}
|
|
}
|
|
return cond
|
|
}
|