From 0f46a6c6cddb925e3b67ec4674d7bcaf834a0e98 Mon Sep 17 00:00:00 2001 From: joowojr Date: Fri, 7 Feb 2025 22:12:43 +0900 Subject: [PATCH 1/3] =?UTF-8?q?CLAP-333=20Fix:=20dto=EB=A1=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/dto/task/request/UpdateTaskStatusRequest.java | 10 ++++++++++ .../adapter/inbound/web/task/ChangeTaskController.java | 7 ++++--- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskStatusRequest.java diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskStatusRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskStatusRequest.java new file mode 100644 index 00000000..3a742ca5 --- /dev/null +++ b/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 +) { +} diff --git a/src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java index 82b3bf21..b3af5072 100644 --- a/src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java +++ b/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,9 +46,9 @@ 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) From 3534a141994050eb8917e638b5f710655123ebf1 Mon Sep 17 00:00:00 2001 From: joowojr Date: Fri, 7 Feb 2025 22:13:59 +0900 Subject: [PATCH 2/3] =?UTF-8?q?CLAP-333=20Docs:=20=EC=9B=8C=EB=94=A9=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inbound/web/dto/task/request/ApprovalTaskRequest.java | 2 +- .../inbound/web/dto/task/request/FilterTaskListRequest.java | 2 +- .../server/adapter/inbound/web/task/ChangeTaskController.java | 2 +- .../outbound/persistense/entity/log/constant/LogStatus.java | 2 +- .../entity/notification/constant/NotificationType.java | 4 ++-- .../persistense/entity/task/constant/TaskHistoryType.java | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/request/ApprovalTaskRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/ApprovalTaskRequest.java index f2af58fb..09d72c54 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/request/ApprovalTaskRequest.java +++ b/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, diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTaskListRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTaskListRequest.java index b09d3048..eb7f3527 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTaskListRequest.java +++ b/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, diff --git a/src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java index b3af5072..18644fb1 100644 --- a/src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java +++ b/src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java @@ -52,7 +52,7 @@ public void updateTaskState( } @LogType(LogStatus.ASSIGNER_CHANGED) - @Operation(summary = "작업 처리자 변경") + @Operation(summary = "작업 담당자 변경") @Secured({"ROLE_MANAGER"}) @PatchMapping("/{taskId}/processor") public void updateTaskProcessor( diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/log/constant/LogStatus.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/log/constant/LogStatus.java index 85d283c6..849cb05b 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/entity/log/constant/LogStatus.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/entity/log/constant/LogStatus.java @@ -12,7 +12,7 @@ public enum LogStatus { REQUEST_UPDATED("요청 수정"), REQUEST_CANCELLED("요청 취소"), REQUEST_APPROVED("요청 승인"), - ASSIGNER_CHANGED("처리자 변경"), + ASSIGNER_CHANGED("담당자 변경"), COMMENT_ADDED("댓글 추가"), COMMENT_UPDATED("댓글 수정"), STATUS_CHANGED("작업 상태 변경"), diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/notification/constant/NotificationType.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/notification/constant/NotificationType.java index 955db493..efa40218 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/entity/notification/constant/NotificationType.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/entity/notification/constant/NotificationType.java @@ -9,8 +9,8 @@ public enum NotificationType { COMMENT("댓글"), TASK_REQUESTED("작업 요청"), STATUS_SWITCHED("상태 전환"), - PROCESSOR_ASSIGNED("처리자 할당"), - PROCESSOR_CHANGED("처리자 변경"), + PROCESSOR_ASSIGNED("담당자 할당"), + PROCESSOR_CHANGED("담당자 변경"), INVITATION("회원가입 초대"); private final String description; diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/TaskHistoryType.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/TaskHistoryType.java index 3b7861a9..360eb05c 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/TaskHistoryType.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/constant/TaskHistoryType.java @@ -9,8 +9,8 @@ public enum TaskHistoryType { COMMENT("댓글"), COMMENT_FILE("댓글 첨부파일"), STATUS_SWITCHED("상태 전환"), - PROCESSOR_ASSIGNED("처리자 할당"), - PROCESSOR_CHANGED("처리자 변경"), + PROCESSOR_ASSIGNED("담당자 할당"), + PROCESSOR_CHANGED("담당자 변경"), TASK_TERMINATED("작업 종료됨"); private final String description; From 1f40f95ef670436ed7c6e6d4ad79255f9d4a44a1 Mon Sep 17 00:00:00 2001 From: joowojr Date: Fri, 7 Feb 2025 22:24:36 +0900 Subject: [PATCH 3/3] =?UTF-8?q?CLAP-333=20Fix:=20=EC=95=A0=EB=84=88?= =?UTF-8?q?=ED=85=8C=EC=9D=B4=EC=85=98=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inbound/web/dto/task/request/FilterTeamStatusRequest.java | 3 ++- .../server/adapter/inbound/web/task/ChangeTaskController.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTeamStatusRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTeamStatusRequest.java index f7e366d6..91524ffc 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTeamStatusRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTeamStatusRequest.java @@ -12,10 +12,11 @@ public record FilterTeamStatusRequest( SortBy sortBy, @Schema(description = "1차 카테고리 ID 목록", example = "[10, 20, 30]") - @NotBlank + @NotNull List mainCategoryIds, @Schema(description = "2차 카테고리 ID 목록", example = "[1, 2, 3]") + @NotNull List categoryIds, @Schema(description = "작업 타이틀 검색", example = "타이틀1") diff --git a/src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java index 18644fb1..723c919a 100644 --- a/src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java +++ b/src/main/java/clap/server/adapter/inbound/web/task/ChangeTaskController.java @@ -71,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"})