diff options
author | Lunny Xiao <xiaolunwen@gmail.com> | 2022-05-20 22:08:52 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-20 22:08:52 +0800 |
commit | fd7d83ace60258acf7139c4c787aa8af75b7ba8c (patch) | |
tree | 50038348ec10485f72344f3ac80324e04abc1283 /models/action_list.go | |
parent | d81e31ad7826a81fc7139f329f250594610a274b (diff) | |
download | gitea-fd7d83ace60258acf7139c4c787aa8af75b7ba8c.tar.gz gitea-fd7d83ace60258acf7139c4c787aa8af75b7ba8c.zip |
Move almost all functions' parameter db.Engine to context.Context (#19748)
* Move almost all functions' parameter db.Engine to context.Context
* remove some unnecessary wrap functions
Diffstat (limited to 'models/action_list.go')
-rw-r--r-- | models/action_list.go | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/models/action_list.go b/models/action_list.go index 5f7b17b9de..d585ef0fc2 100644 --- a/models/action_list.go +++ b/models/action_list.go @@ -5,6 +5,7 @@ package models import ( + "context" "fmt" "code.gitea.io/gitea/models/db" @@ -26,14 +27,14 @@ func (actions ActionList) getUserIDs() []int64 { return container.KeysInt64(userIDs) } -func (actions ActionList) loadUsers(e db.Engine) (map[int64]*user_model.User, error) { +func (actions ActionList) loadUsers(ctx context.Context) (map[int64]*user_model.User, error) { if len(actions) == 0 { return nil, nil } userIDs := actions.getUserIDs() userMaps := make(map[int64]*user_model.User, len(userIDs)) - err := e. + err := db.GetEngine(ctx). In("id", userIDs). Find(&userMaps) if err != nil { @@ -56,14 +57,14 @@ func (actions ActionList) getRepoIDs() []int64 { return container.KeysInt64(repoIDs) } -func (actions ActionList) loadRepositories(e db.Engine) error { +func (actions ActionList) loadRepositories(ctx context.Context) error { if len(actions) == 0 { return nil } repoIDs := actions.getRepoIDs() repoMaps := make(map[int64]*repo_model.Repository, len(repoIDs)) - err := e.In("id", repoIDs).Find(&repoMaps) + err := db.GetEngine(ctx).In("id", repoIDs).Find(&repoMaps) if err != nil { return fmt.Errorf("find repository: %v", err) } @@ -74,7 +75,7 @@ func (actions ActionList) loadRepositories(e db.Engine) error { return nil } -func (actions ActionList) loadRepoOwner(e db.Engine, userMap map[int64]*user_model.User) (err error) { +func (actions ActionList) loadRepoOwner(ctx context.Context, userMap map[int64]*user_model.User) (err error) { if userMap == nil { userMap = make(map[int64]*user_model.User) } @@ -85,7 +86,7 @@ func (actions ActionList) loadRepoOwner(e db.Engine, userMap map[int64]*user_mod } repoOwner, ok := userMap[action.Repo.OwnerID] if !ok { - repoOwner, err = user_model.GetUserByID(action.Repo.OwnerID) + repoOwner, err = user_model.GetUserByIDCtx(ctx, action.Repo.OwnerID) if err != nil { if user_model.IsErrUserNotExist(err) { continue @@ -101,15 +102,15 @@ func (actions ActionList) loadRepoOwner(e db.Engine, userMap map[int64]*user_mod } // loadAttributes loads all attributes -func (actions ActionList) loadAttributes(e db.Engine) error { - userMap, err := actions.loadUsers(e) +func (actions ActionList) loadAttributes(ctx context.Context) error { + userMap, err := actions.loadUsers(ctx) if err != nil { return err } - if err := actions.loadRepositories(e); err != nil { + if err := actions.loadRepositories(ctx); err != nil { return err } - return actions.loadRepoOwner(e, userMap) + return actions.loadRepoOwner(ctx, userMap) } |