CLAP-185 fix: 댓글 삭제 logic 리팩토링 진행

starboxxxx · starboxxxx · commit a2514bd39363 · 2025-01-31T18:51:48.000+09:00
diff --git a/src/main/java/clap/server/adapter/inbound/web/comment/CommandCommentController.java b/src/main/java/clap/server/adapter/inbound/web/comment/CommandCommentController.java
@@ -1,7 +1,6 @@
 package clap.server.adapter.inbound.web.comment;
 
 import clap.server.adapter.inbound.security.SecurityUserDetails;
-import clap.server.adapter.inbound.web.dto.task.DeleteCommentRequest;
 import clap.server.adapter.inbound.web.dto.task.PostAndEditCommentRequest;
 import clap.server.application.port.inbound.comment.CommandCommentUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
@@ -40,9 +39,8 @@ public void editComment(
     @Secured({"ROLE_MANAGER", "ROLE_USER"})
     public void deleteComment(
             @AuthenticationPrincipal SecurityUserDetails userInfo,
-            @PathVariable Long commentId,
-            @RequestBody DeleteCommentRequest request) {
-        commandCommentUsecase.deleteComment(userInfo.getUserId(), commentId, request);
+            @PathVariable Long commentId) {
+        commandCommentUsecase.deleteComment(userInfo.getUserId(), commentId);
     }
 
 }
diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/DeleteCommentRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/DeleteCommentRequest.java
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/AttachmentPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/AttachmentPersistenceAdapter.java
@@ -54,11 +54,9 @@ public List<Attachment> findAllByTaskIdAndCommentIsNullAndAttachmentId(final Lon
     }
 
     @Override
