improvements

Author: lunny

models/actions/run_test.go

@@ -6,6 +6,7 @@ package actions
 import (
 	"testing"
 
+	"code.gitea.io/gitea/models/db"
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/models/unittest"
 
@@ -15,11 +16,18 @@ import (
 func TestUpdateRepoRunsNumbers(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
 
+	// update the number to a wrong one, the original is 3
+	_, err := db.GetEngine(t.Context()).ID(4).Cols("num_closed_action_runs").Update(&repo_model.Repository{
+		NumClosedActionRuns: 2,
+	})
+	assert.NoError(t, err)
+
 	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 4})
 	assert.Equal(t, 4, repo.NumActionRuns)
 	assert.Equal(t, 2, repo.NumClosedActionRuns)
 
-	err := UpdateRepoRunsNumbers(t.Context(), repo)
+	// now update will correct them, only num_actionr_runs and num_closed_action_runs should be updated
+	err = UpdateRepoRunsNumbers(t.Context(), repo)
 	assert.NoError(t, err)
 	repo = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 4})
 	assert.Equal(t, 4, repo.NumActionRuns)

models/fixtures/repository.yml

@@ -111,7 +111,7 @@
   num_projects: 0
   num_closed_projects: 1
   num_action_runs: 4
-  num_closed_action_runs: 2 # this is wrong, should be 3. It's for testing purpose of run_test.go
+  num_closed_action_runs: 3
   is_private: false
   is_empty: false
   is_archived: false

models/issues/comment.go

@@ -862,6 +862,7 @@ func updateCommentInfos(ctx context.Context, opts *CreateCommentOptions, comment
 		if err = UpdateCommentAttachments(ctx, comment, opts.Attachments); err != nil {
 			return err
 		}
+		// comment type reopen and close event have their own logic to update numbers but not here
 	}
 	// update the issue's updated_unix column
 	return UpdateIssueCols(ctx, opts.Issue, "updated_unix")

models/issues/issue_update.go

@@ -145,22 +145,19 @@ func updateIssueNumbers(ctx context.Context, issue *Issue, doer *user_model.User
 		}
 	}
 
-	colName := util.Iif(issue.IsPull, "num_closed_pulls", "num_closed_issues")
-	dbSession := db.GetEngine(ctx)
 	// update repository's issue closed number
 	switch cmtType {
 	case CommentTypeClose, CommentTypeMergePull:
-		dbSession.Incr(colName)
+		if err := DecrRepoIssueNumbers(ctx, issue.RepoID, issue.IsPull, false); err != nil {
+			return nil, err
+		}
 	case CommentTypeReopen:
-		dbSession.Decr(colName)
+		if err := IncrRepoIssueNumbers(ctx, issue.RepoID, issue.IsPull); err != nil {
+			return nil, err
+		}
 	default:
 		return nil, fmt.Errorf("invalid comment type: %d", cmtType)
 	}
-	if _, err := dbSession.ID(issue.RepoID).
-		NoAutoCondition().NoAutoTime().
-		Update(new(repo_model.Repository)); err != nil {
-		return nil, err
-	}
 
 	return CreateComment(ctx, &CreateCommentOptions{
 		Type:  cmtType,
@@ -381,10 +378,7 @@ func NewIssueWithIndex(ctx context.Context, doer *user_model.User, opts NewIssue
 	}
 
 	// Update repository issue count
-	colName := util.Iif(opts.Issue.IsPull, "num_pulls", "num_issues")
-	if _, err := db.GetEngine(ctx).Incr(colName).ID(opts.Repo.ID).
-		NoAutoCondition().NoAutoTime().
-		Update(new(repo_model.Repository)); err != nil {
+	if err := IncrRepoIssueNumbers(ctx, opts.Repo.ID, opts.Issue.IsPull); err != nil {
 		return err
 	}
 
@@ -454,6 +448,27 @@ func NewIssue(ctx context.Context, repo *repo_model.Repository, issue *Issue, la
 	})
 }
 
+func IncrRepoIssueNumbers(ctx context.Context, repoID int64, isPull bool) error {
+	colName := util.Iif(isPull, "num_pulls", "num_issues")
+	_, err := db.GetEngine(ctx).Incr(colName).ID(repoID).
+		NoAutoCondition().NoAutoTime().
+		Update(new(repo_model.Repository))
+	return err
+}
+
+func DecrRepoIssueNumbers(ctx context.Context, repoID int64, isPull, includeTotal bool) error {
+	closedColName := util.Iif(isPull, "num_closed_pulls", "num_closed_issues")
+	dbSession := db.GetEngine(ctx).Decr(closedColName)
+	if includeTotal {
+		colName := util.Iif(isPull, "num_pulls", "num_issues")
+		dbSession = dbSession.Decr(colName)
+	}
+	_, err := dbSession.ID(repoID).
+		NoAutoCondition().NoAutoTime().
+		Update(new(repo_model.Repository))
+	return err
+}
+
 // UpdateIssueMentions updates issue-user relations for mentioned users.
 func UpdateIssueMentions(ctx context.Context, issueID int64, mentions []*user_model.User) error {
 	if len(mentions) == 0 {

services/issue/issue.go

@@ -20,7 +20,6 @@ import (
 	"code.gitea.io/gitea/modules/gitrepo"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/storage"
-	"code.gitea.io/gitea/modules/util"
 	notify_service "code.gitea.io/gitea/services/notify"
 )
 
@@ -271,16 +270,7 @@ func deleteIssue(ctx context.Context, issue *issues_model.Issue) ([]string, erro
 			return nil, err
 		}
 
-		colName := util.Iif(issue.IsPull, "num_pulls", "num_issues")
-		closedColName := util.Iif(issue.IsPull, "num_closed_pulls", "num_closed_issues")
-		dbSession := db.GetEngine(ctx)
-		if issue.IsClosed {
-			dbSession.Decr(closedColName)
-		}
-		// update repository's issue both total number and closed number
-		if _, err := dbSession.ID(issue.RepoID).Decr(colName).
-			NoAutoCondition().NoAutoTime().
-			Update(new(repo_model.Repository)); err != nil {
+		if err := issues_model.DecrRepoIssueNumbers(ctx, issue.RepoID, issue.IsPull, true); err != nil {
 			return nil, err
 		}