remove task.LoadRepository

Author: Zettat123

models/actions/task.go

@@ -12,7 +12,6 @@ import (
 
 	auth_model "code.gitea.io/gitea/models/auth"
 	"code.gitea.io/gitea/models/db"
-	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/models/unit"
 	"code.gitea.io/gitea/modules/container"
 	"code.gitea.io/gitea/modules/log"
@@ -39,10 +38,9 @@ type ActionTask struct {
 	Started  timeutil.TimeStamp `xorm:"index"`
 	Stopped  timeutil.TimeStamp `xorm:"index(stopped_log_expired)"`
 
-	RepoID            int64                  `xorm:"index"`
-	Repo              *repo_model.Repository `xorm:"-"`
-	OwnerID           int64                  `xorm:"index"`
-	CommitSHA         string                 `xorm:"index"`
+	RepoID            int64  `xorm:"index"`
+	OwnerID           int64  `xorm:"index"`
+	CommitSHA         string `xorm:"index"`
 	IsForkPullRequest bool
 
 	Token          string `xorm:"-"`
@@ -146,22 +144,14 @@ func (task *ActionTask) LoadAttributes(ctx context.Context) error {
 		task.Steps = steps
 	}
 
-	return task.LoadRepository(ctx)
+	return nil
 }
 
 func (task *ActionTask) GenerateToken() (err error) {
 	task.Token, task.TokenSalt, task.TokenHash, task.TokenLastEight, err = generateSaltedToken()
 	return err
 }
 
-func (task *ActionTask) LoadRepository(ctx context.Context) (err error) {
-	if task.Repo != nil {
-		return nil
-	}
-	task.Repo, err = repo_model.GetRepositoryByID(ctx, task.RepoID)
-	return err
-}
-
 func GetTaskByID(ctx context.Context, id int64) (*ActionTask, error) {
 	var task ActionTask
 	has, err := db.GetEngine(ctx).Where("id=?", id).Get(&task)

routers/web/repo/githttp.go

@@ -21,6 +21,7 @@ import (
 
 	actions_model "code.gitea.io/gitea/models/actions"
 	auth_model "code.gitea.io/gitea/models/auth"
+	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/models/perm"
 	access_model "code.gitea.io/gitea/models/perm/access"
 	repo_model "code.gitea.io/gitea/models/repo"
@@ -196,12 +197,17 @@ func httpBase(ctx *context.Context) *serviceHandler {
 					return nil
 				}
 				if task.RepoID != repo.ID {
-					if err := task.LoadRepository(ctx); err != nil {
-						ctx.ServerError("LoadRepository", err)
+					taskRepo, exist, err := db.GetByID[repo_model.Repository](ctx, task.RepoID)
+					if err != nil {
+						ctx.ServerError("Load task repository", err)
+						return nil
+					}
+					if !exist {
+						ctx.ServerError("Load task repository", fmt.Errorf("repo not found"))
 						return nil
 					}
 					actionsCfg := repo.MustGetUnit(ctx, unit.TypeActions).ActionsConfig()
-					if !actionsCfg.IsCollaborativeOwner(task.Repo.OwnerID) || !task.Repo.IsPrivate {
+					if !actionsCfg.IsCollaborativeOwner(taskRepo.OwnerID) || !taskRepo.IsPrivate {
 						// The task repo can access the current repo only if the task repo is private and
 						// the owner of the task repo is a collaborative owner of the current repo.
 						ctx.PlainText(http.StatusForbidden, "User permission denied")