Merge pull request #231 from TaskFlow-CLAP/CLAP-220

CLAP-220 구현한 api 전체적으로 수정 작업 진행

Author: starboxxxx

src/main/java/clap/server/adapter/inbound/web/admin/FindLabelAdminController.java

@@ -3,6 +3,7 @@
 import clap.server.adapter.inbound.security.SecurityUserDetails;
 import clap.server.adapter.inbound.web.dto.common.SliceResponse;
 import clap.server.adapter.inbound.web.dto.label.FindLabelListResponse;
+import clap.server.application.port.inbound.label.FindLabelListAdminUsecase;
 import clap.server.application.port.inbound.label.FindLabelListUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
 import io.swagger.v3.oas.annotations.Operation;
@@ -22,13 +23,13 @@
 @RequestMapping("/api/managements/labels")
 public class FindLabelAdminController {
 
-    private final FindLabelListUsecase findLabelListUsecase;
+    private final FindLabelListAdminUsecase findLabelListAdminUsecase;
 
     @Operation(summary = "구분 목록 조회 API")
     @Secured({"ROLE_ADMIN"})
     @GetMapping
     public ResponseEntity<List<FindLabelListResponse>> findLabelList(
             @AuthenticationPrincipal SecurityUserDetails userInfo) {
-        return ResponseEntity.ok(findLabelListUsecase.findLabelListAdmin(userInfo.getUserId()));
+        return ResponseEntity.ok(findLabelListAdminUsecase.findLabelListAdmin(userInfo.getUserId()));
     }
 }

src/main/java/clap/server/adapter/inbound/web/admin/ManagementLabelController.java

@@ -1,15 +1,17 @@
 package clap.server.adapter.inbound.web.admin;
 
 import clap.server.adapter.inbound.security.SecurityUserDetails;
-import clap.server.adapter.inbound.web.dto.label.AddAndEditLabelRequest;
-import clap.server.application.port.inbound.admin.AddLabelUsecase;
+import clap.server.adapter.inbound.web.dto.label.CreateLabelRequest;
+import clap.server.adapter.inbound.web.dto.label.EditLabelRequest;
+import clap.server.application.port.inbound.label.AddLabelUsecase;
 import clap.server.application.port.inbound.admin.DeleteLabelUsecase;
-import clap.server.application.port.inbound.admin.UpdateLabelUsecase;
+import clap.server.application.port.inbound.label.UpdateLabelUsecase;
 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;
@@ -29,7 +31,7 @@ public class ManagementLabelController {
     @PostMapping
     @Secured({"ROLE_ADMIN"})
     public void addLabel(@AuthenticationPrincipal SecurityUserDetails userInfo,
-                         @RequestBody AddAndEditLabelRequest request) {
+                         @Valid @RequestBody CreateLabelRequest request) {
         addLabelUsecase.addLabel(userInfo.getUserId(), request);
     }
 
@@ -39,7 +41,7 @@ public void addLabel(@AuthenticationPrincipal SecurityUserDetails userInfo,
     @Secured({"ROLE_ADMIN"})
     public void updateLabel(@AuthenticationPrincipal SecurityUserDetails userInfo,
                             @PathVariable Long labelId,
-                            @RequestBody AddAndEditLabelRequest request) {
+                            @Valid @RequestBody EditLabelRequest request) {
         updateLabelUsecase.editLabel(userInfo.getUserId(), labelId, request);
 
     }

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

…eb/dto/label/AddAndEditLabelRequest.java …nd/web/dto/label/CreateLabelRequest.javasrc/main/java/clap/server/adapter/inbound/web/dto/label/AddAndEditLabelRequest.java renamed to src/main/java/clap/server/adapter/inbound/web/dto/label/CreateLabelRequest.java src/main/java/clap/server/adapter/inbound/web/dto/label/AddAndEditLabelRequest.java renamed to src/main/java/clap/server/adapter/inbound/web/dto/label/CreateLabelRequest.java

@@ -1,13 +1,17 @@
 package clap.server.adapter.inbound.web.dto.label;
 
-import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
 import clap.server.adapter.outbound.persistense.entity.task.constant.LabelColor;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
 
-public record AddAndEditLabelRequest(
+public record CreateLabelRequest(
 
         @Schema(description = "구분(label) 이름")
+        @NotBlank
         String labelName,
+
         @Schema(description = "구분(label) 색상")
+        @NotBlank
         LabelColor labelColor
-) {}
+) {
+}

src/main/java/clap/server/adapter/inbound/web/dto/label/EditLabelRequest.java

@@ -0,0 +1,17 @@
+package clap.server.adapter.inbound.web.dto.label;
+
+import clap.server.adapter.outbound.persistense.entity.task.constant.LabelColor;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+
+public record EditLabelRequest(
+
+        @Schema(description = "구분(label) 이름")
+        @NotBlank
+        String labelName,
+
+        @Schema(description = "구분(label) 색상")
+        @NotBlank
+        LabelColor labelColor
+) {
+}

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

@@ -1,6 +1,12 @@
 package clap.server.adapter.inbound.web.dto.task;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+
 public record UpdateTaskLabelRequest(
+
+        @Schema(description = "변경할 구분 고유 ID", example = "1")
+        @NotBlank
         Long labelId
 ) {
 }