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

Author: hyoseong-Choi

src/main/java/clap/server/adapter/inbound/web/dto/member/request/UpdateMemberInfoRequest.java

@@ -2,10 +2,13 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 public record UpdateMemberInfoRequest(
         @NotBlank @Schema(description = "이름")
         String name,
+        @NotNull @Schema(description = "이미지 수정이 있을 시에는 false을, 이미지를 삭제할 때에는 true을 보냅니다.")
+        Boolean isProfileImageDeleted,
         @Schema(description = "아지트 알림 수신 여부")
         boolean agitNotification,
         @Schema(description = "이메일 알림 수신 여부")

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

@@ -12,7 +12,7 @@ public record ApprovalTaskRequest(
         Long categoryId,
 
         @NotNull
-        @Schema(description = "처리자 ID",
+        @Schema(description = "담당자 ID",
                 example = "2")
         Long processorId,
 

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

@@ -24,7 +24,7 @@ public record FilterTaskListRequest(
         @NotNull
         String title,
 
-        @Schema(description = "요청자/처리자 닉네임", example = "atom.park")
+        @Schema(description = "요청자/담당자 닉네임", example = "atom.park")
         @NotNull
         String nickName,
 

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

@@ -1,28 +1,27 @@
 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]")
+        @NotNull
         List<Long> mainCategoryIds,
 
         @Schema(description = "2차 카테고리 ID 목록", example = "[1, 2, 3]")
+        @NotNull
         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/request/UpdateTaskStatusRequest.java

@@ -0,0 +1,10 @@
+package clap.server.adapter.inbound.web.dto.task.request;
+
+import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
+import jakarta.validation.constraints.NotNull;
+
+public record UpdateTaskStatusRequest(
+        @NotNull
+        TaskStatus taskStatus
+) {
+}

src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java

@@ -4,9 +4,9 @@
 import clap.server.adapter.inbound.web.dto.task.request.ApprovalTaskRequest;
 import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskLabelRequest;
 import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskProcessorRequest;
+import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskStatusRequest;
 import clap.server.adapter.inbound.web.dto.task.response.ApprovalTaskResponse;
 import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus;
-import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
 import clap.server.application.port.inbound.task.ApprovalTaskUsecase;
 import clap.server.application.port.inbound.task.UpdateTaskLabelUsecase;
 import clap.server.application.port.inbound.task.UpdateTaskProcessorUsecase;
@@ -36,6 +36,7 @@ public class ChangeTaskController {
     private final UpdateTaskProcessorUsecase updateTaskProcessorUsecase;
     private final UpdateTaskLabelUsecase updateTaskLabelUsecase;
     private final ApprovalTaskUsecase approvalTaskUsecase;
+
     @LogType(LogStatus.STATUS_CHANGED)
     @Operation(summary = "작업 상태 변경")
     @Secured("ROLE_MANAGER")
@@ -45,13 +46,13 @@ public void updateTaskState(
             @AuthenticationPrincipal SecurityUserDetails userInfo,
             @Parameter(description = "변경하고 싶은 작업 상태",
                     schema = @Schema(allowableValues = {"IN_PROGRESS", "IN_REVIEWING", "COMPLETED"}))
-            @RequestBody TaskStatus taskStatus) {
+            @RequestBody @Valid UpdateTaskStatusRequest request) {
 
-        updateTaskStatusUsecase.updateTaskStatus(userInfo.getUserId(), taskId, taskStatus);
+        updateTaskStatusUsecase.updateTaskStatus(userInfo.getUserId(), taskId, request.taskStatus());
     }
 
     @LogType(LogStatus.ASSIGNER_CHANGED)
-    @Operation(summary = "작업 처리자 변경")
+    @Operation(summary = "작업 담당자 변경")
     @Secured({"ROLE_MANAGER"})
     @PatchMapping("/{taskId}/processor")
     public void updateTaskProcessor(
@@ -70,6 +71,7 @@ public void updateTaskLabel(
             @Valid @RequestBody UpdateTaskLabelRequest updateTaskLabelRequest) {
         updateTaskLabelUsecase.updateTaskLabel(taskId, userInfo.getUserId(), updateTaskLabelRequest);
     }
+
     @LogType(LogStatus.REQUEST_APPROVED)
     @Operation(summary = "작업 승인")
     @Secured({"ROLE_MANAGER"})

src/main/java/clap/server/adapter/inbound/web/task/TeamStatusController.java

@@ -6,6 +6,7 @@
 import clap.server.common.annotation.architecture.WebAdapter;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.annotation.Secured;
@@ -25,7 +26,7 @@ public class TeamStatusController {
     @Operation(summary = "팀 현황 조회 API")
     @GetMapping()
     @Secured("ROLE_MANAGER")
-    public ResponseEntity<TeamStatusResponse> filterTeamStatus(@ModelAttribute FilterTeamStatusRequest filter) {
+    public ResponseEntity<TeamStatusResponse> filterTeamStatus(@ModelAttribute @Valid FilterTeamStatusRequest filter) {
         TeamStatusResponse response = filterTeamStatusUsecase.filterTeamStatus(filter);
         return ResponseEntity.ok(response != null ? response : new TeamStatusResponse(List.of(), 0, 0, 0));
     }

…ver/adapter/outbound/api/AgitClient.java …dapter/outbound/api/agit/AgitClient.javasrc/main/java/clap/server/adapter/outbound/api/AgitClient.java renamed to src/main/java/clap/server/adapter/outbound/api/agit/AgitClient.java src/main/java/clap/server/adapter/outbound/api/AgitClient.java renamed to src/main/java/clap/server/adapter/outbound/api/agit/AgitClient.java

@@ -1,6 +1,6 @@
-package clap.server.adapter.outbound.api;
+package clap.server.adapter.outbound.api.agit;
 
-import clap.server.adapter.outbound.api.dto.PushNotificationTemplate;
+import clap.server.adapter.outbound.api.data.PushNotificationTemplate;
 import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
 import clap.server.application.port.outbound.webhook.SendAgitPort;
 import clap.server.common.annotation.architecture.ExternalApiAdapter;

…er/outbound/api/AgitTemplateBuilder.java …tbound/api/agit/AgitTemplateBuilder.javasrc/main/java/clap/server/adapter/outbound/api/AgitTemplateBuilder.java renamed to src/main/java/clap/server/adapter/outbound/api/agit/AgitTemplateBuilder.java src/main/java/clap/server/adapter/outbound/api/AgitTemplateBuilder.java renamed to src/main/java/clap/server/adapter/outbound/api/agit/AgitTemplateBuilder.java

@@ -1,6 +1,6 @@
-package clap.server.adapter.outbound.api;
+package clap.server.adapter.outbound.api.agit;
 
-import clap.server.adapter.outbound.api.dto.PushNotificationTemplate;
+import clap.server.adapter.outbound.api.data.PushNotificationTemplate;
 import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
 import clap.server.domain.model.task.Task;
 import org.springframework.http.HttpEntity;

…pter/outbound/api/dto/EmailTemplate.java …ter/outbound/api/data/EmailTemplate.javasrc/main/java/clap/server/adapter/outbound/api/dto/EmailTemplate.java renamed to src/main/java/clap/server/adapter/outbound/api/data/EmailTemplate.java src/main/java/clap/server/adapter/outbound/api/dto/EmailTemplate.java renamed to src/main/java/clap/server/adapter/outbound/api/data/EmailTemplate.java

@@ -1,4 +1,4 @@
-package clap.server.adapter.outbound.api.dto;
+package clap.server.adapter.outbound.api.data;
 
 public record EmailTemplate(
         String email,