Skip to content

Commit edbaa5d

Browse files
KN4CK3Rwxiaoguang
andauthored
Added GetUserByIDCtx. (#17602)
Co-authored-by: wxiaoguang <[email protected]>
1 parent 465fb41 commit edbaa5d

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

models/issue_comment.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ func (c *Comment) LoadAssigneeUserAndTeam() error {
488488
var err error
489489

490490
if c.AssigneeID > 0 && c.Assignee == nil {
491-
c.Assignee, err = getUserByID(db.GetEngine(db.DefaultContext), c.AssigneeID)
491+
c.Assignee, err = GetUserByIDCtx(db.DefaultContext, c.AssigneeID)
492492
if err != nil {
493493
if !IsErrUserNotExist(err) {
494494
return err
@@ -523,7 +523,7 @@ func (c *Comment) LoadResolveDoer() (err error) {
523523
if c.ResolveDoerID == 0 || c.Type != CommentTypeCode {
524524
return nil
525525
}
526-
c.ResolveDoer, err = getUserByID(db.GetEngine(db.DefaultContext), c.ResolveDoerID)
526+
c.ResolveDoer, err = GetUserByIDCtx(db.DefaultContext, c.ResolveDoerID)
527527
if err != nil {
528528
if IsErrUserNotExist(err) {
529529
c.ResolveDoer = NewGhostUser()

models/issue_reaction.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ func (r *Reaction) LoadUser() (*User, error) {
240240
if r.User != nil {
241241
return r.User, nil
242242
}
243-
user, err := getUserByID(db.GetEngine(db.DefaultContext), r.UserID)
243+
user, err := GetUserByIDCtx(db.DefaultContext, r.UserID)
244244
if err != nil {
245245
return nil, err
246246
}

models/user.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1392,7 +1392,12 @@ func getUserByID(e db.Engine, id int64) (*User, error) {
13921392

13931393
// GetUserByID returns the user object by given ID if exists.
13941394
func GetUserByID(id int64) (*User, error) {
1395-
return getUserByID(db.GetEngine(db.DefaultContext), id)
1395+
return GetUserByIDCtx(db.DefaultContext, id)
1396+
}
1397+
1398+
// GetUserByIDCtx returns the user object by given ID if exists.
1399+
func GetUserByIDCtx(ctx context.Context, id int64) (*User, error) {
1400+
return getUserByID(db.GetEngine(ctx), id)
13961401
}
13971402

13981403
// GetUserByName returns user by given name.
@@ -1577,7 +1582,7 @@ func GetUserByEmailContext(ctx context.Context, email string) (*User, error) {
15771582
return nil, err
15781583
}
15791584
if has {
1580-
return getUserByID(db.GetEngine(ctx), emailAddress.UID)
1585+
return GetUserByIDCtx(ctx, emailAddress.UID)
15811586
}
15821587

15831588
// Finally, if email address is the protected email address:

0 commit comments

Comments
 (0)