Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move more functions to db.Find #28419

Merged
merged 28 commits into from
Jan 15, 2024
Merged

Move more functions to db.Find #28419

merged 28 commits into from
Jan 15, 2024

Conversation

lunny
Copy link
Member

@lunny lunny commented Dec 11, 2023 •
edited
Loading

Following #28220

This PR move more functions to use db.Find.

@lunny lunny added the type/refactoring Existing code has been cleaned up. There should be no new functionality. label Dec 11, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 11, 2023
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 11, 2023
@github-actions github-actions bot added the modifies/api This PR adds API routes or modifies them label Dec 11, 2023
@github-actions github-actions bot added the modifies/cli PR changes something on the CLI, i.e. gitea doctor or gitea admin label Dec 11, 2023
@delvh
Copy link
Member

delvh commented Dec 19, 2023

Something seems to have changed:

2023/12/13 09:36:03 ...hook_verification.go:68:readAndVerifyCommitsFromShaReader() [E] Unverified commit: d766f2917716d45be24bfa968b8409544941be32
2023/12/13 09:36:03 ...hook_verification.go:49:func2() [E] Unverified commit: d766f2917716d45be24bfa968b8409544941be32
2023/12/13 09:36:03 ...hook_verification.go:68:readAndVerifyCommitsFromShaReader() [E] Unverified commit: 93eac826f6188f34646cea81bf426aa5ba7d3bfe
2023/12/13 09:36:03 ...hook_verification.go:49:func2() [E] Unverified commit: 93eac826f6188f34646cea81bf426aa5ba7d3bfe
2023/12/13 09:36:03 ...hook_verification.go:68:readAndVerifyCommitsFromShaReader() [E] Unverified commit: 72920278f2f999e3005801e5d5b8ab8139d3641c
2023/12/13 09:36:03 ...hook_verification.go:49:func2() [E] Unverified commit: 72920278f2f999e3005801e5d5b8ab8139d3641c
2023/12/13 09:36:03 ...hook_verification.go:68:readAndVerifyCommitsFromShaReader() [E] Unverified commit: 9ce3f779ae33f31fce17fac3c512047b75d7498b
2023/12/13 09:36:03 ...hook_verification.go:49:func2() [E] Unverified commit: 9ce3f779ae33f31fce17fac3c512047b75d7498b
--- FAIL: TestVerifyCommits (0.18s)
hook_verification_test.go:38:
Error Trace: /home/runner/work/gitea/gitea/routers/private/hook_verification_test.go:38
Error: Received unexpected error:
Unverified commit: d766f2917716d45be24bfa968b8409544941be32
Test: TestVerifyCommits
hook_verification_test.go:38:
Error Trace: /home/runner/work/gitea/gitea/routers/private/hook_verification_test.go:38
Error: Received unexpected error:
Unverified commit: 93eac826f6188f34646cea81bf426aa5ba7d3bfe
Test: TestVerifyCommits

@delvh
Copy link
Member

delvh commented Dec 30, 2023

Sounds a bit like this PR is doomed to never be merged?
After all, the CI seems to have unfixable problems…

@lunny
Copy link
Member Author

lunny commented Dec 30, 2023

Maybe blocked by #28659

@pull-request-size pull-request-size bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 31, 2023
@lunny lunny changed the title WIP: Move more functions to db.Find Move more functions to db.Find Dec 31, 2023
@lunny lunny added this to the 1.22.0 milestone Dec 31, 2023
delvh
delvh reviewed Jan 1, 2024
View reviewed changes
routers/api/v1/repo/pull.go Outdated Show resolved Hide resolved
routers/api/v1/repo/pull.go Outdated Show resolved Hide resolved
routers/api/v1/repo/pull.go Outdated Show resolved Hide resolved
routers/api/v1/repo/pull.go Outdated Show resolved Hide resolved
models/asymkey/gpg_key_list.go Show resolved Hide resolved
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jan 2, 2024
@delvh
Copy link
Member

delvh commented Jan 2, 2024

Ping for other reviewers

@lunny
Copy link
Member Author

lunny commented Jan 11, 2024

Last call @go-gitea/technical-oversight-committee

