Merge pull request #180 from TaskFlow-CLAP/CLAP-181

starboxxxx · web-flow · commit 38d1ad0c3261 · 2025-01-31T17:28:46.000+09:00
CLAP-181 댓글 수정 및 삭제 api 구현
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
@@ -0,0 +1,48 @@
+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;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.annotation.Secured;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+
+@Tag(name = "02. Task", description = "작업 생성/수정 API")
+@WebAdapter
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/comment")
+public class CommandCommentController {
+
+    private final CommandCommentUsecase commandCommentUsecase;
+
+    @Operation(summary = "댓글 수정")
+    @Parameter(name = "commentId", description = "수정할 댓글 고유 ID", required = true, in = ParameterIn.PATH)
+    @PatchMapping("/{commentId}")
+    @Secured({"ROLE_MANAGER", "ROLE_USER"})
+    public void editComment(
+            @AuthenticationPrincipal SecurityUserDetails userInfo,
+            @PathVariable Long commentId,
+            @RequestBody PostAndEditCommentRequest request) {
+        commandCommentUsecase.updateComment(userInfo.getUserId(), commentId, request);
+    }
+
+    @Operation(summary = "댓글 삭제", description = "첨부파일 댓글일 경우 request body에 삭제할 파일 ID를 리스트로 전달")
+    @Parameter(name = "commentId", description = "수정할 댓글 고유 ID", required = true, in = ParameterIn.PATH)
+    @DeleteMapping("/{commentId}")
+    @Secured({"ROLE_MANAGER", "ROLE_USER"})
+    public void deleteComment(
+            @AuthenticationPrincipal SecurityUserDetails userInfo,
+            @PathVariable Long commentId,
+            @RequestBody DeleteCommentRequest request) {
+        commandCommentUsecase.deleteComment(userInfo.getUserId(), commentId, request);
+    }
+
+}
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
@@ -0,0 +1,13 @@
+package clap.server.adapter.inbound.web.dto.task;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+
+import java.util.List;
+
+public record DeleteCommentRequest(
+        @Schema(description = "삭제할 파일 ID 목록, 없을 경우 emptylist 전송")
+        @NotNull
+        List<Long> attachmentsToDelete
+) {
+}
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/AttachmentPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/AttachmentPersistenceAdapter.java
@@ -53,6 +53,14 @@ public List<Attachment> findAllByTaskIdAndCommentIsNullAndAttachmentId(final Lon
                 .collect(Collectors.toList());
     }
 
+    @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());
+    }
+
     @Override
     public List<Attachment> findAllByTaskIdAndCommentIsNotNull(final Long taskId) {
         List<AttachmentEntity> attachmentEntities = attachmentRepository.findAllByTask_TaskIdAndCommentIsNotNullAndIsDeletedIsFalse(taskId);
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/CommentPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/CommentPersistenceAdapter.java
@@ -19,8 +19,15 @@ public class CommentPersistenceAdapter implements LoadCommentPort, CommandCommen
     private final CommentPersistenceMapper commentPersistenceMapper;
 
     @Override
-    public Optional<Comment> findById(Long id) {
-        return Optional.empty();
+    public Optional<Comment> findById(Long commentId) {
+        Optional<CommentEntity> commentEntity = commentRepository.findById(commentId);
+        return commentEntity.map(commentPersistenceMapper::toDomain);
+    }
+
+    @Override
+    public Comment saveComment(Comment comment) {
+        CommentEntity commentEntity = commentRepository.save(commentPersistenceMapper.toEntity(comment));
+        return commentPersistenceMapper.toDomain(commentEntity);
     }
 
     @Override
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java
@@ -45,18 +45,15 @@ public class MemberEntity extends BaseTimeEntity {
     @Column(nullable = false)
     private MemberStatus status;
 
+    // TODO: spring security 적용 예정
     @Column(nullable = false)
     private String password;
 
     @Column
     private String imageUrl;
 
     @Column
-    private Boolean kakaoworkNotificationEnabled;
-    @Column
-    private Boolean agitNotificationEnabled;
-    @Column
-    private Boolean emailNotificationEnabled;
+    private Boolean notificationEnabled;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "admin_id")
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/CommentEntity.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/CommentEntity.java
@@ -32,4 +32,7 @@ public class CommentEntity extends BaseTimeEntity {
 
     @Column(name = "is_modified", nullable = false)
     private boolean isModified;
+
+    @Column(name="is_deleted", nullable = false)
+    private boolean isDeleted;
 }
diff --git a/src/main/java/clap/server/adapter/outbound/persistense/mapper/CommentPersistenceMapper.java b/src/main/java/clap/server/adapter/outbound/persistense/mapper/CommentPersistenceMapper.java
@@ -14,9 +14,11 @@ public interface CommentPersistenceMapper  extends PersistenceMapper<CommentEnti
 
     @Override
     @Mapping(source = "modified", target = "isModified")
+    @Mapping(source = "deleted", target = "isDeleted")
     Comment toDomain(final CommentEntity entity);
 
     @Override
     @Mapping(source = "modified", target = "isModified")
+    @Mapping(source = "deleted", target = "isDeleted")
     CommentEntity toEntity(final Comment domain);
 }
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
@@ -9,5 +9,6 @@
 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);
     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
