Merge pull request #415 from TaskFlow-CLAP/CLAP-324

CLAP-324 디렉토리 구조 정리 및 레이어간의 책임 분리

Author: joowojr

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

@@ -1,28 +1,26 @@
 package clap.server.adapter.inbound.web.dto.task.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.List;
 
 public record FilterTeamStatusRequest(
-        @Schema(description = "정렬 기준 (기여도순, 기본)", example = "기여도순")
-        SortBy sortBy,  // Enum 타입으로 수정
+        @Schema(description = "정렬 기준 (기여도순, 기본)", example = "DEFAULT")
+        @NotNull
+        SortBy sortBy,
 
         @Schema(description = "1차 카테고리 ID 목록", example = "[10, 20, 30]")
+        @NotBlank
         List<Long> mainCategoryIds,
 
         @Schema(description = "2차 카테고리 ID 목록", example = "[1, 2, 3]")
         List<Long> categoryIds,
 
         @Schema(description = "작업 타이틀 검색", example = "타이틀1")
+        @NotNull
         String taskTitle
 ) {
-        public FilterTeamStatusRequest {
-                // 기본값 설정
-                sortBy = (sortBy == null) ? SortBy.DEFAULT : sortBy;  // 기본값을 DEFAULT로 설정
-                mainCategoryIds = mainCategoryIds == null ? List.of() : mainCategoryIds;
-                categoryIds = categoryIds == null ? List.of() : categoryIds;
-                taskTitle = taskTitle == null ? "" : taskTitle;
-        }
 }
 

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

@@ -24,5 +24,4 @@ public static record LabelInfo(
             LabelColor labelColor
     ) {
     }
-
 }

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

@@ -1,7 +1,5 @@
 package clap.server.adapter.inbound.web.dto.task.response;
 
-import com.querydsl.core.annotations.QueryProjection;
-
 import java.util.List;
 
 public record TeamTaskResponse(
@@ -14,8 +12,4 @@ public record TeamTaskResponse(
         int totalTaskCount,
         List<TeamTaskItemResponse> tasks
 ) {
-    @QueryProjection
-    public TeamTaskResponse {
-        tasks = (tasks == null) ? List.of() : tasks;
-    }
 }

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

@@ -17,7 +17,6 @@
 
 @Tag(name = "03. Task History", description = "히스토리 및 댓글 관련 API")
 @WebAdapter
-@RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/comments")
 public class CommandCommentController {

src/main/java/clap/server/adapter/inbound/web/history/FindTaskHistoryController.java

@@ -20,7 +20,6 @@
 
 @Tag(name = "03. Task History")
 @WebAdapter
-@RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/tasks")
 public class FindTaskHistoryController {

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

@@ -22,17 +22,16 @@
 
 @Tag(name = "03. Task History")
 @WebAdapter
-@RestController
 @RequiredArgsConstructor
-@RequestMapping("/api/comments")
+@RequestMapping("/api/tasks")
 public class PostCommentController {
 
     private final SaveCommentUsecase saveCommentUsecase;
     private final SaveCommentAttachmentUsecase saveCommentAttachmentUsecase;
     @LogType(LogStatus.COMMENT_ADDED)
     @Operation(summary = "댓글 작성")
     @Parameter(name = "taskId", description = "댓글 작성할 작업 고유 ID", required = true, in = ParameterIn.PATH)
-    @PostMapping("/{taskId}")
+    @PostMapping("/{taskId}/comments")
     @Secured({"ROLE_MANAGER", "ROLE_USER"})
     public void createComment(
             @AuthenticationPrincipal SecurityUserDetails userInfo,
@@ -43,7 +42,7 @@ public void createComment(
 
     @Operation(summary = "댓글 작성(첨부 파일)")
     @Parameter(name = "taskId", description = "댓글 작성할 작업 고유 ID", required = true, in = ParameterIn.PATH)
-    @PostMapping(value = "/attachment/{taskId}", consumes = {MediaType.MULTIPART_FORM_DATA_VALUE})
+    @PostMapping(value = "/{taskId}/comments/attachment", consumes = {MediaType.MULTIPART_FORM_DATA_VALUE})
     @Secured({"ROLE_MANAGER", "ROLE_USER"})
     public void createAttachmentComment(
             @AuthenticationPrincipal SecurityUserDetails userInfo,

src/main/java/clap/server/adapter/inbound/web/label/FindLabelController.java

@@ -18,7 +18,6 @@
 
 @Tag(name = "02. Task [조회]", description = "담당자 및 관리자 공통으로 사용")
 @WebAdapter
-@RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/labels")
 public class FindLabelController {

src/main/java/clap/server/adapter/inbound/web/log/LogController.java

@@ -20,7 +20,6 @@
 
 @Tag(name = "05. Admin [로깅]")
 @WebAdapter
-@RestController
 @RequestMapping("/api/managements/logs")
 @RequiredArgsConstructor
 public class LogController {

src/main/java/clap/server/adapter/inbound/web/notification/FindNotificationController.java

@@ -23,7 +23,6 @@
 
 @Tag(name = "04. Notification")
 @WebAdapter
-@RestController
 @RequestMapping("/api/notifications")
 @RequiredArgsConstructor
 public class FindNotificationController {

src/main/java/clap/server/adapter/inbound/web/notification/ManagementNotificationController.java

@@ -16,7 +16,6 @@
 
 @Tag(name = "04. Notification")
 @WebAdapter
-@RestController
 @RequestMapping("/api/notifications")
 @RequiredArgsConstructor
 public class ManagementNotificationController {