@delvh delvh added the pr/last-call This PR has been stale for too long. If no one reviewes it within a week, it will be closed. label Jan 11, 2024
KN4CK3R
KN4CK3R reviewed Jan 11, 2024
View reviewed changes
models/asymkey/ssh_key.go Outdated Show resolved Hide resolved
models/issues/tracked_time.go Outdated Show resolved Hide resolved
services/repository/push.go Outdated Show resolved Hide resolved
services/asymkey/sign.go Outdated Show resolved Hide resolved
models/repo/collaboration.go Outdated Show resolved Hide resolved
routers/web/user/home.go Outdated Show resolved Hide resolved
denyskon
denyskon approved these changes Jan 14, 2024
View reviewed changes
routers/api/v1/user/gpg_key.go Outdated Show resolved Hide resolved
tests/integration/mirror_pull_test.go
Comment on lines +61 to +66
findOptions := repo_model.FindReleasesOptions{
IncludeDrafts: true,
IncludeTags: true,
RepoID: mirror.ID,
}
initCount, err := db.Count[repo_model.Release](db.DefaultContext, findOptions)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
findOptions := repo_model.FindReleasesOptions{
IncludeDrafts: true,
IncludeTags: true,
RepoID: mirror.ID,
}
initCount, err := db.Count[repo_model.Release](db.DefaultContext, findOptions)
initCount, err := db.Count[repo_model.Release](db.DefaultContext, repo_model.FindReleasesOptions{
IncludeDrafts: true,
IncludeTags: true,
RepoID: mirror.ID,
})

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

findOptions will be reused on following code.

models/repo/collaboration.go Outdated Show resolved Hide resolved
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jan 14, 2024
@denyskon denyskon removed the pr/last-call This PR has been stale for too long. If no one reviewes it within a week, it will be closed. label Jan 14, 2024
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 15, 2024
@lunny lunny enabled auto-merge (squash) January 15, 2024 01:47
@lunny lunny merged commit 70c4aad into go-gitea:main Jan 15, 2024
25 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 15, 2024
@lunny lunny deleted the lunny/third_db_find branch January 15, 2024 04:24
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jan 16, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
b112684 
* giteaofficial/main: (34 commits)
  Use refname:strip-2 instead of refname:short when syncing tags (go-gitea#28797)
  Add gist to comparison (go-gitea#28809)
  Fix links in issue card (go-gitea#28806)
  Show latest commit for file (go-gitea#28067)
  Add ability to see open and closed issues at the same time (go-gitea#28757)
  Display latest sync time for pull mirrors on the repo page (go-gitea#28712)
  Fix `GetCommitStatuses` (go-gitea#28787)
  Caller should check the ResponseExtra.HasError() first to see whether the request fails (go-gitea#28796)
  Rework markup link rendering (go-gitea#26745)
  Fix nil pointer panic when exec some gitea cli command (go-gitea#28791)
  Add branch protection setting for ignoring stale approvals (go-gitea#28498)
  Forbid removing the last admin user (go-gitea#28337)
  Fix when private user following user, private user will not be counted in his own view (go-gitea#28037)
  Update github.com/cloudflare/circl (go-gitea#28789)
  Move more functions to db.Find (go-gitea#28419)
  Add non-JS fallback for reaction tooltips (go-gitea#28785)
  Modernize merge button (go-gitea#28140)
  Warn that `DISABLE_QUERY_AUTH_TOKEN` is false only if it's explicitly defined (go-gitea#28783)
  Speed up loading the dashboard on mysql/mariadb (go-gitea#28546)
  Fix schedule tasks bugs (go-gitea#28691)
  ...
fuxiaohei pushed a commit to fuxiaohei/gitea that referenced this pull request Jan 17, 2024
@lunny @delvh @fuxiaohei
Move more functions to db.Find (go-gitea#28419)
23179ec 
Following go-gitea#28220

This PR move more functions to use `db.Find`.

---------

Co-authored-by: delvh <[email protected]>
silverwind pushed a commit to silverwind/gitea that referenced this pull request Feb 20, 2024
@lunny @delvh @silverwind
Move more functions to db.Find (go-gitea#28419)
3396b9a 
Following go-gitea#28220

This PR move more functions to use `db.Find`.

---------

Co-authored-by: delvh <[email protected]>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@delvh delvh delvh approved these changes

@KN4CK3R KN4CK3R KN4CK3R left review comments

@denyskon denyskon denyskon approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/api This PR adds API routes or modifies them modifies/cli PR changes something on the CLI, i.e. gitea doctor or gitea admin size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. type/refactoring Existing code has been cleaned up. There should be no new functionality.
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.
5 participants
@lunny @delvh @KN4CK3R @denyskon @GiteaBot