@@ -0,0 +1,13 @@
+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);
+}
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
@@ -8,5 +8,6 @@
 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);
     List<Attachment> findAllByTaskIdAndCommentIsNotNull(Long taskId);
 }
diff --git a/src/main/java/clap/server/application/service/comment/CommandCommentService.java b/src/main/java/clap/server/application/service/comment/CommandCommentService.java
@@ -0,0 +1,103 @@
+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;
+import clap.server.application.port.outbound.task.CommandCommentPort;
+import clap.server.application.port.outbound.task.LoadAttachmentPort;
+import clap.server.application.port.outbound.task.LoadCommentPort;
+import clap.server.common.annotation.architecture.ApplicationService;
+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 {
+
+    private final MemberService memberService;
+    private final LoadCommentPort loadCommentPort;
+    private final CommandCommentPort commandCommentPort;
+    private final LoadAttachmentPort loadAttachmentPort;
+    private final CommandAttachmentPort commandAttachmentPort;
+
+    @Transactional
+    @Override
+    public void updateComment(Long userId, Long commentId, PostAndEditCommentRequest request) {
+
+        Member member = memberService.findActiveMember(userId);
+
+        Comment comment = loadCommentPort.findById(commentId)
+                .orElseThrow(() -> new ApplicationException(CommentErrorCode.COMMENT_NOT_FOUND));
+
+        if (checkCommenter(comment.getTask(), member)) {
+
+            comment.updateComment(request.content());
+            commandCommentPort.saveComment(comment);
+        };
+    }
+
+    @Transactional
+    @Override
+    public void deleteComment(Long userId, Long commentId, DeleteCommentRequest request) {
+        Member member = memberService.findActiveMember(userId);
+
+
+        Comment comment = loadCommentPort.findById(commentId)
+                .orElseThrow(() -> new ApplicationException(CommentErrorCode.COMMENT_NOT_FOUND));
+
+        if (checkCommenter(comment.getTask(), member)) {
+
+            // 삭제할 댓글이 첨부파일일 경우
+            if (!request.attachmentsToDelete().isEmpty()) {
+                deleteAttachments(request.attachmentsToDelete(), comment.getTask(), comment.getCommentId());
+            }
+
+            comment.softDelete();
+            commandCommentPort.saveComment(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;
+    }
+
+    public Boolean checkCommenter(Task task, Member member) {
+        // 일반 회원일 경우 => 요청자인지 확인
+        // 담당자일 경우 => 처리자인지 확인
+        if ((member.getMemberInfo().getRole() == MemberRole.ROLE_MANAGER)
+                && !(member.getMemberId() == task.getProcessor().getMemberId())) {
+            throw new ApplicationException(MemberErrorCode.NOT_A_COMMENTER);
+        }
+
+        else if ((member.getMemberInfo().getRole() == MemberRole.ROLE_USER)
+                && !(member.getMemberId() == task.getRequester().getMemberId())) {
+            throw new ApplicationException(MemberErrorCode.NOT_A_COMMENTER);
+        }
+        else {
+            return true;
+        }
+    }
+}
diff --git a/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java b/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java
@@ -3,14 +3,14 @@
 import clap.server.adapter.inbound.web.dto.member.UpdateMemberInfoRequest;
 import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.inbound.member.UpdateMemberInfoUsecase;
-import clap.server.application.port.outbound.member.CommandMemberPort;
 import clap.server.application.port.outbound.s3.S3UploadPort;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.common.constants.FilePathConstants;
 import clap.server.common.utils.FileUtils;
 import clap.server.domain.model.member.Member;
 import clap.server.exception.ApplicationException;
 import clap.server.exception.code.AttachmentErrorcode;
+import clap.server.exception.code.MemberErrorCode;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -23,20 +23,15 @@
 class UpdateMemberInfoService implements UpdateMemberInfoUsecase {
     private final MemberService memberService;
     private final S3UploadPort s3UploadPort;
-    private final CommandMemberPort commandMemberPort;
 
     @Override
     public void updateMemberInfo(Long memberId, UpdateMemberInfoRequest request, MultipartFile profileImage) throws IOException {
-        Member member = memberService.findActiveMember(memberId);
-        String profileImageUrl = null;
-        if (!profileImage.isEmpty()){
-            if(!FileUtils.validImageFile(profileImage.getInputStream())) {
-                throw new ApplicationException(AttachmentErrorcode.UNSUPPORTED_FILE_TYPE);
-            }
-            profileImageUrl = s3UploadPort.uploadSingleFile(FilePathConstants.MEMBER_IMAGE, profileImage);
+        if (!FileUtils.validImageFile(profileImage.getInputStream())) {
+            throw new ApplicationException(AttachmentErrorcode.UNSUPPORTED_FILE_TYPE);
         }
+        Member member = memberService.findActiveMember(memberId);
+        String profileImageUrl = s3UploadPort.uploadSingleFile(FilePathConstants.MEMBER_IMAGE, profileImage);
         member.updateMemberInfo(request.name(), request.agitNotification(), request.emailNotification(),
                 request.kakaoWorkNotification(), profileImageUrl);
-        commandMemberPort.save(member);
     }
 }
diff --git a/src/main/java/clap/server/application/service/task/UpdateTaskService.java b/src/main/java/clap/server/application/service/task/UpdateTaskService.java
diff --git a/src/main/java/clap/server/domain/model/member/Member.java b/src/main/java/clap/server/domain/model/member/Member.java
diff --git a/src/main/java/clap/server/domain/model/task/Comment.java b/src/main/java/clap/server/domain/model/task/Comment.java
diff --git a/src/main/java/clap/server/exception/code/CommentErrorCode.java b/src/main/java/clap/server/exception/code/CommentErrorCode.java
diff --git a/src/main/java/clap/server/exception/code/MemberErrorCode.java b/src/main/java/clap/server/exception/code/MemberErrorCode.java

Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,7 @@ public class CommentEntity extends BaseTimeEntity {`
`32`	`32`
`33`	`33`	`@Column(name = "is_modified", nullable = false)`
`34`	`34`	`private boolean isModified;`
	`35`	`+`
	`36`	`+ @Column(name="is_deleted", nullable = false)`
	`37`	`+ private boolean isDeleted;`
`35`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,6 @@`
`9`	`9`	`public interface AttachmentRepository extends JpaRepository<AttachmentEntity, Long> {`
`10`	`10`	`List<AttachmentEntity> findAllByTask_TaskIdAndCommentIsNullAndIsDeletedIsFalse(Long taskId);`
`11`	`11`	`List<AttachmentEntity> findAllByTask_TaskIdAndCommentIsNullAndIsDeletedIsFalseAndAttachmentIdIn(Long task_taskId, List<Long> attachmentId);`
	`12`	`+ List<AttachmentEntity> findActiveAttachmentsByTask_TaskIdAndComment_CommentIdAndAttachmentIdIn(Long task_taskId, Long comment_commentId, List<Long> attachmentIds);`
`12`	`13`	`List<AttachmentEntity> findAllByTask_TaskIdAndCommentIsNotNullAndIsDeletedIsFalse(Long taskId);`
`13`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,6 @@`
`8`	`8`	`public interface LoadAttachmentPort {`
`9`	`9`	`List<Attachment> findAllByTaskIdAndCommentIsNull(Long taskId);`
`10`	`10`	`List<Attachment> findAllByTaskIdAndCommentIsNullAndAttachmentId(Long taskId, List<Long> attachmentIds);`
	`11`	`+ List<Attachment> findAllyByTaskIdAndCommentIdAndAttachmentId(Long taskId, Long commentId, List<Long> attachmentIds);`
`11`	`12`	`List<Attachment> findAllByTaskIdAndCommentIsNotNull(Long taskId);`
`12`	`13`	`}`