Move db related basic functions to models/db (#17075)

* Move db related basic functions to models/db

* Fix lint

* Fix lint

* Fix test

* Fix lint

* Fix lint

* revert unnecessary change

* Fix test

* Fix wrong replace string

* Use *Context

* Correct committer spelling and fix wrong replaced words

Co-authored-by: zeripath <art27@cantab.net>

1 files changed, 12 insertions, 4 deletions

diff --git a/models/user_redirect.go b/models/user_redirect.go
index 1da8b44088..4380eb5984 100644
--- a/models/user_redirect.go
+++ b/models/user_redirect.go
@@ -4,7 +4,11 @@
 
 package models
 
-import "strings"
+import (
+	"strings"
+
+	"code.gitea.io/gitea/models/db"
+)
 
 // UserRedirect represents that a user name should be redirected to another
 type UserRedirect struct {
@@ -13,11 +17,15 @@ type UserRedirect struct {
 	RedirectUserID int64  // userID to redirect to
 }
 
+func init() {
+	db.RegisterModel(new(UserRedirect))
+}
+
 // LookupUserRedirect look up userID if a user has a redirect name
 func LookupUserRedirect(userName string) (int64, error) {
 	userName = strings.ToLower(userName)
 	redirect := &UserRedirect{LowerName: userName}
-	if has, err := x.Get(redirect); err != nil {
+	if has, err := db.DefaultContext().Engine().Get(redirect); err != nil {
 		return 0, err
 	} else if !has {
 		return 0, ErrUserRedirectNotExist{Name: userName}
@@ -26,7 +34,7 @@ func LookupUserRedirect(userName string) (int64, error) {
 }
 
 // newUserRedirect create a new user redirect
-func newUserRedirect(e Engine, ID int64, oldUserName, newUserName string) error {
+func newUserRedirect(e db.Engine, ID int64, oldUserName, newUserName string) error {
 	oldUserName = strings.ToLower(oldUserName)
 	newUserName = strings.ToLower(newUserName)
 
@@ -45,7 +53,7 @@ func newUserRedirect(e Engine, ID int64, oldUserName, newUserName string) error
 
 // deleteUserRedirect delete any redirect from the specified user name to
 // anything else
-func deleteUserRedirect(e Engine, userName string) error {
+func deleteUserRedirect(e db.Engine, userName string) error {
 	userName = strings.ToLower(userName)
 	_, err := e.Delete(&UserRedirect{LowerName: userName})
 	return err