improvements

Author: lunny

services/issue/issue.go

@@ -346,44 +346,52 @@ func deleteIssue(ctx context.Context, issue *issues_model.Issue, deleteAttachmen
 
 // DeleteOrphanedIssues delete issues without a repo
 func DeleteOrphanedIssues(ctx context.Context) error {
-	return db.WithTx(ctx, func(ctx context.Context) error {
+	cleanup := util.NewCleanUpFunc()
+	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 {
-			if err := DeleteIssuesByRepoID(ctx, repoIDs[i], true); err != nil {
+			deleteIssuesCleanup, err := DeleteIssuesByRepoID(ctx, repoIDs[i], true)
+			if err != nil {
 				return err
 			}
+			cleanup = cleanup.Append(deleteIssuesCleanup)
 		}
 		return nil
-	})
+	}); err != nil {
+		return err
+	}
+	cleanup()
+	return nil
 }
 
 // DeleteIssuesByRepoID deletes issues by repositories id
-func DeleteIssuesByRepoID(ctx context.Context, repoID int64, deleteAttachments bool) error {
+func DeleteIssuesByRepoID(ctx context.Context, repoID int64, deleteAttachments bool) (util.CleanUpFunc, error) {
+	cleanup := util.NewCleanUpFunc()
 	for {
 		issues := make([]*issues_model.Issue, 0, db.DefaultMaxInSize)
 		if err := db.GetEngine(ctx).
 			Where("repo_id = ?", repoID).
 			OrderBy("id").
 			Limit(db.DefaultMaxInSize).
 			Find(&issues); err != nil {
-			return err
+			return nil, err
 		}
 
 		if len(issues) == 0 {
 			break
 		}
 
 		for _, issue := range issues {
-			cleanup, err := deleteIssue(ctx, issue, deleteAttachments)
+			deleteIssueCleanUp, err := deleteIssue(ctx, issue, deleteAttachments)
 			if err != nil {
-				return fmt.Errorf("deleteIssue [issue_id: %d]: %w", issue.ID, err)
+				return nil, fmt.Errorf("deleteIssue [issue_id: %d]: %w", issue.ID, err)
 			}
-			cleanup()
+			cleanup = cleanup.Append(deleteIssueCleanUp)
 		}
 	}
 
-	return nil
+	return cleanup, nil
 }

services/repository/delete.go

@@ -201,7 +201,8 @@ func DeleteRepositoryDirectly(ctx context.Context, doer *user_model.User, repoID
 
 	// Delete Issues and related objects
 	// attachments will be deleted later with repo_id
-	if err = issue_service.DeleteIssuesByRepoID(ctx, repoID, false); err != nil {
+	cleanup, err := issue_service.DeleteIssuesByRepoID(ctx, repoID, false)
+	if err != nil {
 		return err
 	}
 
@@ -297,6 +298,8 @@ func DeleteRepositoryDirectly(ctx context.Context, doer *user_model.User, repoID
 
 	committer.Close()
 
+	cleanup()
+
 	if needRewriteKeysFile {
 		if err := asymkey_service.RewriteAllPublicKeys(ctx); err != nil {
 			log.Error("RewriteAllPublicKeys failed: %v", err)