CLAP-220 Fix: 댓글 관련 아키텍처 구조에 맞게 전체 수정

Author: starboxxxx

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

@@ -1,13 +1,15 @@
 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.CommandCommentUsecase;
+import clap.server.adapter.inbound.web.dto.comment.EditCommentRequest;
+import clap.server.application.port.inbound.comment.DeleteCommentUsecase;
+import clap.server.application.port.inbound.comment.EditCommentUsecase;
 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.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
@@ -20,7 +22,8 @@
 @RequestMapping("/api/comment")
 public class CommandCommentController {
 
-    private final CommandCommentUsecase commandCommentUsecase;
+    private final EditCommentUsecase editCommentUsecase;
+    private final DeleteCommentUsecase deleteCommentUsecase;
 
     @Operation(summary = "댓글 수정")
     @Parameter(name = "commentId", description = "수정할 댓글 고유 ID", required = true, in = ParameterIn.PATH)
@@ -29,8 +32,8 @@ public class CommandCommentController {
     public void editComment(
             @AuthenticationPrincipal SecurityUserDetails userInfo,
             @PathVariable Long commentId,
-            @RequestBody PostAndEditCommentRequest request) {
-        commandCommentUsecase.updateComment(userInfo.getUserId(), commentId, request);
+            @Valid @RequestBody EditCommentRequest request) {
+        editCommentUsecase.editComment(userInfo.getUserId(), commentId, request);
     }
 
     @Operation(summary = "댓글 삭제", description = "첨부파일 댓글일 경우 request body에 삭제할 파일 ID를 리스트로 전달")
@@ -40,7 +43,7 @@ public void editComment(
     public void deleteComment(
             @AuthenticationPrincipal SecurityUserDetails userInfo,
             @PathVariable Long commentId) {
-        commandCommentUsecase.deleteComment(userInfo.getUserId(), commentId);
+        deleteCommentUsecase.deleteComment(userInfo.getUserId(), commentId);
     }
 
 }

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

@@ -1,30 +1,31 @@
 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.adapter.inbound.web.dto.comment.CreateCommentRequest;
+import clap.server.application.port.inbound.comment.SaveCommentAttachmentUsecase;
+import clap.server.application.port.inbound.comment.SaveCommentUsecase;
 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.Valid;
 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;
+    private final SaveCommentUsecase saveCommentUsecase;
+    private final SaveCommentAttachmentUsecase saveCommentAttachmentUsecase;
 
     @Operation(summary = "댓글 작성")
     @Parameter(name = "taskId", description = "댓글 작성할 작업 고유 ID", required = true, in = ParameterIn.PATH)
@@ -33,8 +34,8 @@ public class PostCommentController {
     public void createComment(
             @AuthenticationPrincipal SecurityUserDetails userInfo,
             @PathVariable Long taskId,
-            @RequestBody(required = true) PostAndEditCommentRequest request){
-        postCommentUsecase.save(userInfo.getUserId(), taskId, request);
+            @Valid @RequestBody CreateCommentRequest request){
+        saveCommentUsecase.save(userInfo.getUserId(), taskId, request);
     }
 
     @Operation(summary = "댓글 작성(첨부 파일)")
@@ -45,7 +46,7 @@ public void createAttachmentComment(
             @AuthenticationPrincipal SecurityUserDetails userInfo,
             @PathVariable Long taskId,
             @RequestPart(name = "attachment") @NotNull MultipartFile attachment) {
-        postCommentUsecase.saveCommentAttachment(userInfo.getUserId(), taskId, attachment);
+        saveCommentAttachmentUsecase.saveCommentAttachment(userInfo.getUserId(), taskId, attachment);
     }
 
 }

src/main/java/clap/server/adapter/inbound/web/dto/comment/CreateCommentRequest.java

@@ -0,0 +1,11 @@
+package clap.server.adapter.inbound.web.dto.comment;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+
+public record CreateCommentRequest(
+        @Schema(description = "댓글 내용")
+        @NotBlank
+        String content
+) {
+}

src/main/java/clap/server/adapter/inbound/web/dto/comment/EditCommentRequest.java

@@ -0,0 +1,11 @@
+package clap.server.adapter.inbound.web.dto.comment;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+
+public record EditCommentRequest(
+        @Schema(description = "댓글 내용")
+        @NotBlank
+        String content
+) {
+}

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

@@ -0,0 +1,6 @@
+package clap.server.application.port.inbound.comment;
+
+public interface DeleteCommentUsecase {
+
+    void deleteComment(Long userId, Long commentId);
+}

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

@@ -0,0 +1,8 @@
+package clap.server.application.port.inbound.comment;
+
+import clap.server.adapter.inbound.web.dto.comment.EditCommentRequest;
+
+public interface EditCommentUsecase {
+
+    void editComment(Long userId, Long commentId, EditCommentRequest request);
+}

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

@@ -0,0 +1,8 @@
+package clap.server.application.port.inbound.comment;
+
+import org.springframework.web.multipart.MultipartFile;
+
+public interface SaveCommentAttachmentUsecase {
+
+    void saveCommentAttachment(Long userId, Long taskId, MultipartFile file);
+}