refactor(db): migrate methods off and delete deprecated methods from `user.go` (#7231)

4 files changed, 6 insertions, 6 deletions

diff --git a/internal/route/repo/pull.go b/internal/route/repo/pull.go
index c203266c..2429ff8b 100644
--- a/internal/route/repo/pull.go
+++ b/internal/route/repo/pull.go
@@ -71,7 +71,7 @@ func parseBaseRepository(c *context.Context) *db.Repository {
 
 	orgs, err := db.Orgs.List(
 		c.Req.Context(),
-		db.ListOrgOptions{
+		db.ListOrgsOptions{
 			MemberID:              c.User.ID,
 			IncludePrivateMembers: true,
 		},
@@ -466,7 +466,7 @@ func ParseCompareInfo(c *context.Context) (*db.User, *db.Repository, *git.Reposi
 		headBranch = headInfos[0]
 
 	} else if len(headInfos) == 2 {
-		headUser, err = db.GetUserByName(headInfos[0])
+		headUser, err = db.Users.GetByUsername(c.Req.Context(), headInfos[0])
 		if err != nil {
 			c.NotFoundOrError(err, "get user by name")
 			return nil, nil, nil, nil, "", ""
diff --git a/internal/route/repo/repo.go b/internal/route/repo/repo.go
index 943540c8..b9f9f988 100644
--- a/internal/route/repo/repo.go
+++ b/internal/route/repo/repo.go
@@ -47,7 +47,7 @@ func checkContextUser(c *context.Context, uid int64) *db.User {
 		return c.User
 	}
 
-	org, err := db.GetUserByID(uid)
+	org, err := db.Users.GetByID(c.Req.Context(), uid)
 	if db.IsErrUserNotExist(err) {
 		return c.User
 	}
diff --git a/internal/route/repo/setting.go b/internal/route/repo/setting.go
index bc7c62bc..cd87769a 100644
--- a/internal/route/repo/setting.go
+++ b/internal/route/repo/setting.go
@@ -380,7 +380,7 @@ func SettingsCollaborationPost(c *context.Context) {
 		return
 	}
 
-	u, err := db.GetUserByName(name)
+	u, err := db.Users.GetByUsername(c.Req.Context(), name)
 	if err != nil {
 		if db.IsErrUserNotExist(err) {
 			c.Flash.Error(c.Tr("form.user_not_exist"))
diff --git a/internal/route/repo/webhook.go b/internal/route/repo/webhook.go
index f52e80c0..615137bc 100644
--- a/internal/route/repo/webhook.go
+++ b/internal/route/repo/webhook.go
@@ -493,7 +493,7 @@ func TestWebhook(c *context.Context) {
 		committer = c.Repo.Commit.Committer
 
 		// Try to match email with a real user.
-		author, err := db.GetUserByEmail(c.Repo.Commit.Author.Email)
+		author, err := db.Users.GetByEmail(c.Req.Context(), c.Repo.Commit.Author.Email)
 		if err == nil {
 			authorUsername = author.Name
 		} else if !db.IsErrUserNotExist(err) {
@@ -501,7 +501,7 @@ func TestWebhook(c *context.Context) {
 			return
 		}
 
-		user, err := db.GetUserByEmail(c.Repo.Commit.Committer.Email)
+		user, err := db.Users.GetByEmail(c.Req.Context(), c.Repo.Commit.Committer.Email)
 		if err == nil {
 			committerUsername = user.Name
 		} else if !db.IsErrUserNotExist(err) {