From 63173a6b3107c23eda4cd02bdbf8a99f8df40136 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 17 Jul 2025 00:04:27 -0700 Subject: [PATCH] fix test --- services/attachment/attachment_test.go | 3 ++- services/issue/comments.go | 2 +- services/issue/issue.go | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/services/attachment/attachment_test.go b/services/attachment/attachment_test.go index 77c6f42a3f4..9562b8f7318 100644 --- a/services/attachment/attachment_test.go +++ b/services/attachment/attachment_test.go @@ -47,8 +47,9 @@ func TestUploadAttachment(t *testing.T) { func TestDeleteAttachments(t *testing.T) { assert.NoError(t, unittest.PrepareTestDatabase()) + attachment8 := unittest.AssertExistsAndLoadBean(t, &repo_model.Attachment{ID: 8}) - err := DeleteAttachment(db.DefaultContext, &repo_model.Attachment{ID: 8}) + err := DeleteAttachment(db.DefaultContext, attachment8) assert.NoError(t, err) attachment, err := repo_model.GetAttachmentByUUID(db.DefaultContext, "a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a18") diff --git a/services/issue/comments.go b/services/issue/comments.go index c415c0f91a7..273af900ffc 100644 --- a/services/issue/comments.go +++ b/services/issue/comments.go @@ -182,7 +182,7 @@ func deleteComment(ctx context.Context, comment *issues_model.Comment, removeAtt } func DeleteComment(ctx context.Context, doer *user_model.User, comment *issues_model.Comment) (*issues_model.Comment, error) { - deletedReviewComment, cleanup, err := deleteComment(ctx, comment, false) + deletedReviewComment, cleanup, err := deleteComment(ctx, comment, true) if err != nil { return nil, err } diff --git a/services/issue/issue.go b/services/issue/issue.go index 446c7cdbf63..80ac9c1d6ae 100644 --- a/services/issue/issue.go +++ b/services/issue/issue.go @@ -325,7 +325,7 @@ func deleteIssue(ctx context.Context, issue *issues_model.Issue, deleteAttachmen if deleteAttachments { // delete issue attachments - _, err := db.GetEngine(ctx).Where("issue_id = ? AND comment_id = 0", issue.ID).NoAutoCondition().Delete(&issues_model.Issue{}) + _, err := db.GetEngine(ctx).Where("issue_id = ? AND comment_id = 0", issue.ID).NoAutoCondition().Delete(&repo_model.Attachment{}) if err != nil { return err }