Merge branch 'develop' of https://github.com/TaskFlow-CLAP/TaskFlow-Server into develop

Author: hyoseong-Choi

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

@@ -0,0 +1,36 @@
+package clap.server.adapter.inbound.web.admin;
+
+import clap.server.adapter.inbound.security.SecurityUserDetails;
+import clap.server.adapter.inbound.web.dto.admin.AddMainCategoryRequest;
+import clap.server.application.port.inbound.management.AddMainCategoryUsecase;
+import clap.server.common.annotation.architecture.WebAdapter;
+import io.swagger.v3.oas.annotations.Operation;
+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.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@Tag(name = "카테고리 추가")
+@WebAdapter
+@RequiredArgsConstructor
+public class addCategoryController {
+    private final AddMainCategoryUsecase addMainCategoryUsecase;
+
+    @Operation(summary = "1차 카테고리 추가")
+    @PostMapping("/api/maincategory")
+    @Secured("ROLE_ADMIN")
+    public void addMainCategory(@AuthenticationPrincipal SecurityUserDetails userInfo, @Validated @RequestBody AddMainCategoryRequest addMainCategoryRequest) {
+        addMainCategoryUsecase.addMainCategory(userInfo.getUserId(), addMainCategoryRequest.code(), addMainCategoryRequest.name());
+    }
+
+//    @Operation(summary = "2차 카테고리 추가")
+//    @PostMapping("/api/subcategory")
+//    @Secured("ROLE_ADMIN")
+//    public void addSubCategory(@Validated @RequestBody AddCategoryRequest addCategoryRequest) {
+//        addMainCategoryUsecase.addSubCategory(addCategoryRequest.code(), addCategoryRequest.name());
+//    }
+
+}

src/main/java/clap/server/adapter/inbound/web/dto/admin/AddMainCategoryRequest.java

@@ -0,0 +1,13 @@
+package clap.server.adapter.inbound.web.dto.admin;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import org.hibernate.validator.constraints.Length;
+
+public record AddMainCategoryRequest(
+        @NotBlank @Length(max = 20)
+        String name,
+        @NotBlank @Pattern(regexp = "^[A-Z]{1,2}$", message = "올바른 카테고리 코드 형식이 아닙니다.")
+        String code
+) {
+}

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

@@ -1,7 +1,13 @@
 package clap.server.adapter.inbound.web.dto.task;
 
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 public record AttachmentRequest(
+        @Schema(description = "파일 ID", example = "45")
         Long fileId,
-        String fileUrl) {
+
+        @Schema(description = "파일 URL", example = "https://example.com/file.png")
+        String fileUrl
+) {
 }

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

@@ -1,18 +1,30 @@
 package clap.server.adapter.inbound.web.dto.task;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 
 import java.util.List;
 
+
+@Schema(description = "작업 생성 요청")
 public record CreateTaskRequest(
+        @Schema(description = "카테고리 ID")
         @NotNull
         Long categoryId,
+
+        @Schema(description = "메인 카테고리 ID")
         @NotNull
         Long mainCategoryId,
+
+        @Schema(description = "작업 제목")
         @NotBlank
         String title,
+
+        @Schema(description = "작업 설명")
         String description,
+
+        @Schema(description = "첨부 파일 URL 목록", example = "[\"https://example.com/file1.png\", \"https://example.com/file2.pdf\"]")
         List<@NotBlank String> fileUrls
 ) {
 }

…to/task/CreateAndUpdateTaskResponse.java …und/web/dto/task/CreateTaskResponse.javasrc/main/java/clap/server/adapter/inbound/web/dto/task/CreateAndUpdateTaskResponse.java renamed to src/main/java/clap/server/adapter/inbound/web/dto/task/CreateTaskResponse.java src/main/java/clap/server/adapter/inbound/web/dto/task/CreateAndUpdateTaskResponse.java renamed to src/main/java/clap/server/adapter/inbound/web/dto/task/CreateTaskResponse.java

@@ -2,7 +2,7 @@
 
 
 
-public record CreateAndUpdateTaskResponse(
+public record CreateTaskResponse(
         Long taskId,
         Long categoryId,
         String title

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

@@ -0,0 +1,41 @@
+package clap.server.adapter.inbound.web.dto.task;
+
+
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import org.springframework.beans.factory.annotation.Value;
+
+import java.util.List;
+
+@Schema(description = "작업 필터링 요청")
+public record FilterTaskListRequest(
+
+        @Schema(description = "검색 기간 (단위: 시간)", example = "1, 24, 168, 730, 2190 (1시간, 24시간, 1주일, 1개월, 3개월)")
+        Integer term,
+
+        @Schema(description = "카테고리 ID 목록", example = "[1, 2, 3]")
+        @NotNull
+        List<Long> categoryIds,
+
+        @Schema(description = "메인 카테고리 ID 목록", example = "[10, 20, 30]")
+        @NotNull
+        List<Long> mainCategoryIds,
+
+        @Schema(description = "작업 제목", example = "작업 제목")
+        @NotNull
+        String title,
+
+        @Schema(description = "사용자 닉네임", example = "atom.park")
+        @NotNull
+        String nickName,
+
+        @Schema(description = "작업 상태 목록", example = "[\"REQUESTED\", \"IN_PROGRESS\"]")
+        @NotNull
+        List<TaskStatus> taskStatus,
+
+        @Schema(description = "정렬 기준", implementation = OrderRequest.class)
+        @NotNull
+        OrderRequest orderRequest
+) {
+}

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

@@ -0,0 +1,11 @@
+package clap.server.adapter.inbound.web.dto.task;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public record OrderRequest(
+        @Schema(description = "정렬 기준 (REQUESTED_AT/FINISHED_AT)", example = "REQUESTED_AT")
+        String sortBy,
+
+        @Schema(description = "정렬 방향 (ASC/DESC)", example = "ASC")
+        String sortDirection
+) {}

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

@@ -1,20 +1,34 @@
 package clap.server.adapter.inbound.web.dto.task;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 
 import java.util.List;
 
+@Schema(description = "작업 업데이트 요청")
 public record UpdateTaskRequest(
+
+        @Schema(description = "작업 ID", example = "123")
         @NotNull
         Long taskId,
+
+        @Schema(description = "카테고리 ID", example = "1")
         @NotNull
         Long categoryId,
+
+        @Schema(description = "메인 카테고리 ID", example = "10")
         @NotNull
         Long mainCategoryId,
+
+        @Schema(description = "작업 제목", example = "업데이트된 제목")
         @NotBlank
         String title,
+
+        @Schema(description = "작업 설명", example = "업데이트된 설명.")
         String description,
+
+        @Schema(description = "첨부 파일 요청 목록", implementation = AttachmentRequest.class)
         List<AttachmentRequest> attachmentRequests
-) {
-}
+) {}
+

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

@@ -0,0 +1,8 @@
+package clap.server.adapter.inbound.web.dto.task;
+
+public record UpdateTaskResponse(
+    Long taskId,
+    Long categoryId,
+    String title
+) {
+}