Rename the function for post database transaction

lunny · lunny · commit 844034435443 · 2025-07-17T21:05:38.000-07:00
diff --git a/modules/util/cleanup.go b/modules/util/cleanup.go
diff --git a/modules/util/post_tx_action.go b/modules/util/post_tx_action.go
@@ -0,0 +1,18 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package util
+
+// PostTxAction is a function that is executed after a database transaction
+type PostTxAction func()
+
+func NewPostTxAction() PostTxAction {
+	return func() {}
+}
+
+func (f PostTxAction) Append(appendF PostTxAction) PostTxAction {
+	return func() {
+		f()
+		appendF()
+	}
+}
diff --git a/services/issue/comments.go b/services/issue/comments.go
@@ -136,7 +136,7 @@ func UpdateComment(ctx context.Context, c *issues_model.Comment, contentVersion
 
 // deleteComment deletes the comment
 func deleteComment(ctx context.Context, comment *issues_model.Comment, removeAttachments bool) (*issues_model.Comment, func(), error) {
-	storageCleanup := util.NewCleanUpFunc()
+	storageCleanup := util.NewPostTxAction()
 	deletedReviewComment, err := db.WithTx2(ctx, func(ctx context.Context) (*issues_model.Comment, error) {
 		if removeAttachments {
 			// load attachments before deleting the comment
diff --git a/services/issue/issue.go b/services/issue/issue.go
@@ -191,16 +191,16 @@ func DeleteIssue(ctx context.Context, doer *user_model.User, gitRepo *git.Reposi
 	}
 
 	// delete entries in database
-	cleanup, err := deleteIssue(ctx, issue, true)
+	postTxActions, err := deleteIssue(ctx, issue, true)
 	if err != nil {
 		return err
 	}
-	cleanup()
+	postTxActions()
 
 	// delete pull request related git data
 	if issue.IsPull && gitRepo != nil {
 		if err := gitRepo.RemoveReference(issue.PullRequest.GetGitHeadRefName()); err != nil {
-			return err
+			log.Error("DeleteIssue: RemoveReference %s: %v", issue.PullRequest.GetGitHeadRefName(), err)
 		}
 	}
 
@@ -259,8 +259,8 @@ func GetRefEndNamesAndURLs(issues []*issues_model.Issue, repoLink string) (map[i
 }
 
 // deleteIssue deletes the issue
-func deleteIssue(ctx context.Context, issue *issues_model.Issue, deleteAttachments bool) (util.CleanUpFunc, error) {
-	cleanup := util.NewCleanUpFunc()
+func deleteIssue(ctx context.Context, issue *issues_model.Issue, deleteAttachments bool) (util.PostTxAction, error) {
+	postTxActions := util.NewPostTxAction()
 	if err := db.WithTx(ctx, func(ctx context.Context) error {
 		if _, err := db.GetEngine(ctx).ID(issue.ID).NoAutoCondition().Delete(issue); err != nil {
 			return err
@@ -316,11 +316,11 @@ func deleteIssue(ctx context.Context, issue *issues_model.Issue, deleteAttachmen
 		}
 
 		for _, comment := range issue.Comments {
-			_, cleanupDeleteComment, err := deleteComment(ctx, comment, deleteAttachments)
+			_, postTxActionsDeleteComment, err := deleteComment(ctx, comment, deleteAttachments)
 			if err != nil {
 				return fmt.Errorf("deleteComment [comment_id: %d]: %w", comment.ID, err)
 			}
-			cleanup = cleanup.Append(cleanupDeleteComment)
+			postTxActions = postTxActions.Append(postTxActionsDeleteComment)
 		}
 
 		if deleteAttachments {
@@ -330,7 +330,7 @@ func deleteIssue(ctx context.Context, issue *issues_model.Issue, deleteAttachmen
 				return err
 			}
 			// the storage cleanup function to remove attachments could be called after all transactions are committed
-			cleanup = cleanup.Append(func() {
+			postTxActions = postTxActions.Append(func() {
 				// Remove issue attachment files.
 				for i := range issue.Attachments {
 					system_model.RemoveStorageWithNotice(ctx, storage.Attachments, "Delete issue attachment", issue.Attachments[i].RelativePath())
@@ -341,35 +341,35 @@ func deleteIssue(ctx context.Context, issue *issues_model.Issue, deleteAttachmen
 	}); err != nil {
 		return nil, err
 	}
-	return cleanup, nil
+	return postTxActions, nil
 }
 
 // DeleteOrphanedIssues delete issues without a repo
 func DeleteOrphanedIssues(ctx context.Context) error {
-	cleanup := util.NewCleanUpFunc()
+	postTxActions := util.NewPostTxAction()
 	if err := db.WithTx(ctx, func(ctx context.Context) error {
 		repoIDs, err := issues_model.GetOrphanedIssueRepoIDs(ctx)
 		if err != nil {
 			return err
 		}
 		for i := range repoIDs {
-			deleteIssuesCleanup, err := DeleteIssuesByRepoID(ctx, repoIDs[i], true)
+			postTxActionsDeleteIssues, err := DeleteIssuesByRepoID(ctx, repoIDs[i], true)
 			if err != nil {
 				return err
 			}
-			cleanup = cleanup.Append(deleteIssuesCleanup)
+			postTxActions = postTxActions.Append(postTxActionsDeleteIssues)
 		}
 		return nil
 	}); err != nil {
 		return err
 	}
-	cleanup()
+	postTxActions()
 	return nil
 }
 
 // DeleteIssuesByRepoID deletes issues by repositories id
-func DeleteIssuesByRepoID(ctx context.Context, repoID int64, deleteAttachments bool) (util.CleanUpFunc, error) {
-	cleanup := util.NewCleanUpFunc()
+func DeleteIssuesByRepoID(ctx context.Context, repoID int64, deleteAttachments bool) (util.PostTxAction, error) {
+	postTxActions := util.NewPostTxAction()
 	for {
 		issues := make([]*issues_model.Issue, 0, db.DefaultMaxInSize)
 		if err := db.GetEngine(ctx).
@@ -385,13 +385,13 @@ func DeleteIssuesByRepoID(ctx context.Context, repoID int64, deleteAttachments b
 		}
 
 		for _, issue := range issues {
-			deleteIssueCleanUp, err := deleteIssue(ctx, issue, deleteAttachments)
+			postTxActionsDeleteIssue, err := deleteIssue(ctx, issue, deleteAttachments)
 			if err != nil {
 				return nil, fmt.Errorf("deleteIssue [issue_id: %d]: %w", issue.ID, err)
 			}
-			cleanup = cleanup.Append(deleteIssueCleanUp)
+			postTxActions = postTxActions.Append(postTxActionsDeleteIssue)
 		}
 	}
 
-	return cleanup, nil
+	return postTxActions, nil
 }
diff --git a/services/issue/issue_test.go b/services/issue/issue_test.go
@@ -44,9 +44,9 @@ func TestIssue_DeleteIssue(t *testing.T) {
 		ID:     issueIDs[2],
 	}
 
-	cleanup, err := deleteIssue(db.DefaultContext, issue, true)
+	postTxActions, err := deleteIssue(db.DefaultContext, issue, true)
 	assert.NoError(t, err)
-	cleanup()
+	postTxActions()
 	issueIDs, err = issues_model.GetIssueIDsByRepoID(db.DefaultContext, 1)
 	assert.NoError(t, err)
 	assert.Len(t, issueIDs, 4)
@@ -56,9 +56,9 @@ func TestIssue_DeleteIssue(t *testing.T) {
 	assert.NoError(t, err)
 	issue, err = issues_model.GetIssueByID(db.DefaultContext, 4)
 	assert.NoError(t, err)
-	cleanup, err = deleteIssue(db.DefaultContext, issue, true)
+	postTxActions, err = deleteIssue(db.DefaultContext, issue, true)
 	assert.NoError(t, err)
-	cleanup()
+	postTxActions()
 	assert.Len(t, attachments, 2)
 	for i := range attachments {
 		attachment, err := repo_model.GetAttachmentByUUID(db.DefaultContext, attachments[i].UUID)
@@ -80,9 +80,9 @@ func TestIssue_DeleteIssue(t *testing.T) {
 	assert.NoError(t, err)
 	assert.False(t, left)
 
-	cleanup, err = deleteIssue(db.DefaultContext, issue2, true)
+	postTxActions, err = deleteIssue(db.DefaultContext, issue2, true)
 	assert.NoError(t, err)
-	cleanup()
+	postTxActions()
 	left, err = issues_model.IssueNoDependenciesLeft(db.DefaultContext, issue1)
 	assert.NoError(t, err)
 	assert.True(t, left)
diff --git a/services/repository/delete.go b/services/repository/delete.go
@@ -201,7 +201,7 @@ func DeleteRepositoryDirectly(ctx context.Context, repoID int64, ignoreOrgTeams
 
 	// Delete Issues and related objects
 	// attachments will be deleted later with repo_id
-	cleanup, err := issue_service.DeleteIssuesByRepoID(ctx, repoID, false)
+	postTxActions, err := issue_service.DeleteIssuesByRepoID(ctx, repoID, false)
 	if err != nil {
 		return err
 	}
@@ -298,7 +298,7 @@ func DeleteRepositoryDirectly(ctx context.Context, repoID int64, ignoreOrgTeams
 
 	committer.Close()
 
-	cleanup()
+	postTxActions()
 
 	if needRewriteKeysFile {
 		if err := asymkey_service.RewriteAllPublicKeys(ctx); err != nil {
diff --git a/services/user/delete.go b/services/user/delete.go
@@ -33,8 +33,8 @@ import (
 )
 
 // deleteUser deletes models associated to an user.
-func deleteUser(ctx context.Context, u *user_model.User, purge bool) (cleanup util.CleanUpFunc, err error) {
-	cleanup = util.NewCleanUpFunc()
+func deleteUser(ctx context.Context, u *user_model.User, purge bool) (postTxActions util.PostTxAction, err error) {
+	postTxActions = util.NewPostTxAction()
 
 	// ***** START: Watch *****
 	watchedRepoIDs, err := db.FindIDs(ctx, "watch", "watch.repo_id",
@@ -135,7 +135,7 @@ func deleteUser(ctx context.Context, u *user_model.User, purge bool) (cleanup ut
 					return nil, err
 				}
 
-				cleanup = cleanup.Append(func() {
+				postTxActions = postTxActions.Append(func() {
 					for _, a := range comment.Attachments {
 						if err := storage.Attachments.Delete(a.RelativePath()); err != nil {
 							if !errors.Is(err, os.ErrNotExist) {
@@ -227,5 +227,5 @@ func deleteUser(ctx context.Context, u *user_model.User, purge bool) (cleanup ut
 		return nil, fmt.Errorf("delete: %w", err)
 	}
 
-	return cleanup, nil
+	return postTxActions, nil
 }
diff --git a/services/user/user.go b/services/user/user.go
@@ -243,7 +243,7 @@ func DeleteUser(ctx context.Context, u *user_model.User, purge bool) error {
 		return packages_model.ErrUserOwnPackages{UID: u.ID}
 	}
 
-	cleanup, err := deleteUser(ctx, u, purge)
+	postTxActions, err := deleteUser(ctx, u, purge)
 	if err != nil {
 		return fmt.Errorf("DeleteUser: %w", err)
 	}
@@ -253,7 +253,7 @@ func DeleteUser(ctx context.Context, u *user_model.User, purge bool) error {
 	}
 	_ = committer.Close()
 
-	cleanup()
+	postTxActions()
 
 	if err = asymkey_service.RewriteAllPublicKeys(ctx); err != nil {
 		return err

Original file line number	Diff line number	Diff line change
`@@ -191,16 +191,16 @@ func DeleteIssue(ctx context.Context, doer user_model.User, gitRepo git.Reposi`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`// delete entries in database`
`194`		`- cleanup, err := deleteIssue(ctx, issue, true)`
	`194`	`+ postTxActions, err := deleteIssue(ctx, issue, true)`
`195`	`195`	`if err != nil {`
`196`	`196`	`return err`
`197`	`197`	`}`
`198`		`- cleanup()`
	`198`	`+ postTxActions()`
`199`	`199`
`200`	`200`	`// delete pull request related git data`
`201`	`201`	`if issue.IsPull && gitRepo != nil {`
`202`	`202`	`if err := gitRepo.RemoveReference(issue.PullRequest.GetGitHeadRefName()); err != nil {`
`203`		`- return err`
	`203`	`+ log.Error("DeleteIssue: RemoveReference %s: %v", issue.PullRequest.GetGitHeadRefName(), err)`
`204`	`204`	`}`
`205`	`205`	`}`
`206`	`206`
`@@ -259,8 +259,8 @@ func GetRefEndNamesAndURLs(issues []*issues_model.Issue, repoLink string) (map[i`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`// deleteIssue deletes the issue`
`262`		`-func deleteIssue(ctx context.Context, issue *issues_model.Issue, deleteAttachments bool) (util.CleanUpFunc, error) {`
`263`		`- cleanup := util.NewCleanUpFunc()`
	`262`	`+func deleteIssue(ctx context.Context, issue *issues_model.Issue, deleteAttachments bool) (util.PostTxAction, error) {`
	`263`	`+ postTxActions := util.NewPostTxAction()`
`264`	`264`	`if err := db.WithTx(ctx, func(ctx context.Context) error {`
`265`	`265`	`if _, err := db.GetEngine(ctx).ID(issue.ID).NoAutoCondition().Delete(issue); err != nil {`
`266`	`266`	`return err`
`@@ -316,11 +316,11 @@ func deleteIssue(ctx context.Context, issue *issues_model.Issue, deleteAttachmen`
`316`	`316`	`}`
`317`	`317`
`318`	`318`	`for _, comment := range issue.Comments {`
`319`		`- _, cleanupDeleteComment, err := deleteComment(ctx, comment, deleteAttachments)`
	`319`	`+ _, postTxActionsDeleteComment, err := deleteComment(ctx, comment, deleteAttachments)`
`320`	`320`	`if err != nil {`
`321`	`321`	`return fmt.Errorf("deleteComment [comment_id: %d]: %w", comment.ID, err)`
`322`	`322`	`}`
`323`		`- cleanup = cleanup.Append(cleanupDeleteComment)`
	`323`	`+ postTxActions = postTxActions.Append(postTxActionsDeleteComment)`
`324`	`324`	`}`
`325`	`325`
`326`	`326`	`if deleteAttachments {`
`@@ -330,7 +330,7 @@ func deleteIssue(ctx context.Context, issue *issues_model.Issue, deleteAttachmen`
`330`	`330`	`return err`
`331`	`331`	`}`
`332`	`332`	`// the storage cleanup function to remove attachments could be called after all transactions are committed`
`333`		`- cleanup = cleanup.Append(func() {`
	`333`	`+ postTxActions = postTxActions.Append(func() {`
`334`	`334`	`// Remove issue attachment files.`
`335`	`335`	`for i := range issue.Attachments {`
`336`	`336`	`system_model.RemoveStorageWithNotice(ctx, storage.Attachments, "Delete issue attachment", issue.Attachments[i].RelativePath())`
`@@ -341,35 +341,35 @@ func deleteIssue(ctx context.Context, issue *issues_model.Issue, deleteAttachmen`
`341`	`341`	`}); err != nil {`
`342`	`342`	`return nil, err`
`343`	`343`	`}`
`344`		`- return cleanup, nil`
	`344`	`+ return postTxActions, nil`
`345`	`345`	`}`
`346`	`346`
`347`	`347`	`// DeleteOrphanedIssues delete issues without a repo`
`348`	`348`	`func DeleteOrphanedIssues(ctx context.Context) error {`
`349`		`- cleanup := util.NewCleanUpFunc()`
	`349`	`+ postTxActions := util.NewPostTxAction()`
`350`	`350`	`if err := db.WithTx(ctx, func(ctx context.Context) error {`
`351`	`351`	`repoIDs, err := issues_model.GetOrphanedIssueRepoIDs(ctx)`
`352`	`352`	`if err != nil {`
`353`	`353`	`return err`
`354`	`354`	`}`
`355`	`355`	`for i := range repoIDs {`
`356`		`- deleteIssuesCleanup, err := DeleteIssuesByRepoID(ctx, repoIDs[i], true)`
	`356`	`+ postTxActionsDeleteIssues, err := DeleteIssuesByRepoID(ctx, repoIDs[i], true)`
`357`	`357`	`if err != nil {`
`358`	`358`	`return err`
`359`	`359`	`}`
`360`		`- cleanup = cleanup.Append(deleteIssuesCleanup)`
	`360`	`+ postTxActions = postTxActions.Append(postTxActionsDeleteIssues)`
`361`	`361`	`}`
`362`	`362`	`return nil`
`363`	`363`	`}); err != nil {`
`364`	`364`	`return err`
`365`	`365`	`}`
`366`		`- cleanup()`
	`366`	`+ postTxActions()`
`367`	`367`	`return nil`
`368`	`368`	`}`
`369`	`369`
`370`	`370`	`// DeleteIssuesByRepoID deletes issues by repositories id`
`371`		`-func DeleteIssuesByRepoID(ctx context.Context, repoID int64, deleteAttachments bool) (util.CleanUpFunc, error) {`
`372`		`- cleanup := util.NewCleanUpFunc()`
	`371`	`+func DeleteIssuesByRepoID(ctx context.Context, repoID int64, deleteAttachments bool) (util.PostTxAction, error) {`
	`372`	`+ postTxActions := util.NewPostTxAction()`
`373`	`373`	`for {`
`374`	`374`	`issues := make([]*issues_model.Issue, 0, db.DefaultMaxInSize)`
`375`	`375`	`if err := db.GetEngine(ctx).`
`@@ -385,13 +385,13 @@ func DeleteIssuesByRepoID(ctx context.Context, repoID int64, deleteAttachments b`
`385`	`385`	`}`
`386`	`386`
`387`	`387`	`for _, issue := range issues {`
`388`		`- deleteIssueCleanUp, err := deleteIssue(ctx, issue, deleteAttachments)`
	`388`	`+ postTxActionsDeleteIssue, err := deleteIssue(ctx, issue, deleteAttachments)`
`389`	`389`	`if err != nil {`
`390`	`390`	`return nil, fmt.Errorf("deleteIssue [issue_id: %d]: %w", issue.ID, err)`
`391`	`391`	`}`
`392`		`- cleanup = cleanup.Append(deleteIssueCleanUp)`
	`392`	`+ postTxActions = postTxActions.Append(postTxActionsDeleteIssue)`
`393`	`393`	`}`
`394`	`394`	`}`
`395`	`395`
`396`		`- return cleanup, nil`
	`396`	`+ return postTxActions, nil`
`397`	`397`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@ import (`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`// deleteUser deletes models associated to an user.`
`36`		`-func deleteUser(ctx context.Context, u *user_model.User, purge bool) (cleanup util.CleanUpFunc, err error) {`
`37`		`- cleanup = util.NewCleanUpFunc()`
	`36`	`+func deleteUser(ctx context.Context, u *user_model.User, purge bool) (postTxActions util.PostTxAction, err error) {`
	`37`	`+ postTxActions = util.NewPostTxAction()`
`38`	`38`
`39`	`39`	`// *** START: Watch ***`
`40`	`40`	`watchedRepoIDs, err := db.FindIDs(ctx, "watch", "watch.repo_id",`
`@@ -135,7 +135,7 @@ func deleteUser(ctx context.Context, u *user_model.User, purge bool) (cleanup ut`
`135`	`135`	`return nil, err`
`136`	`136`	`}`
`137`	`137`
`138`		`- cleanup = cleanup.Append(func() {`
	`138`	`+ postTxActions = postTxActions.Append(func() {`
`139`	`139`	`for _, a := range comment.Attachments {`
`140`	`140`	`if err := storage.Attachments.Delete(a.RelativePath()); err != nil {`
`141`	`141`	`if !errors.Is(err, os.ErrNotExist) {`
`@@ -227,5 +227,5 @@ func deleteUser(ctx context.Context, u *user_model.User, purge bool) (cleanup ut`
`227`	`227`	`return nil, fmt.Errorf("delete: %w", err)`
`228`	`228`	`}`
`229`	`229`
`230`		`- return cleanup, nil`
	`230`	`+ return postTxActions, nil`
`231`	`231`	`}`
Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ func DeleteUser(ctx context.Context, u *user_model.User, purge bool) error {`
`243`	`243`	`return packages_model.ErrUserOwnPackages{UID: u.ID}`
`244`	`244`	`}`
`245`	`245`
`246`		`- cleanup, err := deleteUser(ctx, u, purge)`
	`246`	`+ postTxActions, err := deleteUser(ctx, u, purge)`
`247`	`247`	`if err != nil {`
`248`	`248`	`return fmt.Errorf("DeleteUser: %w", err)`
`249`	`249`	`}`
`@@ -253,7 +253,7 @@ func DeleteUser(ctx context.Context, u *user_model.User, purge bool) error {`
`253`	`253`	`}`
`254`	`254`	`_ = committer.Close()`
`255`	`255`
`256`		`- cleanup()`
	`256`	`+ postTxActions()`
`257`	`257`
`258`	`258`	`if err = asymkey_service.RewriteAllPublicKeys(ctx); err != nil {`
`259`	`259`	`return err`