From 912c21c6cdb21570fa60bef112ef90ae1e847408 Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Sun, 2 Feb 2025 22:15:46 +0900 Subject: [PATCH 1/9] =?UTF-8?q?CLAP-222=20Refactor:=20=EC=9E=91=EC=97=85?= =?UTF-8?q?=20dto=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/dto/task/{ => request}/ApprovalTaskRequest.java | 2 +- .../web/dto/task/{ => request}/CreateTaskRequest.java | 2 +- .../web/dto/task/{ => request}/FilterTaskListRequest.java | 2 +- .../web/dto/task/request/PostAndEditCommentRequest.java | 0 .../dto/task/{ => request}/UpdateTaskLabelRequest.java | 2 +- .../task/{ => request}/UpdateTaskProcessorRequest.java | 2 +- .../web/dto/task/{ => request}/UpdateTaskRequest.java | 2 +- .../dto/task/{ => request}/UpdateTaskStatusRequest.java | 2 +- .../web/dto/task/{ => response}/ApprovalTaskResponse.java | 2 +- .../web/dto/task/{ => response}/AttachmentResponse.java | 2 +- .../web/dto/task/{ => response}/CreateTaskResponse.java | 2 +- .../dto/task/{ => response}/FilterAllTasksResponse.java | 2 +- .../{ => response}/FilterAssignedTaskListResponse.java | 2 +- .../{ => response}/FilterPendingApprovalResponse.java | 2 +- .../task/{ => response}/FilterRequestedTasksResponse.java | 2 +- .../dto/task/{ => response}/FindApprovalFormResponse.java | 2 +- .../{ => response}/FindTaskDetailsForManagerResponse.java | 2 +- .../dto/task/{ => response}/FindTaskDetailsResponse.java | 2 +- .../web/dto/task/{ => response}/TaskDetailsResponse.java | 2 +- .../web/dto/task/{ => response}/UpdateTaskResponse.java | 2 +- .../adapter/inbound/web/task/ChangeTaskController.java | 7 ++++++- .../inbound/web/task/FindApprovalTaskFormController.java | 2 +- .../adapter/inbound/web/task/FindTaskController.java | 4 ++-- .../inbound/web/task/FindTaskHistoryController.java | 1 - .../inbound/web/task/ManagementTaskController.java | 5 ++++- .../outbound/persistense/TaskPersistenceAdapter.java | 7 +------ .../persistense/repository/task/TaskCustomRepository.java | 3 +-- .../repository/task/TaskCustomRepositoryImpl.java | 2 +- .../clap/server/application/mapper/AttachmentMapper.java | 2 +- .../java/clap/server/application/mapper/TaskMapper.java | 4 +--- .../port/inbound/comment/CommandCommentUsecase.java | 0 .../port/inbound/task/ApprovalTaskUsecase.java | 6 +++--- .../application/port/inbound/task/CreateTaskUsecase.java | 4 ++-- .../port/inbound/task/FindTaskDetailsUsecase.java | 4 ++-- .../port/inbound/task/FindTaskListUsecase.java | 7 +++++-- .../port/inbound/task/UpdateTaskLabelUsecase.java | 4 ++-- .../port/inbound/task/UpdateTaskProcessorUsecase.java | 4 ++-- .../port/inbound/task/UpdateTaskStatusUsecase.java | 4 ++-- .../application/port/inbound/task/UpdateTaskUsecase.java | 4 ++-- .../application/port/outbound/task/LoadTaskPort.java | 6 +----- .../application/service/task/ApprovalTaskService.java | 6 +++--- .../application/service/task/CreateTaskService.java | 4 ++-- .../application/service/task/FindTaskDetailsService.java | 4 ++-- .../application/service/task/FindTaskListService.java | 6 +++++- .../application/service/task/UpdateTaskService.java | 6 +++++- .../application/service/task/FindTaskListServiceTest.java | 8 ++------ 46 files changed, 77 insertions(+), 75 deletions(-) rename src/main/java/clap/server/adapter/inbound/web/dto/task/{ => request}/ApprovalTaskRequest.java (83%) rename src/main/java/clap/server/adapter/inbound/web/dto/task/{ => request}/CreateTaskRequest.java (89%) rename src/main/java/clap/server/adapter/inbound/web/dto/task/{ => request}/FilterTaskListRequest.java (95%) create mode 100644 src/main/java/clap/server/adapter/inbound/web/dto/task/request/PostAndEditCommentRequest.java rename src/main/java/clap/server/adapter/inbound/web/dto/task/{ => request}/UpdateTaskLabelRequest.java (81%) rename src/main/java/clap/server/adapter/inbound/web/dto/task/{ => request}/UpdateTaskProcessorRequest.java (82%) rename src/main/java/clap/server/adapter/inbound/web/dto/task/{ => request}/UpdateTaskRequest.java (92%) rename src/main/java/clap/server/adapter/inbound/web/dto/task/{ => request}/UpdateTaskStatusRequest.java (87%) rename src/main/java/clap/server/adapter/inbound/web/dto/task/{ => response}/ApprovalTaskResponse.java (84%) rename src/main/java/clap/server/adapter/inbound/web/dto/task/{ => response}/AttachmentResponse.java (78%) rename src/main/java/clap/server/adapter/inbound/web/dto/task/{ => response}/CreateTaskResponse.java (65%) rename src/main/java/clap/server/adapter/inbound/web/dto/task/{ => response}/FilterAllTasksResponse.java (89%) rename src/main/java/clap/server/adapter/inbound/web/dto/task/{ => response}/FilterAssignedTaskListResponse.java (88%) rename src/main/java/clap/server/adapter/inbound/web/dto/task/{ => response}/FilterPendingApprovalResponse.java (84%) rename src/main/java/clap/server/adapter/inbound/web/dto/task/{ => response}/FilterRequestedTasksResponse.java (88%) rename src/main/java/clap/server/adapter/inbound/web/dto/task/{ => response}/FindApprovalFormResponse.java (69%) rename src/main/java/clap/server/adapter/inbound/web/dto/task/{ => response}/FindTaskDetailsForManagerResponse.java (92%) rename src/main/java/clap/server/adapter/inbound/web/dto/task/{ => response}/FindTaskDetailsResponse.java (91%) rename src/main/java/clap/server/adapter/inbound/web/dto/task/{ => response}/TaskDetailsResponse.java (91%) rename src/main/java/clap/server/adapter/inbound/web/dto/task/{ => response}/UpdateTaskResponse.java (61%) create mode 100644 src/main/java/clap/server/application/port/inbound/comment/CommandCommentUsecase.java diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/ApprovalTaskRequest.java similarity index 83% rename from src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskRequest.java rename to src/main/java/clap/server/adapter/inbound/web/dto/task/request/ApprovalTaskRequest.java index 9e84f3ce..3df4d7cf 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/ApprovalTaskRequest.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.task; +package clap.server.adapter.inbound.web.dto.task.request; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/CreateTaskRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/CreateTaskRequest.java similarity index 89% rename from src/main/java/clap/server/adapter/inbound/web/dto/task/CreateTaskRequest.java rename to src/main/java/clap/server/adapter/inbound/web/dto/task/request/CreateTaskRequest.java index 423b3683..4ebffff1 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/CreateTaskRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/CreateTaskRequest.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.task; +package clap.server.adapter.inbound.web.dto.task.request; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterTaskListRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTaskListRequest.java similarity index 95% rename from src/main/java/clap/server/adapter/inbound/web/dto/task/FilterTaskListRequest.java rename to src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTaskListRequest.java index d7dcc404..b09d3048 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterTaskListRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/FilterTaskListRequest.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.task; +package clap.server.adapter.inbound.web.dto.task.request; import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/request/PostAndEditCommentRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/PostAndEditCommentRequest.java new file mode 100644 index 00000000..e69de29b diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskLabelRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskLabelRequest.java similarity index 81% rename from src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskLabelRequest.java rename to src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskLabelRequest.java index bb33fb91..aadfaf5d 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskLabelRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskLabelRequest.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.task; +package clap.server.adapter.inbound.web.dto.task.request; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskProcessorRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskProcessorRequest.java similarity index 82% rename from src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskProcessorRequest.java rename to src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskProcessorRequest.java index a3b6cbe0..eda7a9b6 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskProcessorRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskProcessorRequest.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.task; +package clap.server.adapter.inbound.web.dto.task.request; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskRequest.java similarity index 92% rename from src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskRequest.java rename to src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskRequest.java index 7451d3fd..e4e21562 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskRequest.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.task; +package clap.server.adapter.inbound.web.dto.task.request; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskStatusRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskStatusRequest.java similarity index 87% rename from src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskStatusRequest.java rename to src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskStatusRequest.java index dd4b07cb..c73f2268 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskStatusRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/UpdateTaskStatusRequest.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.task; +package clap.server.adapter.inbound.web.dto.task.request; import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/ApprovalTaskResponse.java similarity index 84% rename from src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/task/response/ApprovalTaskResponse.java index ebc46883..db84fa0b 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/ApprovalTaskResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/ApprovalTaskResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.task; +package clap.server.adapter.inbound.web.dto.task.response; import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/AttachmentResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/AttachmentResponse.java similarity index 78% rename from src/main/java/clap/server/adapter/inbound/web/dto/task/AttachmentResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/task/response/AttachmentResponse.java index 12039463..f4e258ac 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/AttachmentResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/AttachmentResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.task; +package clap.server.adapter.inbound.web.dto.task.response; import java.time.LocalDateTime; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/CreateTaskResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/CreateTaskResponse.java similarity index 65% rename from src/main/java/clap/server/adapter/inbound/web/dto/task/CreateTaskResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/task/response/CreateTaskResponse.java index a58f1a79..540aa004 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/CreateTaskResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/CreateTaskResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.task; +package clap.server.adapter.inbound.web.dto.task.response; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterAllTasksResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/FilterAllTasksResponse.java similarity index 89% rename from src/main/java/clap/server/adapter/inbound/web/dto/task/FilterAllTasksResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/task/response/FilterAllTasksResponse.java index e8caf21d..8d2a8584 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterAllTasksResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/FilterAllTasksResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.task; +package clap.server.adapter.inbound.web.dto.task.response; import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterAssignedTaskListResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/FilterAssignedTaskListResponse.java similarity index 88% rename from src/main/java/clap/server/adapter/inbound/web/dto/task/FilterAssignedTaskListResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/task/response/FilterAssignedTaskListResponse.java index 408dace7..d3c4ebe6 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterAssignedTaskListResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/FilterAssignedTaskListResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.task; +package clap.server.adapter.inbound.web.dto.task.response; import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterPendingApprovalResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/FilterPendingApprovalResponse.java similarity index 84% rename from src/main/java/clap/server/adapter/inbound/web/dto/task/FilterPendingApprovalResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/task/response/FilterPendingApprovalResponse.java index 9fbaeee1..2c14b009 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterPendingApprovalResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/FilterPendingApprovalResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.task; +package clap.server.adapter.inbound.web.dto.task.response; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterRequestedTasksResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/FilterRequestedTasksResponse.java similarity index 88% rename from src/main/java/clap/server/adapter/inbound/web/dto/task/FilterRequestedTasksResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/task/response/FilterRequestedTasksResponse.java index 8f1540e0..924b7edf 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/FilterRequestedTasksResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/FilterRequestedTasksResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.task; +package clap.server.adapter.inbound.web.dto.task.response; import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/FindApprovalFormResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/FindApprovalFormResponse.java similarity index 69% rename from src/main/java/clap/server/adapter/inbound/web/dto/task/FindApprovalFormResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/task/response/FindApprovalFormResponse.java index 5c46a428..d9c82b35 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/FindApprovalFormResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/FindApprovalFormResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.task; +package clap.server.adapter.inbound.web.dto.task.response; public record FindApprovalFormResponse( Long categoryId, diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/FindTaskDetailsForManagerResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/FindTaskDetailsForManagerResponse.java similarity index 92% rename from src/main/java/clap/server/adapter/inbound/web/dto/task/FindTaskDetailsForManagerResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/task/response/FindTaskDetailsForManagerResponse.java index 19dd72be..82ff8c6a 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/FindTaskDetailsForManagerResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/FindTaskDetailsForManagerResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.task; +package clap.server.adapter.inbound.web.dto.task.response; import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/FindTaskDetailsResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/FindTaskDetailsResponse.java similarity index 91% rename from src/main/java/clap/server/adapter/inbound/web/dto/task/FindTaskDetailsResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/task/response/FindTaskDetailsResponse.java index 905c01e3..57283595 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/FindTaskDetailsResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/FindTaskDetailsResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.task; +package clap.server.adapter.inbound.web.dto.task.response; import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/TaskDetailsResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TaskDetailsResponse.java similarity index 91% rename from src/main/java/clap/server/adapter/inbound/web/dto/task/TaskDetailsResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/task/response/TaskDetailsResponse.java index 6dbbc5a3..7ffc296f 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/TaskDetailsResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/TaskDetailsResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.task; +package clap.server.adapter.inbound.web.dto.task.response; import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/UpdateTaskResponse.java similarity index 61% rename from src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/task/response/UpdateTaskResponse.java index 9f97ebd8..4231b0aa 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/UpdateTaskResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/UpdateTaskResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.task; +package clap.server.adapter.inbound.web.dto.task.response; public record UpdateTaskResponse( Long taskId, 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 3b418102..e4ca41c2 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 @@ -1,7 +1,12 @@ package clap.server.adapter.inbound.web.task; import clap.server.adapter.inbound.security.SecurityUserDetails; -import clap.server.adapter.inbound.web.dto.task.*; +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.inbound.web.dto.task.response.UpdateTaskResponse; import clap.server.application.port.inbound.task.ApprovalTaskUsecase; import clap.server.application.port.inbound.task.UpdateTaskLabelUsecase; import clap.server.application.port.inbound.task.UpdateTaskProcessorUsecase; diff --git a/src/main/java/clap/server/adapter/inbound/web/task/FindApprovalTaskFormController.java b/src/main/java/clap/server/adapter/inbound/web/task/FindApprovalTaskFormController.java index 416394b8..6f8cb89f 100644 --- a/src/main/java/clap/server/adapter/inbound/web/task/FindApprovalTaskFormController.java +++ b/src/main/java/clap/server/adapter/inbound/web/task/FindApprovalTaskFormController.java @@ -1,7 +1,7 @@ package clap.server.adapter.inbound.web.task; import clap.server.adapter.inbound.security.SecurityUserDetails; -import clap.server.adapter.inbound.web.dto.task.FindApprovalFormResponse; +import clap.server.adapter.inbound.web.dto.task.response.FindApprovalFormResponse; import clap.server.application.port.inbound.task.ApprovalTaskUsecase; import clap.server.common.annotation.architecture.WebAdapter; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/clap/server/adapter/inbound/web/task/FindTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/FindTaskController.java index 8c21d191..370548a8 100644 --- a/src/main/java/clap/server/adapter/inbound/web/task/FindTaskController.java +++ b/src/main/java/clap/server/adapter/inbound/web/task/FindTaskController.java @@ -2,7 +2,8 @@ import clap.server.adapter.inbound.security.SecurityUserDetails; import clap.server.adapter.inbound.web.dto.common.PageResponse; -import clap.server.adapter.inbound.web.dto.task.*; +import clap.server.adapter.inbound.web.dto.task.request.FilterTaskListRequest; +import clap.server.adapter.inbound.web.dto.task.response.*; import clap.server.application.port.inbound.task.FindTaskDetailsUsecase; import clap.server.application.port.inbound.task.FindTaskListUsecase; import clap.server.common.annotation.architecture.WebAdapter; @@ -10,7 +11,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/clap/server/adapter/inbound/web/task/FindTaskHistoryController.java b/src/main/java/clap/server/adapter/inbound/web/task/FindTaskHistoryController.java index 9352bce9..c8cc2e4f 100644 --- a/src/main/java/clap/server/adapter/inbound/web/task/FindTaskHistoryController.java +++ b/src/main/java/clap/server/adapter/inbound/web/task/FindTaskHistoryController.java @@ -1,7 +1,6 @@ package clap.server.adapter.inbound.web.task; import clap.server.adapter.inbound.security.SecurityUserDetails; -import clap.server.adapter.inbound.web.dto.task.FindTaskDetailsForManagerResponse; import clap.server.adapter.inbound.web.dto.task.response.FindTaskHistoryResponse; import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus; import clap.server.application.port.inbound.task.FindTaskHistoriesUsecase; diff --git a/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java index d0ac4cb7..57814728 100644 --- a/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java +++ b/src/main/java/clap/server/adapter/inbound/web/task/ManagementTaskController.java @@ -1,7 +1,10 @@ package clap.server.adapter.inbound.web.task; import clap.server.adapter.inbound.security.SecurityUserDetails; -import clap.server.adapter.inbound.web.dto.task.*; +import clap.server.adapter.inbound.web.dto.task.request.CreateTaskRequest; +import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskRequest; +import clap.server.adapter.inbound.web.dto.task.response.CreateTaskResponse; +import clap.server.adapter.inbound.web.dto.task.response.UpdateTaskResponse; import clap.server.application.port.inbound.task.*; import clap.server.common.annotation.architecture.WebAdapter; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java index 27611395..4aeedd4c 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java @@ -1,16 +1,11 @@ package clap.server.adapter.outbound.persistense; -import clap.server.adapter.inbound.web.dto.task.FilterAllTasksResponse; -import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalResponse; -import clap.server.adapter.inbound.web.dto.task.FilterRequestedTasksResponse; -import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest; +import clap.server.adapter.inbound.web.dto.task.request.FilterTaskListRequest; import clap.server.adapter.inbound.web.dto.task.request.FilterTaskBoardRequest; -import clap.server.adapter.inbound.web.dto.task.*; import clap.server.adapter.outbound.persistense.entity.task.TaskEntity; import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus; import clap.server.adapter.outbound.persistense.mapper.TaskPersistenceMapper; import clap.server.adapter.outbound.persistense.repository.task.TaskRepository; -import clap.server.application.mapper.TaskMapper; import clap.server.application.port.outbound.task.CommandTaskPort; import clap.server.application.port.outbound.task.LoadTaskPort; import clap.server.common.annotation.architecture.PersistenceAdapter; diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepository.java index 9b7607d5..27bfc61e 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepository.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepository.java @@ -1,12 +1,11 @@ package clap.server.adapter.outbound.persistense.repository.task; -import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest; +import clap.server.adapter.inbound.web.dto.task.request.FilterTaskListRequest; import clap.server.adapter.inbound.web.dto.task.request.FilterTaskBoardRequest; import clap.server.adapter.outbound.persistense.entity.task.TaskEntity; import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Slice; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java index ca429333..e2b36970 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/task/TaskCustomRepositoryImpl.java @@ -1,6 +1,6 @@ package clap.server.adapter.outbound.persistense.repository.task; -import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest; +import clap.server.adapter.inbound.web.dto.task.request.FilterTaskListRequest; import clap.server.adapter.inbound.web.dto.task.request.FilterTaskBoardRequest; import clap.server.adapter.outbound.persistense.entity.task.TaskEntity; import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus; diff --git a/src/main/java/clap/server/application/mapper/AttachmentMapper.java b/src/main/java/clap/server/application/mapper/AttachmentMapper.java index 217780eb..56d516de 100644 --- a/src/main/java/clap/server/application/mapper/AttachmentMapper.java +++ b/src/main/java/clap/server/application/mapper/AttachmentMapper.java @@ -1,6 +1,6 @@ package clap.server.application.mapper; -import clap.server.adapter.inbound.web.dto.task.AttachmentResponse; +import clap.server.adapter.inbound.web.dto.task.response.AttachmentResponse; import clap.server.domain.model.task.Attachment; import clap.server.domain.model.task.Comment; import clap.server.domain.model.task.Task; diff --git a/src/main/java/clap/server/application/mapper/TaskMapper.java b/src/main/java/clap/server/application/mapper/TaskMapper.java index c03911eb..f700416e 100644 --- a/src/main/java/clap/server/application/mapper/TaskMapper.java +++ b/src/main/java/clap/server/application/mapper/TaskMapper.java @@ -1,9 +1,7 @@ package clap.server.application.mapper; -import clap.server.adapter.inbound.web.dto.task.*; -import clap.server.adapter.inbound.web.dto.task.response.TaskBoardResponse; -import clap.server.adapter.inbound.web.dto.task.response.TaskItemResponse; +import clap.server.adapter.inbound.web.dto.task.response.*; import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus; import clap.server.domain.model.task.Attachment; import clap.server.domain.model.task.Task; diff --git a/src/main/java/clap/server/application/port/inbound/comment/CommandCommentUsecase.java b/src/main/java/clap/server/application/port/inbound/comment/CommandCommentUsecase.java new file mode 100644 index 00000000..e69de29b diff --git a/src/main/java/clap/server/application/port/inbound/task/ApprovalTaskUsecase.java b/src/main/java/clap/server/application/port/inbound/task/ApprovalTaskUsecase.java index 75e179a9..299fac31 100644 --- a/src/main/java/clap/server/application/port/inbound/task/ApprovalTaskUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/task/ApprovalTaskUsecase.java @@ -1,8 +1,8 @@ package clap.server.application.port.inbound.task; -import clap.server.adapter.inbound.web.dto.task.ApprovalTaskRequest; -import clap.server.adapter.inbound.web.dto.task.ApprovalTaskResponse; -import clap.server.adapter.inbound.web.dto.task.FindApprovalFormResponse; +import clap.server.adapter.inbound.web.dto.task.request.ApprovalTaskRequest; +import clap.server.adapter.inbound.web.dto.task.response.ApprovalTaskResponse; +import clap.server.adapter.inbound.web.dto.task.response.FindApprovalFormResponse; public interface ApprovalTaskUsecase { ApprovalTaskResponse approvalTaskByReviewer(Long userId, Long taskId, ApprovalTaskRequest approvalTaskRequest); diff --git a/src/main/java/clap/server/application/port/inbound/task/CreateTaskUsecase.java b/src/main/java/clap/server/application/port/inbound/task/CreateTaskUsecase.java index 758c0476..385c579d 100644 --- a/src/main/java/clap/server/application/port/inbound/task/CreateTaskUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/task/CreateTaskUsecase.java @@ -1,7 +1,7 @@ package clap.server.application.port.inbound.task; -import clap.server.adapter.inbound.web.dto.task.CreateTaskRequest; -import clap.server.adapter.inbound.web.dto.task.CreateTaskResponse; +import clap.server.adapter.inbound.web.dto.task.request.CreateTaskRequest; +import clap.server.adapter.inbound.web.dto.task.response.CreateTaskResponse; import org.springframework.web.multipart.MultipartFile; import java.util.List; diff --git a/src/main/java/clap/server/application/port/inbound/task/FindTaskDetailsUsecase.java b/src/main/java/clap/server/application/port/inbound/task/FindTaskDetailsUsecase.java index b537fc9a..d116eadf 100644 --- a/src/main/java/clap/server/application/port/inbound/task/FindTaskDetailsUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/task/FindTaskDetailsUsecase.java @@ -1,7 +1,7 @@ package clap.server.application.port.inbound.task; -import clap.server.adapter.inbound.web.dto.task.FindTaskDetailsResponse; -import clap.server.adapter.inbound.web.dto.task.FindTaskDetailsForManagerResponse; +import clap.server.adapter.inbound.web.dto.task.response.FindTaskDetailsResponse; +import clap.server.adapter.inbound.web.dto.task.response.FindTaskDetailsForManagerResponse; public interface FindTaskDetailsUsecase { FindTaskDetailsResponse findRequestedTaskDetails(Long memberId, Long taskId); diff --git a/src/main/java/clap/server/application/port/inbound/task/FindTaskListUsecase.java b/src/main/java/clap/server/application/port/inbound/task/FindTaskListUsecase.java index 3d4ff05b..33612b2c 100644 --- a/src/main/java/clap/server/application/port/inbound/task/FindTaskListUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/task/FindTaskListUsecase.java @@ -1,8 +1,11 @@ package clap.server.application.port.inbound.task; import clap.server.adapter.inbound.web.dto.common.PageResponse; -import clap.server.adapter.inbound.web.dto.task.*; -import org.springframework.data.domain.Page; +import clap.server.adapter.inbound.web.dto.task.request.FilterTaskListRequest; +import clap.server.adapter.inbound.web.dto.task.response.FilterAllTasksResponse; +import clap.server.adapter.inbound.web.dto.task.response.FilterAssignedTaskListResponse; +import clap.server.adapter.inbound.web.dto.task.response.FilterPendingApprovalResponse; +import clap.server.adapter.inbound.web.dto.task.response.FilterRequestedTasksResponse; import org.springframework.data.domain.Pageable; public interface FindTaskListUsecase { diff --git a/src/main/java/clap/server/application/port/inbound/task/UpdateTaskLabelUsecase.java b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskLabelUsecase.java index be5c66dc..78a5bfcf 100644 --- a/src/main/java/clap/server/application/port/inbound/task/UpdateTaskLabelUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskLabelUsecase.java @@ -1,7 +1,7 @@ package clap.server.application.port.inbound.task; -import clap.server.adapter.inbound.web.dto.task.UpdateTaskLabelRequest; -import clap.server.adapter.inbound.web.dto.task.UpdateTaskResponse; +import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskLabelRequest; +import clap.server.adapter.inbound.web.dto.task.response.UpdateTaskResponse; public interface UpdateTaskLabelUsecase { UpdateTaskResponse updateTaskLabel(Long taskId, Long userId, UpdateTaskLabelRequest request); diff --git a/src/main/java/clap/server/application/port/inbound/task/UpdateTaskProcessorUsecase.java b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskProcessorUsecase.java index 4381c0c5..a5cd48b2 100644 --- a/src/main/java/clap/server/application/port/inbound/task/UpdateTaskProcessorUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskProcessorUsecase.java @@ -1,7 +1,7 @@ package clap.server.application.port.inbound.task; -import clap.server.adapter.inbound.web.dto.task.UpdateTaskResponse; -import clap.server.adapter.inbound.web.dto.task.UpdateTaskProcessorRequest; +import clap.server.adapter.inbound.web.dto.task.response.UpdateTaskResponse; +import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskProcessorRequest; public interface UpdateTaskProcessorUsecase { UpdateTaskResponse updateTaskProcessor(Long taskId, Long userId, UpdateTaskProcessorRequest request); diff --git a/src/main/java/clap/server/application/port/inbound/task/UpdateTaskStatusUsecase.java b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskStatusUsecase.java index 9d35b392..3ab60de5 100644 --- a/src/main/java/clap/server/application/port/inbound/task/UpdateTaskStatusUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskStatusUsecase.java @@ -1,7 +1,7 @@ package clap.server.application.port.inbound.task; -import clap.server.adapter.inbound.web.dto.task.UpdateTaskResponse; -import clap.server.adapter.inbound.web.dto.task.UpdateTaskStatusRequest; +import clap.server.adapter.inbound.web.dto.task.response.UpdateTaskResponse; +import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskStatusRequest; public interface UpdateTaskStatusUsecase { UpdateTaskResponse updateTaskState(Long memberId, Long taskId, UpdateTaskStatusRequest updateTaskStatusRequest); diff --git a/src/main/java/clap/server/application/port/inbound/task/UpdateTaskUsecase.java b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskUsecase.java index ee3f6f98..fb78cba6 100644 --- a/src/main/java/clap/server/application/port/inbound/task/UpdateTaskUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/task/UpdateTaskUsecase.java @@ -1,8 +1,8 @@ package clap.server.application.port.inbound.task; -import clap.server.adapter.inbound.web.dto.task.UpdateTaskRequest; -import clap.server.adapter.inbound.web.dto.task.UpdateTaskResponse; +import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskRequest; +import clap.server.adapter.inbound.web.dto.task.response.UpdateTaskResponse; import org.springframework.web.multipart.MultipartFile; import java.util.List; diff --git a/src/main/java/clap/server/application/port/outbound/task/LoadTaskPort.java b/src/main/java/clap/server/application/port/outbound/task/LoadTaskPort.java index cc4fd71c..278dd99c 100644 --- a/src/main/java/clap/server/application/port/outbound/task/LoadTaskPort.java +++ b/src/main/java/clap/server/application/port/outbound/task/LoadTaskPort.java @@ -1,10 +1,6 @@ package clap.server.application.port.outbound.task; -import clap.server.adapter.inbound.web.dto.task.*; -import clap.server.adapter.inbound.web.dto.task.FilterAllTasksResponse; -import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalResponse; -import clap.server.adapter.inbound.web.dto.task.FilterRequestedTasksResponse; -import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest; +import clap.server.adapter.inbound.web.dto.task.request.FilterTaskListRequest; import clap.server.adapter.inbound.web.dto.task.request.FilterTaskBoardRequest; import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus; import clap.server.domain.model.task.Task; diff --git a/src/main/java/clap/server/application/service/task/ApprovalTaskService.java b/src/main/java/clap/server/application/service/task/ApprovalTaskService.java index 5cd73d76..3dc9d7bc 100644 --- a/src/main/java/clap/server/application/service/task/ApprovalTaskService.java +++ b/src/main/java/clap/server/application/service/task/ApprovalTaskService.java @@ -1,8 +1,8 @@ package clap.server.application.service.task; -import clap.server.adapter.inbound.web.dto.task.ApprovalTaskRequest; -import clap.server.adapter.inbound.web.dto.task.ApprovalTaskResponse; -import clap.server.adapter.inbound.web.dto.task.FindApprovalFormResponse; +import clap.server.adapter.inbound.web.dto.task.request.ApprovalTaskRequest; +import clap.server.adapter.inbound.web.dto.task.response.ApprovalTaskResponse; +import clap.server.adapter.inbound.web.dto.task.response.FindApprovalFormResponse; import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType; import clap.server.adapter.outbound.persistense.entity.task.constant.TaskHistoryType; import clap.server.application.mapper.TaskMapper; diff --git a/src/main/java/clap/server/application/service/task/CreateTaskService.java b/src/main/java/clap/server/application/service/task/CreateTaskService.java index 83f37076..32899443 100644 --- a/src/main/java/clap/server/application/service/task/CreateTaskService.java +++ b/src/main/java/clap/server/application/service/task/CreateTaskService.java @@ -1,7 +1,7 @@ package clap.server.application.service.task; -import clap.server.adapter.inbound.web.dto.task.CreateTaskRequest; -import clap.server.adapter.inbound.web.dto.task.CreateTaskResponse; +import clap.server.adapter.inbound.web.dto.task.request.CreateTaskRequest; +import clap.server.adapter.inbound.web.dto.task.response.CreateTaskResponse; import clap.server.adapter.outbound.infrastructure.s3.S3UploadAdapter; import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType; diff --git a/src/main/java/clap/server/application/service/task/FindTaskDetailsService.java b/src/main/java/clap/server/application/service/task/FindTaskDetailsService.java index 7cac0338..3283d99a 100644 --- a/src/main/java/clap/server/application/service/task/FindTaskDetailsService.java +++ b/src/main/java/clap/server/application/service/task/FindTaskDetailsService.java @@ -1,7 +1,7 @@ package clap.server.application.service.task; -import clap.server.adapter.inbound.web.dto.task.FindTaskDetailsForManagerResponse; -import clap.server.adapter.inbound.web.dto.task.FindTaskDetailsResponse; +import clap.server.adapter.inbound.web.dto.task.response.FindTaskDetailsForManagerResponse; +import clap.server.adapter.inbound.web.dto.task.response.FindTaskDetailsResponse; import clap.server.application.mapper.TaskMapper; import clap.server.application.port.inbound.domain.MemberService; import clap.server.application.port.inbound.task.FindTaskDetailsUsecase; diff --git a/src/main/java/clap/server/application/service/task/FindTaskListService.java b/src/main/java/clap/server/application/service/task/FindTaskListService.java index 50461dbb..828aa333 100644 --- a/src/main/java/clap/server/application/service/task/FindTaskListService.java +++ b/src/main/java/clap/server/application/service/task/FindTaskListService.java @@ -1,8 +1,12 @@ package clap.server.application.service.task; import clap.server.adapter.inbound.web.dto.common.PageResponse; -import clap.server.adapter.inbound.web.dto.task.*; +import clap.server.adapter.inbound.web.dto.task.request.FilterTaskListRequest; +import clap.server.adapter.inbound.web.dto.task.response.FilterAllTasksResponse; +import clap.server.adapter.inbound.web.dto.task.response.FilterAssignedTaskListResponse; +import clap.server.adapter.inbound.web.dto.task.response.FilterPendingApprovalResponse; +import clap.server.adapter.inbound.web.dto.task.response.FilterRequestedTasksResponse; import clap.server.application.mapper.TaskMapper; import clap.server.application.port.inbound.domain.MemberService; diff --git a/src/main/java/clap/server/application/service/task/UpdateTaskService.java b/src/main/java/clap/server/application/service/task/UpdateTaskService.java index 2e939d29..339e4011 100644 --- a/src/main/java/clap/server/application/service/task/UpdateTaskService.java +++ b/src/main/java/clap/server/application/service/task/UpdateTaskService.java @@ -1,6 +1,10 @@ package clap.server.application.service.task; -import clap.server.adapter.inbound.web.dto.task.*; +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.UpdateTaskRequest; +import clap.server.adapter.inbound.web.dto.task.request.UpdateTaskStatusRequest; +import clap.server.adapter.inbound.web.dto.task.response.UpdateTaskResponse; import clap.server.adapter.outbound.infrastructure.s3.S3UploadAdapter; import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType; import clap.server.application.mapper.AttachmentMapper; diff --git a/src/test/java/clap/server/application/service/task/FindTaskListServiceTest.java b/src/test/java/clap/server/application/service/task/FindTaskListServiceTest.java index 75fb6bf0..40018268 100644 --- a/src/test/java/clap/server/application/service/task/FindTaskListServiceTest.java +++ b/src/test/java/clap/server/application/service/task/FindTaskListServiceTest.java @@ -1,19 +1,15 @@ package clap.server.application.service.task; import clap.server.adapter.inbound.web.dto.common.PageResponse; -import clap.server.adapter.inbound.web.dto.task.FilterTaskListRequest; -import clap.server.adapter.inbound.web.dto.task.FilterPendingApprovalResponse; +import clap.server.adapter.inbound.web.dto.task.request.FilterTaskListRequest; +import clap.server.adapter.inbound.web.dto.task.response.FilterPendingApprovalResponse; import clap.server.application.mapper.TaskMapper; import clap.server.application.port.inbound.domain.MemberService; import clap.server.application.port.outbound.task.LoadTaskPort; import clap.server.domain.model.task.Task; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; From 6bf0c91ad55013b54b0cb7e041ca5758f29d3a62 Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Sun, 2 Feb 2025 22:55:48 +0900 Subject: [PATCH 2/9] =?UTF-8?q?CLAP-222=20Refactor:=20log=20request=20?= =?UTF-8?q?=EC=8A=A4=EC=9B=A8=EA=B1=B0=20=EB=AA=85=EC=84=B8=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inbound/web/dto/log/FilterLogRequest.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/log/FilterLogRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/log/FilterLogRequest.java index 65a9a70c..7e3280ce 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/log/FilterLogRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/log/FilterLogRequest.java @@ -7,13 +7,23 @@ import java.util.List; public record FilterLogRequest( - @Schema(description = "검색 기간 (단위: 시간)", example = "1, 24, 168, 730, 2190 (1시간, 24시간, 1주일, 1개월, 3개월)") + @Schema(description = "검색 기간 (단위: 시간)", + example = "1, 24, 168, 730, 2190 (1시간, 24시간, 1주일, 1개월, 3개월)") Integer term, + @NotNull + @Schema(description = "로그 상태 목록", + example = "[\"LOGIN\", \"ASSIGNER_CHANGED\", \"COMMENT_ADDED\"]") List logStatus, + @NotNull + @Schema(description = "닉네임", + example = "john_doe") String nickName, + @NotNull + @Schema(description = "클라이언트 IP 주소", + example = "192.168.1.1") String clientIp - ) { +) { } From 59ffc55cc453fa3b4614781792fec99a82d635ea Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Sun, 2 Feb 2025 22:56:19 +0900 Subject: [PATCH 3/9] =?UTF-8?q?CLAP-222=20Refactor:=20log=20request=20vali?= =?UTF-8?q?dation=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clap/server/adapter/inbound/web/log/LogController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/clap/server/adapter/inbound/web/log/LogController.java b/src/main/java/clap/server/adapter/inbound/web/log/LogController.java index fb2a8495..adf1faf6 100644 --- a/src/main/java/clap/server/adapter/inbound/web/log/LogController.java +++ b/src/main/java/clap/server/adapter/inbound/web/log/LogController.java @@ -9,6 +9,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.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -35,7 +36,7 @@ public class LogController { public ResponseEntity> getLoginAttempts( @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "20") int pageSize, - @ModelAttribute FilterLogRequest anonymousLogRequest, + @ModelAttribute @Valid FilterLogRequest anonymousLogRequest, @AuthenticationPrincipal SecurityUserDetails userInfo) { Pageable pageable = PageRequest.of(page, pageSize); return ResponseEntity.ok(findApiLogsUsecase.filterAnonymousLogs(anonymousLogRequest, pageable)); @@ -47,7 +48,7 @@ public ResponseEntity> getLoginAttempts( public ResponseEntity> getApiCalls( @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "20") int pageSize, - @ModelAttribute FilterLogRequest memberLogRequest, + @ModelAttribute @Valid FilterLogRequest memberLogRequest, @AuthenticationPrincipal SecurityUserDetails userInfo) { Pageable pageable = PageRequest.of(page, pageSize); return ResponseEntity.ok(findApiLogsUsecase.filterMemberLogs(memberLogRequest, pageable)); From 02830dfa164eeafc93e8e9ff765a13a596720278 Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Sun, 2 Feb 2025 23:00:11 +0900 Subject: [PATCH 4/9] =?UTF-8?q?CLAP-222=20Refactor:=20ApprovalTaskRequest?= =?UTF-8?q?=20=EC=8A=A4=EC=9B=A8=EA=B1=B0=20=EB=AA=85=EC=84=B8=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/dto/task/request/ApprovalTaskRequest.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) 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 3df4d7cf..f1d8b0a8 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 @@ -4,15 +4,26 @@ import java.time.LocalDateTime; +import io.swagger.v3.oas.annotations.media.Schema; public record ApprovalTaskRequest( @NotNull + @Schema(description = "2차 카테고리 ID", + example = "1 ") Long categoryId, + @NotNull + @Schema(description = "처리자 ID", + example = "2") Long processorId, + @NotNull + @Schema(description = "마감 기한", + example = "2025-02-10T15:30:00") LocalDateTime dueDate, + @NotNull + @Schema(description = "라벨 ID", + example = "1") Long labelId - ) { } From 7ab5cf9c55cec120bb6c2b34ca16c1f0d9de26c1 Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Mon, 3 Feb 2025 09:03:44 +0900 Subject: [PATCH 5/9] =?UTF-8?q?CLAP-222=20Refactor:=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=20=EC=A0=80=EC=9E=A5=20=EC=84=9C=EB=B9=84=EC=8A=A4=EC=97=90?= =?UTF-8?q?=EC=84=9C=20port=20=EC=9D=98=EC=A1=B4=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/service/log/CreateAnonymousLogsService.java | 5 +++-- .../application/service/log/CreateMemberLogsService.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/clap/server/application/service/log/CreateAnonymousLogsService.java b/src/main/java/clap/server/application/service/log/CreateAnonymousLogsService.java index ff79d66e..16d9d002 100644 --- a/src/main/java/clap/server/application/service/log/CreateAnonymousLogsService.java +++ b/src/main/java/clap/server/application/service/log/CreateAnonymousLogsService.java @@ -3,6 +3,7 @@ import clap.server.adapter.outbound.persistense.ApiLogPersistenceAdapter; import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus; import clap.server.application.port.inbound.log.CreateAnonymousLogsUsecase; +import clap.server.application.port.outbound.log.CommandLogPort; import clap.server.common.annotation.architecture.ApplicationService; import clap.server.domain.model.log.AnonymousLog; @@ -15,11 +16,11 @@ @ApplicationService @RequiredArgsConstructor public class CreateAnonymousLogsService implements CreateAnonymousLogsUsecase { - private final ApiLogPersistenceAdapter apiLogPersistenceAdapter; + private final CommandLogPort commandLogPort; @Override public void createAnonymousLog(HttpServletRequest request, int statusCode, String customCode, LogStatus logStatus, Object responseBody, String requestBody, String nickName) { AnonymousLog anonymousLog = AnonymousLog.createAnonymousLog(request, statusCode,customCode, logStatus, responseBody, requestBody, nickName); - apiLogPersistenceAdapter.saveAnonymousLog(anonymousLog); + commandLogPort.saveAnonymousLog(anonymousLog); } } diff --git a/src/main/java/clap/server/application/service/log/CreateMemberLogsService.java b/src/main/java/clap/server/application/service/log/CreateMemberLogsService.java index 690e24ea..e1e602f8 100644 --- a/src/main/java/clap/server/application/service/log/CreateMemberLogsService.java +++ b/src/main/java/clap/server/application/service/log/CreateMemberLogsService.java @@ -4,6 +4,7 @@ import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus; import clap.server.application.port.inbound.domain.MemberService; import clap.server.application.port.inbound.log.CreateMemberLogsUsecase; +import clap.server.application.port.outbound.log.CommandLogPort; import clap.server.common.annotation.architecture.ApplicationService; import clap.server.domain.model.log.MemberLog; import clap.server.domain.model.member.Member; @@ -18,7 +19,7 @@ @RequiredArgsConstructor public class CreateMemberLogsService implements CreateMemberLogsUsecase { - private final ApiLogPersistenceAdapter apiLogPersistenceAdapter; + private final CommandLogPort commandLogPort; private final MemberService memberService; @Override @@ -26,6 +27,6 @@ public class CreateMemberLogsService implements CreateMemberLogsUsecase { public void createMemberLog(HttpServletRequest request, int statusCode, String customCode,LogStatus logStatus, Object responseBody, String requestBody, Long userId) { Member member = memberService.findById(userId); MemberLog memberLog = MemberLog.createMemberLog(request, statusCode, customCode, logStatus, responseBody, requestBody, member); - apiLogPersistenceAdapter.saveMemberLog(memberLog); + commandLogPort.saveMemberLog(memberLog); } } From cd440b67ea37c5cc9e0aff8048389dd0d1599a9e Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Mon, 3 Feb 2025 09:11:48 +0900 Subject: [PATCH 6/9] =?UTF-8?q?CLAP-222=20Refactor:=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=20=EC=BB=A8=ED=8A=B8=EB=A1=A4=EB=9F=AC=20admin=20=ED=83=9C?= =?UTF-8?q?=EA=B7=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inbound/web/dto/task/request/PostAndEditCommentRequest.java | 0 .../java/clap/server/adapter/inbound/web/log/LogController.java | 2 +- .../application/port/inbound/comment/CommandCommentUsecase.java | 0 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 src/main/java/clap/server/adapter/inbound/web/dto/task/request/PostAndEditCommentRequest.java delete mode 100644 src/main/java/clap/server/application/port/inbound/comment/CommandCommentUsecase.java diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/request/PostAndEditCommentRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/request/PostAndEditCommentRequest.java deleted file mode 100644 index e69de29b..00000000 diff --git a/src/main/java/clap/server/adapter/inbound/web/log/LogController.java b/src/main/java/clap/server/adapter/inbound/web/log/LogController.java index adf1faf6..2da9fae6 100644 --- a/src/main/java/clap/server/adapter/inbound/web/log/LogController.java +++ b/src/main/java/clap/server/adapter/inbound/web/log/LogController.java @@ -21,7 +21,7 @@ import java.util.List; -@Tag(name = "05. Admin") +@Tag(name = "05. Admin [로깅]") @WebAdapter @RestController @RequestMapping("/api/managements/logs") diff --git a/src/main/java/clap/server/application/port/inbound/comment/CommandCommentUsecase.java b/src/main/java/clap/server/application/port/inbound/comment/CommandCommentUsecase.java deleted file mode 100644 index e69de29b..00000000 From 5d89f73da16f04abd9c25b756e6d4b6e704ad843 Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Mon, 3 Feb 2025 09:48:05 +0900 Subject: [PATCH 7/9] =?UTF-8?q?CLAP-222=20Refactor:=20bucketName=20?= =?UTF-8?q?=ED=94=84=EB=A1=9C=ED=8D=BC=ED=8B=B0=20=EB=AA=85=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/clap/server/config/s3/KakaoS3Config.java | 2 -- src/main/resources/s3.yml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/clap/server/config/s3/KakaoS3Config.java b/src/main/java/clap/server/config/s3/KakaoS3Config.java index 649b1b3d..b7387600 100644 --- a/src/main/java/clap/server/config/s3/KakaoS3Config.java +++ b/src/main/java/clap/server/config/s3/KakaoS3Config.java @@ -8,8 +8,6 @@ import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.s3.S3Client; -import software.amazon.awssdk.services.s3.S3Configuration; -import software.amazon.awssdk.services.s3.presigner.S3Presigner; import java.net.URI; diff --git a/src/main/resources/s3.yml b/src/main/resources/s3.yml index d04485c8..49132cf3 100644 --- a/src/main/resources/s3.yml +++ b/src/main/resources/s3.yml @@ -6,4 +6,4 @@ cloud: endpoint: ${KAKAO_OBJECT_STORAGE_ENDPOINT} access-key: ${KAKAO_OBJECT_STORAGE_ACCESS_KEY} secret-key: ${KAKAO_OBJECT_STORAGE_SECRET_KEY} - bucketName: ${KAKAO_OBJECT_STORAGE_BUCKET_NAME} \ No newline at end of file + bucket-name: ${KAKAO_OBJECT_STORAGE_BUCKET_NAME} \ No newline at end of file From 384259dbaa8e6a1364047a196665a9709fd14086 Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Mon, 3 Feb 2025 09:51:23 +0900 Subject: [PATCH 8/9] =?UTF-8?q?CLAP-222=20Refactor:=20GlobalMethodSecurity?= =?UTF-8?q?=20=EB=8C=80=EC=B2=B4=ED=95=98=EC=97=AC=20MethodSecurity=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clap/server/config/security/MethodSecurityConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/clap/server/config/security/MethodSecurityConfig.java b/src/main/java/clap/server/config/security/MethodSecurityConfig.java index 2877a293..1b3439a0 100644 --- a/src/main/java/clap/server/config/security/MethodSecurityConfig.java +++ b/src/main/java/clap/server/config/security/MethodSecurityConfig.java @@ -2,12 +2,12 @@ import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; @Configuration @EnableWebSecurity -@EnableGlobalMethodSecurity( - prePostEnabled = true, +@EnableMethodSecurity( securedEnabled = true ) public class MethodSecurityConfig { From e75409694a33f34285d7cd42324a7c61996f7b47 Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Mon, 3 Feb 2025 09:53:33 +0900 Subject: [PATCH 9/9] =?UTF-8?q?CLAP-222=20Refactor:=20builder=20default=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=ED=95=98=EC=97=AC=20=EC=B4=88=EA=B8=B0?= =?UTF-8?q?=EA=B0=92=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../outbound/persistense/entity/member/MemberEntity.java | 4 ++++ .../outbound/persistense/entity/task/CommentEntity.java | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java index 4898a3c4..828c9ed6 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/entity/member/MemberEntity.java @@ -5,6 +5,7 @@ import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus; import jakarta.persistence.*; import lombok.AccessLevel; +import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; @@ -53,12 +54,15 @@ public class MemberEntity extends BaseTimeEntity { private String imageUrl; @Column(name = "kakaowork_notification_enabled") + @Builder.Default private Boolean kakaoworkNotificationEnabled = Boolean.TRUE;; @Column(name = "agit_notification_enabled") + @Builder.Default private Boolean agitNotificationEnabled = Boolean.TRUE;; @Column(name = "email_notification_enabled") + @Builder.Default private Boolean emailNotificationEnabled = Boolean.TRUE;; @ManyToOne(fetch = FetchType.LAZY) diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/CommentEntity.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/CommentEntity.java index ba3ef2e8..eb7f6483 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/entity/task/CommentEntity.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/entity/task/CommentEntity.java @@ -4,6 +4,7 @@ import clap.server.adapter.outbound.persistense.entity.member.MemberEntity; import jakarta.persistence.*; import lombok.AccessLevel; +import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; @@ -36,5 +37,6 @@ public class CommentEntity extends BaseTimeEntity { private boolean isModified; @Column(name="is_deleted", nullable = false) + @Builder.Default private boolean isDeleted = Boolean.FALSE; }