revert unnecessary change in this pull request

Author: lunny

models/fixtures/comment.yml

@@ -102,12 +102,3 @@
   review_id: 22
   assignee_id: 5
   created_unix: 946684817
-
--
-  id: 12
-  type: 22 # review
-  poster_id: 100
-  issue_id: 3
-  content: ""
-  review_id: 10
-  created_unix: 946684812

models/issues/comment.go

@@ -1113,75 +1113,35 @@ func UpdateComment(ctx context.Context, c *Comment, contentVersion int, doer *us
 }
 
 // DeleteComment deletes the comment
-func DeleteComment(ctx context.Context, comment *Comment) (*Comment, error) {
+func DeleteComment(ctx context.Context, comment *Comment) error {
 	if _, err := db.GetEngine(ctx).ID(comment.ID).NoAutoCondition().Delete(comment); err != nil {
-		return nil, err
+		return err
 	}
 
 	if _, err := db.DeleteByBean(ctx, &ContentHistory{
 		CommentID: comment.ID,
 	}); err != nil {
-		return nil, err
+		return err
 	}
 
 	if comment.Type.CountedAsConversation() {
 		if err := UpdateIssueNumComments(ctx, comment.IssueID); err != nil {
-			return nil, err
+			return err
 		}
 	}
 	if _, err := db.GetEngine(ctx).Table("action").
 		Where("comment_id = ?", comment.ID).
 		Update(map[string]any{
 			"is_deleted": true,
 		}); err != nil {
-		return nil, err
-	}
-
-	var deletedReviewComment *Comment
-
-	// delete review & review comment if the code comment is the last comment of the review
-	if comment.Type == CommentTypeCode && comment.ReviewID > 0 {
-		if err := comment.LoadReview(ctx); err != nil {
-			return nil, err
-		}
-		if comment.Review != nil && comment.Review.Type == ReviewTypeComment {
-			res, err := db.GetEngine(ctx).ID(comment.ReviewID).
-				Where("NOT EXISTS (SELECT 1 FROM comment WHERE review_id = ? AND `type` = ?)", comment.ReviewID, CommentTypeCode).
-				Delete(new(Review))
-			if err != nil {
-				return nil, err
-			}
-			if res > 0 {
-				var reviewComment Comment
-				has, err := db.GetEngine(ctx).Where("review_id = ?", comment.ReviewID).
-					And("`type` = ?", CommentTypeReview).Get(&reviewComment)
-				if err != nil {
-					return nil, err
-				}
-				if has && reviewComment.Content == "" {
-					if err := reviewComment.LoadAttachments(ctx); err != nil {
-						return nil, err
-					}
-					if len(reviewComment.Attachments) == 0 {
-						if _, err := db.GetEngine(ctx).ID(reviewComment.ID).Delete(new(Comment)); err != nil {
-							return nil, err
-						}
-						deletedReviewComment = &reviewComment
-					}
-				}
-				comment.ReviewID = 0 // reset review ID to 0 for the notification
-			}
-		}
+		return err
 	}
 
 	if err := comment.neuterCrossReferences(ctx); err != nil {
-		return nil, err
+		return err
 	}
 
-	if err := DeleteReaction(ctx, &ReactionOptions{CommentID: comment.ID}); err != nil {
-		return nil, err
-	}
-	return deletedReviewComment, nil
+	return DeleteReaction(ctx, &ReactionOptions{CommentID: comment.ID})
 }
 
 // UpdateCommentsMigrationsByType updates comments' migrations information via given git service type and original id and poster id

routers/api/v1/repo/issue_comment.go

@@ -726,7 +726,7 @@ func deleteIssueComment(ctx *context.APIContext) {
 		return
 	}
 
-	if _, err = issue_service.DeleteComment(ctx, ctx.Doer, comment); err != nil {
+	if err = issue_service.DeleteComment(ctx, ctx.Doer, comment); err != nil {
 		ctx.APIErrorInternal(err)
 		return
 	}

routers/web/repo/issue_comment.go

@@ -325,18 +325,12 @@ func DeleteComment(ctx *context.Context) {
 		return
 	}
 
-	deletedReviewComment, err := issue_service.DeleteComment(ctx, ctx.Doer, comment)
-	if err != nil {
+	if err := issue_service.DeleteComment(ctx, ctx.Doer, comment); err != nil {
 		ctx.ServerError("DeleteComment", err)
 		return
 	}
 
-	res := map[string]any{}
-	if deletedReviewComment != nil {
-		res["deletedReviewCommentHashTag"] = deletedReviewComment.HashTag()
-	}
-
-	ctx.JSON(http.StatusOK, res)
+	ctx.Status(http.StatusOK)
 }
 
 // ChangeCommentReaction create a reaction for comment

services/issue/comments.go

@@ -132,42 +132,40 @@ 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, error) {
-	return db.WithTx2(ctx, func(ctx context.Context) (*issues_model.Comment, error) {
+func deleteComment(ctx context.Context, comment *issues_model.Comment, removeAttachments bool) error {
+	return db.WithTx(ctx, func(ctx context.Context) error {
 		if removeAttachments {
 			// load attachments before deleting the comment
 			if err := comment.LoadAttachments(ctx); err != nil {
-				return nil, err
+				return err
 			}
 		}
 
 		// deletedReviewComment should be a review comment with no content and no attachments
-		deletedReviewComment, err := issues_model.DeleteComment(ctx, comment)
-		if err != nil {
-			return nil, err
+		if err := issues_model.DeleteComment(ctx, comment); err != nil {
+			return err
 		}
 
 		if removeAttachments {
 			// mark comment attachments as deleted
 			if _, err := repo_model.MarkAttachmentsDeleted(ctx, comment.Attachments); err != nil {
-				return nil, err
+				return err
 			}
 		}
-		return deletedReviewComment, nil
+		return nil
 	})
 }
 
-func DeleteComment(ctx context.Context, doer *user_model.User, comment *issues_model.Comment) (*issues_model.Comment, error) {
-	deletedReviewComment, err := deleteComment(ctx, comment, true)
-	if err != nil {
-		return nil, err
+func DeleteComment(ctx context.Context, doer *user_model.User, comment *issues_model.Comment) error {
+	if err := deleteComment(ctx, comment, true); err != nil {
+		return err
 	}
 
 	attachment.AddAttachmentsToCleanQueue(ctx, comment.Attachments)
 
 	notify_service.DeleteComment(ctx, doer, comment)
 
-	return deletedReviewComment, nil
+	return nil
 }
 
 // LoadCommentPushCommits Load push commits

services/issue/comments_test.go

@@ -315,8 +315,7 @@ func deleteIssue(ctx context.Context, issue *issues_model.Issue, deleteAttachmen
 		}
 
 		for _, comment := range issue.Comments {
-			_, err := deleteComment(ctx, comment, deleteAttachments)
-			if err != nil {
+			if err := deleteComment(ctx, comment, deleteAttachments); err != nil {
 				return nil, fmt.Errorf("deleteComment [comment_id: %d]: %w", comment.ID, err)
 			}
 			toBeCleanedAttachments = append(toBeCleanedAttachments, comment.Attachments...)

services/issue/issue.go

@@ -122,7 +122,7 @@ func deleteUser(ctx context.Context, u *user_model.User, purge bool) (toBeCleane
 					return nil, err
 				}
 
-				if _, err = issues_model.DeleteComment(ctx, comment); err != nil {
+				if err = issues_model.DeleteComment(ctx, comment); err != nil {
 					return nil, err
 				}