Refactor compare router param parse and fix bugs #36105
Draft
+544
−172
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lunny
added
the
type/refactoring
GiteaBot
added
the
lgtm/need 2
github-actions
bot
added
modifies/api
Co-authored-by: techknowlogick <techknowlogick@gitea.io> Signed-off-by: Lunny Xiao <xiaolunwen@gmail.com>
Member
|
please have a look at #36116 |
lunny
changed the title
Member
Author
This has been included and it's ready to review now. |
Zettat123
approved these changes
Dec 11, 2025
GiteaBot
added
lgtm/need 1
kerwin612
approved these changes
Dec 12, 2025
GiteaBot
added
lgtm/done
wxiaoguang
reviewed
Dec 12, 2025
models/user/user.go
Outdated
|
|
||
| func GetUserOrOrgByName(ctx context.Context, name string) (*User, error) { | ||
| var u User | ||
| has, err := db.GetEngine(ctx).Where("name = ?", name).Get(&u) |
Contributor
There was a problem hiding this comment.
- Why not
lower_name - There is no existing similar function?
Member
Author
There was a problem hiding this comment.
6453e4a There is no existing function that can retrieve a user or an organization.
wxiaoguang
reviewed
Dec 12, 2025
routers/api/v1/repo/pull.go
Outdated
| return nil, nil | ||
| } | ||
| if headRepo == nil { | ||
| ctx.HTTPError(http.StatusBadRequest, "The user "+headOwner.Name+" does not have a fork of the base repository") |
Contributor
There was a problem hiding this comment.
Why sometimes APIError sometimes HTTPError?
wxiaoguang
reviewed
Dec 12, 2025
routers/web/repo/compare.go
Outdated
| } else { | ||
| ctx.ServerError("GetRepositoryByName", err) | ||
| } | ||
| return nil |
Contributor
There was a problem hiding this comment.
Why duplicate the code with API?
wxiaoguang
reviewed
Dec 12, 2025
routers/api/v1/repo/pull.go
Outdated
| } else { | ||
| headOwner, err = user_model.GetUserOrOrgByName(ctx, compareReq.HeadOwner) | ||
| if err != nil { | ||
| if user_model.IsErrUserNotExist(err) { |
Contributor
There was a problem hiding this comment.
GetUserOrOrgByName doesn't return errors for IsErrUserNotExist
Contributor
|
Is it safe to backport a refactoring PR with so many logic changes? |
GiteaBot
added
lgtm/need 1
GiteaBot
removed
the
lgtm/need 1
Member
Author
This will be partially backport. Only bugfixes will be backport. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #36116
Fix #35912
Fix #20906