CLAP-181 댓글 수정 및 삭제 api 구현

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);
+    }
+
+}

src/main/java/clap/server/adapter/inbound/web/comment/PostCommentController.java

@@ -0,0 +1,51 @@
+package clap.server.adapter.inbound.web.comment;
+
+import clap.server.adapter.inbound.security.SecurityUserDetails;
+import clap.server.adapter.inbound.web.dto.task.PostAndEditCommentRequest;
+import clap.server.application.port.inbound.comment.PostCommentUsecase;
+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 jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.annotation.Secured;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+@Tag(name = "02. Task", description = "작업 생성/수정 API")
+@WebAdapter
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/comment")
+public class PostCommentController {
+
+    private final PostCommentUsecase postCommentUsecase;
+
+    @Operation(summary = "댓글 작성")
+    @Parameter(name = "taskId", description = "댓글 작성할 작업 고유 ID", required = true, in = ParameterIn.PATH)
+    @PostMapping("/{taskId}")
+    @Secured({"ROLE_MANAGER", "ROLE_USER"})
+    public void createComment(
+            @AuthenticationPrincipal SecurityUserDetails userInfo,
+            @PathVariable Long taskId,
+            @RequestBody(required = true) PostAndEditCommentRequest request){
+        postCommentUsecase.save(userInfo.getUserId(), taskId, request);
+    }
+
+    @Operation(summary = "댓글 작성(첨부 파일)")
+    @Parameter(name = "taskId", description = "댓글 작성할 작업 고유 ID", required = true, in = ParameterIn.PATH)
+    @PostMapping("/attachment/{taskId}")
+    @Secured({"ROLE_MANAGER", "ROLE_USER"})
+    public void createAttachmentComment(
+            @AuthenticationPrincipal SecurityUserDetails userInfo,
+            @PathVariable Long taskId,
+            @RequestPart(name = "attachment") @NotNull List<MultipartFile> attachments) {
+        postCommentUsecase.saveCommentAttachment(userInfo.getUserId(), taskId, attachments);
+    }
+
+}

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
+) {
+}

src/main/java/clap/server/adapter/inbound/web/dto/task/PostAndEditCommentRequest.java

@@ -0,0 +1,10 @@
+package clap.server.adapter.inbound.web.dto.task;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public record PostAndEditCommentRequest(
+        @Schema(description = "댓글 내용")
+        String content
+) {
+}

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);

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

@@ -1,13 +1,32 @@
 package clap.server.adapter.outbound.persistense;
 
-import clap.server.application.port.outbound.taskhistory.LoadCommentPort;
+import clap.server.adapter.outbound.persistense.entity.task.CommentEntity;
+import clap.server.adapter.outbound.persistense.mapper.CommentPersistenceMapper;
+import clap.server.adapter.outbound.persistense.repository.task.CommentRepository;
+import clap.server.application.port.outbound.task.CommandCommentPort;
+import clap.server.application.port.outbound.task.LoadCommentPort;
+import clap.server.common.annotation.architecture.PersistenceAdapter;
 import clap.server.domain.model.task.Comment;
+import lombok.RequiredArgsConstructor;
 
 import java.util.Optional;
 
-public class CommentPersistenceAdapter implements LoadCommentPort {
+@PersistenceAdapter
+@RequiredArgsConstructor
+public class CommentPersistenceAdapter implements LoadCommentPort, CommandCommentPort {
+
+    private final CommentRepository commentRepository;
+    private final CommentPersistenceMapper commentPersistenceMapper;
+
+    @Override
+    public Optional<Comment> findById(Long commentId) {
+        Optional<CommentEntity> commentEntity = commentRepository.findById(commentId);
+        return commentEntity.map(commentPersistenceMapper::toDomain);
+    }
+
     @Override
-    public Optional<Comment> findById(Long id) {
-        return Optional.empty();
+    public Comment saveComment(Comment comment) {
+        CommentEntity commentEntity = commentRepository.save(commentPersistenceMapper.toEntity(comment));
+        return commentPersistenceMapper.toDomain(commentEntity);
     }
 }

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")

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;
 }

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);
 }

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);
 }

src/main/java/clap/server/application/mapper/AttachmentMapper.java

@@ -2,13 +2,15 @@
 
 import clap.server.adapter.inbound.web.dto.task.AttachmentResponse;
 import clap.server.domain.model.task.Attachment;
+import clap.server.domain.model.task.Comment;
 import clap.server.domain.model.task.Task;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 import java.util.stream.IntStream;
 
 import static clap.server.domain.model.task.Attachment.createAttachment;
+import static clap.server.domain.model.task.Attachment.createCommentAttachment;
 
 public class AttachmentMapper {
     private AttachmentMapper() {
@@ -26,6 +28,19 @@ public static List<Attachment> toTaskAttachments(Task task, List<MultipartFile>
                 .toList();
     }
 
+    public static List<Attachment> toCommentAttachments(Task task, Comment comment, List<MultipartFile> files, List<String> fileUrls) {
+        return IntStream.range(0, files.size())
+                .mapToObj(i -> createCommentAttachment(
+                        task,
+                        comment,
+                        files.get(i).getOriginalFilename(),
+                        fileUrls.get(i),
+                        files.get(i).getSize()
+                ))
+                .toList();
+    }
+
+
     public static List<AttachmentResponse> toAttachmentResponseList(List<Attachment> attachments) {
         return attachments.stream()
                 .map(attachment -> new AttachmentResponse(

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);
+}

src/main/java/clap/server/application/port/inbound/comment/PostCommentUsecase.java

@@ -0,0 +1,13 @@
+package clap.server.application.port.inbound.comment;
+
+import clap.server.adapter.inbound.web.dto.task.PostAndEditCommentRequest;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+public interface PostCommentUsecase {
+
+    void save(Long userId, Long taskId, PostAndEditCommentRequest request);
+
+    void saveCommentAttachment(Long userId, Long taskId, List<MultipartFile> files);
+}

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

@@ -0,0 +1,8 @@
+package clap.server.application.port.outbound.task;
+
+import clap.server.domain.model.task.Comment;
+
+public interface CommandCommentPort {
+
+    Comment saveComment(Comment comment);
+}

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);
 }

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

@@ -0,0 +1,9 @@
+package clap.server.application.port.outbound.task;
+
+import clap.server.domain.model.task.Comment;
+
+import java.util.Optional;
+
+public interface LoadCommentPort {
+    Optional<Comment> findById(Long commentId);
+}

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

@@ -5,5 +5,5 @@
 import java.util.Optional;
 
 public interface CommandCommentPort {
-    Optional<Comment> save(Comment comment);
+    void save(Comment comment);
 }