CLAP-375 Fix: 작업 관련 조회시 notnull 관련 jpa 쿼리 제거

Author: parkjaehak

src/main/java/clap/server/adapter/outbound/persistense/AttachmentPersistenceAdapter.java

@@ -37,37 +37,18 @@ public void saveAll(final List<Attachment> attachments) {
     }
 
     @Override
-    public List<Attachment> findAllByTaskIdAndCommentIsNull(final Long taskId) {
-        List<AttachmentEntity> attachmentEntities = attachmentRepository.findAllByTask_TaskIdAndCommentIsNull(taskId);
+    public List<Attachment> findAllByTaskId(final Long taskId) {
+        List<AttachmentEntity> attachmentEntities = attachmentRepository.findAllByTask_TaskId(taskId);
         return attachmentEntities.stream()
                 .map(attachmentPersistenceMapper::toDomain)
                 .collect(Collectors.toList());
     }
 
     @Override
-    public List<Attachment> findAllByTaskIdAndCommentIsNullAndAttachmentId(final Long taskId, final List<Long> attachmentIds) {
-        List<AttachmentEntity> attachmentEntities = attachmentRepository.findAllByTask_TaskIdAndCommentIsNullAndAttachmentIdIn(taskId, attachmentIds);
+    public List<Attachment> findAllByTaskIdAndAttachmentId(final Long taskId, final List<Long> attachmentIds) {
+        List<AttachmentEntity> attachmentEntities = attachmentRepository.findAllByTask_TaskIdAndAttachmentIdIn(taskId, attachmentIds);
         return attachmentEntities.stream()
                 .map(attachmentPersistenceMapper::toDomain)
                 .collect(Collectors.toList());
     }
-
-    @Override
-    public Optional<Attachment> findByCommentId(final Long commentId) {
-        Optional<AttachmentEntity> attachmentEntity = attachmentRepository.findByComment_CommentId(commentId);
-        return attachmentEntity.map(attachmentPersistenceMapper::toDomain);
-    }
-
-    @Override
-    public List<Attachment> findAllByTaskIdAndCommentIsNotNull(final Long taskId) {
-        List<AttachmentEntity> attachmentEntities = attachmentRepository.findAllByTask_TaskIdAndCommentIsNotNull(taskId);
-        return attachmentEntities.stream()
-                .map(attachmentPersistenceMapper::toDomain)
-                .collect(Collectors.toList());
-    }
-
-    @Override
-    public boolean exitsByCommentId(final Long commentId) {
-        return attachmentRepository.existsByComment_CommentId(commentId);
-    }
 }

src/main/java/clap/server/adapter/outbound/persistense/CommentPersistenceAdapter.java

@@ -34,9 +34,4 @@ public Comment saveComment(final Comment comment) {
     public void deleteCommentWithTaskHistory(final Long commentId) {
         commentRepository.deleteCommentWithTaskHistory(commentId);
     }
-
-    @Override
-    public void deleteComment(final Comment comment) {
-        commentRepository.delete(commentPersistenceMapper.toEntity(comment));
-    }
 }

src/main/java/clap/server/adapter/outbound/persistense/repository/task/AttachmentRepository.java

@@ -8,9 +8,6 @@
 
 @Repository
 public interface AttachmentRepository extends JpaRepository<AttachmentEntity, Long> {
-    List<AttachmentEntity> findAllByTask_TaskIdAndCommentIsNull(Long taskId);
-    List<AttachmentEntity> findAllByTask_TaskIdAndCommentIsNullAndAttachmentIdIn(Long task_taskId, List<Long> attachmentId);
-    Optional<AttachmentEntity> findByComment_CommentId(Long commentId);
-    boolean existsByComment_CommentId(Long commentId);
-    List<AttachmentEntity> findAllByTask_TaskIdAndCommentIsNotNull(Long taskId);
+    List<AttachmentEntity> findAllByTask_TaskId(Long taskId);
+    List<AttachmentEntity> findAllByTask_TaskIdAndAttachmentIdIn(Long task_taskId, List<Long> attachmentId);
 }

src/main/java/clap/server/application/port/outbound/task/CommandCommentPort.java

@@ -7,6 +7,4 @@ public interface CommandCommentPort {
     Comment saveComment(Comment comment);
 
     void deleteCommentWithTaskHistory(Long commentId);
-
-    void deleteComment(Comment comment);
 }

src/main/java/clap/server/application/port/outbound/task/LoadAttachmentPort.java

@@ -3,13 +3,9 @@
 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);
-    Optional<Attachment> findByCommentId(Long commentId);
-    List<Attachment> findAllByTaskIdAndCommentIsNotNull(Long taskId);
-    boolean exitsByCommentId(Long commentId);
+    List<Attachment> findAllByTaskId(Long taskId);
+    List<Attachment> findAllByTaskIdAndAttachmentId(Long taskId, List<Long> attachmentIds);
 }

