replace update repository function in some places

lunny · lunny · commit 7ee15fdf03e1 · 2025-05-29T23:18:47.000-07:00
diff --git a/models/issues/pull.go b/models/issues/pull.go
@@ -649,12 +649,6 @@ func GetAllUnmergedAgitPullRequestByPoster(ctx context.Context, uid int64) ([]*P
 	return pulls, err
 }
 
-// Update updates all fields of pull request.
-func (pr *PullRequest) Update(ctx context.Context) error {
-	_, err := db.GetEngine(ctx).ID(pr.ID).AllCols().Update(pr)
-	return err
-}
-
 // UpdateCols updates specific fields of pull request.
 func (pr *PullRequest) UpdateCols(ctx context.Context, cols ...string) error {
 	_, err := db.GetEngine(ctx).ID(pr.ID).Cols(cols...).Update(pr)
diff --git a/models/issues/pull_test.go b/models/issues/pull_test.go
@@ -248,19 +248,6 @@ func TestGetPullRequestByIssueID(t *testing.T) {
 	assert.True(t, issues_model.IsErrPullRequestNotExist(err))
 }
 
-func TestPullRequest_Update(t *testing.T) {
-	assert.NoError(t, unittest.PrepareTestDatabase())
-	pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: 1})
-	pr.BaseBranch = "baseBranch"
-	pr.HeadBranch = "headBranch"
-	pr.Update(db.DefaultContext)
-
-	pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID})
-	assert.Equal(t, "baseBranch", pr.BaseBranch)
-	assert.Equal(t, "headBranch", pr.HeadBranch)
-	unittest.CheckConsistencyFor(t, pr)
-}
-
 func TestPullRequest_UpdateCols(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
 	pr := &issues_model.PullRequest{
diff --git a/models/repo/release.go b/models/repo/release.go
@@ -180,7 +180,7 @@ func AddReleaseAttachments(ctx context.Context, releaseID int64, attachmentUUIDs
 		}
 		attachments[i].ReleaseID = releaseID
 		// No assign value could be 0, so ignore AllCols().
-		if _, err = db.GetEngine(ctx).ID(attachments[i].ID).Update(attachments[i]); err != nil {
+		if _, err = db.GetEngine(ctx).ID(attachments[i].ID).Cols("release_id").Update(attachments[i]); err != nil {
 			return fmt.Errorf("update attachment [%d]: %w", attachments[i].ID, err)
 		}
 	}
diff --git a/models/repo/repo.go b/models/repo/repo.go
@@ -992,3 +992,11 @@ func UpdateRepositoryOwnerName(ctx context.Context, oldUserName, newUserName str
 	}
 	return nil
 }
+
+func UpdateRepositoryForksNum(ctx context.Context, repoID int64) error {
+	// Update the forks count of the repository
+	if _, err := db.GetEngine(ctx).Exec("UPDATE `repository` SET num_forks = (SELECT COUNT(*) FROM `repository` WHERE fork_id = ?) WHERE id = ?", repoID, repoID); err != nil {
+		return fmt.Errorf("update repository forks num: %w", err)
+	}
+	return nil
+}
diff --git a/models/repo/update.go b/models/repo/update.go
@@ -42,12 +42,18 @@ func UpdateRepositoryUpdatedTime(ctx context.Context, repoID int64, updateTime t
 
 // UpdateRepositoryColsWithAutoTime updates repository's columns
 func UpdateRepositoryColsWithAutoTime(ctx context.Context, repo *Repository, cols ...string) error {
+	if len(cols) == 0 {
+		return nil
+	}
 	_, err := db.GetEngine(ctx).ID(repo.ID).Cols(cols...).Update(repo)
 	return err
 }
 
 // UpdateRepositoryColsNoAutoTime updates repository's columns and but applies time change automatically
 func UpdateRepositoryColsNoAutoTime(ctx context.Context, repo *Repository, cols ...string) error {
+	if len(cols) == 0 {
+		return nil
+	}
 	_, err := db.GetEngine(ctx).ID(repo.ID).Cols(cols...).NoAutoTime().Update(repo)
 	return err
 }
diff --git a/services/repository/adopt.go b/services/repository/adopt.go
@@ -196,8 +196,9 @@ func adoptRepository(ctx context.Context, repo *repo_model.Repository, defaultBr
 			return fmt.Errorf("setDefaultBranch: %w", err)
 		}
 	}
-	if err = updateRepository(ctx, repo, false); err != nil {
-		return fmt.Errorf("updateRepository: %w", err)
+
+	if err = repo_model.UpdateRepositoryColsNoAutoTime(ctx, repo, "is_empty", "default_branch"); err != nil {
+		return fmt.Errorf("UpdateRepositoryCols: %w", err)
 	}
 
 	return nil
diff --git a/services/repository/create.go b/services/repository/create.go
@@ -191,7 +191,7 @@ func initRepository(ctx context.Context, u *user_model.User, repo *repo_model.Re
 		}
 	}
 
-	if err = UpdateRepository(ctx, repo, false); err != nil {
+	if err = repo_model.UpdateRepositoryColsNoAutoTime(ctx, repo, "is_empty", "default_branch", "default_wiki_branch"); err != nil {
 		return fmt.Errorf("updateRepository: %w", err)
 	}
 
diff --git a/services/repository/fork.go b/services/repository/fork.go
@@ -209,7 +209,7 @@ func ForkRepository(ctx context.Context, doer, owner *user_model.User, opts Fork
 
 // ConvertForkToNormalRepository convert the provided repo from a forked repo to normal repo
 func ConvertForkToNormalRepository(ctx context.Context, repo *repo_model.Repository) error {
-	err := db.WithTx(ctx, func(ctx context.Context) error {
+	return db.WithTx(ctx, func(ctx context.Context) error {
 		repo, err := repo_model.GetRepositoryByID(ctx, repo.ID)
 		if err != nil {
 			return err
@@ -224,18 +224,15 @@ func ConvertForkToNormalRepository(ctx context.Context, repo *repo_model.Reposit
 			return err
 		}
 
+		parentRepoID := repo.ForkID
 		repo.IsFork = false
 		repo.ForkID = 0
-
-		if err := updateRepository(ctx, repo, false); err != nil {
-			log.Error("Unable to update repository %-v whilst converting from fork. Error: %v", repo, err)
+		if err := repo_model.UpdateRepositoryColsNoAutoTime(ctx, repo, "is_fork", "fork_id"); err != nil {
 			return err
 		}
 
-		return nil
+		return repo_model.UpdateRepositoryForksNum(ctx, parentRepoID)
 	})
-
-	return err
 }
 
 type findForksOptions struct {
diff --git a/services/repository/generate.go b/services/repository/generate.go
@@ -279,7 +279,7 @@ func generateGitContent(ctx context.Context, repo, templateRepo, generateRepo *r
 	if err = gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch); err != nil {
 		return fmt.Errorf("setDefaultBranch: %w", err)
 	}
-	if err = UpdateRepository(ctx, repo, false); err != nil {
+	if err = repo_model.UpdateRepositoryColsNoAutoTime(ctx, repo, "default_branch"); err != nil {
 		return fmt.Errorf("updateRepository: %w", err)
 	}
 
diff --git a/services/repository/migrate.go b/services/repository/migrate.go
@@ -220,7 +220,7 @@ func MigrateRepositoryGitData(ctx context.Context, u *user_model.User,
 		}
 
 		repo.IsMirror = true
-		if err = UpdateRepository(ctx, repo, false); err != nil {
+		if err = repo_model.UpdateRepositoryColsNoAutoTime(ctx, repo, "num_watches", "is_empty", "default_branch", "default_wiki_branch", "is_mirror"); err != nil {
 			return nil, err
 		}
 
diff --git a/services/repository/repository.go b/services/repository/repository.go
@@ -127,19 +127,94 @@ func UpdateRepository(ctx context.Context, repo *repo_model.Repository, visibili
 func MakeRepoPublic(ctx context.Context, repo *repo_model.Repository) (err error) {
 	return db.WithTx(ctx, func(ctx context.Context) error {
 		repo.IsPrivate = false
-		if err = updateRepository(ctx, repo, true); err != nil {
-			return fmt.Errorf("MakeRepoPublic: %w", err)
+		if err := repo_model.UpdateRepositoryColsNoAutoTime(ctx, repo, "is_private"); err != nil {
+			return err
+		}
+
+		if err = repo.LoadOwner(ctx); err != nil {
+			return fmt.Errorf("LoadOwner: %w", err)
 		}
+		if repo.Owner.IsOrganization() {
+			// Organization repository need to recalculate access table when visibility is changed.
+			if err = access_model.RecalculateTeamAccesses(ctx, repo, 0); err != nil {
+				return fmt.Errorf("recalculateTeamAccesses: %w", err)
+			}
+		}
+
+		// Create/Remove git-daemon-export-ok for git-daemon...
+		if err := checkDaemonExportOK(ctx, repo); err != nil {
+			return err
+		}
+
+		forkRepos, err := repo_model.GetRepositoriesByForkID(ctx, repo.ID)
+		if err != nil {
+			return fmt.Errorf("getRepositoriesByForkID: %w", err)
+		}
+
+		if repo.Owner.Visibility != structs.VisibleTypePrivate {
+			for i := range forkRepos {
+				if err = MakeRepoPublic(ctx, forkRepos[i]); err != nil {
+					return fmt.Errorf("MakeRepoPublic[%d]: %w", forkRepos[i].ID, err)
+				}
+			}
+		}
+
+		// If visibility is changed, we need to update the issue indexer.
+		// Since the data in the issue indexer have field to indicate if the repo is public or not.
+		issue_indexer.UpdateRepoIndexer(ctx, repo.ID)
+
 		return nil
 	})
 }
 
 func MakeRepoPrivate(ctx context.Context, repo *repo_model.Repository) (err error) {
 	return db.WithTx(ctx, func(ctx context.Context) error {
 		repo.IsPrivate = true
-		if err = updateRepository(ctx, repo, true); err != nil {
-			return fmt.Errorf("MakeRepoPrivate: %w", err)
+		if err := repo_model.UpdateRepositoryColsNoAutoTime(ctx, repo, "is_private"); err != nil {
+			return err
+		}
+
+		if err = repo.LoadOwner(ctx); err != nil {
+			return fmt.Errorf("LoadOwner: %w", err)
 		}
+		if repo.Owner.IsOrganization() {
+			// Organization repository need to recalculate access table when visibility is changed.
+			if err = access_model.RecalculateTeamAccesses(ctx, repo, 0); err != nil {
+				return fmt.Errorf("recalculateTeamAccesses: %w", err)
+			}
+		}
+
+		// If repo has become private, we need to set its actions to private.
+		_, err = db.GetEngine(ctx).Where("repo_id = ?", repo.ID).Cols("is_private").Update(&activities_model.Action{
+			IsPrivate: true,
+		})
+		if err != nil {
+			return err
+		}
+
+		if err = repo_model.ClearRepoStars(ctx, repo.ID); err != nil {
+			return err
+		}
+
+		// Create/Remove git-daemon-export-ok for git-daemon...
+		if err := checkDaemonExportOK(ctx, repo); err != nil {
+			return err
+		}
+
+		forkRepos, err := repo_model.GetRepositoriesByForkID(ctx, repo.ID)
+		if err != nil {
+			return fmt.Errorf("getRepositoriesByForkID: %w", err)
+		}
+		for i := range forkRepos {
+			if err = MakeRepoPrivate(ctx, forkRepos[i]); err != nil {
+				return fmt.Errorf("MakeRepoPrivate[%d]: %w", forkRepos[i].ID, err)
+			}
+		}
+
+		// If visibility is changed, we need to update the issue indexer.
+		// Since the data in the issue indexer have field to indicate if the repo is public or not.
+		issue_indexer.UpdateRepoIndexer(ctx, repo.ID)
+
 		return nil
 	})
 }

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ func AddReleaseAttachments(ctx context.Context, releaseID int64, attachmentUUIDs`
`180`	`180`	`}`
`181`	`181`	`attachments[i].ReleaseID = releaseID`
`182`	`182`	`// No assign value could be 0, so ignore AllCols().`
`183`		`- if _, err = db.GetEngine(ctx).ID(attachments[i].ID).Update(attachments[i]); err != nil {`
	`183`	`+ if _, err = db.GetEngine(ctx).ID(attachments[i].ID).Cols("release_id").Update(attachments[i]); err != nil {`
`184`	`184`	`return fmt.Errorf("update attachment [%d]: %w", attachments[i].ID, err)`
`185`	`185`	`}`
`186`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -992,3 +992,11 @@ func UpdateRepositoryOwnerName(ctx context.Context, oldUserName, newUserName str`
`992`	`992`	`}`
`993`	`993`	`return nil`
`994`	`994`	`}`
	`995`	`+`
	`996`	`+func UpdateRepositoryForksNum(ctx context.Context, repoID int64) error {`
	`997`	`+ // Update the forks count of the repository`
	`998`	+ if _, err := db.GetEngine(ctx).Exec("UPDATE `repository` SET num_forks = (SELECT COUNT(*) FROM `repository` WHERE fork_id = ?) WHERE id = ?", repoID, repoID); err != nil {
	`999`	`+ return fmt.Errorf("update repository forks num: %w", err)`
	`1000`	`+ }`
	`1001`	`+ return nil`
	`1002`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -196,8 +196,9 @@ func adoptRepository(ctx context.Context, repo *repo_model.Repository, defaultBr`
`196`	`196`	`return fmt.Errorf("setDefaultBranch: %w", err)`
`197`	`197`	`}`
`198`	`198`	`}`
`199`		`- if err = updateRepository(ctx, repo, false); err != nil {`
`200`		`- return fmt.Errorf("updateRepository: %w", err)`
	`199`	`+`
	`200`	`+ if err = repo_model.UpdateRepositoryColsNoAutoTime(ctx, repo, "is_empty", "default_branch"); err != nil {`
	`201`	`+ return fmt.Errorf("UpdateRepositoryCols: %w", err)`
`201`	`202`	`}`
`202`	`203`
`203`	`204`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ func initRepository(ctx context.Context, u user_model.User, repo repo_model.Re`
`191`	`191`	`}`
`192`	`192`	`}`
`193`	`193`
`194`		`- if err = UpdateRepository(ctx, repo, false); err != nil {`
	`194`	`+ if err = repo_model.UpdateRepositoryColsNoAutoTime(ctx, repo, "is_empty", "default_branch", "default_wiki_branch"); err != nil {`
`195`	`195`	`return fmt.Errorf("updateRepository: %w", err)`
`196`	`196`	`}`
`197`	`197`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ func generateGitContent(ctx context.Context, repo, templateRepo, generateRepo *r`
`279`	`279`	`if err = gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch); err != nil {`
`280`	`280`	`return fmt.Errorf("setDefaultBranch: %w", err)`
`281`	`281`	`}`
`282`		`- if err = UpdateRepository(ctx, repo, false); err != nil {`
	`282`	`+ if err = repo_model.UpdateRepositoryColsNoAutoTime(ctx, repo, "default_branch"); err != nil {`
`283`	`283`	`return fmt.Errorf("updateRepository: %w", err)`
`284`	`284`	`}`
`285`	`285`
Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ func MigrateRepositoryGitData(ctx context.Context, u *user_model.User,`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`repo.IsMirror = true`
`223`		`- if err = UpdateRepository(ctx, repo, false); err != nil {`
	`223`	`+ if err = repo_model.UpdateRepositoryColsNoAutoTime(ctx, repo, "num_watches", "is_empty", "default_branch", "default_wiki_branch", "is_mirror"); err != nil {`
`224`	`224`	`return nil, err`
`225`	`225`	`}`
`226`	`226`