-    public List<Attachment> findAllyByTaskIdAndCommentIdAndAttachmentId(Long taskId, Long commentId, List<Long> attachmentIds) {
-        List<AttachmentEntity> attachmentEntities = attachmentRepository.findActiveAttachmentsByTask_TaskIdAndComment_CommentIdAndAttachmentIdIn(taskId, commentId, attachmentIds);
-        return attachmentEntities.stream()
-                .map(attachmentPersistenceMapper::toDomain)
-                .collect(Collectors.toList());
+    public Optional<Attachment> findByCommentId(Long commentId) {
+        Optional<AttachmentEntity> attachmentEntity = attachmentRepository.findByComment_CommentIdAndIsDeletedFalse(commentId);
+        return attachmentEntity.map(attachmentPersistenceMapper::toDomain);
     }
 
     @Override
@@ -68,4 +66,9 @@ public List<Attachment> findAllByTaskIdAndCommentIsNotNull(final Long taskId) {
                 .map(attachmentPersistenceMapper::toDomain)
                 .collect(Collectors.toList());
     }
+
+    @Override
+    public boolean exitsByCommentId(Long commentId) {
+        return attachmentRepository.existsByComment_CommentId(commentId);
+    }
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/AttachmentRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/AttachmentRepository.java
@@ -4,11 +4,13 @@
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Optional;
 
 @Repository
 public interface AttachmentRepository extends JpaRepository<AttachmentEntity, Long> {
     List<AttachmentEntity> findAllByTask_TaskIdAndCommentIsNullAndIsDeletedIsFalse(Long taskId);
     List<AttachmentEntity> findAllByTask_TaskIdAndCommentIsNullAndIsDeletedIsFalseAndAttachmentIdIn(Long task_taskId, List<Long> attachmentId);
-    List<AttachmentEntity> findActiveAttachmentsByTask_TaskIdAndComment_CommentIdAndAttachmentIdIn(Long task_taskId, Long comment_commentId, List<Long> attachmentIds);
+    Optional<AttachmentEntity> findByComment_CommentIdAndIsDeletedFalse(Long commentId);
+    boolean existsByComment_CommentId(Long commentId);
     List<AttachmentEntity> findAllByTask_TaskIdAndCommentIsNotNullAndIsDeletedIsFalse(Long taskId);
 }
diff --git a/src/main/java/clap/server/application/port/inbound/comment/CommandCommentUsecase.java b/src/main/java/clap/server/application/port/inbound/comment/CommandCommentUsecase.java
@@ -1,13 +1,10 @@
 package clap.server.application.port.inbound.comment;
 
-import clap.server.adapter.inbound.web.dto.task.DeleteCommentRequest;
 import clap.server.adapter.inbound.web.dto.task.PostAndEditCommentRequest;
 
-import java.util.List;
-
 public interface CommandCommentUsecase {
 
     void updateComment(Long userId, Long commentId, PostAndEditCommentRequest request);
 
-    void deleteComment(Long userId, Long commentId, DeleteCommentRequest request);
+    void deleteComment(Long userId, Long commentId);
 }
diff --git a/src/main/java/clap/server/application/port/outbound/task/CommandCommentPort.java b/src/main/java/clap/server/application/port/outbound/task/CommandCommentPort.java
@@ -5,4 +5,6 @@
 public interface CommandCommentPort {
 
     Comment saveComment(Comment comment);
+
+    void deleteComment(Comment comment);
 }
diff --git a/src/main/java/clap/server/application/port/outbound/task/LoadAttachmentPort.java b/src/main/java/clap/server/application/port/outbound/task/LoadAttachmentPort.java
@@ -3,11 +3,13 @@
 import clap.server.domain.model.task.Attachment;
 
 import java.util.List;
+import java.util.Optional;
 
 
 public interface LoadAttachmentPort {
     List<Attachment> findAllByTaskIdAndCommentIsNull(Long taskId);
     List<Attachment> findAllByTaskIdAndCommentIsNullAndAttachmentId(Long taskId, List<Long> attachmentIds);
-    List<Attachment> findAllyByTaskIdAndCommentIdAndAttachmentId(Long taskId, Long commentId, List<Long> attachmentIds);
+    Optional<Attachment> findByCommentId(Long commentId);
     List<Attachment> findAllByTaskIdAndCommentIsNotNull(Long taskId);
+    boolean exitsByCommentId(Long commentId);
 }
diff --git a/src/main/java/clap/server/application/service/comment/CommandCommentService.java b/src/main/java/clap/server/application/service/comment/CommandCommentService.java
@@ -1,8 +1,6 @@
 package clap.server.application.service.comment;
 
-import clap.server.adapter.inbound.web.dto.task.DeleteCommentRequest;
 import clap.server.adapter.inbound.web.dto.task.PostAndEditCommentRequest;
-import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import clap.server.application.port.inbound.comment.CommandCommentUsecase;
 import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.outbound.task.CommandAttachmentPort;
@@ -13,16 +11,11 @@
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.task.Attachment;
 import clap.server.domain.model.task.Comment;
-import clap.server.domain.model.task.Task;
 import clap.server.exception.ApplicationException;
 import clap.server.exception.code.CommentErrorCode;
-import clap.server.exception.code.MemberErrorCode;
-import clap.server.exception.code.TaskErrorCode;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
 @ApplicationService
 @RequiredArgsConstructor
 public class CommandCommentService implements CommandCommentUsecase {
@@ -51,36 +44,25 @@ public void updateComment(Long userId, Long commentId, PostAndEditCommentRequest
 
     @Transactional
     @Override
-    public void deleteComment(Long userId, Long commentId, DeleteCommentRequest request) {
+    public void deleteComment(Long userId, Long commentId) {
         Member member = memberService.findActiveMember(userId);
 
 
         Comment comment = loadCommentPort.findById(commentId)
                 .orElseThrow(() -> new ApplicationException(CommentErrorCode.COMMENT_NOT_FOUND));
 
         if (Member.checkCommenter(comment.getTask(), member)) {
-
-            // 삭제할 댓글이 첨부파일일 경우
-            if (!request.attachmentsToDelete().isEmpty()) {
-                deleteAttachments(request.attachmentsToDelete(), comment.getTask(), comment.getCommentId());
+            if (loadAttachmentPort.exitsByCommentId(commentId)) {
+                deleteAttachments(commentId);
             }
-
-            comment.softDelete();
-            commandCommentPort.saveComment(comment);
+            commandCommentPort.deleteComment(comment);
         };
     }
 
-    private void deleteAttachments(List<Long> attachmentIdsToDelete, Task task, Long commentId) {
-        List<Attachment> attachmentsToDelete = validateAndGetAttachments(attachmentIdsToDelete, task, commentId);
-        attachmentsToDelete.forEach(Attachment::softDelete);
-        commandAttachmentPort.saveAll(attachmentsToDelete);
-    }
-
-    private List<Attachment> validateAndGetAttachments(List<Long> attachmentIdsToDelete, Task task, Long commentId) {
-        List<Attachment> attachmentsOfTask = loadAttachmentPort.findAllyByTaskIdAndCommentIdAndAttachmentId(task.getTaskId(), commentId, attachmentIdsToDelete);
-        if (attachmentsOfTask.size() != attachmentIdsToDelete.size()) {
-            throw new ApplicationException(TaskErrorCode.TASK_ATTACHMENT_NOT_FOUND);
-        }
-        return attachmentsOfTask;
+    private void deleteAttachments(Long commentId) {
+        Attachment attachment = loadAttachmentPort.findByCommentId(commentId)
+                .orElseThrow(() -> new ApplicationException(CommentErrorCode.COMMENT_ATTACHMENT_NOT_FOUND));
+        attachment.softDelete();
+        commandAttachmentPort.save(attachment);
     }
 }
diff --git a/src/main/java/clap/server/domain/model/task/Comment.java b/src/main/java/clap/server/domain/model/task/Comment.java
@@ -7,6 +7,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
+import org.hibernate.annotations.SQLDelete;
 
 @Getter
 @SuperBuilder
diff --git a/src/main/java/clap/server/exception/code/CommentErrorCode.java b/src/main/java/clap/server/exception/code/CommentErrorCode.java
@@ -8,7 +8,9 @@
 @AllArgsConstructor
 public enum CommentErrorCode implements BaseErrorCode {
 
-    COMMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "COMMENT_001", "댓글을 찾을 수 없습니다.");
+    COMMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "COMMENT_001", "댓글을 찾을 수 없습니다."),
+    COMMENT_ATTACHMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "COMMENT_002", "댓글 첨부파일을 찾을 수 없습니다.")
+    ;
 
 
     private final HttpStatus httpStatus;

Original file line number	Diff line number	Diff line change
`@@ -54,11 +54,9 @@ public List<Attachment> findAllByTaskIdAndCommentIsNullAndAttachmentId(final Lon`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`@Override`
`57`		`- public List<Attachment> findAllyByTaskIdAndCommentIdAndAttachmentId(Long taskId, Long commentId, List<Long> attachmentIds) {`
`58`		`- List<AttachmentEntity> attachmentEntities = attachmentRepository.findActiveAttachmentsByTask_TaskIdAndComment_CommentIdAndAttachmentIdIn(taskId, commentId, attachmentIds);`
`59`		`- return attachmentEntities.stream()`
`60`		`- .map(attachmentPersistenceMapper::toDomain)`
`61`		`- .collect(Collectors.toList());`
	`57`	`+ public Optional<Attachment> findByCommentId(Long commentId) {`
	`58`	`+ Optional<AttachmentEntity> attachmentEntity = attachmentRepository.findByComment_CommentIdAndIsDeletedFalse(commentId);`
	`59`	`+ return attachmentEntity.map(attachmentPersistenceMapper::toDomain);`
`62`	`60`	`}`
`63`	`61`
`64`	`62`	`@Override`
`@@ -68,4 +66,9 @@ public List<Attachment> findAllByTaskIdAndCommentIsNotNull(final Long taskId) {`
`68`	`66`	`.map(attachmentPersistenceMapper::toDomain)`
`69`	`67`	`.collect(Collectors.toList());`
`70`	`68`	`}`
	`69`	`+`
	`70`	`+ @Override`
	`71`	`+ public boolean exitsByCommentId(Long commentId) {`
	`72`	`+ return attachmentRepository.existsByComment_CommentId(commentId);`
	`73`	`+ }`
`71`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,6 @@`
`5`	`5`	`public interface CommandCommentPort {`
`6`	`6`
`7`	`7`	`Comment saveComment(Comment comment);`
	`8`	`+`
	`9`	`+ void deleteComment(Comment comment);`
`8`	`10`	`}`