From 880192ea5d6130c0cafb2b69a8350463e8a6c010 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Fri, 1 Aug 2025 10:58:34 -0700
Subject: [PATCH] Fix test

---
 models/fixtures/comment.yml     | 17 +++++++++++++----
 models/issues/comment.go        |  9 ++-------
 services/issue/comments_test.go | 13 +++----------
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/models/fixtures/comment.yml b/models/fixtures/comment.yml
index 7d472cdea4..00f7f6e536 100644
--- a/models/fixtures/comment.yml
+++ b/models/fixtures/comment.yml
@@ -105,9 +105,18 @@
 
 -
   id: 12
-  type: 22 # review
-  poster_id: 100
+  type: 22 # review comment
+  poster_id: 1
   issue_id: 3
   content: ""
-  review_id: 10
-  created_unix: 946684812
+  review_id: 5
+  created_unix: 946684810
+
+-
+  id: 13
+  type: 21 # code comment
+  poster_id: 1
+  issue_id: 3
+  content: "Some codes need to be changed"
+  review_id: 5
+  created_unix: 946684810
diff --git a/models/issues/comment.go b/models/issues/comment.go
index df80b75d32..7ff4db6aaa 100644
--- a/models/issues/comment.go
+++ b/models/issues/comment.go
@@ -1168,15 +1168,10 @@ func DeleteComment(ctx context.Context, comment *Comment) (*Comment, error) {
 					return nil, err
 				}
 				if has && reviewComment.Content == "" {
-					if err := reviewComment.LoadAttachments(ctx); err != nil {
+					if _, err := db.GetEngine(ctx).ID(reviewComment.ID).Delete(new(Comment)); 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
-					}
+					deletedReviewComment = &reviewComment
 				}
 				comment.ReviewID = 0 // reset review ID to 0 for the notification
 			}
diff --git a/services/issue/comments_test.go b/services/issue/comments_test.go
index 4088bd1020..771a070330 100644
--- a/services/issue/comments_test.go
+++ b/services/issue/comments_test.go
@@ -8,7 +8,6 @@ import (
 
 	"code.gitea.io/gitea/models/db"
 	issues_model "code.gitea.io/gitea/models/issues"
-	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/models/unittest"
 	user_model "code.gitea.io/gitea/models/user"
 
@@ -18,11 +17,8 @@ import (
 func Test_DeleteCommentWithReview(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
 
-	comment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: 7})
-	assert.NoError(t, comment.LoadAttachments(t.Context()))
-	assert.Len(t, comment.Attachments, 1)
-	assert.Equal(t, int64(13), comment.Attachments[0].ID)
-	assert.Equal(t, int64(10), comment.ReviewID)
+	comment := unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: 13})
+	assert.Equal(t, int64(5), comment.ReviewID)
 	review := unittest.AssertExistsAndLoadBean(t, &issues_model.Review{ID: comment.ReviewID})
 	user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
 
@@ -33,8 +29,5 @@ func Test_DeleteCommentWithReview(t *testing.T) {
 
 	// the review should be deleted as well
 	unittest.AssertNotExistsBean(t, &issues_model.Review{ID: review.ID})
-	// the attachment should be deleted as well
-	newAttachment, err := repo_model.GetAttachmentByID(t.Context(), comment.Attachments[0].ID)
-	assert.Error(t, err)
-	assert.Nil(t, newAttachment)
+	unittest.AssertNotExistsBean(t, &issues_model.Comment{ID: deletedReviewComment.ID})
 }