Move some repository related code into sub package (go-gitea#19711)

* Move some repository related code into sub package

* Move more repository functions out of models

* Fix lint

* Some performance optimization for webhooks and others

* some refactors

* Fix lint

* Fix

* Update modules/repository/delete.go

Co-authored-by: delvh <dev.lh@web.de>

* Fix test

* Merge

* Fix test

* Fix test

* Fix test

* Fix test

Co-authored-by: delvh <dev.lh@web.de>

cmd/admin.go

@@ -17,6 +17,7 @@ import (
  asymkey_model "code.gitea.io/gitea/models/asymkey"
  "code.gitea.io/gitea/models/auth"
  "code.gitea.io/gitea/models/db"
+ repo_model "code.gitea.io/gitea/models/repo"
  user_model "code.gitea.io/gitea/models/user"
  "code.gitea.io/gitea/modules/git"
  "code.gitea.io/gitea/modules/graceful"
@@ -722,9 +723,9 @@ func runRepoSyncReleases(_ *cli.Context) error {
 
  log.Trace("Synchronizing repository releases (this may take a while)")
  for page := 1; ; page++ {
- repos, count, err := models.SearchRepositoryByName(&models.SearchRepoOptions{
+ repos, count, err := repo_model.SearchRepositoryByName(&repo_model.SearchRepoOptions{
  ListOptions: db.ListOptions{
- PageSize: models.RepositoryListDefaultPageSize,
+ PageSize: repo_model.RepositoryListDefaultPageSize,
  Page: page,
  },
  Private: true,

models/action.go

@@ -393,7 +393,7 @@ func activityQueryCondition(opts GetFeedsOptions) (builder.Cond, error) {
 
  // check readable repositories by doer/actor
  if opts.Actor == nil || !opts.Actor.IsAdmin {
- cond = cond.And(builder.In("repo_id", AccessibleRepoIDsQuery(opts.Actor)))
+ cond = cond.And(builder.In("repo_id", repo_model.AccessibleRepoIDsQuery(opts.Actor)))
  }
 
  if opts.RequestedRepo != nil {

models/asymkey/ssh_key_deploy.go

@@ -190,6 +190,13 @@ func GetDeployKeyByRepo(ctx context.Context, keyID, repoID int64) (*DeployKey, e
  return key, nil
 }
 
+// IsDeployKeyExistByKeyID return true if there is at least one deploykey with the key id
+func IsDeployKeyExistByKeyID(ctx context.Context, keyID int64) (bool, error) {
+ return db.GetEngine(ctx).
+ Where("key_id = ?", keyID).
+ Get(new(DeployKey))
+}
+
 // UpdateDeployKeyCols updates deploy key information in the specified columns.
 func UpdateDeployKeyCols(key *DeployKey, cols ...string) error {
  _, err := db.GetEngine(db.DefaultContext).ID(key.ID).Cols(cols...).Update(key)

models/db/engine.go

@@ -271,11 +271,6 @@ func MaxBatchInsertSize(bean interface{}) int {
  return 999 / len(t.ColumnsSeq())
 }
 
-// Count returns records number according struct's fields as database query conditions
-func Count(bean interface{}) (int64, error) {
- return x.Count(bean)
-}
-
 // IsTableNotEmpty returns true if table has at least one record
 func IsTableNotEmpty(tableName string) (bool, error) {
  return x.Table(tableName).Exist()

models/issue.go

@@ -1343,6 +1343,48 @@ func (opts *IssuesOptions) setupSessionNoLimit(sess *xorm.Session) {
  }
 }
 
+// teamUnitsRepoCond returns query condition for those repo id in the special org team with special units access
+func teamUnitsRepoCond(id string, userID, orgID, teamID int64, units ...unit.Type) builder.Cond {
+ return builder.In(id,
+ builder.Select("repo_id").From("team_repo").Where(
+ builder.Eq{
+ "team_id": teamID,
+ }.And(
+ builder.Or(
+ // Check if the user is member of the team.
+ builder.In(
+ "team_id", builder.Select("team_id").From("team_user").Where(
+ builder.Eq{
+ "uid": userID,
+ },
+ ),
+ ),
+ // Check if the user is in the owner team of the organisation.
+ builder.Exists(builder.Select("team_id").From("team_user").
+ Where(builder.Eq{
+ "org_id": orgID,
+ "team_id": builder.Select("id").From("team").Where(
+ builder.Eq{
+ "org_id": orgID,
+ "lower_name": strings.ToLower(organization.OwnerTeamName),
+ }),
+ "uid": userID,
+ }),
+ ),
+ )).And(
+ builder.In(
+ "team_id", builder.Select("team_id").From("team_unit").Where(
+ builder.Eq{
+ "`team_unit`.org_id": orgID,
+ }.And(
+ builder.In("`team_unit`.type", units),
+ ),
+ ),
+ ),
+ ),
+ ))
+}
+
 // issuePullAccessibleRepoCond userID must not be zero, this condition require join repository table
 func issuePullAccessibleRepoCond(repoIDstr string, userID int64, org *organization.Organization, team *organization.Team, isPull bool) builder.Cond {
  cond := builder.NewCond()
@@ -1356,19 +1398,19 @@ func issuePullAccessibleRepoCond(repoIDstr string, userID int64, org *organizati
  } else {
  cond = cond.And(
  builder.Or(
- userOrgUnitRepoCond(repoIDstr, userID, org.ID, unitType), // team member repos
- userOrgPublicUnitRepoCond(userID, org.ID), // user org public non-member repos, TODO: check repo has issues
+ repo_model.UserOrgUnitRepoCond(repoIDstr, userID, org.ID, unitType), // team member repos
+ repo_model.UserOrgPublicUnitRepoCond(userID, org.ID), // user org public non-member repos, TODO: check repo has issues
  ),
  )
  }
  } else {
  cond = cond.And(
  builder.Or(
- userOwnedRepoCond(userID), // owned repos
- userCollaborationRepoCond(repoIDstr, userID), // collaboration repos
- userAssignedRepoCond(repoIDstr, userID), // user has been assigned accessible public repos
- userMentionedRepoCond(repoIDstr, userID), // user has been mentioned accessible public repos
- userCreateIssueRepoCond(repoIDstr, userID, isPull), // user has created issue/pr accessible public repos
+ repo_model.UserOwnedRepoCond(userID), // owned repos
+ repo_model.UserCollaborationRepoCond(repoIDstr, userID), // collaboration repos
+ repo_model.UserAssignedRepoCond(repoIDstr, userID), // user has been assigned accessible public repos
+ repo_model.UserMentionedRepoCond(repoIDstr, userID), // user has been mentioned accessible public repos
+ repo_model.UserCreateIssueRepoCond(repoIDstr, userID, isPull), // user has created issue/pr accessible public repos
  ),
  )
  }
@@ -1434,7 +1476,7 @@ func GetRepoIDsForIssuesOptions(opts *IssuesOptions, user *user_model.User) ([]i
 
  opts.setupSessionNoLimit(sess)
 
- accessCond := accessibleRepositoryCondition(user)
+ accessCond := repo_model.AccessibleRepositoryCondition(user)
  if err := sess.Where(accessCond).
  Distinct("issue.repo_id").
  Table("issue").

models/issue_list.go

@@ -75,7 +75,7 @@ func (issues IssueList) loadRepositories(ctx context.Context) ([]*repo_model.Rep
  }
  }
  }
- return valuesRepository(repoMaps), nil
+ return repo_model.ValuesRepository(repoMaps), nil
 }
 
 // LoadRepositories loads issues' all repositories

models/issue_user.go

@@ -26,7 +26,7 @@ func init() {
 }
 
 func newIssueUsers(ctx context.Context, repo *repo_model.Repository, issue *Issue) error {
- assignees, err := getRepoAssignees(ctx, repo)
+ assignees, err := repo_model.GetRepoAssignees(ctx, repo)
  if err != nil {
  return fmt.Errorf("getAssignees: %v", err)
  }

models/lfs.go

@@ -142,7 +142,7 @@ func LFSObjectAccessible(user *user_model.User, oid string) (bool, error) {
  count, err := db.GetEngine(db.DefaultContext).Count(&LFSMetaObject{Pointer: lfs.Pointer{Oid: oid}})
  return count > 0, err
  }
- cond := accessibleRepositoryCondition(user)
+ cond := repo_model.AccessibleRepositoryCondition(user)
  count, err := db.GetEngine(db.DefaultContext).Where(cond).Join("INNER", "repository", "`lfs_meta_object`.repository_id = `repository`.id").Count(&LFSMetaObject{Pointer: lfs.Pointer{Oid: oid}})
  return count > 0, err
 }
@@ -173,7 +173,7 @@ func LFSAutoAssociate(metas []*LFSMetaObject, user *user_model.User, repoID int6
  newMetas := make([]*LFSMetaObject, 0, len(metas))
  cond := builder.In(
  "`lfs_meta_object`.repository_id",
- builder.Select("`repository`.id").From("repository").Where(accessibleRepositoryCondition(user)),
+ builder.Select("`repository`.id").From("repository").Where(repo_model.AccessibleRepositoryCondition(user)),
  )
  err = sess.Cols("oid").Where(cond).In("oid", oids...).GroupBy("oid").Find(&newMetas)
  if err != nil {
@@ -246,3 +246,12 @@ func CopyLFS(ctx context.Context, newRepo, oldRepo *repo_model.Repository) error
 
  return nil
 }
+
+// GetRepoLFSSize return a repository's lfs files size
+func GetRepoLFSSize(ctx context.Context, repoID int64) (int64, error) {
+ lfsSize, err := db.GetEngine(ctx).Where("repository_id = ?", repoID).SumInt(new(LFSMetaObject), "size")
+ if err != nil {
+ return 0, fmt.Errorf("updateSize: GetLFSMetaObjects: %v", err)
+ }
+ return lfsSize, nil
+}

models/notification.go

@@ -266,10 +266,10 @@ func createOrUpdateIssueNotifications(ctx context.Context, issueID, commentID, n
 
  return err
  }
- if issue.IsPull && !checkRepoUnitUser(ctx, issue.Repo, user, unit.TypePullRequests) {
+ if issue.IsPull && !CheckRepoUnitUser(ctx, issue.Repo, user, unit.TypePullRequests) {
  continue
  }
- if !issue.IsPull && !checkRepoUnitUser(ctx, issue.Repo, user, unit.TypeIssues) {
+ if !issue.IsPull && !CheckRepoUnitUser(ctx, issue.Repo, user, unit.TypeIssues) {
  continue
  }
 
@@ -510,9 +510,9 @@ func (nl NotificationList) getPendingRepoIDs() []int64 {
 }
 
 // LoadRepos loads repositories from database
-func (nl NotificationList) LoadRepos() (RepositoryList, []int, error) {
+func (nl NotificationList) LoadRepos() (repo_model.RepositoryList, []int, error) {
  if len(nl) == 0 {
- return RepositoryList{}, []int{}, nil
+ return repo_model.RepositoryList{}, []int{}, nil
  }
 
  repoIDs := nl.getPendingRepoIDs()
@@ -548,7 +548,7 @@ func (nl NotificationList) LoadRepos() (RepositoryList, []int, error) {
 
  failed := []int{}
 
- reposList := make(RepositoryList, 0, len(repoIDs))
+ reposList := make(repo_model.RepositoryList, 0, len(repoIDs))
  for i, notification := range nl {
  if notification.Repository == nil {
  notification.Repository = repos[notification.RepoID]

models/org.go

@@ -54,7 +54,7 @@ func GetUserOrgsList(user *user_model.User) ([]*MinimalOrg, error) {
  Join("LEFT", builder.
  Select("id as repo_id, owner_id as repo_owner_id").
  From("repository").
- Where(accessibleRepositoryCondition(user)), "`repository`.repo_owner_id = `team`.org_id").
+ Where(repo_model.AccessibleRepositoryCondition(user)), "`repository`.repo_owner_id = `team`.org_id").
  Where("`team_user`.uid = ?", user.ID).
  GroupBy(groupByStr)