diff options
| author | Joe Chen <jc@unknwon.io> | 2022-11-05 23:33:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-05 23:33:05 +0800 |
| commit | 5fb29db2db04bc128af410867f1f602320eb5d66 (patch) | |
| tree | 9d0b86702d872f8f5ab7d0691e511c52f38fde34 /internal/route/api/v1/user | |
| parent | b5d47b969258f3d644ad797b29901eb607f6b94f (diff) | |
refactor(db): migrate methods off and delete deprecated methods from `user.go` (#7231)
Diffstat (limited to 'internal/route/api/v1/user')
| -rw-r--r-- | internal/route/api/v1/user/email.go | 6 | ||||
| -rw-r--r-- | internal/route/api/v1/user/key.go | 2 | ||||
| -rw-r--r-- | internal/route/api/v1/user/user.go | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/internal/route/api/v1/user/email.go b/internal/route/api/v1/user/email.go index 5584803e..cda2a0a4 100644 --- a/internal/route/api/v1/user/email.go +++ b/internal/route/api/v1/user/email.go @@ -38,7 +38,7 @@ func AddEmail(c *context.APIContext, form api.CreateEmailOption) { emails := make([]*db.EmailAddress, len(form.Emails)) for i := range form.Emails { emails[i] = &db.EmailAddress{ - UID: c.User.ID, + UserID: c.User.ID, Email: form.Emails[i], IsActivated: !conf.Auth.RequireEmailConfirmation, } @@ -69,8 +69,8 @@ func DeleteEmail(c *context.APIContext, form api.CreateEmailOption) { emails := make([]*db.EmailAddress, len(form.Emails)) for i := range form.Emails { emails[i] = &db.EmailAddress{ - UID: c.User.ID, - Email: form.Emails[i], + UserID: c.User.ID, + Email: form.Emails[i], } } diff --git a/internal/route/api/v1/user/key.go b/internal/route/api/v1/user/key.go index 344c7ca2..c80e3bf0 100644 --- a/internal/route/api/v1/user/key.go +++ b/internal/route/api/v1/user/key.go @@ -18,7 +18,7 @@ import ( ) func GetUserByParamsName(c *context.APIContext, name string) *db.User { - user, err := db.GetUserByName(c.Params(name)) + user, err := db.Users.GetByUsername(c.Req.Context(), c.Params(name)) if err != nil { c.NotFoundOrError(err, "get user by name") return nil diff --git a/internal/route/api/v1/user/user.go b/internal/route/api/v1/user/user.go index 5852f660..10d82b9a 100644 --- a/internal/route/api/v1/user/user.go +++ b/internal/route/api/v1/user/user.go @@ -55,7 +55,7 @@ func Search(c *context.APIContext) { } func GetInfo(c *context.APIContext) { - u, err := db.GetUserByName(c.Params(":username")) + u, err := db.Users.GetByUsername(c.Req.Context(), c.Params(":username")) if err != nil { c.NotFoundOrError(err, "get user by name") return |