Skip to content

Commit 0a7d3ff

Browse files
lunnyKN4CK3Rlafriks
authored
refactor some functions to support ctx as first parameter (#21878)
Co-authored-by: KN4CK3R <[email protected]> Co-authored-by: Lauris BH <[email protected]>
1 parent 8698458 commit 0a7d3ff

File tree

145 files changed

+360
-369
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+360
-369
lines changed

‎cmd/admin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ func runDeleteUser(c *cli.Context) error {
665665
} else if c.IsSet("username") {
666666
user, err = user_model.GetUserByName(ctx, c.String("username"))
667667
} else {
668-
user, err = user_model.GetUserByID(c.Int64("id"))
668+
user, err = user_model.GetUserByID(ctx, c.Int64("id"))
669669
}
670670
if err != nil {
671671
return err

‎models/activities/action.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,12 @@ func (a *Action) GetOpType() ActionType {
114114
}
115115

116116
// LoadActUser loads a.ActUser
117-
func (a *Action) LoadActUser() {
117+
func (a *Action) LoadActUser(ctx context.Context) {
118118
if a.ActUser != nil {
119119
return
120120
}
121121
var err error
122-
a.ActUser, err = user_model.GetUserByID(a.ActUserID)
122+
a.ActUser, err = user_model.GetUserByID(ctx, a.ActUserID)
123123
if err == nil {
124124
return
125125
} else if user_model.IsErrUserNotExist(err) {
@@ -129,26 +129,26 @@ func (a *Action) LoadActUser() {
129129
}
130130
}
131131

132-
func (a *Action) loadRepo() {
132+
func (a *Action) loadRepo(ctx context.Context) {
133133
if a.Repo != nil {
134134
return
135135
}
136136
var err error
137-
a.Repo, err = repo_model.GetRepositoryByID(a.RepoID)
137+
a.Repo, err = repo_model.GetRepositoryByID(ctx, a.RepoID)
138138
if err != nil {
139139
log.Error("repo_model.GetRepositoryByID(%d): %v", a.RepoID, err)
140140
}
141141
}
142142

143143
// GetActFullName gets the action's user full name.
144144
func (a *Action) GetActFullName() string {
145-
a.LoadActUser()
145+
a.LoadActUser(db.DefaultContext)
146146
return a.ActUser.FullName
147147
}
148148

149149
// GetActUserName gets the action's user name.
150150
func (a *Action) GetActUserName() string {
151-
a.LoadActUser()
151+
a.LoadActUser(db.DefaultContext)
152152
return a.ActUser.Name
153153
}
154154

@@ -179,7 +179,7 @@ func (a *Action) GetDisplayNameTitle() string {
179179

180180
// GetRepoUserName returns the name of the action repository owner.
181181
func (a *Action) GetRepoUserName() string {
182-
a.loadRepo()
182+
a.loadRepo(db.DefaultContext)
183183
return a.Repo.OwnerName
184184
}
185185

@@ -191,7 +191,7 @@ func (a *Action) ShortRepoUserName() string {
191191

192192
// GetRepoName returns the name of the action repository.
193193
func (a *Action) GetRepoName() string {
194-
a.loadRepo()
194+
a.loadRepo(db.DefaultContext)
195195
return a.Repo.Name
196196
}
197197

@@ -379,7 +379,7 @@ func activityQueryCondition(opts GetFeedsOptions) (builder.Cond, error) {
379379
cond := builder.NewCond()
380380

381381
if opts.RequestedTeam != nil && opts.RequestedUser == nil {
382-
org, err := user_model.GetUserByID(opts.RequestedTeam.OrgID)
382+
org, err := user_model.GetUserByID(db.DefaultContext, opts.RequestedTeam.OrgID)
383383
if err != nil {
384384
return nil, err
385385
}
@@ -489,7 +489,7 @@ func NotifyWatchers(ctx context.Context, actions ...*Action) error {
489489
}
490490

491491
if repoChanged {
492-
act.loadRepo()
492+
act.loadRepo(ctx)
493493
repo = act.Repo
494494

495495
// check repo owner exist.
@@ -514,7 +514,7 @@ func NotifyWatchers(ctx context.Context, actions ...*Action) error {
514514
permIssue = make([]bool, len(watchers))
515515
permPR = make([]bool, len(watchers))
516516
for i, watcher := range watchers {
517-
user, err := user_model.GetUserByIDCtx(ctx, watcher.UserID)
517+
user, err := user_model.GetUserByID(ctx, watcher.UserID)
518518
if err != nil {
519519
permCode[i] = false
520520
permIssue[i] = false

‎models/activities/action_list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func (actions ActionList) loadRepoOwner(ctx context.Context, userMap map[int64]*
8181
}
8282
repoOwner, ok := userMap[action.Repo.OwnerID]
8383
if !ok {
84-
repoOwner, err = user_model.GetUserByIDCtx(ctx, action.Repo.OwnerID)
84+
repoOwner, err = user_model.GetUserByID(ctx, action.Repo.OwnerID)
8585
if err != nil {
8686
if user_model.IsErrUserNotExist(err) {
8787
continue

‎models/activities/notification.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ func createOrUpdateIssueNotifications(ctx context.Context, issueID, commentID, n
245245
// notify
246246
for userID := range toNotify {
247247
issue.Repo.Units = nil
248-
user, err := user_model.GetUserByIDCtx(ctx, userID)
248+
user, err := user_model.GetUserByID(ctx, userID)
249249
if err != nil {
250250
if user_model.IsErrUserNotExist(err) {
251251
continue
@@ -388,7 +388,7 @@ func (n *Notification) LoadAttributes(ctx context.Context) (err error) {
388388

389389
func (n *Notification) loadRepo(ctx context.Context) (err error) {
390390
if n.Repository == nil {
391-
n.Repository, err = repo_model.GetRepositoryByIDCtx(ctx, n.RepoID)
391+
n.Repository, err = repo_model.GetRepositoryByID(ctx, n.RepoID)
392392
if err != nil {
393393
return fmt.Errorf("getRepositoryByID [%d]: %w", n.RepoID, err)
394394
}
@@ -425,7 +425,7 @@ func (n *Notification) loadComment(ctx context.Context) (err error) {
425425

426426
func (n *Notification) loadUser(ctx context.Context) (err error) {
427427
if n.User == nil {
428-
n.User, err = user_model.GetUserByIDCtx(ctx, n.UserID)
428+
n.User, err = user_model.GetUserByID(ctx, n.UserID)
429429
if err != nil {
430430
return fmt.Errorf("getUserByID [%d]: %w", n.UserID, err)
431431
}

‎models/asymkey/gpg_key_commit_verification.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ func hashAndVerifyForKeyID(sig *packet.Signature, payload string, committer *use
426426
Email: email,
427427
}
428428
if key.OwnerID != 0 {
429-
owner, err := user_model.GetUserByID(key.OwnerID)
429+
owner, err := user_model.GetUserByID(db.DefaultContext, key.OwnerID)
430430
if err == nil {
431431
signer = owner
432432
} else if !user_model.IsErrUserNotExist(err) {

‎models/git/branches.go

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ func (protectBranch *ProtectedBranch) CanUserPush(userID int64) bool {
7373
}
7474

7575
if !protectBranch.EnableWhitelist {
76-
if user, err := user_model.GetUserByID(userID); err != nil {
76+
if user, err := user_model.GetUserByID(db.DefaultContext, userID); err != nil {
7777
log.Error("GetUserByID: %v", err)
7878
return false
79-
} else if repo, err := repo_model.GetRepositoryByID(protectBranch.RepoID); err != nil {
79+
} else if repo, err := repo_model.GetRepositoryByID(db.DefaultContext, protectBranch.RepoID); err != nil {
8080
log.Error("repo_model.GetRepositoryByID: %v", err)
8181
return false
8282
} else if writeAccess, err := access_model.HasAccessUnit(db.DefaultContext, user, repo, unit.TypeCode, perm.AccessModeWrite); err != nil {
@@ -127,13 +127,8 @@ func IsUserMergeWhitelisted(ctx context.Context, protectBranch *ProtectedBranch,
127127
}
128128

129129
// IsUserOfficialReviewer check if user is official reviewer for the branch (counts towards required approvals)
130-
func IsUserOfficialReviewer(protectBranch *ProtectedBranch, user *user_model.User) (bool, error) {
131-
return IsUserOfficialReviewerCtx(db.DefaultContext, protectBranch, user)
132-
}
133-
134-
// IsUserOfficialReviewerCtx check if user is official reviewer for the branch (counts towards required approvals)
135-
func IsUserOfficialReviewerCtx(ctx context.Context, protectBranch *ProtectedBranch, user *user_model.User) (bool, error) {
136-
repo, err := repo_model.GetRepositoryByIDCtx(ctx, protectBranch.RepoID)
130+
func IsUserOfficialReviewer(ctx context.Context, protectBranch *ProtectedBranch, user *user_model.User) (bool, error) {
131+
repo, err := repo_model.GetRepositoryByID(ctx, protectBranch.RepoID)
137132
if err != nil {
138133
return false, err
139134
}
@@ -375,7 +370,7 @@ func updateUserWhitelist(ctx context.Context, repo *repo_model.Repository, curre
375370

376371
whitelist = make([]int64, 0, len(newWhitelist))
377372
for _, userID := range newWhitelist {
378-
user, err := user_model.GetUserByIDCtx(ctx, userID)
373+
user, err := user_model.GetUserByID(ctx, userID)
379374
if err != nil {
380375
return nil, fmt.Errorf("GetUserByID [user_id: %d, repo_id: %d]: %w", userID, repo.ID, err)
381376
}
@@ -494,8 +489,8 @@ func RemoveDeletedBranchByID(repoID, id int64) (err error) {
494489

495490
// LoadUser loads the user that deleted the branch
496491
// When there's no user found it returns a user_model.NewGhostUser
497-
func (deletedBranch *DeletedBranch) LoadUser() {
498-
user, err := user_model.GetUserByID(deletedBranch.DeletedByID)
492+
func (deletedBranch *DeletedBranch) LoadUser(ctx context.Context) {
493+
user, err := user_model.GetUserByID(ctx, deletedBranch.DeletedByID)
499494
if err != nil {
500495
user = user_model.NewGhostUser()
501496
}

‎models/git/branches_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ func TestDeletedBranchLoadUser(t *testing.T) {
4848

4949
branch := getDeletedBranch(t, firstBranch)
5050
assert.Nil(t, branch.DeletedBy)
51-
branch.LoadUser()
51+
branch.LoadUser(db.DefaultContext)
5252
assert.NotNil(t, branch.DeletedBy)
5353
assert.Equal(t, "user1", branch.DeletedBy.Name)
5454

5555
branch = getDeletedBranch(t, secondBranch)
5656
assert.Nil(t, branch.DeletedBy)
57-
branch.LoadUser()
57+
branch.LoadUser(db.DefaultContext)
5858
assert.NotNil(t, branch.DeletedBy)
5959
assert.Equal(t, "Ghost", branch.DeletedBy.Name)
6060
}

‎models/git/commit_status.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,13 @@ func GetNextCommitStatusIndex(ctx context.Context, repoID int64, sha string) (in
114114

115115
func (status *CommitStatus) loadAttributes(ctx context.Context) (err error) {
116116
if status.Repo == nil {
117-
status.Repo, err = repo_model.GetRepositoryByIDCtx(ctx, status.RepoID)
117+
status.Repo, err = repo_model.GetRepositoryByID(ctx, status.RepoID)
118118
if err != nil {
119119
return fmt.Errorf("getRepositoryByID [%d]: %w", status.RepoID, err)
120120
}
121121
}
122122
if status.Creator == nil && status.CreatorID > 0 {
123-
status.Creator, err = user_model.GetUserByIDCtx(ctx, status.CreatorID)
123+
status.Creator, err = user_model.GetUserByID(ctx, status.CreatorID)
124124
if err != nil {
125125
return fmt.Errorf("getUserByID [%d]: %w", status.CreatorID, err)
126126
}

‎models/git/lfs_lock.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ func CheckLFSAccessForRepo(ctx context.Context, ownerID int64, repo *repo_model.
167167
if ownerID == 0 {
168168
return ErrLFSUnauthorizedAction{repo.ID, "undefined", mode}
169169
}
170-
u, err := user_model.GetUserByIDCtx(ctx, ownerID)
170+
u, err := user_model.GetUserByID(ctx, ownerID)
171171
if err != nil {
172172
return err
173173
}

‎models/issues/assignees.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func toggleIssueAssignee(ctx context.Context, issue *Issue, doer *user_model.Use
118118
// toggles user assignee state in database
119119
func toggleUserAssignee(ctx context.Context, issue *Issue, assigneeID int64) (removed bool, err error) {
120120
// Check if the user exists
121-
assignee, err := user_model.GetUserByIDCtx(ctx, assigneeID)
121+
assignee, err := user_model.GetUserByID(ctx, assigneeID)
122122
if err != nil {
123123
return false, err
124124
}

‎models/issues/assignees_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@ func TestUpdateAssignee(t *testing.T) {
2222
assert.NoError(t, err)
2323

2424
// Assign multiple users
25-
user2, err := user_model.GetUserByID(2)
25+
user2, err := user_model.GetUserByID(db.DefaultContext, 2)
2626
assert.NoError(t, err)
2727
_, _, err = issues_model.ToggleIssueAssignee(issue, &user_model.User{ID: 1}, user2.ID)
2828
assert.NoError(t, err)
2929

30-
user3, err := user_model.GetUserByID(3)
30+
user3, err := user_model.GetUserByID(db.DefaultContext, 3)
3131
assert.NoError(t, err)
3232
_, _, err = issues_model.ToggleIssueAssignee(issue, &user_model.User{ID: 1}, user3.ID)
3333
assert.NoError(t, err)
3434

35-
user1, err := user_model.GetUserByID(1) // This user is already assigned (see the definition in fixtures), so running UpdateAssignee should unassign him
35+
user1, err := user_model.GetUserByID(db.DefaultContext, 1) // This user is already assigned (see the definition in fixtures), so running UpdateAssignee should unassign him
3636
assert.NoError(t, err)
3737
_, _, err = issues_model.ToggleIssueAssignee(issue, &user_model.User{ID: 1}, user1.ID)
3838
assert.NoError(t, err)

‎models/issues/comment.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ func (c *Comment) LoadPoster(ctx context.Context) (err error) {
350350
return nil
351351
}
352352

353-
c.Poster, err = user_model.GetUserByIDCtx(ctx, c.PosterID)
353+
c.Poster, err = user_model.GetUserByID(ctx, c.PosterID)
354354
if err != nil {
355355
if user_model.IsErrUserNotExist(err) {
356356
c.PosterID = -1
@@ -580,7 +580,7 @@ func (c *Comment) LoadAssigneeUserAndTeam() error {
580580
var err error
581581

582582
if c.AssigneeID > 0 && c.Assignee == nil {
583-
c.Assignee, err = user_model.GetUserByIDCtx(db.DefaultContext, c.AssigneeID)
583+
c.Assignee, err = user_model.GetUserByID(db.DefaultContext, c.AssigneeID)
584584
if err != nil {
585585
if !user_model.IsErrUserNotExist(err) {
586586
return err
@@ -615,7 +615,7 @@ func (c *Comment) LoadResolveDoer() (err error) {
615615
if c.ResolveDoerID == 0 || c.Type != CommentTypeCode {
616616
return nil
617617
}
618-
c.ResolveDoer, err = user_model.GetUserByIDCtx(db.DefaultContext, c.ResolveDoerID)
618+
c.ResolveDoer, err = user_model.GetUserByID(db.DefaultContext, c.ResolveDoerID)
619619
if err != nil {
620620
if user_model.IsErrUserNotExist(err) {
621621
c.ResolveDoer = user_model.NewGhostUser()

‎models/issues/dependency_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestCreateIssueDependency(t *testing.T) {
1818
// Prepare
1919
assert.NoError(t, unittest.PrepareTestDatabase())
2020

21-
user1, err := user_model.GetUserByID(1)
21+
user1, err := user_model.GetUserByID(db.DefaultContext, 1)
2222
assert.NoError(t, err)
2323

2424
issue1, err := issues_model.GetIssueByID(db.DefaultContext, 1)

‎models/issues/issue.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ func (issue *Issue) IsOverdue() bool {
193193
// LoadRepo loads issue's repository
194194
func (issue *Issue) LoadRepo(ctx context.Context) (err error) {
195195
if issue.Repo == nil {
196-
issue.Repo, err = repo_model.GetRepositoryByIDCtx(ctx, issue.RepoID)
196+
issue.Repo, err = repo_model.GetRepositoryByID(ctx, issue.RepoID)
197197
if err != nil {
198198
return fmt.Errorf("getRepositoryByID [%d]: %w", issue.RepoID, err)
199199
}
@@ -242,7 +242,7 @@ func (issue *Issue) LoadLabels(ctx context.Context) (err error) {
242242
// LoadPoster loads poster
243243
func (issue *Issue) LoadPoster(ctx context.Context) (err error) {
244244
if issue.Poster == nil {
245-
issue.Poster, err = user_model.GetUserByIDCtx(ctx, issue.PosterID)
245+
issue.Poster, err = user_model.GetUserByID(ctx, issue.PosterID)
246246
if err != nil {
247247
issue.PosterID = -1
248248
issue.Poster = user_model.NewGhostUser()

‎models/issues/issue_xref.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func (issue *Issue) getCrossReferences(stdCtx context.Context, ctx *crossReferen
148148
refRepo = ctx.OrigIssue.Repo
149149
} else {
150150
// Issues in other repositories
151-
refRepo, err = repo_model.GetRepositoryByOwnerAndNameCtx(stdCtx, ref.Owner, ref.Name)
151+
refRepo, err = repo_model.GetRepositoryByOwnerAndName(stdCtx, ref.Owner, ref.Name)
152152
if err != nil {
153153
if repo_model.IsErrRepoNotExist(err) {
154154
continue

‎models/issues/milestone.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ func DeleteMilestoneByRepoID(repoID, id int64) error {
284284
return err
285285
}
286286

287-
repo, err := repo_model.GetRepositoryByID(m.RepoID)
287+
repo, err := repo_model.GetRepositoryByID(db.DefaultContext, m.RepoID)
288288
if err != nil {
289289
return err
290290
}

‎models/issues/pull.go

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ func (pr *PullRequest) MustHeadUserName(ctx context.Context) string {
223223
// Note: don't try to get Issue because will end up recursive querying.
224224
func (pr *PullRequest) LoadAttributes(ctx context.Context) (err error) {
225225
if pr.HasMerged && pr.Merger == nil {
226-
pr.Merger, err = user_model.GetUserByIDCtx(ctx, pr.MergerID)
226+
pr.Merger, err = user_model.GetUserByID(ctx, pr.MergerID)
227227
if user_model.IsErrUserNotExist(err) {
228228
pr.MergerID = -1
229229
pr.Merger = user_model.NewGhostUser()
@@ -248,9 +248,9 @@ func (pr *PullRequest) LoadHeadRepo(ctx context.Context) (err error) {
248248
}
249249
}
250250

251-
pr.HeadRepo, err = repo_model.GetRepositoryByIDCtx(ctx, pr.HeadRepoID)
251+
pr.HeadRepo, err = repo_model.GetRepositoryByID(ctx, pr.HeadRepoID)
252252
if err != nil && !repo_model.IsErrRepoNotExist(err) { // Head repo maybe deleted, but it should still work
253-
return fmt.Errorf("getRepositoryByID(head): %w", err)
253+
return fmt.Errorf("GetRepositoryByID(head): %w", err)
254254
}
255255
pr.isHeadRepoLoaded = true
256256
}
@@ -273,7 +273,7 @@ func (pr *PullRequest) LoadBaseRepo(ctx context.Context) (err error) {
273273
return nil
274274
}
275275

276-
pr.BaseRepo, err = repo_model.GetRepositoryByIDCtx(ctx, pr.BaseRepoID)
276+
pr.BaseRepo, err = repo_model.GetRepositoryByID(ctx, pr.BaseRepoID)
277277
if err != nil {
278278
return fmt.Errorf("repo_model.GetRepositoryByID(base): %w", err)
279279
}
@@ -294,18 +294,13 @@ func (pr *PullRequest) LoadIssue(ctx context.Context) (err error) {
294294
}
295295

296296
// LoadProtectedBranch loads the protected branch of the base branch
297-
func (pr *PullRequest) LoadProtectedBranch() (err error) {
298-
return pr.LoadProtectedBranchCtx(db.DefaultContext)
299-
}
300-
301-
// LoadProtectedBranchCtx loads the protected branch of the base branch
302-
func (pr *PullRequest) LoadProtectedBranchCtx(ctx context.Context) (err error) {
297+
func (pr *PullRequest) LoadProtectedBranch(ctx context.Context) (err error) {
303298
if pr.ProtectedBranch == nil {
304299
if pr.BaseRepo == nil {
305300
if pr.BaseRepoID == 0 {
306301
return nil
307302
}
308-
pr.BaseRepo, err = repo_model.GetRepositoryByIDCtx(ctx, pr.BaseRepoID)
303+
pr.BaseRepo, err = repo_model.GetRepositoryByID(ctx, pr.BaseRepoID)
309304
if err != nil {
310305
return
311306
}

‎models/issues/reaction.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func (r *Reaction) LoadUser() (*user_model.User, error) {
7575
if r.User != nil {
7676
return r.User, nil
7777
}
78-
user, err := user_model.GetUserByIDCtx(db.DefaultContext, r.UserID)
78+
user, err := user_model.GetUserByID(db.DefaultContext, r.UserID)
7979
if err != nil {
8080
return nil, err
8181
}

0 commit comments

Comments
 (0)