Skip to content

Commit 6d5f307

Browse files
wxiaoguangwxiaoguang
committed
Remove db.DefaultContext usage in routers, use ctx directly
1 parent 80fd255 commit 6d5f307

File tree

25 files changed

+55
-65
lines changed

25 files changed

+55
-65
lines changed

‎routers/api/v1/org/org.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ func Edit(ctx *context.APIContext) {
346346
if form.RepoAdminChangeTeamAccess != nil {
347347
org.RepoAdminChangeTeamAccess = *form.RepoAdminChangeTeamAccess
348348
}
349-
if err := user_model.UpdateUserCols(db.DefaultContext, org.AsUser(),
349+
if err := user_model.UpdateUserCols(ctx, org.AsUser(),
350350
"full_name", "description", "website", "location",
351351
"visibility", "repo_admin_change_team_access",
352352
); err != nil {

‎routers/api/v1/repo/issue_stopwatch.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"net/http"
1010

1111
"code.gitea.io/gitea/models"
12-
"code.gitea.io/gitea/models/db"
1312
"code.gitea.io/gitea/modules/context"
1413
"code.gitea.io/gitea/modules/convert"
1514
"code.gitea.io/gitea/routers/api/v1/utils"
@@ -56,7 +55,7 @@ func StartIssueStopwatch(ctx *context.APIContext) {
5655
return
5756
}
5857

59-
if err := models.CreateIssueStopwatch(db.DefaultContext, ctx.Doer, issue); err != nil {
58+
if err := models.CreateIssueStopwatch(ctx, ctx.Doer, issue); err != nil {
6059
ctx.Error(http.StatusInternalServerError, "CreateOrStopIssueStopwatch", err)
6160
return
6261
}
@@ -105,7 +104,7 @@ func StopIssueStopwatch(ctx *context.APIContext) {
105104
return
106105
}
107106

108-
if err := models.FinishIssueStopwatch(db.DefaultContext, ctx.Doer, issue); err != nil {
107+
if err := models.FinishIssueStopwatch(ctx, ctx.Doer, issue); err != nil {
109108
ctx.Error(http.StatusInternalServerError, "CreateOrStopIssueStopwatch", err)
110109
return
111110
}

‎routers/api/v1/repo/key.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func ListDeployKeys(ctx *context.APIContext) {
8787
Fingerprint: ctx.FormString("fingerprint"),
8888
}
8989

90-
keys, err := asymkey_model.ListDeployKeys(db.DefaultContext, opts)
90+
keys, err := asymkey_model.ListDeployKeys(ctx, opts)
9191
if err != nil {
9292
ctx.InternalServerError(err)
9393
return
@@ -144,7 +144,7 @@ func GetDeployKey(ctx *context.APIContext) {
144144
// "200":
145145
// "$ref": "#/responses/DeployKey"
146146

147-
key, err := asymkey_model.GetDeployKeyByID(db.DefaultContext, ctx.ParamsInt64(":id"))
147+
key, err := asymkey_model.GetDeployKeyByID(ctx, ctx.ParamsInt64(":id"))
148148
if err != nil {
149149
if asymkey_model.IsErrDeployKeyNotExist(err) {
150150
ctx.NotFound()

‎routers/api/v1/repo/repo.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ func Search(ctx *context.APIContext) {
217217

218218
results := make([]*api.Repository, len(repos))
219219
for i, repo := range repos {
220-
if err = repo.GetOwner(db.DefaultContext); err != nil {
220+
if err = repo.GetOwner(ctx); err != nil {
221221
ctx.JSON(http.StatusInternalServerError, api.SearchError{
222222
OK: false,
223223
Error: err.Error(),

‎routers/api/v1/user/gpg_key.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
)
1919

2020
func listGPGKeys(ctx *context.APIContext, uid int64, listOptions db.ListOptions) {
21-
keys, err := asymkey_model.ListGPGKeys(db.DefaultContext, uid, listOptions)
21+
keys, err := asymkey_model.ListGPGKeys(ctx, uid, listOptions)
2222
if err != nil {
2323
ctx.Error(http.StatusInternalServerError, "ListGPGKeys", err)
2424
return

‎routers/api/v1/user/repo.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"net/http"
99

1010
"code.gitea.io/gitea/models"
11-
"code.gitea.io/gitea/models/db"
1211
"code.gitea.io/gitea/models/perm"
1312
user_model "code.gitea.io/gitea/models/user"
1413
"code.gitea.io/gitea/modules/context"
@@ -124,7 +123,7 @@ func ListMyRepos(ctx *context.APIContext) {
124123

125124
results := make([]*api.Repository, len(repos))
126125
for i, repo := range repos {
127-
if err = repo.GetOwner(db.DefaultContext); err != nil {
126+
if err = repo.GetOwner(ctx); err != nil {
128127
ctx.Error(http.StatusInternalServerError, "GetOwner", err)
129128
return
130129
}

‎routers/api/v1/utils/hook.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"net/http"
1010
"strings"
1111

12-
"code.gitea.io/gitea/models/db"
1312
"code.gitea.io/gitea/models/webhook"
1413
"code.gitea.io/gitea/modules/context"
1514
"code.gitea.io/gitea/modules/convert"
@@ -164,7 +163,7 @@ func addHook(ctx *context.APIContext, form *api.CreateHookOption, orgID, repoID
164163
if err := w.UpdateEvent(); err != nil {
165164
ctx.Error(http.StatusInternalServerError, "UpdateEvent", err)
166165
return nil, false
167-
} else if err := webhook.CreateWebhook(db.DefaultContext, w); err != nil {
166+
} else if err := webhook.CreateWebhook(ctx, w); err != nil {
168167
ctx.Error(http.StatusInternalServerError, "CreateWebhook", err)
169168
return nil, false
170169
}

‎routers/web/auth/auth.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func resetLocale(ctx *context.Context, u *user_model.User) error {
107107
// If the user does not have a locale set, we save the current one.
108108
if len(u.Language) == 0 {
109109
u.Language = ctx.Locale.Language()
110-
if err := user_model.UpdateUserCols(db.DefaultContext, u, "language"); err != nil {
110+
if err := user_model.UpdateUserCols(ctx, u, "language"); err != nil {
111111
return err
112112
}
113113
}
@@ -333,7 +333,7 @@ func handleSignInFull(ctx *context.Context, u *user_model.User, remember, obeyRe
333333
// If the user does not have a locale set, we save the current one.
334334
if len(u.Language) == 0 {
335335
u.Language = ctx.Locale.Language()
336-
if err := user_model.UpdateUserCols(db.DefaultContext, u, "language"); err != nil {
336+
if err := user_model.UpdateUserCols(ctx, u, "language"); err != nil {
337337
ctx.ServerError("UpdateUserCols Language", fmt.Errorf("Error updating user language [user: %d, locale: %s]", u.ID, u.Language))
338338
return setting.AppSubURL + "/"
339339
}
@@ -350,7 +350,7 @@ func handleSignInFull(ctx *context.Context, u *user_model.User, remember, obeyRe
350350

351351
// Register last login
352352
u.SetLastLogin()
353-
if err := user_model.UpdateUserCols(db.DefaultContext, u, "last_login_unix"); err != nil {
353+
if err := user_model.UpdateUserCols(ctx, u, "last_login_unix"); err != nil {
354354
ctx.ServerError("UpdateUserCols", err)
355355
return setting.AppSubURL + "/"
356356
}
@@ -606,7 +606,7 @@ func handleUserCreated(ctx *context.Context, u *user_model.User, gothUser *goth.
606606
u.IsAdmin = true
607607
u.IsActive = true
608608
u.SetLastLogin()
609-
if err := user_model.UpdateUserCols(db.DefaultContext, u, "is_admin", "is_active", "last_login_unix"); err != nil {
609+
if err := user_model.UpdateUserCols(ctx, u, "is_admin", "is_active", "last_login_unix"); err != nil {
610610
ctx.ServerError("UpdateUser", err)
611611
return
612612
}
@@ -733,7 +733,7 @@ func handleAccountActivation(ctx *context.Context, user *user_model.User) {
733733
ctx.ServerError("UpdateUser", err)
734734
return
735735
}
736-
if err := user_model.UpdateUserCols(db.DefaultContext, user, "is_active", "rands"); err != nil {
736+
if err := user_model.UpdateUserCols(ctx, user, "is_active", "rands"); err != nil {
737737
if user_model.IsErrUserNotExist(err) {
738738
ctx.NotFound("UpdateUserCols", err)
739739
} else {

‎routers/web/auth/oauth.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616

1717
"code.gitea.io/gitea/models"
1818
"code.gitea.io/gitea/models/auth"
19-
"code.gitea.io/gitea/models/db"
2019
user_model "code.gitea.io/gitea/models/user"
2120
"code.gitea.io/gitea/modules/base"
2221
"code.gitea.io/gitea/modules/context"
@@ -1021,7 +1020,7 @@ func handleOAuth2SignIn(ctx *context.Context, source *auth.Source, u *user_model
10211020
cols = append(cols, "is_admin", "is_restricted")
10221021
}
10231022

1024-
if err := user_model.UpdateUserCols(db.DefaultContext, u, cols...); err != nil {
1023+
if err := user_model.UpdateUserCols(ctx, u, cols...); err != nil {
10251024
ctx.ServerError("UpdateUserCols", err)
10261025
return
10271026
}
@@ -1048,7 +1047,7 @@ func handleOAuth2SignIn(ctx *context.Context, source *auth.Source, u *user_model
10481047

10491048
changed := setUserGroupClaims(source, u, &gothUser)
10501049
if changed {
1051-
if err := user_model.UpdateUserCols(db.DefaultContext, u, "is_admin", "is_restricted"); err != nil {
1050+
if err := user_model.UpdateUserCols(ctx, u, "is_admin", "is_restricted"); err != nil {
10521051
ctx.ServerError("UpdateUserCols", err)
10531052
return
10541053
}

‎routers/web/auth/password.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"net/http"
1010

1111
"code.gitea.io/gitea/models/auth"
12-
"code.gitea.io/gitea/models/db"
1312
user_model "code.gitea.io/gitea/models/user"
1413
"code.gitea.io/gitea/modules/base"
1514
"code.gitea.io/gitea/modules/context"
@@ -232,7 +231,7 @@ func ResetPasswdPost(ctx *context.Context) {
232231
return
233232
}
234233
u.MustChangePassword = false
235-
if err := user_model.UpdateUserCols(db.DefaultContext, u, "must_change_password", "passwd", "passwd_hash_algo", "rands", "salt"); err != nil {
234+
if err := user_model.UpdateUserCols(ctx, u, "must_change_password", "passwd", "passwd_hash_algo", "rands", "salt"); err != nil {
236235
ctx.ServerError("UpdateUser", err)
237236
return
238237
}
@@ -327,7 +326,7 @@ func MustChangePasswordPost(ctx *context.Context) {
327326

328327
u.MustChangePassword = false
329328

330-
if err := user_model.UpdateUserCols(db.DefaultContext, u, "must_change_password", "passwd", "passwd_hash_algo", "salt"); err != nil {
329+
if err := user_model.UpdateUserCols(ctx, u, "must_change_password", "passwd", "passwd_hash_algo", "salt"); err != nil {
331330
ctx.ServerError("UpdateUser", err)
332331
return
333332
}

0 commit comments

Comments
 (0)