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, 11 insertions, 7 deletions

diff --git a/models/action_list.go b/models/action_list.go
index 6f726f4b34..a0ceef6bee 100644
--- a/models/action_list.go
+++ b/models/action_list.go
@@ -4,7 +4,11 @@
 
 package models
 
-import "fmt"
+import (
+	"fmt"
+
+	"code.gitea.io/gitea/models/db"
+)
 
 // ActionList defines a list of actions
 type ActionList []*Action
@@ -19,7 +23,7 @@ func (actions ActionList) getUserIDs() []int64 {
 	return keysInt64(userIDs)
 }
 
-func (actions ActionList) loadUsers(e Engine) ([]*User, error) {
+func (actions ActionList) loadUsers(e db.Engine) ([]*User, error) {
 	if len(actions) == 0 {
 		return nil, nil
 	}
@@ -41,7 +45,7 @@ func (actions ActionList) loadUsers(e Engine) ([]*User, error) {
 
 // LoadUsers loads actions' all users
 func (actions ActionList) LoadUsers() ([]*User, error) {
-	return actions.loadUsers(x)
+	return actions.loadUsers(db.DefaultContext().Engine())
 }
 
 func (actions ActionList) getRepoIDs() []int64 {
@@ -54,7 +58,7 @@ func (actions ActionList) getRepoIDs() []int64 {
 	return keysInt64(repoIDs)
 }
 
-func (actions ActionList) loadRepositories(e Engine) ([]*Repository, error) {
+func (actions ActionList) loadRepositories(e db.Engine) ([]*Repository, error) {
 	if len(actions) == 0 {
 		return nil, nil
 	}
@@ -76,11 +80,11 @@ func (actions ActionList) loadRepositories(e Engine) ([]*Repository, error) {
 
 // LoadRepositories loads actions' all repositories
 func (actions ActionList) LoadRepositories() ([]*Repository, error) {
-	return actions.loadRepositories(x)
+	return actions.loadRepositories(db.DefaultContext().Engine())
 }
 
 // loadAttributes loads all attributes
-func (actions ActionList) loadAttributes(e Engine) (err error) {
+func (actions ActionList) loadAttributes(e db.Engine) (err error) {
 	if _, err = actions.loadUsers(e); err != nil {
 		return
 	}
@@ -94,5 +98,5 @@ func (actions ActionList) loadAttributes(e Engine) (err error) {
 
 // LoadAttributes loads attributes of the actions
 func (actions ActionList) LoadAttributes() error {
-	return actions.loadAttributes(x)
+	return actions.loadAttributes(db.DefaultContext().Engine())
 }