src/main/java/clap/server/application/service/history/CommandCommentService.java

@@ -32,10 +32,7 @@ public class CommandCommentService implements EditCommentUsecase, DeleteCommentU
 
     private final MemberService memberService;
     private final CommentService commentService;
-
     private final CommandCommentPort commandCommentPort;
-    private final LoadAttachmentPort loadAttachmentPort;
-    private final CommandAttachmentPort commandAttachmentPort;
 
     @Transactional
     @Override
@@ -54,23 +51,8 @@ public void editComment(Long memberId, Long commentId, EditCommentRequest reques
     @Transactional
     @Override
     public void deleteComment(Long memberId, Long commentId) {
-        Member member = memberService.findActiveMember(memberId);
-        Comment comment = commentService.findById(commentId);
-        
-        if (comment.getMember().getMemberId().equals(member.getMemberId())) {
-            if (loadAttachmentPort.exitsByCommentId(commentId)) {
-                deleteAttachments(commentId);
-            }
-            commandCommentPort.deleteCommentWithTaskHistory(commentId);
-        }else{
-            throw new ApplicationException(CommentErrorCode.NOT_A_COMMENT_WRITER);
-        }
-    }
-
-    private void deleteAttachments(Long commentId) {
-        Attachment attachment = loadAttachmentPort.findByCommentId(commentId)
-                .orElseThrow(() -> new ApplicationException(CommentErrorCode.COMMENT_ATTACHMENT_NOT_FOUND));
-        attachment.softDelete();
-        commandAttachmentPort.save(attachment);
+        memberService.findActiveMember(memberId);
+        commentService.findById(commentId);
+        commandCommentPort.deleteCommentWithTaskHistory(commentId);
     }
 }

src/main/java/clap/server/application/service/history/FindTaskHistoriesService.java

@@ -33,7 +33,6 @@ public FindTaskHistoryResponse findTaskHistories(Long memberId, Long taskId) {
         memberService.findActiveMember(memberId);
         Task task = loadTaskPort.findById(taskId)
                 .orElseThrow(()-> new DomainException(TaskErrorCode.TASK_NOT_FOUND));
-        //List<Attachment> attachments = loadAttachmentPort.findAllByTaskIdAndCommentIsNotNull(task.getTaskId());
         List<TaskHistory> taskHistories = loadTaskHistoryPort.findAllTaskHistoriesByTaskId(task.getTaskId());
         return TaskHistoryResponseMapper.toFindTaskHistoryResponse(taskHistories);
     }

src/main/java/clap/server/application/service/task/FindTaskDetailsService.java

@@ -31,7 +31,7 @@ public FindTaskDetailsResponse findRequestedTaskDetails(final Long requesterId,
         memberService.findActiveMember(requesterId);
         Task task = loadTaskPort.findById(taskId)
                 .orElseThrow(()-> new ApplicationException(TaskErrorCode.TASK_NOT_FOUND));
-        List<Attachment> attachments = loadAttachmentPort.findAllByTaskIdAndCommentIsNull(taskId);
+        List<Attachment> attachments = loadAttachmentPort.findAllByTaskId(taskId);
         return TaskResponseMapper.toFindTaskDetailResponse(task, attachments);
     }
 
@@ -40,7 +40,7 @@ public FindTaskDetailsForManagerResponse findTaskDetailsForManager(final Long re
         memberService.findActiveMember(requesterId);
         Task task = loadTaskPort.findById(taskId)
                 .orElseThrow(() -> new ApplicationException(TaskErrorCode.TASK_NOT_FOUND));
-        List<Attachment> attachments = loadAttachmentPort.findAllByTaskIdAndCommentIsNull(taskId);
+        List<Attachment> attachments = loadAttachmentPort.findAllByTaskId(taskId);
         return TaskResponseMapper.toFindTaskDetailForManagerResponse(task, attachments);
     }
 }

src/main/java/clap/server/application/service/task/UpdateTaskService.java

@@ -138,7 +138,7 @@ private void updateAttachments(List<Long> attachmentIdsToDelete, List<MultipartF
     }
 
     private List<Attachment> validateAndGetAttachments(List<Long> attachmentIdsToDelete, Task task) {
-        List<Attachment> attachmentsOfTask = loadAttachmentPort.findAllByTaskIdAndCommentIsNullAndAttachmentId(task.getTaskId(), attachmentIdsToDelete);
+        List<Attachment> attachmentsOfTask = loadAttachmentPort.findAllByTaskIdAndAttachmentId(task.getTaskId(), attachmentIdsToDelete);
         if (attachmentsOfTask.size() != attachmentIdsToDelete.size()) {
             throw new ApplicationException(TaskErrorCode.TASK_ATTACHMENT_NOT_FOUND);
         }