Skip to content

Commit cc5df26

Browse files
JakobDevlunnydelvh
authored
Even more db.DefaultContext refactor (#27352)
Part of #27065 --------- Co-authored-by: Lunny Xiao <[email protected]> Co-authored-by: delvh <[email protected]>
1 parent 08507e2 commit cc5df26

File tree

97 files changed

+298
-294
lines changed

Some content is hidden

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

97 files changed

+298
-294
lines changed

‎models/activities/action.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ func activityQueryCondition(ctx context.Context, opts GetFeedsOptions) (builder.
524524
}
525525

526526
if opts.RequestedTeam != nil {
527-
env := organization.OrgFromUser(opts.RequestedUser).AccessibleTeamReposEnv(opts.RequestedTeam)
527+
env := organization.OrgFromUser(opts.RequestedUser).AccessibleTeamReposEnv(ctx, opts.RequestedTeam)
528528
teamRepoIDs, err := env.RepoIDs(1, opts.RequestedUser.NumRepos)
529529
if err != nil {
530530
return nil, fmt.Errorf("GetTeamRepositories: %w", err)

‎models/activities/statistic.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ type IssueByRepositoryCount struct {
5252
func GetStatistic(ctx context.Context) (stats Statistic) {
5353
e := db.GetEngine(ctx)
5454
stats.Counter.User = user_model.CountUsers(ctx, nil)
55-
stats.Counter.Org, _ = organization.CountOrgs(organization.FindOrgOptions{IncludePrivate: true})
55+
stats.Counter.Org, _ = organization.CountOrgs(ctx, organization.FindOrgOptions{IncludePrivate: true})
5656
stats.Counter.PublicKey, _ = e.Count(new(asymkey_model.PublicKey))
5757
stats.Counter.Repo, _ = repo_model.CountRepositories(ctx, repo_model.CountRepositoryOptions{})
5858
stats.Counter.Watch, _ = e.Count(new(repo_model.Watch))

‎models/issues/assignees_test.go

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

2020
// Fake issue with assignees
21-
issue, err := issues_model.GetIssueWithAttrsByID(1)
21+
issue, err := issues_model.GetIssueWithAttrsByID(db.DefaultContext, 1)
2222
assert.NoError(t, err)
2323

2424
// Assign multiple users

‎models/issues/comment.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -655,12 +655,12 @@ func (c *Comment) LoadDepIssueDetails(ctx context.Context) (err error) {
655655
}
656656

657657
// LoadTime loads the associated time for a CommentTypeAddTimeManual
658-
func (c *Comment) LoadTime() error {
658+
func (c *Comment) LoadTime(ctx context.Context) error {
659659
if c.Time != nil || c.TimeID == 0 {
660660
return nil
661661
}
662662
var err error
663-
c.Time, err = GetTrackedTimeByID(c.TimeID)
663+
c.Time, err = GetTrackedTimeByID(ctx, c.TimeID)
664664
return err
665665
}
666666

‎models/issues/issue.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,12 @@ func (issue *Issue) IsTimetrackerEnabled(ctx context.Context) bool {
201201
}
202202

203203
// GetPullRequest returns the issue pull request
204-
func (issue *Issue) GetPullRequest() (pr *PullRequest, err error) {
204+
func (issue *Issue) GetPullRequest(ctx context.Context) (pr *PullRequest, err error) {
205205
if !issue.IsPull {
206206
return nil, fmt.Errorf("Issue is not a pull request")
207207
}
208208

209-
pr, err = GetPullRequestByIssueID(db.DefaultContext, issue.ID)
209+
pr, err = GetPullRequestByIssueID(ctx, issue.ID)
210210
if err != nil {
211211
return nil, err
212212
}
@@ -369,9 +369,9 @@ func (issue *Issue) LoadAttributes(ctx context.Context) (err error) {
369369
}
370370

371371
// GetIsRead load the `IsRead` field of the issue
372-
func (issue *Issue) GetIsRead(userID int64) error {
372+
func (issue *Issue) GetIsRead(ctx context.Context, userID int64) error {
373373
issueUser := &IssueUser{IssueID: issue.ID, UID: userID}
374-
if has, err := db.GetEngine(db.DefaultContext).Get(issueUser); err != nil {
374+
if has, err := db.GetEngine(ctx).Get(issueUser); err != nil {
375375
return err
376376
} else if !has {
377377
issue.IsRead = false
@@ -382,9 +382,9 @@ func (issue *Issue) GetIsRead(userID int64) error {
382382
}
383383

384384
// APIURL returns the absolute APIURL to this issue.
385-
func (issue *Issue) APIURL() string {
385+
func (issue *Issue) APIURL(ctx context.Context) string {
386386
if issue.Repo == nil {
387-
err := issue.LoadRepo(db.DefaultContext)
387+
err := issue.LoadRepo(ctx)
388388
if err != nil {
389389
log.Error("Issue[%d].APIURL(): %v", issue.ID, err)
390390
return ""
@@ -479,9 +479,9 @@ func (issue *Issue) GetLastEventLabel() string {
479479
}
480480

481481
// GetLastComment return last comment for the current issue.
482-
func (issue *Issue) GetLastComment() (*Comment, error) {
482+
func (issue *Issue) GetLastComment(ctx context.Context) (*Comment, error) {
483483
var c Comment
484-
exist, err := db.GetEngine(db.DefaultContext).Where("type = ?", CommentTypeComment).
484+
exist, err := db.GetEngine(ctx).Where("type = ?", CommentTypeComment).
485485
And("issue_id = ?", issue.ID).Desc("created_unix").Get(&c)
486486
if err != nil {
487487
return nil, err
@@ -543,12 +543,12 @@ func GetIssueByID(ctx context.Context, id int64) (*Issue, error) {
543543
}
544544

545545
// GetIssueWithAttrsByID returns an issue with attributes by given ID.
546-
func GetIssueWithAttrsByID(id int64) (*Issue, error) {
547-
issue, err := GetIssueByID(db.DefaultContext, id)
546+
func GetIssueWithAttrsByID(ctx context.Context, id int64) (*Issue, error) {
547+
issue, err := GetIssueByID(ctx, id)
548548
if err != nil {
549549
return nil, err
550550
}
551-
return issue, issue.LoadAttributes(db.DefaultContext)
551+
return issue, issue.LoadAttributes(ctx)
552552
}
553553

554554
// GetIssuesByIDs return issues with the given IDs.
@@ -600,8 +600,8 @@ func GetParticipantsIDsByIssueID(ctx context.Context, issueID int64) ([]int64, e
600600
}
601601

602602
// IsUserParticipantsOfIssue return true if user is participants of an issue
603-
func IsUserParticipantsOfIssue(user *user_model.User, issue *Issue) bool {
604-
userIDs, err := issue.GetParticipantIDsByIssue(db.DefaultContext)
603+
func IsUserParticipantsOfIssue(ctx context.Context, user *user_model.User, issue *Issue) bool {
604+
userIDs, err := issue.GetParticipantIDsByIssue(ctx)
605605
if err != nil {
606606
log.Error(err.Error())
607607
return false
@@ -894,8 +894,8 @@ func IsErrIssueMaxPinReached(err error) bool {
894894
}
895895

896896
// InsertIssues insert issues to database
897-
func InsertIssues(issues ...*Issue) error {
898-
ctx, committer, err := db.TxContext(db.DefaultContext)
897+
func InsertIssues(ctx context.Context, issues ...*Issue) error {
898+
ctx, committer, err := db.TxContext(ctx)
899899
if err != nil {
900900
return err
901901
}

‎models/issues/issue_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func TestIssueAPIURL(t *testing.T) {
6565
err := issue.LoadAttributes(db.DefaultContext)
6666

6767
assert.NoError(t, err)
68-
assert.Equal(t, "https://try.gitea.io/api/v1/repos/user2/repo1/issues/1", issue.APIURL())
68+
assert.Equal(t, "https://try.gitea.io/api/v1/repos/user2/repo1/issues/1", issue.APIURL(db.DefaultContext))
6969
}
7070

7171
func TestGetIssuesByIDs(t *testing.T) {
@@ -477,7 +477,7 @@ func assertCreateIssues(t *testing.T, isPull bool) {
477477
Labels: []*issues_model.Label{label},
478478
Reactions: []*issues_model.Reaction{reaction},
479479
}
480-
err := issues_model.InsertIssues(is)
480+
err := issues_model.InsertIssues(db.DefaultContext, is)
481481
assert.NoError(t, err)
482482

483483
i := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{Title: title})

‎models/issues/issue_watch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func CheckIssueWatch(ctx context.Context, user *user_model.User, issue *Issue) (
8181
if err != nil {
8282
return false, err
8383
}
84-
return repo_model.IsWatchMode(w.Mode) || IsUserParticipantsOfIssue(user, issue), nil
84+
return repo_model.IsWatchMode(w.Mode) || IsUserParticipantsOfIssue(ctx, user, issue), nil
8585
}
8686

8787
// GetIssueWatchersIDs returns IDs of subscribers or explicit unsubscribers to a given issue id

‎models/issues/pull.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1040,7 +1040,7 @@ func ParseCodeOwnersLine(ctx context.Context, tokens []string) (*CodeOwnerRule,
10401040
warnings = append(warnings, fmt.Sprintf("incorrect codeowner organization: %s", user))
10411041
continue
10421042
}
1043-
teams, err := org.LoadTeams()
1043+
teams, err := org.LoadTeams(ctx)
10441044
if err != nil {
10451045
warnings = append(warnings, fmt.Sprintf("incorrect codeowner team: %s", user))
10461046
continue

‎models/issues/tracked_time.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ func addTime(ctx context.Context, user *user_model.User, issue *Issue, amount in
199199
}
200200

201201
// TotalTimesForEachUser returns the spent time in seconds for each user by an issue
202-
func TotalTimesForEachUser(options *FindTrackedTimesOptions) (map[*user_model.User]int64, error) {
203-
trackedTimes, err := GetTrackedTimes(db.DefaultContext, options)
202+
func TotalTimesForEachUser(ctx context.Context, options *FindTrackedTimesOptions) (map[*user_model.User]int64, error) {
203+
trackedTimes, err := GetTrackedTimes(ctx, options)
204204
if err != nil {
205205
return nil, err
206206
}
@@ -213,7 +213,7 @@ func TotalTimesForEachUser(options *FindTrackedTimesOptions) (map[*user_model.Us
213213
totalTimes := make(map[*user_model.User]int64)
214214
// Fetching User and making time human readable
215215
for userID, total := range totalTimesByUser {
216-
user, err := user_model.GetUserByID(db.DefaultContext, userID)
216+
user, err := user_model.GetUserByID(ctx, userID)
217217
if err != nil {
218218
if user_model.IsErrUserNotExist(err) {
219219
continue
@@ -226,8 +226,8 @@ func TotalTimesForEachUser(options *FindTrackedTimesOptions) (map[*user_model.Us
226226
}
227227

228228
// DeleteIssueUserTimes deletes times for issue
229-
func DeleteIssueUserTimes(issue *Issue, user *user_model.User) error {
230-
ctx, committer, err := db.TxContext(db.DefaultContext)
229+
func DeleteIssueUserTimes(ctx context.Context, issue *Issue, user *user_model.User) error {
230+
ctx, committer, err := db.TxContext(ctx)
231231
if err != nil {
232232
return err
233233
}
@@ -265,8 +265,8 @@ func DeleteIssueUserTimes(issue *Issue, user *user_model.User) error {
265265
}
266266

267267
// DeleteTime delete a specific Time
268-
func DeleteTime(t *TrackedTime) error {
269-
ctx, committer, err := db.TxContext(db.DefaultContext)
268+
func DeleteTime(ctx context.Context, t *TrackedTime) error {
269+
ctx, committer, err := db.TxContext(ctx)
270270
if err != nil {
271271
return err
272272
}
@@ -315,9 +315,9 @@ func deleteTime(ctx context.Context, t *TrackedTime) error {
315315
}
316316

317317
// GetTrackedTimeByID returns raw TrackedTime without loading attributes by id
318-
func GetTrackedTimeByID(id int64) (*TrackedTime, error) {
318+
func GetTrackedTimeByID(ctx context.Context, id int64) (*TrackedTime, error) {
319319
time := new(TrackedTime)
320-
has, err := db.GetEngine(db.DefaultContext).ID(id).Get(time)
320+
has, err := db.GetEngine(ctx).ID(id).Get(time)
321321
if err != nil {
322322
return nil, err
323323
} else if !has {

‎models/issues/tracked_time_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,15 @@ func TestGetTrackedTimes(t *testing.T) {
8282
func TestTotalTimesForEachUser(t *testing.T) {
8383
assert.NoError(t, unittest.PrepareTestDatabase())
8484

85-
total, err := issues_model.TotalTimesForEachUser(&issues_model.FindTrackedTimesOptions{IssueID: 1})
85+
total, err := issues_model.TotalTimesForEachUser(db.DefaultContext, &issues_model.FindTrackedTimesOptions{IssueID: 1})
8686
assert.NoError(t, err)
8787
assert.Len(t, total, 1)
8888
for user, time := range total {
8989
assert.EqualValues(t, 1, user.ID)
9090
assert.EqualValues(t, 400, time)
9191
}
9292

93-
total, err = issues_model.TotalTimesForEachUser(&issues_model.FindTrackedTimesOptions{IssueID: 2})
93+
total, err = issues_model.TotalTimesForEachUser(db.DefaultContext, &issues_model.FindTrackedTimesOptions{IssueID: 2})
9494
assert.NoError(t, err)
9595
assert.Len(t, total, 2)
9696
for user, time := range total {
@@ -103,15 +103,15 @@ func TestTotalTimesForEachUser(t *testing.T) {
103103
}
104104
}
105105

106-
total, err = issues_model.TotalTimesForEachUser(&issues_model.FindTrackedTimesOptions{IssueID: 5})
106+
total, err = issues_model.TotalTimesForEachUser(db.DefaultContext, &issues_model.FindTrackedTimesOptions{IssueID: 5})
107107
assert.NoError(t, err)
108108
assert.Len(t, total, 1)
109109
for user, time := range total {
110110
assert.EqualValues(t, 2, user.ID)
111111
assert.EqualValues(t, 1, time)
112112
}
113113

114-
total, err = issues_model.TotalTimesForEachUser(&issues_model.FindTrackedTimesOptions{IssueID: 4})
114+
total, err = issues_model.TotalTimesForEachUser(db.DefaultContext, &issues_model.FindTrackedTimesOptions{IssueID: 4})
115115
assert.NoError(t, err)
116116
assert.Len(t, total, 2)
117117
}

‎models/org_team.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ func AddTeamMember(ctx context.Context, team *organization.Team, userID int64) e
362362
return err
363363
}
364364

365-
if err := organization.AddOrgUser(team.OrgID, userID); err != nil {
365+
if err := organization.AddOrgUser(ctx, team.OrgID, userID); err != nil {
366366
return err
367367
}
368368

0 commit comments

Comments
 (0)