diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/ManagementLabelController.java b/src/main/java/clap/server/adapter/inbound/web/admin/ManagementLabelController.java index 4248ceec..67108279 100644 --- a/src/main/java/clap/server/adapter/inbound/web/admin/ManagementLabelController.java +++ b/src/main/java/clap/server/adapter/inbound/web/admin/ManagementLabelController.java @@ -1,8 +1,8 @@ package clap.server.adapter.inbound.web.admin; import clap.server.adapter.inbound.security.SecurityUserDetails; -import clap.server.adapter.inbound.web.dto.label.CreateLabelRequest; -import clap.server.adapter.inbound.web.dto.label.EditLabelRequest; +import clap.server.adapter.inbound.web.dto.label.request.CreateLabelRequest; +import clap.server.adapter.inbound.web.dto.label.request.EditLabelRequest; import clap.server.application.port.inbound.label.AddLabelUsecase; import clap.server.application.port.inbound.admin.DeleteLabelUsecase; import clap.server.application.port.inbound.label.UpdateLabelUsecase; diff --git a/src/main/java/clap/server/adapter/inbound/web/auth/AuthController.java b/src/main/java/clap/server/adapter/inbound/web/auth/AuthController.java index ae60c027..d4c3fe8e 100644 --- a/src/main/java/clap/server/adapter/inbound/web/auth/AuthController.java +++ b/src/main/java/clap/server/adapter/inbound/web/auth/AuthController.java @@ -7,7 +7,7 @@ import clap.server.application.port.inbound.auth.LoginUsecase; import clap.server.application.port.inbound.auth.LogoutUsecase; import clap.server.common.annotation.architecture.WebAdapter; -import clap.server.config.annotation.LogType; +import clap.server.common.annotation.log.LogType; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindManagersResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindManagersResponse.java deleted file mode 100644 index 441d9909..00000000 --- a/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindManagersResponse.java +++ /dev/null @@ -1,15 +0,0 @@ -package clap.server.adapter.inbound.web.dto.admin; - -import java.util.List; - -public record FindManagersResponse( - Long memberId, - String nickname, - String imageUrl, - int remainingTasks -) { - - public static List emptyListResponse() { - return List.of(); - } -} diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/AddMainCategoryRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/AddMainCategoryRequest.java similarity index 100% rename from src/main/java/clap/server/adapter/inbound/web/dto/admin/AddMainCategoryRequest.java rename to src/main/java/clap/server/adapter/inbound/web/dto/admin/request/AddMainCategoryRequest.java diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/AddSubCategoryRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/AddSubCategoryRequest.java similarity index 100% rename from src/main/java/clap/server/adapter/inbound/web/dto/admin/AddSubCategoryRequest.java rename to src/main/java/clap/server/adapter/inbound/web/dto/admin/request/AddSubCategoryRequest.java diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindMemberRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/FindMemberRequest.java similarity index 100% rename from src/main/java/clap/server/adapter/inbound/web/dto/admin/FindMemberRequest.java rename to src/main/java/clap/server/adapter/inbound/web/dto/admin/request/FindMemberRequest.java diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/RegisterMemberRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/RegisterMemberRequest.java similarity index 100% rename from src/main/java/clap/server/adapter/inbound/web/dto/admin/RegisterMemberRequest.java rename to src/main/java/clap/server/adapter/inbound/web/dto/admin/request/RegisterMemberRequest.java diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/SendInvitationRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/SendInvitationRequest.java similarity index 100% rename from src/main/java/clap/server/adapter/inbound/web/dto/admin/SendInvitationRequest.java rename to src/main/java/clap/server/adapter/inbound/web/dto/admin/request/SendInvitationRequest.java diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/UpdateCategoryRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/UpdateCategoryRequest.java similarity index 100% rename from src/main/java/clap/server/adapter/inbound/web/dto/admin/UpdateCategoryRequest.java rename to src/main/java/clap/server/adapter/inbound/web/dto/admin/request/UpdateCategoryRequest.java diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/UpdateMemberRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/UpdateMemberRequest.java similarity index 100% rename from src/main/java/clap/server/adapter/inbound/web/dto/admin/UpdateMemberRequest.java rename to src/main/java/clap/server/adapter/inbound/web/dto/admin/request/UpdateMemberRequest.java diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindAllCategoryResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindAllCategoryResponse.java similarity index 100% rename from src/main/java/clap/server/adapter/inbound/web/dto/admin/FindAllCategoryResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindAllCategoryResponse.java diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindMainCategoryResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindMainCategoryResponse.java similarity index 100% rename from src/main/java/clap/server/adapter/inbound/web/dto/admin/FindMainCategoryResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindMainCategoryResponse.java diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/FindSubCategoryResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindSubCategoryResponse.java similarity index 100% rename from src/main/java/clap/server/adapter/inbound/web/dto/admin/FindSubCategoryResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindSubCategoryResponse.java diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/RetrieveAllMemberResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/RetrieveAllMemberResponse.java similarity index 100% rename from src/main/java/clap/server/adapter/inbound/web/dto/admin/RetrieveAllMemberResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/admin/response/RetrieveAllMemberResponse.java diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/auth/LoginRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/auth/request/LoginRequest.java similarity index 100% rename from src/main/java/clap/server/adapter/inbound/web/dto/auth/LoginRequest.java rename to src/main/java/clap/server/adapter/inbound/web/dto/auth/request/LoginRequest.java diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/auth/LoginResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/auth/response/LoginResponse.java similarity index 100% rename from src/main/java/clap/server/adapter/inbound/web/dto/auth/LoginResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/auth/response/LoginResponse.java diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/auth/MemberInfoResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/auth/response/MemberInfoResponse.java similarity index 100% rename from src/main/java/clap/server/adapter/inbound/web/dto/auth/MemberInfoResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/auth/response/MemberInfoResponse.java diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/auth/ReissueTokenResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/auth/response/ReissueTokenResponse.java similarity index 100% rename from src/main/java/clap/server/adapter/inbound/web/dto/auth/ReissueTokenResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/auth/response/ReissueTokenResponse.java diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/comment/CreateCommentRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/history/request/CreateCommentRequest.java similarity index 81% rename from src/main/java/clap/server/adapter/inbound/web/dto/comment/CreateCommentRequest.java rename to src/main/java/clap/server/adapter/inbound/web/dto/history/request/CreateCommentRequest.java index 81883729..7415c9d4 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/comment/CreateCommentRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/history/request/CreateCommentRequest.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.comment; +package clap.server.adapter.inbound.web.dto.history; 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/comment/EditCommentRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/history/request/EditCommentRequest.java similarity index 81% rename from src/main/java/clap/server/adapter/inbound/web/dto/comment/EditCommentRequest.java rename to src/main/java/clap/server/adapter/inbound/web/dto/history/request/EditCommentRequest.java index 7820f915..447f8396 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/comment/EditCommentRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/history/request/EditCommentRequest.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.comment; +package clap.server.adapter.inbound.web.dto.history; 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/response/FindTaskHistoryResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/history/response/FindTaskHistoryResponse.java similarity index 94% rename from src/main/java/clap/server/adapter/inbound/web/dto/task/response/FindTaskHistoryResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/history/response/FindTaskHistoryResponse.java index 431c7a92..24b0a7a6 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/task/response/FindTaskHistoryResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/history/response/FindTaskHistoryResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.task.response; +package clap.server.adapter.inbound.web.dto.history.response; import clap.server.adapter.outbound.persistense.entity.task.constant.TaskHistoryType; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/label/CreateLabelRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/label/request/CreateLabelRequest.java similarity index 88% rename from src/main/java/clap/server/adapter/inbound/web/dto/label/CreateLabelRequest.java rename to src/main/java/clap/server/adapter/inbound/web/dto/label/request/CreateLabelRequest.java index 1da103f9..4436a4c5 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/label/CreateLabelRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/label/request/CreateLabelRequest.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.label; +package clap.server.adapter.inbound.web.dto.label.request; import clap.server.adapter.outbound.persistense.entity.task.constant.LabelColor; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/label/EditLabelRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/label/request/EditLabelRequest.java similarity index 88% rename from src/main/java/clap/server/adapter/inbound/web/dto/label/EditLabelRequest.java rename to src/main/java/clap/server/adapter/inbound/web/dto/label/request/EditLabelRequest.java index b70e824e..016aa052 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/label/EditLabelRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/label/request/EditLabelRequest.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.label; +package clap.server.adapter.inbound.web.dto.label.request; import clap.server.adapter.outbound.persistense.entity.task.constant.LabelColor; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/label/FindLabelListResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/label/response/FindLabelListResponse.java similarity index 87% rename from src/main/java/clap/server/adapter/inbound/web/dto/label/FindLabelListResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/label/response/FindLabelListResponse.java index 853287e3..6251505e 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/label/FindLabelListResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/label/response/FindLabelListResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.label; +package clap.server.adapter.inbound.web.dto.label.response; import clap.server.adapter.outbound.persistense.entity.task.constant.LabelColor; import io.swagger.v3.oas.annotations.media.Schema; 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/request/FilterLogRequest.java similarity index 93% rename from src/main/java/clap/server/adapter/inbound/web/dto/log/FilterLogRequest.java rename to src/main/java/clap/server/adapter/inbound/web/dto/log/request/FilterLogRequest.java index 7e3280ce..6685d933 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/request/FilterLogRequest.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.log; +package clap.server.adapter.inbound.web.dto.log.request; import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/log/AnonymousLogResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/log/response/AnonymousLogResponse.java similarity index 82% rename from src/main/java/clap/server/adapter/inbound/web/dto/log/AnonymousLogResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/log/response/AnonymousLogResponse.java index d0e7b772..f239d289 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/log/AnonymousLogResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/log/response/AnonymousLogResponse.java @@ -1,8 +1,7 @@ -package clap.server.adapter.inbound.web.dto.log; +package clap.server.adapter.inbound.web.dto.log.response; import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus; import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import java.time.LocalDateTime; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/log/MemberLogResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/log/response/MemberLogResponse.java similarity index 81% rename from src/main/java/clap/server/adapter/inbound/web/dto/log/MemberLogResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/log/response/MemberLogResponse.java index 950695e6..b2467704 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/log/MemberLogResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/log/response/MemberLogResponse.java @@ -1,8 +1,7 @@ -package clap.server.adapter.inbound.web.dto.log; +package clap.server.adapter.inbound.web.dto.log.response; import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus; import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import java.time.LocalDateTime; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/member/UpdateMemberInfoRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/member/request/UpdateMemberInfoRequest.java similarity index 89% rename from src/main/java/clap/server/adapter/inbound/web/dto/member/UpdateMemberInfoRequest.java rename to src/main/java/clap/server/adapter/inbound/web/dto/member/request/UpdateMemberInfoRequest.java index 25269a07..6934a221 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/member/UpdateMemberInfoRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/member/request/UpdateMemberInfoRequest.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.member; +package clap.server.adapter.inbound.web.dto.member.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/member/MemberDetailInfoResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/member/response/MemberDetailInfoResponse.java similarity index 95% rename from src/main/java/clap/server/adapter/inbound/web/dto/member/MemberDetailInfoResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/member/response/MemberDetailInfoResponse.java index 2327bdb2..3b939ded 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/member/MemberDetailInfoResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/member/response/MemberDetailInfoResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.member; +package clap.server.adapter.inbound.web.dto.member.response; import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/member/MemberProfileResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/member/response/MemberProfileResponse.java similarity index 90% rename from src/main/java/clap/server/adapter/inbound/web/dto/member/MemberProfileResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/member/response/MemberProfileResponse.java index 84b8a856..61f6328e 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/member/MemberProfileResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/member/response/MemberProfileResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.member; +package clap.server.adapter.inbound.web.dto.member.response; import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/notification/SseRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/notification/request/SseRequest.java similarity index 78% rename from src/main/java/clap/server/adapter/inbound/web/dto/notification/SseRequest.java rename to src/main/java/clap/server/adapter/inbound/web/dto/notification/request/SseRequest.java index 4dd9224c..e68e40d9 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/notification/SseRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/notification/request/SseRequest.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.notification; +package clap.server.adapter.inbound.web.dto.notification.request; import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/notification/CountNotificationResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/notification/response/CountNotificationResponse.java similarity index 58% rename from src/main/java/clap/server/adapter/inbound/web/dto/notification/CountNotificationResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/notification/response/CountNotificationResponse.java index 0c9eba0b..58973897 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/notification/CountNotificationResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/notification/response/CountNotificationResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.notification; +package clap.server.adapter.inbound.web.dto.notification.response; public record CountNotificationResponse( Long memberId, diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/notification/FindNotificationListResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/notification/response/FindNotificationListResponse.java similarity index 94% rename from src/main/java/clap/server/adapter/inbound/web/dto/notification/FindNotificationListResponse.java rename to src/main/java/clap/server/adapter/inbound/web/dto/notification/response/FindNotificationListResponse.java index 1326e0f2..710939c2 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/notification/FindNotificationListResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/notification/response/FindNotificationListResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.notification; +package clap.server.adapter.inbound.web.dto.notification.response; import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/task/response/FindManagersResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/FindManagersResponse.java new file mode 100644 index 00000000..cbd8b26c --- /dev/null +++ b/src/main/java/clap/server/adapter/inbound/web/dto/task/response/FindManagersResponse.java @@ -0,0 +1,9 @@ +package clap.server.adapter.inbound.web.dto.task.response; + +public record FindManagersResponse( + Long memberId, + String nickname, + String imageUrl, + int remainingTasks +) { +} diff --git a/src/main/java/clap/server/adapter/inbound/web/example/ErrorExampleController.java b/src/main/java/clap/server/adapter/inbound/web/example/ErrorExampleController.java index ce90801e..c10b7c0d 100644 --- a/src/main/java/clap/server/adapter/inbound/web/example/ErrorExampleController.java +++ b/src/main/java/clap/server/adapter/inbound/web/example/ErrorExampleController.java @@ -2,7 +2,7 @@ import clap.server.common.annotation.architecture.WebAdapter; import clap.server.common.annotation.swagger.ApiErrorCodes; -import clap.server.common.annotation.architecture.DevelopOnlyApi; +import clap.server.common.annotation.swagger.DevelopOnlyApi; import clap.server.exception.code.*; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/clap/server/adapter/inbound/web/comment/CommandCommentController.java b/src/main/java/clap/server/adapter/inbound/web/history/CommandCommentController.java similarity index 85% rename from src/main/java/clap/server/adapter/inbound/web/comment/CommandCommentController.java rename to src/main/java/clap/server/adapter/inbound/web/history/CommandCommentController.java index 335e243f..2e6f3e8e 100644 --- a/src/main/java/clap/server/adapter/inbound/web/comment/CommandCommentController.java +++ b/src/main/java/clap/server/adapter/inbound/web/history/CommandCommentController.java @@ -1,9 +1,9 @@ -package clap.server.adapter.inbound.web.comment; +package clap.server.adapter.inbound.web.history; import clap.server.adapter.inbound.security.SecurityUserDetails; -import clap.server.adapter.inbound.web.dto.comment.EditCommentRequest; -import clap.server.application.port.inbound.comment.DeleteCommentUsecase; -import clap.server.application.port.inbound.comment.EditCommentUsecase; +import clap.server.adapter.inbound.web.dto.history.EditCommentRequest; +import clap.server.application.port.inbound.history.DeleteCommentUsecase; +import clap.server.application.port.inbound.history.EditCommentUsecase; import clap.server.common.annotation.architecture.WebAdapter; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -15,7 +15,7 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; -@Tag(name = "02. Task [생성/수정]", description = "작업 생성/수정 API") +@Tag(name = "03. Task History", description = "히스토리 및 댓글 관련 API") @WebAdapter @RestController @RequiredArgsConstructor diff --git a/src/main/java/clap/server/adapter/inbound/web/task/FindTaskHistoryController.java b/src/main/java/clap/server/adapter/inbound/web/history/FindTaskHistoryController.java similarity index 81% rename from src/main/java/clap/server/adapter/inbound/web/task/FindTaskHistoryController.java rename to src/main/java/clap/server/adapter/inbound/web/history/FindTaskHistoryController.java index c8cc2e4f..92811acd 100644 --- a/src/main/java/clap/server/adapter/inbound/web/task/FindTaskHistoryController.java +++ b/src/main/java/clap/server/adapter/inbound/web/history/FindTaskHistoryController.java @@ -1,11 +1,11 @@ -package clap.server.adapter.inbound.web.task; +package clap.server.adapter.inbound.web.history; import clap.server.adapter.inbound.security.SecurityUserDetails; -import clap.server.adapter.inbound.web.dto.task.response.FindTaskHistoryResponse; +import clap.server.adapter.inbound.web.dto.history.response.FindTaskHistoryResponse; import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus; -import clap.server.application.port.inbound.task.FindTaskHistoriesUsecase; +import clap.server.application.port.inbound.history.FindTaskHistoriesUsecase; import clap.server.common.annotation.architecture.WebAdapter; -import clap.server.config.annotation.LogType; +import clap.server.common.annotation.log.LogType; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; -@Tag(name = "02. Task [조회]", description = "작업 조회 API") +@Tag(name = "03. Task History") @WebAdapter @RestController @RequiredArgsConstructor diff --git a/src/main/java/clap/server/adapter/inbound/web/comment/PostCommentController.java b/src/main/java/clap/server/adapter/inbound/web/history/PostCommentController.java similarity index 86% rename from src/main/java/clap/server/adapter/inbound/web/comment/PostCommentController.java rename to src/main/java/clap/server/adapter/inbound/web/history/PostCommentController.java index 307c4ee3..42053a84 100644 --- a/src/main/java/clap/server/adapter/inbound/web/comment/PostCommentController.java +++ b/src/main/java/clap/server/adapter/inbound/web/history/PostCommentController.java @@ -1,9 +1,9 @@ -package clap.server.adapter.inbound.web.comment; +package clap.server.adapter.inbound.web.history; import clap.server.adapter.inbound.security.SecurityUserDetails; -import clap.server.adapter.inbound.web.dto.comment.CreateCommentRequest; -import clap.server.application.port.inbound.comment.SaveCommentAttachmentUsecase; -import clap.server.application.port.inbound.comment.SaveCommentUsecase; +import clap.server.adapter.inbound.web.dto.history.CreateCommentRequest; +import clap.server.application.port.inbound.history.SaveCommentAttachmentUsecase; +import clap.server.application.port.inbound.history.SaveCommentUsecase; import clap.server.common.annotation.architecture.WebAdapter; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -@Tag(name = "02. Task [생성/수정]", description = "작업 생성/수정 API") +@Tag(name = "03. Task History") @WebAdapter @RestController @RequiredArgsConstructor diff --git a/src/main/java/clap/server/adapter/inbound/web/label/FindLabelController.java b/src/main/java/clap/server/adapter/inbound/web/label/FindLabelController.java index 4b2c29cc..d088a0f8 100644 --- a/src/main/java/clap/server/adapter/inbound/web/label/FindLabelController.java +++ b/src/main/java/clap/server/adapter/inbound/web/label/FindLabelController.java @@ -1,17 +1,12 @@ package clap.server.adapter.inbound.web.label; import clap.server.adapter.inbound.security.SecurityUserDetails; -import clap.server.adapter.inbound.web.dto.common.SliceResponse; -import clap.server.adapter.inbound.web.dto.label.FindLabelListResponse; +import clap.server.adapter.inbound.web.dto.label.response.FindLabelListResponse; import clap.server.application.port.inbound.label.FindLabelListUsecase; import clap.server.common.annotation.architecture.WebAdapter; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Pageable; import org.springframework.http.ResponseEntity; import org.springframework.security.access.annotation.Secured; import org.springframework.security.core.annotation.AuthenticationPrincipal; 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 0829a404..67f5cce5 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 @@ -2,9 +2,9 @@ import clap.server.adapter.inbound.security.SecurityUserDetails; import clap.server.adapter.inbound.web.dto.common.PageResponse; -import clap.server.adapter.inbound.web.dto.log.AnonymousLogResponse; -import clap.server.adapter.inbound.web.dto.log.FilterLogRequest; -import clap.server.adapter.inbound.web.dto.log.MemberLogResponse; +import clap.server.adapter.inbound.web.dto.log.response.AnonymousLogResponse; +import clap.server.adapter.inbound.web.dto.log.request.FilterLogRequest; +import clap.server.adapter.inbound.web.dto.log.response.MemberLogResponse; import clap.server.application.port.inbound.log.FindApiLogsUsecase; import clap.server.common.annotation.architecture.WebAdapter; import io.swagger.v3.oas.annotations.Operation; @@ -13,12 +13,10 @@ import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Sort; import org.springframework.http.ResponseEntity; import org.springframework.security.access.annotation.Secured; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; -import java.util.List; @Tag(name = "05. Admin [로깅]") @WebAdapter diff --git a/src/main/java/clap/server/adapter/inbound/web/member/ManagerController.java b/src/main/java/clap/server/adapter/inbound/web/member/ManagerController.java deleted file mode 100644 index c7e4c966..00000000 --- a/src/main/java/clap/server/adapter/inbound/web/member/ManagerController.java +++ /dev/null @@ -1,32 +0,0 @@ -package clap.server.adapter.inbound.web.member; - -import clap.server.application.port.inbound.domain.FindManagersUsecase; -import clap.server.adapter.inbound.web.dto.admin.FindManagersResponse; -import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -@RestController -@RequestMapping("/manager") -@RequiredArgsConstructor -public class ManagerController { - - private final FindManagersUsecase findManagersUsecase; - - @GetMapping - public ResponseEntity> findManagers() { - - List managers = findManagersUsecase.execute(); - - if (managers.isEmpty()) { - return ResponseEntity.status(HttpStatus.NO_CONTENT).body(FindManagersResponse.emptyListResponse()); - } - - return ResponseEntity.ok(managers); - } -} diff --git a/src/main/java/clap/server/adapter/inbound/web/member/MemberInfoController.java b/src/main/java/clap/server/adapter/inbound/web/member/MemberInfoController.java index eb4cef68..ab50c194 100644 --- a/src/main/java/clap/server/adapter/inbound/web/member/MemberInfoController.java +++ b/src/main/java/clap/server/adapter/inbound/web/member/MemberInfoController.java @@ -1,9 +1,9 @@ package clap.server.adapter.inbound.web.member; import clap.server.adapter.inbound.security.SecurityUserDetails; -import clap.server.adapter.inbound.web.dto.member.MemberDetailInfoResponse; -import clap.server.adapter.inbound.web.dto.member.MemberProfileResponse; -import clap.server.adapter.inbound.web.dto.member.UpdateMemberInfoRequest; +import clap.server.adapter.inbound.web.dto.member.response.MemberDetailInfoResponse; +import clap.server.adapter.inbound.web.dto.member.response.MemberProfileResponse; +import clap.server.adapter.inbound.web.dto.member.request.UpdateMemberInfoRequest; import clap.server.application.port.inbound.member.UpdateMemberInfoUsecase; import clap.server.application.port.inbound.member.MemberDetailInfoUsecase; import clap.server.application.port.inbound.member.MemberProfileUsecase; diff --git a/src/main/java/clap/server/adapter/inbound/web/notification/FindNotificationController.java b/src/main/java/clap/server/adapter/inbound/web/notification/FindNotificationController.java index 1feb38ed..2901d43b 100644 --- a/src/main/java/clap/server/adapter/inbound/web/notification/FindNotificationController.java +++ b/src/main/java/clap/server/adapter/inbound/web/notification/FindNotificationController.java @@ -2,8 +2,8 @@ import clap.server.adapter.inbound.security.SecurityUserDetails; import clap.server.adapter.inbound.web.dto.common.SliceResponse; -import clap.server.adapter.inbound.web.dto.notification.CountNotificationResponse; -import clap.server.adapter.inbound.web.dto.notification.FindNotificationListResponse; +import clap.server.adapter.inbound.web.dto.notification.response.CountNotificationResponse; +import clap.server.adapter.inbound.web.dto.notification.response.FindNotificationListResponse; import clap.server.application.port.inbound.notification.CountNotificationUseCase; import clap.server.application.port.inbound.notification.FindNotificationListUsecase; import clap.server.common.annotation.architecture.WebAdapter; diff --git a/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java b/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java index de72d30b..76e2b7ed 100644 --- a/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java +++ b/src/main/java/clap/server/adapter/inbound/web/statistics/FindStatisticsController.java @@ -37,8 +37,6 @@ public class FindStatisticsController { @GetMapping @Secured("ROLE_MANAGER") public ResponseEntity> aggregateTaskStatistics(@RequestParam PeriodType periodType, @RequestParam StatisticsType statisticsType) { - System.out.println("periodType = " + periodType); - System.out.println("statisticsType = " + statisticsType); return switch (statisticsType) { case REQUEST_BY_PERIOD -> ResponseEntity.ok(findTaskProcessUsecase.aggregatePeriodTaskRequest(periodType.getType())); diff --git a/src/main/java/clap/server/adapter/inbound/web/task/ManagerController.java b/src/main/java/clap/server/adapter/inbound/web/task/ManagerController.java new file mode 100644 index 00000000..f0c387e9 --- /dev/null +++ b/src/main/java/clap/server/adapter/inbound/web/task/ManagerController.java @@ -0,0 +1,22 @@ +package clap.server.adapter.inbound.web.task; + +import clap.server.application.port.inbound.task.FindManagersUsecase; +import clap.server.adapter.inbound.web.dto.task.response.FindManagersResponse; +import clap.server.common.annotation.architecture.WebAdapter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.List; +@WebAdapter +@RequestMapping("/api/managers") +@RequiredArgsConstructor +public class ManagerController { + private final FindManagersUsecase findManagersUsecase; + + @GetMapping + public ResponseEntity> findManagers() { + return ResponseEntity.ok(findManagersUsecase.findManagers()); + } +} diff --git a/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadAdapter.java b/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadAdapter.java index c0d01f09..cb033305 100644 --- a/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadAdapter.java +++ b/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadAdapter.java @@ -3,7 +3,7 @@ import clap.server.application.port.outbound.s3.S3UploadPort; import clap.server.common.annotation.architecture.InfrastructureAdapter; import clap.server.config.s3.KakaoS3Config; -import clap.server.common.constants.FilePathConstants; +import clap.server.domain.policy.attachment.FilePathPolicy; import clap.server.exception.S3Exception; import clap.server.exception.code.FileErrorcode; import lombok.RequiredArgsConstructor; @@ -26,11 +26,11 @@ public class S3UploadAdapter implements S3UploadPort { private final KakaoS3Config kakaoS3Config; private final S3Client s3Client; - public List uploadFiles(FilePathConstants filePrefix, List multipartFiles) { + public List uploadFiles(FilePathPolicy filePrefix, List multipartFiles) { return multipartFiles.stream().map((file) -> uploadSingleFile(filePrefix, file)).toList(); } - public String uploadSingleFile(FilePathConstants filePrefix, MultipartFile file) { + public String uploadSingleFile(FilePathPolicy filePrefix, MultipartFile file) { try { Path filePath = getFilePath(file); String objectKey = createObjectKey(filePrefix.getPath(), file.getOriginalFilename()); diff --git a/src/main/java/clap/server/adapter/outbound/persistense/ApiLogPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/ApiLogPersistenceAdapter.java index 469f171d..e1a03723 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/ApiLogPersistenceAdapter.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/ApiLogPersistenceAdapter.java @@ -1,6 +1,6 @@ package clap.server.adapter.outbound.persistense; -import clap.server.adapter.inbound.web.dto.log.FilterLogRequest; +import clap.server.adapter.inbound.web.dto.log.request.FilterLogRequest; import clap.server.adapter.outbound.persistense.mapper.ApiLogPersistenceMapper; import clap.server.adapter.outbound.persistense.mapper.MemberPersistenceMapper; diff --git a/src/main/java/clap/server/adapter/outbound/persistense/NotificationPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/NotificationPersistenceAdapter.java index 6df83e81..3f3098ac 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/NotificationPersistenceAdapter.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/NotificationPersistenceAdapter.java @@ -1,7 +1,7 @@ package clap.server.adapter.outbound.persistense; import clap.server.adapter.inbound.web.dto.common.SliceResponse; -import clap.server.adapter.inbound.web.dto.notification.FindNotificationListResponse; +import clap.server.adapter.inbound.web.dto.notification.response.FindNotificationListResponse; import clap.server.adapter.outbound.persistense.mapper.NotificationPersistenceMapper; import clap.server.adapter.outbound.persistense.repository.notification.NotificationRepository; import clap.server.application.mapper.NotificationMapper; diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogCustomRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogCustomRepository.java index 269df757..b7f0cbb5 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogCustomRepository.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogCustomRepository.java @@ -1,6 +1,6 @@ package clap.server.adapter.outbound.persistense.repository.log; -import clap.server.adapter.inbound.web.dto.log.FilterLogRequest; +import clap.server.adapter.inbound.web.dto.log.request.FilterLogRequest; import clap.server.adapter.outbound.persistense.entity.log.AnonymousLogEntity; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogCustomRepositoryImpl.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogCustomRepositoryImpl.java index 4d6404c0..cc9aefea 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogCustomRepositoryImpl.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogCustomRepositoryImpl.java @@ -1,6 +1,6 @@ package clap.server.adapter.outbound.persistense.repository.log; -import clap.server.adapter.inbound.web.dto.log.FilterLogRequest; +import clap.server.adapter.inbound.web.dto.log.request.FilterLogRequest; import clap.server.adapter.outbound.persistense.entity.log.AnonymousLogEntity; import com.querydsl.core.BooleanBuilder; import com.querydsl.core.types.OrderSpecifier; @@ -12,11 +12,9 @@ import org.springframework.stereotype.Repository; import java.time.LocalDateTime; -import java.util.ArrayList; import java.util.List; import static clap.server.adapter.outbound.persistense.entity.log.QAnonymousLogEntity.anonymousLogEntity; -import static clap.server.adapter.outbound.persistense.entity.log.QMemberLogEntity.memberLogEntity; @Repository @RequiredArgsConstructor diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogRepository.java index 65b684c6..6519aae9 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogRepository.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/log/AnonymousLogRepository.java @@ -1,16 +1,9 @@ package clap.server.adapter.outbound.persistense.repository.log; -import aj.org.objectweb.asm.commons.Remapper; -import clap.server.adapter.inbound.web.dto.log.FilterLogRequest; import clap.server.adapter.outbound.persistense.entity.log.AnonymousLogEntity; -import clap.server.domain.model.log.AnonymousLog; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import java.util.List; - @Repository public interface AnonymousLogRepository extends JpaRepository, AnonymousLogCustomRepository{ } diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/log/MemberLogCustomRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/log/MemberLogCustomRepository.java index 5440a5d5..acf11b56 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/repository/log/MemberLogCustomRepository.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/log/MemberLogCustomRepository.java @@ -1,6 +1,6 @@ package clap.server.adapter.outbound.persistense.repository.log; -import clap.server.adapter.inbound.web.dto.log.FilterLogRequest; +import clap.server.adapter.inbound.web.dto.log.request.FilterLogRequest; import clap.server.adapter.outbound.persistense.entity.log.MemberLogEntity; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/log/MemberLogCustomRepositoryImpl.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/log/MemberLogCustomRepositoryImpl.java index 1a813a99..29154e8e 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/repository/log/MemberLogCustomRepositoryImpl.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/log/MemberLogCustomRepositoryImpl.java @@ -1,7 +1,7 @@ package clap.server.adapter.outbound.persistense.repository.log; -import clap.server.adapter.inbound.web.dto.log.FilterLogRequest; +import clap.server.adapter.inbound.web.dto.log.request.FilterLogRequest; import clap.server.adapter.outbound.persistense.entity.log.MemberLogEntity; import com.querydsl.core.BooleanBuilder; import com.querydsl.core.types.OrderSpecifier; @@ -13,7 +13,6 @@ import org.springframework.stereotype.Repository; import java.time.LocalDateTime; -import java.util.ArrayList; import java.util.List; import static clap.server.adapter.outbound.persistense.entity.log.QMemberLogEntity.memberLogEntity; diff --git a/src/main/java/clap/server/application/mapper/response/AuthResponseMapper.java b/src/main/java/clap/server/application/mapper/AuthResponseMapper.java similarity index 96% rename from src/main/java/clap/server/application/mapper/response/AuthResponseMapper.java rename to src/main/java/clap/server/application/mapper/AuthResponseMapper.java index 3c9ddbdd..dfa7cfd7 100644 --- a/src/main/java/clap/server/application/mapper/response/AuthResponseMapper.java +++ b/src/main/java/clap/server/application/mapper/AuthResponseMapper.java @@ -1,4 +1,4 @@ -package clap.server.application.mapper.response; +package clap.server.application.mapper; import clap.server.adapter.inbound.web.dto.auth.LoginResponse; import clap.server.adapter.inbound.web.dto.auth.MemberInfoResponse; diff --git a/src/main/java/clap/server/application/mapper/response/CategoryResponseMapper.java b/src/main/java/clap/server/application/mapper/CategoryResponseMapper.java similarity index 95% rename from src/main/java/clap/server/application/mapper/response/CategoryResponseMapper.java rename to src/main/java/clap/server/application/mapper/CategoryResponseMapper.java index 663637b7..060fedb8 100644 --- a/src/main/java/clap/server/application/mapper/response/CategoryResponseMapper.java +++ b/src/main/java/clap/server/application/mapper/CategoryResponseMapper.java @@ -1,4 +1,4 @@ -package clap.server.application.mapper.response; +package clap.server.application.mapper; import clap.server.adapter.inbound.web.dto.admin.FindAllCategoryResponse; import clap.server.adapter.inbound.web.dto.admin.FindMainCategoryResponse; diff --git a/src/main/java/clap/server/application/mapper/response/FindTaskStatisticsMapper.java b/src/main/java/clap/server/application/mapper/FindTaskStatisticsMapper.java similarity index 91% rename from src/main/java/clap/server/application/mapper/response/FindTaskStatisticsMapper.java rename to src/main/java/clap/server/application/mapper/FindTaskStatisticsMapper.java index 30bc60bf..c1a226f2 100644 --- a/src/main/java/clap/server/application/mapper/response/FindTaskStatisticsMapper.java +++ b/src/main/java/clap/server/application/mapper/FindTaskStatisticsMapper.java @@ -1,4 +1,4 @@ -package clap.server.application.mapper.response; +package clap.server.application.mapper; import clap.server.adapter.inbound.web.dto.statistics.StatisticsResponse; diff --git a/src/main/java/clap/server/application/mapper/LabelMapper.java b/src/main/java/clap/server/application/mapper/LabelResponseMapper.java similarity index 72% rename from src/main/java/clap/server/application/mapper/LabelMapper.java rename to src/main/java/clap/server/application/mapper/LabelResponseMapper.java index 9fc6fd15..b1a26d5a 100644 --- a/src/main/java/clap/server/application/mapper/LabelMapper.java +++ b/src/main/java/clap/server/application/mapper/LabelResponseMapper.java @@ -1,11 +1,11 @@ package clap.server.application.mapper; -import clap.server.adapter.inbound.web.dto.label.FindLabelListResponse; +import clap.server.adapter.inbound.web.dto.label.response.FindLabelListResponse; import clap.server.domain.model.task.Label; -public class LabelMapper { +public class LabelResponseMapper { - private LabelMapper() { + private LabelResponseMapper() { throw new IllegalArgumentException(); } diff --git a/src/main/java/clap/server/application/mapper/response/LogMapper.java b/src/main/java/clap/server/application/mapper/LogMapper.java similarity index 83% rename from src/main/java/clap/server/application/mapper/response/LogMapper.java rename to src/main/java/clap/server/application/mapper/LogMapper.java index a230dda2..0899c673 100644 --- a/src/main/java/clap/server/application/mapper/response/LogMapper.java +++ b/src/main/java/clap/server/application/mapper/LogMapper.java @@ -1,7 +1,7 @@ -package clap.server.application.mapper.response; +package clap.server.application.mapper; -import clap.server.adapter.inbound.web.dto.log.AnonymousLogResponse; -import clap.server.adapter.inbound.web.dto.log.MemberLogResponse; +import clap.server.adapter.inbound.web.dto.log.response.AnonymousLogResponse; +import clap.server.adapter.inbound.web.dto.log.response.MemberLogResponse; import clap.server.domain.model.log.AnonymousLog; import clap.server.domain.model.log.MemberLog; diff --git a/src/main/java/clap/server/application/mapper/ManagersMapper.java b/src/main/java/clap/server/application/mapper/ManagersMapper.java deleted file mode 100644 index db7fb6d8..00000000 --- a/src/main/java/clap/server/application/mapper/ManagersMapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package clap.server.application.mapper; - -import clap.server.adapter.inbound.web.dto.admin.FindManagersResponse; -import clap.server.domain.model.member.Member; -import clap.server.application.port.inbound.domain.MemberService; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Component; - -@Component -@RequiredArgsConstructor -public class ManagersMapper { - - private final MemberService memberService; - - public FindManagersResponse mapToFindManagersResponse(Member manager) { - int remainingTasks = memberService.getRemainingTasks(manager.getMemberId()); - String nickname = memberService.getMemberNickname(manager.getMemberId()); - String imageUrl = memberService.getMemberImageUrl(manager.getMemberId()); - - return new FindManagersResponse( - manager.getMemberId(), - nickname, - imageUrl, - remainingTasks - ); - } -} diff --git a/src/main/java/clap/server/application/mapper/MemberMapper.java b/src/main/java/clap/server/application/mapper/MemberResponseMapper.java similarity index 89% rename from src/main/java/clap/server/application/mapper/MemberMapper.java rename to src/main/java/clap/server/application/mapper/MemberResponseMapper.java index df6a54c7..4eed787e 100644 --- a/src/main/java/clap/server/application/mapper/MemberMapper.java +++ b/src/main/java/clap/server/application/mapper/MemberResponseMapper.java @@ -1,13 +1,13 @@ package clap.server.application.mapper; -import clap.server.adapter.inbound.web.dto.member.MemberDetailInfoResponse; -import clap.server.adapter.inbound.web.dto.member.MemberProfileResponse; +import clap.server.adapter.inbound.web.dto.member.response.MemberDetailInfoResponse; +import clap.server.adapter.inbound.web.dto.member.response.MemberProfileResponse; import clap.server.domain.model.member.Member; import clap.server.domain.model.member.MemberInfo; -public class MemberMapper { - private MemberMapper() { +public class MemberResponseMapper { + private MemberResponseMapper() { throw new IllegalArgumentException(); } diff --git a/src/main/java/clap/server/application/mapper/NotificationMapper.java b/src/main/java/clap/server/application/mapper/NotificationMapper.java index 4098dd39..fdacb40f 100644 --- a/src/main/java/clap/server/application/mapper/NotificationMapper.java +++ b/src/main/java/clap/server/application/mapper/NotificationMapper.java @@ -1,8 +1,8 @@ package clap.server.application.mapper; import clap.server.adapter.inbound.web.dto.common.SliceResponse; -import clap.server.adapter.inbound.web.dto.notification.CountNotificationResponse; -import clap.server.adapter.inbound.web.dto.notification.FindNotificationListResponse; +import clap.server.adapter.inbound.web.dto.notification.response.CountNotificationResponse; +import clap.server.adapter.inbound.web.dto.notification.response.FindNotificationListResponse; import clap.server.domain.model.notification.Notification; import org.springframework.data.domain.Slice; diff --git a/src/main/java/clap/server/application/mapper/TaskHistoryMapper.java b/src/main/java/clap/server/application/mapper/TaskHistoryResponseMapper.java similarity index 96% rename from src/main/java/clap/server/application/mapper/TaskHistoryMapper.java rename to src/main/java/clap/server/application/mapper/TaskHistoryResponseMapper.java index d0fc4e4f..f24e8fcd 100644 --- a/src/main/java/clap/server/application/mapper/TaskHistoryMapper.java +++ b/src/main/java/clap/server/application/mapper/TaskHistoryResponseMapper.java @@ -1,6 +1,6 @@ package clap.server.application.mapper; -import clap.server.adapter.inbound.web.dto.task.response.FindTaskHistoryResponse; +import clap.server.adapter.inbound.web.dto.history.response.FindTaskHistoryResponse; import clap.server.domain.model.task.Attachment; import clap.server.domain.model.task.TaskHistory; @@ -8,9 +8,9 @@ import java.util.List; -public class TaskHistoryMapper { +public class TaskHistoryResponseMapper { - private TaskHistoryMapper() { + private TaskHistoryResponseMapper() { throw new IllegalArgumentException(); } diff --git a/src/main/java/clap/server/application/mapper/TaskMapper.java b/src/main/java/clap/server/application/mapper/TaskResponseMapper.java similarity index 94% rename from src/main/java/clap/server/application/mapper/TaskMapper.java rename to src/main/java/clap/server/application/mapper/TaskResponseMapper.java index 4828acfd..7381a5ed 100644 --- a/src/main/java/clap/server/application/mapper/TaskMapper.java +++ b/src/main/java/clap/server/application/mapper/TaskResponseMapper.java @@ -5,6 +5,7 @@ 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.member.Member; import clap.server.domain.model.task.Attachment; import clap.server.domain.model.task.Task; import org.springframework.data.domain.Slice; @@ -16,8 +17,8 @@ import static clap.server.application.mapper.AttachmentMapper.toAttachmentResponseList; -public class TaskMapper { - private TaskMapper() { +public class TaskResponseMapper { + private TaskResponseMapper() { throw new IllegalArgumentException(); } @@ -120,7 +121,7 @@ public static FilterAllTasksResponse toFilterAllTasksResponse(Task task) { public static TaskBoardResponse toSliceTaskItemResponse(Slice tasks) { Map> tasksByStatus =tasks.getContent().stream() - .map(TaskMapper::toTaskItemResponse) + .map(TaskResponseMapper::toTaskItemResponse) .collect(Collectors.groupingBy(TaskItemResponse::taskStatus)); return new TaskBoardResponse( @@ -178,4 +179,13 @@ public static FindApprovalFormResponse toFindApprovalFormResponse(Task task) { task.getCategory().getMainCategory().getName() ); } + + public static FindManagersResponse toFindManagersResponse(Member manager, int remainingTasks) { + return new FindManagersResponse( + manager.getMemberId(), + manager.getNickname(), + manager.getImageUrl(), + remainingTasks + ); + } } diff --git a/src/main/java/clap/server/application/port/inbound/domain/FindManagersUsecase.java b/src/main/java/clap/server/application/port/inbound/domain/FindManagersUsecase.java deleted file mode 100644 index 57327d16..00000000 --- a/src/main/java/clap/server/application/port/inbound/domain/FindManagersUsecase.java +++ /dev/null @@ -1,8 +0,0 @@ -package clap.server.application.port.inbound.domain; - -import clap.server.adapter.inbound.web.dto.admin.FindManagersResponse; -import java.util.List; - -public interface FindManagersUsecase { - List execute(); -} diff --git a/src/main/java/clap/server/application/port/inbound/comment/DeleteCommentUsecase.java b/src/main/java/clap/server/application/port/inbound/history/DeleteCommentUsecase.java similarity index 64% rename from src/main/java/clap/server/application/port/inbound/comment/DeleteCommentUsecase.java rename to src/main/java/clap/server/application/port/inbound/history/DeleteCommentUsecase.java index 5445344e..1355faf4 100644 --- a/src/main/java/clap/server/application/port/inbound/comment/DeleteCommentUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/history/DeleteCommentUsecase.java @@ -1,4 +1,4 @@ -package clap.server.application.port.inbound.comment; +package clap.server.application.port.inbound.history; public interface DeleteCommentUsecase { diff --git a/src/main/java/clap/server/application/port/inbound/comment/EditCommentUsecase.java b/src/main/java/clap/server/application/port/inbound/history/EditCommentUsecase.java similarity index 52% rename from src/main/java/clap/server/application/port/inbound/comment/EditCommentUsecase.java rename to src/main/java/clap/server/application/port/inbound/history/EditCommentUsecase.java index 37af7789..ff5f6fa1 100644 --- a/src/main/java/clap/server/application/port/inbound/comment/EditCommentUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/history/EditCommentUsecase.java @@ -1,6 +1,6 @@ -package clap.server.application.port.inbound.comment; +package clap.server.application.port.inbound.history; -import clap.server.adapter.inbound.web.dto.comment.EditCommentRequest; +import clap.server.adapter.inbound.web.dto.history.EditCommentRequest; public interface EditCommentUsecase { diff --git a/src/main/java/clap/server/application/port/inbound/history/FindTaskHistoriesUsecase.java b/src/main/java/clap/server/application/port/inbound/history/FindTaskHistoriesUsecase.java new file mode 100644 index 00000000..2381a8ad --- /dev/null +++ b/src/main/java/clap/server/application/port/inbound/history/FindTaskHistoriesUsecase.java @@ -0,0 +1,7 @@ +package clap.server.application.port.inbound.history; + +import clap.server.adapter.inbound.web.dto.history.response.FindTaskHistoryResponse; + +public interface FindTaskHistoriesUsecase { + FindTaskHistoryResponse findTaskHistories(Long userId, Long taskId); +} diff --git a/src/main/java/clap/server/application/port/inbound/comment/SaveCommentAttachmentUsecase.java b/src/main/java/clap/server/application/port/inbound/history/SaveCommentAttachmentUsecase.java similarity index 77% rename from src/main/java/clap/server/application/port/inbound/comment/SaveCommentAttachmentUsecase.java rename to src/main/java/clap/server/application/port/inbound/history/SaveCommentAttachmentUsecase.java index d6566f6b..8b2daf3e 100644 --- a/src/main/java/clap/server/application/port/inbound/comment/SaveCommentAttachmentUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/history/SaveCommentAttachmentUsecase.java @@ -1,4 +1,4 @@ -package clap.server.application.port.inbound.comment; +package clap.server.application.port.inbound.history; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/clap/server/application/port/inbound/comment/SaveCommentUsecase.java b/src/main/java/clap/server/application/port/inbound/history/SaveCommentUsecase.java similarity index 51% rename from src/main/java/clap/server/application/port/inbound/comment/SaveCommentUsecase.java rename to src/main/java/clap/server/application/port/inbound/history/SaveCommentUsecase.java index cc8bac82..1cfa861b 100644 --- a/src/main/java/clap/server/application/port/inbound/comment/SaveCommentUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/history/SaveCommentUsecase.java @@ -1,6 +1,6 @@ -package clap.server.application.port.inbound.comment; +package clap.server.application.port.inbound.history; -import clap.server.adapter.inbound.web.dto.comment.CreateCommentRequest; +import clap.server.adapter.inbound.web.dto.history.CreateCommentRequest; public interface SaveCommentUsecase { diff --git a/src/main/java/clap/server/application/port/inbound/label/AddLabelUsecase.java b/src/main/java/clap/server/application/port/inbound/label/AddLabelUsecase.java index 1acc97cd..78526c62 100644 --- a/src/main/java/clap/server/application/port/inbound/label/AddLabelUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/label/AddLabelUsecase.java @@ -1,6 +1,6 @@ package clap.server.application.port.inbound.label; -import clap.server.adapter.inbound.web.dto.label.CreateLabelRequest; +import clap.server.adapter.inbound.web.dto.label.request.CreateLabelRequest; public interface AddLabelUsecase { diff --git a/src/main/java/clap/server/application/port/inbound/label/FindLabelListUsecase.java b/src/main/java/clap/server/application/port/inbound/label/FindLabelListUsecase.java index dcf62125..7198e583 100644 --- a/src/main/java/clap/server/application/port/inbound/label/FindLabelListUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/label/FindLabelListUsecase.java @@ -1,6 +1,6 @@ package clap.server.application.port.inbound.label; -import clap.server.adapter.inbound.web.dto.label.FindLabelListResponse; +import clap.server.adapter.inbound.web.dto.label.response.FindLabelListResponse; import java.util.List; diff --git a/src/main/java/clap/server/application/port/inbound/label/UpdateLabelUsecase.java b/src/main/java/clap/server/application/port/inbound/label/UpdateLabelUsecase.java index ccd18f21..390eb0ec 100644 --- a/src/main/java/clap/server/application/port/inbound/label/UpdateLabelUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/label/UpdateLabelUsecase.java @@ -1,6 +1,6 @@ package clap.server.application.port.inbound.label; -import clap.server.adapter.inbound.web.dto.label.EditLabelRequest; +import clap.server.adapter.inbound.web.dto.label.request.EditLabelRequest; public interface UpdateLabelUsecase { void editLabel(Long adminId, Long labelId, EditLabelRequest request); diff --git a/src/main/java/clap/server/application/port/inbound/log/FindApiLogsUsecase.java b/src/main/java/clap/server/application/port/inbound/log/FindApiLogsUsecase.java index 43322086..dc105815 100644 --- a/src/main/java/clap/server/application/port/inbound/log/FindApiLogsUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/log/FindApiLogsUsecase.java @@ -2,15 +2,11 @@ import clap.server.adapter.inbound.web.dto.common.PageResponse; -import clap.server.adapter.inbound.web.dto.log.AnonymousLogResponse; -import clap.server.adapter.inbound.web.dto.log.FilterLogRequest; -import clap.server.adapter.inbound.web.dto.log.MemberLogResponse; -import clap.server.domain.model.log.ApiLog; -import org.springframework.data.domain.Page; +import clap.server.adapter.inbound.web.dto.log.response.AnonymousLogResponse; +import clap.server.adapter.inbound.web.dto.log.request.FilterLogRequest; +import clap.server.adapter.inbound.web.dto.log.response.MemberLogResponse; import org.springframework.data.domain.Pageable; -import java.util.List; - public interface FindApiLogsUsecase { PageResponse filterAnonymousLogs(FilterLogRequest anonymousLogsRequest, Pageable pageable, String sortDirection); PageResponse filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable, String sortDirection); diff --git a/src/main/java/clap/server/application/port/inbound/member/MemberDetailInfoUsecase.java b/src/main/java/clap/server/application/port/inbound/member/MemberDetailInfoUsecase.java index a87a094e..79c85f57 100644 --- a/src/main/java/clap/server/application/port/inbound/member/MemberDetailInfoUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/member/MemberDetailInfoUsecase.java @@ -1,6 +1,6 @@ package clap.server.application.port.inbound.member; -import clap.server.adapter.inbound.web.dto.member.MemberDetailInfoResponse; +import clap.server.adapter.inbound.web.dto.member.response.MemberDetailInfoResponse; public interface MemberDetailInfoUsecase { MemberDetailInfoResponse getMemberInfo(Long memberId); diff --git a/src/main/java/clap/server/application/port/inbound/member/MemberProfileUsecase.java b/src/main/java/clap/server/application/port/inbound/member/MemberProfileUsecase.java index e05acebd..d0cfadea 100644 --- a/src/main/java/clap/server/application/port/inbound/member/MemberProfileUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/member/MemberProfileUsecase.java @@ -1,6 +1,6 @@ package clap.server.application.port.inbound.member; -import clap.server.adapter.inbound.web.dto.member.MemberProfileResponse; +import clap.server.adapter.inbound.web.dto.member.response.MemberProfileResponse; public interface MemberProfileUsecase { MemberProfileResponse getMemberProfile(Long memberId); diff --git a/src/main/java/clap/server/application/port/inbound/member/UpdateMemberInfoUsecase.java b/src/main/java/clap/server/application/port/inbound/member/UpdateMemberInfoUsecase.java index 52aaff2a..b0587a3f 100644 --- a/src/main/java/clap/server/application/port/inbound/member/UpdateMemberInfoUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/member/UpdateMemberInfoUsecase.java @@ -1,6 +1,6 @@ package clap.server.application.port.inbound.member; -import clap.server.adapter.inbound.web.dto.member.UpdateMemberInfoRequest; +import clap.server.adapter.inbound.web.dto.member.request.UpdateMemberInfoRequest; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; diff --git a/src/main/java/clap/server/application/port/inbound/notification/CountNotificationUseCase.java b/src/main/java/clap/server/application/port/inbound/notification/CountNotificationUseCase.java index f69158a6..36d25dc6 100644 --- a/src/main/java/clap/server/application/port/inbound/notification/CountNotificationUseCase.java +++ b/src/main/java/clap/server/application/port/inbound/notification/CountNotificationUseCase.java @@ -1,6 +1,6 @@ package clap.server.application.port.inbound.notification; -import clap.server.adapter.inbound.web.dto.notification.CountNotificationResponse; +import clap.server.adapter.inbound.web.dto.notification.response.CountNotificationResponse; public interface CountNotificationUseCase { diff --git a/src/main/java/clap/server/application/port/inbound/notification/FindNotificationListUsecase.java b/src/main/java/clap/server/application/port/inbound/notification/FindNotificationListUsecase.java index 4b6f96ac..7232884b 100644 --- a/src/main/java/clap/server/application/port/inbound/notification/FindNotificationListUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/notification/FindNotificationListUsecase.java @@ -1,7 +1,7 @@ package clap.server.application.port.inbound.notification; import clap.server.adapter.inbound.web.dto.common.SliceResponse; -import clap.server.adapter.inbound.web.dto.notification.FindNotificationListResponse; +import clap.server.adapter.inbound.web.dto.notification.response.FindNotificationListResponse; import org.springframework.data.domain.Pageable; public interface FindNotificationListUsecase { diff --git a/src/main/java/clap/server/application/port/inbound/notification/SendSseUsecase.java b/src/main/java/clap/server/application/port/inbound/notification/SendSseUsecase.java index c7b4e5a3..985dc2e2 100644 --- a/src/main/java/clap/server/application/port/inbound/notification/SendSseUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/notification/SendSseUsecase.java @@ -1,6 +1,6 @@ package clap.server.application.port.inbound.notification; -import clap.server.adapter.inbound.web.dto.notification.SseRequest; +import clap.server.adapter.inbound.web.dto.notification.request.SseRequest; public interface SendSseUsecase { diff --git a/src/main/java/clap/server/application/port/inbound/task/FindManagersUsecase.java b/src/main/java/clap/server/application/port/inbound/task/FindManagersUsecase.java new file mode 100644 index 00000000..2bde8b39 --- /dev/null +++ b/src/main/java/clap/server/application/port/inbound/task/FindManagersUsecase.java @@ -0,0 +1,8 @@ +package clap.server.application.port.inbound.task; + +import clap.server.adapter.inbound.web.dto.task.response.FindManagersResponse; +import java.util.List; + +public interface FindManagersUsecase { + List findManagers(); +} diff --git a/src/main/java/clap/server/application/port/inbound/task/FindTaskHistoriesUsecase.java b/src/main/java/clap/server/application/port/inbound/task/FindTaskHistoriesUsecase.java deleted file mode 100644 index ca166c60..00000000 --- a/src/main/java/clap/server/application/port/inbound/task/FindTaskHistoriesUsecase.java +++ /dev/null @@ -1,7 +0,0 @@ -package clap.server.application.port.inbound.task; - -import clap.server.adapter.inbound.web.dto.task.response.FindTaskHistoryResponse; - -public interface FindTaskHistoriesUsecase { - FindTaskHistoryResponse findTaskHistories(Long userId, Long taskId); -} diff --git a/src/main/java/clap/server/application/port/outbound/log/LoadLogPort.java b/src/main/java/clap/server/application/port/outbound/log/LoadLogPort.java index 51314cec..c9b134bc 100644 --- a/src/main/java/clap/server/application/port/outbound/log/LoadLogPort.java +++ b/src/main/java/clap/server/application/port/outbound/log/LoadLogPort.java @@ -1,16 +1,11 @@ package clap.server.application.port.outbound.log; -import clap.server.adapter.inbound.web.dto.log.AnonymousLogResponse; -import clap.server.adapter.inbound.web.dto.log.FilterLogRequest; -import clap.server.adapter.inbound.web.dto.log.MemberLogResponse; +import clap.server.adapter.inbound.web.dto.log.request.FilterLogRequest; import clap.server.domain.model.log.AnonymousLog; -import clap.server.domain.model.log.ApiLog; import clap.server.domain.model.log.MemberLog; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import java.util.List; - public interface LoadLogPort { Page filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable, String sortDirection); diff --git a/src/main/java/clap/server/application/port/outbound/notification/LoadNotificationPort.java b/src/main/java/clap/server/application/port/outbound/notification/LoadNotificationPort.java index 4e4a8731..73d92f40 100644 --- a/src/main/java/clap/server/application/port/outbound/notification/LoadNotificationPort.java +++ b/src/main/java/clap/server/application/port/outbound/notification/LoadNotificationPort.java @@ -1,7 +1,7 @@ package clap.server.application.port.outbound.notification; import clap.server.adapter.inbound.web.dto.common.SliceResponse; -import clap.server.adapter.inbound.web.dto.notification.FindNotificationListResponse; +import clap.server.adapter.inbound.web.dto.notification.response.FindNotificationListResponse; import clap.server.domain.model.notification.Notification; import org.springframework.data.domain.Pageable; import java.util.List; diff --git a/src/main/java/clap/server/application/port/outbound/s3/S3UploadPort.java b/src/main/java/clap/server/application/port/outbound/s3/S3UploadPort.java index 63423da3..34fcaa02 100644 --- a/src/main/java/clap/server/application/port/outbound/s3/S3UploadPort.java +++ b/src/main/java/clap/server/application/port/outbound/s3/S3UploadPort.java @@ -1,12 +1,12 @@ package clap.server.application.port.outbound.s3; -import clap.server.common.constants.FilePathConstants; +import clap.server.domain.policy.attachment.FilePathPolicy; import org.springframework.web.multipart.MultipartFile; import java.util.List; public interface S3UploadPort { - List uploadFiles(FilePathConstants filePrefix, List multipartFiles); + List uploadFiles(FilePathPolicy filePrefix, List multipartFiles); - String uploadSingleFile(FilePathConstants filePrefix, MultipartFile file); + String uploadSingleFile(FilePathPolicy filePrefix, MultipartFile file); } diff --git a/src/main/java/clap/server/application/port/outbound/task/LoadLabelPort.java b/src/main/java/clap/server/application/port/outbound/task/LoadLabelPort.java index a652ae03..8b0961ec 100644 --- a/src/main/java/clap/server/application/port/outbound/task/LoadLabelPort.java +++ b/src/main/java/clap/server/application/port/outbound/task/LoadLabelPort.java @@ -1,7 +1,7 @@ package clap.server.application.port.outbound.task; import clap.server.adapter.inbound.web.dto.common.SliceResponse; -import clap.server.adapter.inbound.web.dto.label.FindLabelListResponse; +import clap.server.adapter.inbound.web.dto.label.response.FindLabelListResponse; import clap.server.domain.model.task.Label; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/clap/server/application/service/FindActiveManagersService.java b/src/main/java/clap/server/application/service/FindActiveManagersService.java deleted file mode 100644 index 06ddf464..00000000 --- a/src/main/java/clap/server/application/service/FindActiveManagersService.java +++ /dev/null @@ -1,33 +0,0 @@ -package clap.server.application.service; - -import clap.server.adapter.inbound.web.dto.admin.FindManagersResponse; -import clap.server.domain.model.member.Member; -import clap.server.application.port.inbound.domain.MemberService; -import clap.server.application.mapper.ManagersMapper; -import clap.server.application.port.inbound.domain.FindManagersUsecase; -import jakarta.transaction.Transactional; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.stream.Collectors; - -@Service // 여기 추가 -@RequiredArgsConstructor -public class FindActiveManagersService implements FindManagersUsecase { - - private final MemberService memberService; - private final ManagersMapper findManagersResponseMapper; - - @Transactional - @Override - public List execute() { - - List managers = memberService.findActiveManagers(); - - // managers를 FindManagersResponse로 매핑 - return managers.stream() - .map(findManagersResponseMapper::mapToFindManagersResponse) - .collect(Collectors.toList()); - } -} diff --git a/src/main/java/clap/server/application/service/admin/CsvParseService.java b/src/main/java/clap/server/application/service/admin/CsvParseService.java index def504c0..6fd8deb7 100644 --- a/src/main/java/clap/server/application/service/admin/CsvParseService.java +++ b/src/main/java/clap/server/application/service/admin/CsvParseService.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.List; -import static clap.server.application.mapper.MemberMapper.toMember; +import static clap.server.application.mapper.MemberResponseMapper.toMember; import static clap.server.domain.model.member.MemberInfo.toMemberInfo; diff --git a/src/main/java/clap/server/application/service/admin/FindAllCategoryService.java b/src/main/java/clap/server/application/service/admin/FindAllCategoryService.java index 27fe7c76..aa20f56d 100644 --- a/src/main/java/clap/server/application/service/admin/FindAllCategoryService.java +++ b/src/main/java/clap/server/application/service/admin/FindAllCategoryService.java @@ -2,7 +2,7 @@ import clap.server.adapter.inbound.web.dto.admin.FindAllCategoryResponse; import clap.server.adapter.inbound.web.dto.admin.FindSubCategoryResponse; -import clap.server.application.mapper.response.CategoryResponseMapper; +import clap.server.application.mapper.CategoryResponseMapper; import clap.server.application.port.inbound.admin.FindAllCategoryUsecase; import clap.server.application.port.outbound.task.LoadCategoryPort; import clap.server.common.annotation.architecture.ApplicationService; diff --git a/src/main/java/clap/server/application/service/admin/FindMainCategoryService.java b/src/main/java/clap/server/application/service/admin/FindMainCategoryService.java index 80947a51..32c042be 100644 --- a/src/main/java/clap/server/application/service/admin/FindMainCategoryService.java +++ b/src/main/java/clap/server/application/service/admin/FindMainCategoryService.java @@ -1,7 +1,7 @@ package clap.server.application.service.admin; import clap.server.adapter.inbound.web.dto.admin.FindMainCategoryResponse; -import clap.server.application.mapper.response.CategoryResponseMapper; +import clap.server.application.mapper.CategoryResponseMapper; import clap.server.application.port.inbound.admin.FindMainCategoryUsecase; import clap.server.application.port.outbound.task.LoadCategoryPort; import clap.server.common.annotation.architecture.ApplicationService; diff --git a/src/main/java/clap/server/application/service/admin/FindSubCategoryService.java b/src/main/java/clap/server/application/service/admin/FindSubCategoryService.java index 71ef4b21..7b81e68b 100644 --- a/src/main/java/clap/server/application/service/admin/FindSubCategoryService.java +++ b/src/main/java/clap/server/application/service/admin/FindSubCategoryService.java @@ -1,7 +1,7 @@ package clap.server.application.service.admin; import clap.server.adapter.inbound.web.dto.admin.FindSubCategoryResponse; -import clap.server.application.mapper.response.CategoryResponseMapper; +import clap.server.application.mapper.CategoryResponseMapper; import clap.server.application.port.inbound.admin.FindSubCategoryUsecase; import clap.server.application.port.outbound.task.LoadCategoryPort; import clap.server.common.annotation.architecture.ApplicationService; diff --git a/src/main/java/clap/server/application/service/auth/AuthService.java b/src/main/java/clap/server/application/service/auth/AuthService.java index aafac610..fb5cfe4d 100644 --- a/src/main/java/clap/server/application/service/auth/AuthService.java +++ b/src/main/java/clap/server/application/service/auth/AuthService.java @@ -2,7 +2,7 @@ import clap.server.adapter.inbound.web.dto.auth.LoginResponse; import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus; -import clap.server.application.mapper.response.AuthResponseMapper; +import clap.server.application.mapper.AuthResponseMapper; import clap.server.application.port.inbound.auth.LoginUsecase; import clap.server.application.port.inbound.auth.LogoutUsecase; import clap.server.application.port.outbound.auth.ForbiddenTokenPort; diff --git a/src/main/java/clap/server/application/service/auth/ReissueTokenService.java b/src/main/java/clap/server/application/service/auth/ReissueTokenService.java index 443a94d3..4b8efd31 100644 --- a/src/main/java/clap/server/application/service/auth/ReissueTokenService.java +++ b/src/main/java/clap/server/application/service/auth/ReissueTokenService.java @@ -11,7 +11,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.transaction.annotation.Transactional; -import static clap.server.application.mapper.response.AuthResponseMapper.toReissueTokenResponse; +import static clap.server.application.mapper.AuthResponseMapper.toReissueTokenResponse; @ApplicationService @RequiredArgsConstructor diff --git a/src/main/java/clap/server/application/service/comment/CommandCommentService.java b/src/main/java/clap/server/application/service/history/CommandCommentService.java similarity index 91% rename from src/main/java/clap/server/application/service/comment/CommandCommentService.java rename to src/main/java/clap/server/application/service/history/CommandCommentService.java index ab330b3e..d82ec5cb 100644 --- a/src/main/java/clap/server/application/service/comment/CommandCommentService.java +++ b/src/main/java/clap/server/application/service/history/CommandCommentService.java @@ -1,8 +1,8 @@ -package clap.server.application.service.comment; +package clap.server.application.service.history; -import clap.server.adapter.inbound.web.dto.comment.EditCommentRequest; -import clap.server.application.port.inbound.comment.DeleteCommentUsecase; -import clap.server.application.port.inbound.comment.EditCommentUsecase; +import clap.server.adapter.inbound.web.dto.history.EditCommentRequest; +import clap.server.application.port.inbound.history.DeleteCommentUsecase; +import clap.server.application.port.inbound.history.EditCommentUsecase; import clap.server.application.port.inbound.domain.MemberService; import clap.server.application.port.outbound.task.CommandAttachmentPort; import clap.server.application.port.outbound.task.CommandCommentPort; diff --git a/src/main/java/clap/server/application/service/task/FindTaskHistoriesService.java b/src/main/java/clap/server/application/service/history/FindTaskHistoriesService.java similarity index 81% rename from src/main/java/clap/server/application/service/task/FindTaskHistoriesService.java rename to src/main/java/clap/server/application/service/history/FindTaskHistoriesService.java index 4bb1d4a1..e67bb3e1 100644 --- a/src/main/java/clap/server/application/service/task/FindTaskHistoriesService.java +++ b/src/main/java/clap/server/application/service/history/FindTaskHistoriesService.java @@ -1,9 +1,9 @@ -package clap.server.application.service.task; +package clap.server.application.service.history; -import clap.server.adapter.inbound.web.dto.task.response.FindTaskHistoryResponse; -import clap.server.application.mapper.TaskHistoryMapper; +import clap.server.adapter.inbound.web.dto.history.response.FindTaskHistoryResponse; +import clap.server.application.mapper.TaskHistoryResponseMapper; import clap.server.application.port.inbound.domain.MemberService; -import clap.server.application.port.inbound.task.FindTaskHistoriesUsecase; +import clap.server.application.port.inbound.history.FindTaskHistoriesUsecase; import clap.server.application.port.outbound.task.LoadAttachmentPort; import clap.server.application.port.outbound.taskhistory.LoadTaskHistoryPort; @@ -35,6 +35,6 @@ public FindTaskHistoryResponse findTaskHistories(Long memberId, Long taskId) { .orElseThrow(()-> new DomainException(TaskErrorCode.TASK_NOT_FOUND)); List attachments = loadAttachmentPort.findAllByTaskIdAndCommentIsNotNull(task.getTaskId()); List taskHistories = loadTaskHistoryPort.findAllTaskHistoriesByTaskId(task.getTaskId()); - return TaskHistoryMapper.toFindTaskHistoryResponse(taskHistories, attachments); + return TaskHistoryResponseMapper.toFindTaskHistoryResponse(taskHistories, attachments); } } diff --git a/src/main/java/clap/server/application/service/comment/PostCommentService.java b/src/main/java/clap/server/application/service/history/PostCommentService.java similarity index 91% rename from src/main/java/clap/server/application/service/comment/PostCommentService.java rename to src/main/java/clap/server/application/service/history/PostCommentService.java index 8ec5f262..a6e138f7 100644 --- a/src/main/java/clap/server/application/service/comment/PostCommentService.java +++ b/src/main/java/clap/server/application/service/history/PostCommentService.java @@ -1,11 +1,11 @@ -package clap.server.application.service.comment; +package clap.server.application.service.history; -import clap.server.adapter.inbound.web.dto.comment.CreateCommentRequest; +import clap.server.adapter.inbound.web.dto.history.CreateCommentRequest; import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole; import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType; import clap.server.adapter.outbound.persistense.entity.task.constant.TaskHistoryType; -import clap.server.application.port.inbound.comment.SaveCommentAttachmentUsecase; -import clap.server.application.port.inbound.comment.SaveCommentUsecase; +import clap.server.application.port.inbound.history.SaveCommentAttachmentUsecase; +import clap.server.application.port.inbound.history.SaveCommentUsecase; import clap.server.application.port.inbound.domain.MemberService; import clap.server.application.port.inbound.domain.TaskService; import clap.server.application.port.outbound.s3.S3UploadPort; @@ -14,7 +14,7 @@ import clap.server.application.port.outbound.taskhistory.CommandTaskHistoryPort; import clap.server.application.service.webhook.SendNotificationService; import clap.server.common.annotation.architecture.ApplicationService; -import clap.server.common.constants.FilePathConstants; +import clap.server.domain.policy.attachment.FilePathPolicy; import clap.server.domain.model.member.Member; import clap.server.domain.model.task.Attachment; import clap.server.domain.model.task.Comment; @@ -82,7 +82,7 @@ public void saveCommentAttachment(Long userId, Long taskId, MultipartFile file) } private void saveAttachment(MultipartFile file, Task task, Comment comment) { - String fileUrl = s3UploadPort.uploadSingleFile(FilePathConstants.TASK_COMMENT, file); + String fileUrl = s3UploadPort.uploadSingleFile(FilePathPolicy.TASK_COMMENT, file); Attachment attachment = Attachment.createCommentAttachment(task, comment, file.getOriginalFilename(), fileUrl, file.getSize()); commandAttachmentPort.save(attachment); } diff --git a/src/main/java/clap/server/application/service/label/AddLabelService.java b/src/main/java/clap/server/application/service/label/AddLabelService.java index 38821bed..6979a053 100644 --- a/src/main/java/clap/server/application/service/label/AddLabelService.java +++ b/src/main/java/clap/server/application/service/label/AddLabelService.java @@ -1,6 +1,6 @@ package clap.server.application.service.label; -import clap.server.adapter.inbound.web.dto.label.CreateLabelRequest; +import clap.server.adapter.inbound.web.dto.label.request.CreateLabelRequest; import clap.server.application.port.inbound.label.AddLabelUsecase; import clap.server.application.port.inbound.domain.MemberService; import clap.server.application.port.outbound.task.CommandLabelPort; @@ -21,7 +21,7 @@ public class AddLabelService implements AddLabelUsecase { @Override public void addLabel(Long adminId, CreateLabelRequest request) { Member admin = memberService.findActiveMember(adminId); - Label label = Label.addLabel(admin, request); + Label label = Label.addLabel(admin, request.labelName(), request.labelColor()); commandLabelPort.save(label); } } diff --git a/src/main/java/clap/server/application/service/label/FindLabelListService.java b/src/main/java/clap/server/application/service/label/FindLabelListService.java index c61d68f1..a8d098bc 100644 --- a/src/main/java/clap/server/application/service/label/FindLabelListService.java +++ b/src/main/java/clap/server/application/service/label/FindLabelListService.java @@ -1,7 +1,7 @@ package clap.server.application.service.label; -import clap.server.adapter.inbound.web.dto.label.FindLabelListResponse; -import clap.server.application.mapper.LabelMapper; +import clap.server.adapter.inbound.web.dto.label.response.FindLabelListResponse; +import clap.server.application.mapper.LabelResponseMapper; import clap.server.application.port.inbound.domain.MemberService; import clap.server.application.port.inbound.label.FindLabelListUsecase; import clap.server.application.port.outbound.task.LoadLabelPort; @@ -24,7 +24,7 @@ public List findLabelList(Long userId) { memberService.findActiveMember(userId); return loadLabelPort.findLabelList() .stream() - .map(LabelMapper::toFindLabelListResponse) + .map(LabelResponseMapper::toFindLabelListResponse) .toList(); } } diff --git a/src/main/java/clap/server/application/service/label/ManageLabelService.java b/src/main/java/clap/server/application/service/label/ManageLabelService.java index a9cb930e..6a6b55cb 100644 --- a/src/main/java/clap/server/application/service/label/ManageLabelService.java +++ b/src/main/java/clap/server/application/service/label/ManageLabelService.java @@ -1,6 +1,6 @@ package clap.server.application.service.label; -import clap.server.adapter.inbound.web.dto.label.EditLabelRequest; +import clap.server.adapter.inbound.web.dto.label.request.EditLabelRequest; import clap.server.application.port.inbound.admin.DeleteLabelUsecase; import clap.server.application.port.inbound.label.UpdateLabelUsecase; import clap.server.application.port.inbound.domain.MemberService; diff --git a/src/main/java/clap/server/application/service/log/FindApiLogsService.java b/src/main/java/clap/server/application/service/log/FindApiLogsService.java index 02152b73..1fdc0f0a 100644 --- a/src/main/java/clap/server/application/service/log/FindApiLogsService.java +++ b/src/main/java/clap/server/application/service/log/FindApiLogsService.java @@ -1,25 +1,21 @@ package clap.server.application.service.log; import clap.server.adapter.inbound.web.dto.common.PageResponse; -import clap.server.adapter.inbound.web.dto.log.AnonymousLogResponse; -import clap.server.adapter.inbound.web.dto.log.FilterLogRequest; -import clap.server.adapter.inbound.web.dto.log.MemberLogResponse; -import clap.server.adapter.outbound.persistense.ApiLogPersistenceAdapter; -import clap.server.application.mapper.response.LogMapper; +import clap.server.adapter.inbound.web.dto.log.response.AnonymousLogResponse; +import clap.server.adapter.inbound.web.dto.log.request.FilterLogRequest; +import clap.server.adapter.inbound.web.dto.log.response.MemberLogResponse; +import clap.server.application.mapper.LogMapper; import clap.server.application.port.inbound.domain.LoginDomainService; import clap.server.application.port.inbound.log.FindApiLogsUsecase; import clap.server.application.port.outbound.log.LoadLogPort; import clap.server.common.annotation.architecture.ApplicationService; import clap.server.domain.model.log.AnonymousLog; -import clap.server.domain.model.log.ApiLog; import clap.server.domain.model.log.MemberLog; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.transaction.annotation.Transactional; -import java.util.List; - @ApplicationService @RequiredArgsConstructor @Transactional(readOnly = true) diff --git a/src/main/java/clap/server/application/service/member/MemberInfoService.java b/src/main/java/clap/server/application/service/member/MemberInfoService.java index d4e993d8..010f1ce9 100644 --- a/src/main/java/clap/server/application/service/member/MemberInfoService.java +++ b/src/main/java/clap/server/application/service/member/MemberInfoService.java @@ -1,7 +1,7 @@ package clap.server.application.service.member; -import clap.server.adapter.inbound.web.dto.member.MemberDetailInfoResponse; -import clap.server.adapter.inbound.web.dto.member.MemberProfileResponse; +import clap.server.adapter.inbound.web.dto.member.response.MemberDetailInfoResponse; +import clap.server.adapter.inbound.web.dto.member.response.MemberProfileResponse; import clap.server.application.port.inbound.domain.MemberService; import clap.server.application.port.inbound.member.MemberDetailInfoUsecase; import clap.server.application.port.inbound.member.MemberProfileUsecase; @@ -10,8 +10,8 @@ import lombok.RequiredArgsConstructor; import org.springframework.transaction.annotation.Transactional; -import static clap.server.application.mapper.MemberMapper.toMemberDetailInfoResponse; -import static clap.server.application.mapper.MemberMapper.toMemberProfileResponse; +import static clap.server.application.mapper.MemberResponseMapper.toMemberDetailInfoResponse; +import static clap.server.application.mapper.MemberResponseMapper.toMemberProfileResponse; @ApplicationService @RequiredArgsConstructor diff --git a/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java b/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java index 04bb3960..7e5afb8d 100644 --- a/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java +++ b/src/main/java/clap/server/application/service/member/UpdateMemberInfoService.java @@ -1,11 +1,11 @@ package clap.server.application.service.member; -import clap.server.adapter.inbound.web.dto.member.UpdateMemberInfoRequest; +import clap.server.adapter.inbound.web.dto.member.request.UpdateMemberInfoRequest; import clap.server.application.port.inbound.domain.MemberService; import clap.server.application.port.inbound.member.UpdateMemberInfoUsecase; import clap.server.application.port.outbound.s3.S3UploadPort; import clap.server.common.annotation.architecture.ApplicationService; -import clap.server.common.constants.FilePathConstants; +import clap.server.domain.policy.attachment.FilePathPolicy; import clap.server.common.utils.FileUtils; import clap.server.domain.model.member.Member; import clap.server.exception.ApplicationException; @@ -29,7 +29,7 @@ public void updateMemberInfo(Long memberId, UpdateMemberInfoRequest request, Mul throw new ApplicationException(FileErrorcode.UNSUPPORTED_FILE_TYPE); } Member member = memberService.findActiveMember(memberId); - String profileImageUrl = s3UploadPort.uploadSingleFile(FilePathConstants.MEMBER_IMAGE, profileImage); + String profileImageUrl = s3UploadPort.uploadSingleFile(FilePathPolicy.MEMBER_IMAGE, profileImage); member.updateMemberInfo(request.name(), request.agitNotification(), request.emailNotification(), request.kakaoWorkNotification(), profileImageUrl); } diff --git a/src/main/java/clap/server/application/service/notification/CountNotificationService.java b/src/main/java/clap/server/application/service/notification/CountNotificationService.java index 325688bc..93f6b188 100644 --- a/src/main/java/clap/server/application/service/notification/CountNotificationService.java +++ b/src/main/java/clap/server/application/service/notification/CountNotificationService.java @@ -1,6 +1,6 @@ package clap.server.application.service.notification; -import clap.server.adapter.inbound.web.dto.notification.CountNotificationResponse; +import clap.server.adapter.inbound.web.dto.notification.response.CountNotificationResponse; import clap.server.application.mapper.NotificationMapper; import clap.server.application.port.inbound.notification.CountNotificationUseCase; import clap.server.application.port.outbound.notification.LoadNotificationPort; diff --git a/src/main/java/clap/server/application/service/notification/FindNotificationListService.java b/src/main/java/clap/server/application/service/notification/FindNotificationListService.java index 5b352e10..0e949b5f 100644 --- a/src/main/java/clap/server/application/service/notification/FindNotificationListService.java +++ b/src/main/java/clap/server/application/service/notification/FindNotificationListService.java @@ -1,7 +1,7 @@ package clap.server.application.service.notification; import clap.server.adapter.inbound.web.dto.common.SliceResponse; -import clap.server.adapter.inbound.web.dto.notification.FindNotificationListResponse; +import clap.server.adapter.inbound.web.dto.notification.response.FindNotificationListResponse; import clap.server.application.port.inbound.notification.FindNotificationListUsecase; import clap.server.application.port.outbound.notification.LoadNotificationPort; import clap.server.common.annotation.architecture.ApplicationService; diff --git a/src/main/java/clap/server/application/statistics/FindSubCategoryTaskRequestService.java b/src/main/java/clap/server/application/service/statistics/FindSubCategoryTaskRequestService.java similarity index 85% rename from src/main/java/clap/server/application/statistics/FindSubCategoryTaskRequestService.java rename to src/main/java/clap/server/application/service/statistics/FindSubCategoryTaskRequestService.java index 688de788..8c42dba5 100644 --- a/src/main/java/clap/server/application/statistics/FindSubCategoryTaskRequestService.java +++ b/src/main/java/clap/server/application/service/statistics/FindSubCategoryTaskRequestService.java @@ -1,14 +1,13 @@ -package clap.server.application.statistics; +package clap.server.application.service.statistics; import clap.server.adapter.inbound.web.dto.statistics.StatisticsResponse; -import clap.server.application.mapper.response.FindTaskStatisticsMapper; +import clap.server.application.mapper.FindTaskStatisticsMapper; import clap.server.application.port.inbound.statistics.FindSubCategoryTaskRequestUsecase; import clap.server.application.port.outbound.task.TaskDocumentPort; import clap.server.common.annotation.architecture.ApplicationService; import lombok.RequiredArgsConstructor; import java.util.List; -import java.util.Map; @ApplicationService @RequiredArgsConstructor diff --git a/src/main/java/clap/server/application/statistics/FindTaskProcessService.java b/src/main/java/clap/server/application/service/statistics/FindTaskProcessService.java similarity index 79% rename from src/main/java/clap/server/application/statistics/FindTaskProcessService.java rename to src/main/java/clap/server/application/service/statistics/FindTaskProcessService.java index 6c17b3d6..ef1364f2 100644 --- a/src/main/java/clap/server/application/statistics/FindTaskProcessService.java +++ b/src/main/java/clap/server/application/service/statistics/FindTaskProcessService.java @@ -1,22 +1,22 @@ -package clap.server.application.statistics; +package clap.server.application.service.statistics; import clap.server.adapter.inbound.web.dto.statistics.StatisticsResponse; -import clap.server.application.mapper.response.FindTaskStatisticsMapper; +import clap.server.application.mapper.FindTaskStatisticsMapper; import clap.server.application.port.inbound.statistics.FindTaskProcessUsecase; import clap.server.application.port.outbound.task.TaskDocumentPort; import clap.server.common.annotation.architecture.ApplicationService; -import clap.server.domain.statistics.Statistics; +import clap.server.domain.policy.task.TaskStatisticsPolicy; import lombok.RequiredArgsConstructor; import org.springframework.transaction.annotation.Transactional; import java.util.List; -import java.util.Map; @ApplicationService @RequiredArgsConstructor @Transactional(readOnly = true) class FindTaskProcessService implements FindTaskProcessUsecase { private final TaskDocumentPort taskDocumentPort; + private final TaskStatisticsPolicy taskStatisticsPolicy; @Override public List aggregateCategoryTaskRequest(String period) { @@ -31,7 +31,7 @@ public List aggregateManagerTaskProcess(String period) { @Override public List aggregatePeriodTaskProcess(String period) { if (period.equals("week") || period.equals("month")) { - return FindTaskStatisticsMapper.toStatisticsResponse( Statistics.transformToWeekdayStatistics(taskDocumentPort.findPeriodTaskProcessByPeriod(period))); + return FindTaskStatisticsMapper.toStatisticsResponse( taskStatisticsPolicy.filterAndFormatWeekdayStatistics(taskDocumentPort.findPeriodTaskProcessByPeriod(period))); } return FindTaskStatisticsMapper.toStatisticsResponse(taskDocumentPort.findPeriodTaskProcessByPeriod(period)); } @@ -39,7 +39,7 @@ public List aggregatePeriodTaskProcess(String period) { @Override public List aggregatePeriodTaskRequest(String period) { if (period.equals("week") || period.equals("month")) { - return FindTaskStatisticsMapper.toStatisticsResponse(Statistics.transformToWeekdayStatistics(taskDocumentPort.findPeriodTaskRequestByPeriod(period))); + return FindTaskStatisticsMapper.toStatisticsResponse(taskStatisticsPolicy.filterAndFormatWeekdayStatistics(taskDocumentPort.findPeriodTaskRequestByPeriod(period))); } return FindTaskStatisticsMapper.toStatisticsResponse(taskDocumentPort.findPeriodTaskRequestByPeriod(period)); } diff --git a/src/main/java/clap/server/application/statistics/StatisticsIndexingService.java b/src/main/java/clap/server/application/service/statistics/StatisticsIndexingService.java similarity index 93% rename from src/main/java/clap/server/application/statistics/StatisticsIndexingService.java rename to src/main/java/clap/server/application/service/statistics/StatisticsIndexingService.java index a5ee5c57..d5bbec1b 100644 --- a/src/main/java/clap/server/application/statistics/StatisticsIndexingService.java +++ b/src/main/java/clap/server/application/service/statistics/StatisticsIndexingService.java @@ -1,4 +1,4 @@ -package clap.server.application.statistics; +package clap.server.application.service.statistics; import clap.server.application.port.outbound.task.LoadTaskPort; import clap.server.application.port.outbound.task.TaskDocumentPort; 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 74d3b13e..eb6f272a 100644 --- a/src/main/java/clap/server/application/service/task/ApprovalTaskService.java +++ b/src/main/java/clap/server/application/service/task/ApprovalTaskService.java @@ -5,7 +5,7 @@ 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; +import clap.server.application.mapper.TaskResponseMapper; import clap.server.application.port.inbound.domain.CategoryService; import clap.server.application.port.inbound.domain.LabelService; import clap.server.application.port.inbound.domain.MemberService; @@ -57,7 +57,7 @@ public ApprovalTaskResponse approvalTaskByReviewer(Long reviewerId, Long taskId, List receivers = List.of(reviewer, processor); publishNotification(receivers, task); - return TaskMapper.toApprovalTaskResponse(commandTaskPort.save(task)); + return TaskResponseMapper.toApprovalTaskResponse(commandTaskPort.save(task)); } @Override @@ -65,7 +65,7 @@ public FindApprovalFormResponse findApprovalForm(Long managerId, Long taskId) { memberService.findActiveMember(managerId); Task task = taskService.findById(taskId); requestedTaskUpdatePolicy.validateTaskRequested(task); - return TaskMapper.toFindApprovalFormResponse(task); + return TaskResponseMapper.toFindApprovalFormResponse(task); } private void publishNotification(List receivers, Task task){ 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 174d5b16..8f2cd5bd 100644 --- a/src/main/java/clap/server/application/service/task/CreateTaskService.java +++ b/src/main/java/clap/server/application/service/task/CreateTaskService.java @@ -3,10 +3,9 @@ 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; import clap.server.application.mapper.AttachmentMapper; -import clap.server.application.mapper.TaskMapper; +import clap.server.application.mapper.TaskResponseMapper; import clap.server.application.port.inbound.domain.CategoryService; import clap.server.application.port.inbound.domain.MemberService; import clap.server.application.port.inbound.task.CreateTaskUsecase; @@ -15,7 +14,7 @@ import clap.server.application.port.outbound.task.CommandTaskPort; import clap.server.application.service.webhook.SendNotificationService; import clap.server.common.annotation.architecture.ApplicationService; -import clap.server.common.constants.FilePathConstants; +import clap.server.domain.policy.attachment.FilePathPolicy; import clap.server.domain.model.member.Member; import clap.server.domain.model.task.Attachment; import clap.server.domain.model.task.Category; @@ -51,11 +50,11 @@ public CreateTaskResponse createTask(Long requesterId, CreateTaskRequest createT if (files != null) { saveAttachments(files, savedTask);} publishNotification(savedTask); - return TaskMapper.toCreateTaskResponse(savedTask); + return TaskResponseMapper.toCreateTaskResponse(savedTask); } private void saveAttachments(List files, Task task) { - List fileUrls = s3UploadPort.uploadFiles(FilePathConstants.TASK_IMAGE, files); + List fileUrls = s3UploadPort.uploadFiles(FilePathPolicy.TASK_IMAGE, files); List attachments = AttachmentMapper.toTaskAttachments(task, files, fileUrls); commandAttachmentPort.saveAll(attachments); } diff --git a/src/main/java/clap/server/application/service/task/FindManagersService.java b/src/main/java/clap/server/application/service/task/FindManagersService.java new file mode 100644 index 00000000..60c5d17a --- /dev/null +++ b/src/main/java/clap/server/application/service/task/FindManagersService.java @@ -0,0 +1,32 @@ +package clap.server.application.service.task; + +import clap.server.adapter.inbound.web.dto.task.response.FindManagersResponse; +import clap.server.application.port.inbound.task.FindManagersUsecase; +import clap.server.application.port.inbound.domain.MemberService; +import clap.server.common.annotation.architecture.ApplicationService; +import clap.server.domain.model.member.Member; +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; + +import java.util.List; + +import static clap.server.application.mapper.TaskResponseMapper.toFindManagersResponse; + +@ApplicationService +@RequiredArgsConstructor +public class FindManagersService implements FindManagersUsecase { + + private final MemberService memberService; + + @Transactional + @Override + public List findManagers() { + List managers = memberService.findActiveManagers(); + return managers.stream() + .map(manager -> { + int remainingTasks = memberService.getRemainingTasks(manager.getMemberId()); + return toFindManagersResponse(manager, remainingTasks); + }).toList(); + } +} +; \ No newline at end of file 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 3283d99a..1df897ed 100644 --- a/src/main/java/clap/server/application/service/task/FindTaskDetailsService.java +++ b/src/main/java/clap/server/application/service/task/FindTaskDetailsService.java @@ -2,7 +2,7 @@ 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.mapper.TaskResponseMapper; import clap.server.application.port.inbound.domain.MemberService; import clap.server.application.port.inbound.task.FindTaskDetailsUsecase; import clap.server.application.port.outbound.task.LoadAttachmentPort; @@ -32,7 +32,7 @@ public FindTaskDetailsResponse findRequestedTaskDetails(final Long requesterId, Task task = loadTaskPort.findById(taskId) .orElseThrow(()-> new ApplicationException(TaskErrorCode.TASK_NOT_FOUND)); List attachments = loadAttachmentPort.findAllByTaskIdAndCommentIsNull(taskId); - return TaskMapper.toFindTaskDetailResponse(task, attachments); + return TaskResponseMapper.toFindTaskDetailResponse(task, attachments); } @Override @@ -41,6 +41,6 @@ public FindTaskDetailsForManagerResponse findTaskDetailsForManager(final Long re Task task = loadTaskPort.findById(taskId) .orElseThrow(() -> new ApplicationException(TaskErrorCode.TASK_NOT_FOUND)); List attachments = loadAttachmentPort.findAllByTaskIdAndCommentIsNull(taskId); - return TaskMapper.toFindTaskDetailForManagerResponse(task, attachments); + return TaskResponseMapper.toFindTaskDetailForManagerResponse(task, attachments); } } 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 828aa333..7c28e2f6 100644 --- a/src/main/java/clap/server/application/service/task/FindTaskListService.java +++ b/src/main/java/clap/server/application/service/task/FindTaskListService.java @@ -7,7 +7,7 @@ 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.mapper.TaskResponseMapper; import clap.server.application.port.inbound.domain.MemberService; import clap.server.application.port.inbound.task.FindTaskListUsecase; @@ -36,27 +36,27 @@ public class FindTaskListService implements FindTaskListUsecase { public PageResponse findTasksRequestedByUser(Long requesterId, Pageable pageable, FilterTaskListRequest findTaskListRequest) { Member requester = memberService.findActiveMember(requesterId); return PageResponse.from(loadTaskPort.findTasksRequestedByUser(requester.getMemberId(), pageable, findTaskListRequest) - .map(TaskMapper::toFilterRequestedTasksResponse)); + .map(TaskResponseMapper::toFilterRequestedTasksResponse)); } @Override public PageResponse findTasksAssignedByManager(Long processorId, Pageable pageable, FilterTaskListRequest findTaskListRequest) { Member processor = memberService.findActiveMember(processorId); return PageResponse.from(loadTaskPort.findTasksAssignedByManager(processor.getMemberId(), pageable, findTaskListRequest) - .map(TaskMapper::toFilterAssignedTaskListResponse)); + .map(TaskResponseMapper::toFilterAssignedTaskListResponse)); } @Override public PageResponse findPendingApprovalTasks(Long managerId, Pageable pageable, FilterTaskListRequest filterTaskListRequest) { memberService.findActiveMember(managerId); Page taskList = loadTaskPort.findPendingApprovalTasks(pageable, filterTaskListRequest); - return PageResponse.from(taskList.map(TaskMapper::toFilterPendingApprovalTasksResponse)); + return PageResponse.from(taskList.map(TaskResponseMapper::toFilterPendingApprovalTasksResponse)); } @Override public PageResponse findAllTasks(Long managerId, Pageable pageable, FilterTaskListRequest filterTaskListRequest) { memberService.findActiveMember(managerId); return PageResponse.from(loadTaskPort.findAllTasks(pageable, filterTaskListRequest) - .map(TaskMapper::toFilterAllTasksResponse)); + .map(TaskResponseMapper::toFilterAllTasksResponse)); } } diff --git a/src/main/java/clap/server/application/service/task/GetTaskBoardService.java b/src/main/java/clap/server/application/service/task/GetTaskBoardService.java index e624f1a2..94bfd697 100644 --- a/src/main/java/clap/server/application/service/task/GetTaskBoardService.java +++ b/src/main/java/clap/server/application/service/task/GetTaskBoardService.java @@ -2,8 +2,7 @@ import clap.server.adapter.inbound.web.dto.task.request.FilterTaskBoardRequest; import clap.server.adapter.inbound.web.dto.task.response.TaskBoardResponse; -import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus; -import clap.server.application.mapper.TaskMapper; +import clap.server.application.mapper.TaskResponseMapper; import clap.server.application.port.inbound.domain.MemberService; import clap.server.application.port.inbound.task.FilterTaskBoardUsecase; import clap.server.application.port.inbound.task.GetTaskBoardUsecase; @@ -19,7 +18,6 @@ import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.List; @Slf4j @ApplicationService @@ -35,7 +33,7 @@ public TaskBoardResponse getTaskBoards(Long processorId, LocalDate untilDate, Pa memberService.findActiveMember(processorId); LocalDateTime untilDateTime = untilDate == null ? LocalDate.now().plusDays(1).atStartOfDay() : untilDate.plusDays(1).atStartOfDay(); Slice tasks = loadTaskPort.findByProcessorAndStatus(processorId, TaskValuePolicy.TASK_BOARD_STATUS_FILTER, untilDateTime, pageable); - return TaskMapper.toSliceTaskItemResponse(tasks); + return TaskResponseMapper.toSliceTaskItemResponse(tasks); } @Override @@ -43,6 +41,6 @@ public TaskBoardResponse getTaskBoardByFilter(Long processorId, LocalDate untilD memberService.findActiveMember(processorId); LocalDateTime untilDateTime = untilDate == null ? LocalDate.now().plusDays(1).atStartOfDay() : untilDate.plusDays(1).atStartOfDay(); Slice tasks = loadTaskPort.findTaskBoardByFilter(processorId, TaskValuePolicy.TASK_BOARD_STATUS_FILTER, untilDateTime, request, pageable); - return TaskMapper.toSliceTaskItemResponse(tasks); + return TaskResponseMapper.toSliceTaskItemResponse(tasks); } } 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 06d65aa3..829bbf35 100644 --- a/src/main/java/clap/server/application/service/task/UpdateTaskService.java +++ b/src/main/java/clap/server/application/service/task/UpdateTaskService.java @@ -7,7 +7,7 @@ import clap.server.adapter.inbound.web.dto.task.response.UpdateTaskResponse; import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType; import clap.server.application.mapper.AttachmentMapper; -import clap.server.application.mapper.TaskMapper; +import clap.server.application.mapper.TaskResponseMapper; import clap.server.application.port.inbound.domain.CategoryService; import clap.server.application.port.inbound.domain.LabelService; import clap.server.application.port.inbound.domain.MemberService; @@ -22,7 +22,7 @@ import clap.server.application.port.outbound.task.LoadAttachmentPort; import clap.server.application.service.webhook.SendNotificationService; import clap.server.common.annotation.architecture.ApplicationService; -import clap.server.common.constants.FilePathConstants; +import clap.server.domain.policy.attachment.FilePathPolicy; import clap.server.domain.model.member.Member; import clap.server.domain.model.task.Attachment; import clap.server.domain.model.task.Category; @@ -67,7 +67,7 @@ public UpdateTaskResponse updateTask(Long requesterId, Long taskId, UpdateTaskRe if (!updateTaskRequest.attachmentsToDelete().isEmpty()) { updateAttachments(updateTaskRequest.attachmentsToDelete(), files, task); } - return TaskMapper.toUpdateTaskResponse(updatedTask); + return TaskResponseMapper.toUpdateTaskResponse(updatedTask); } @Override @@ -79,7 +79,7 @@ public UpdateTaskResponse updateTaskState(Long memberId, Long taskId, UpdateTask Task updateTask = commandTaskPort.save(task); publishNotification(updateTask, NotificationType.STATUS_SWITCHED, String.valueOf(updateTask.getTaskStatus())); - return TaskMapper.toUpdateTaskResponse(updateTask); + return TaskResponseMapper.toUpdateTaskResponse(updateTask); } @Transactional @@ -93,7 +93,7 @@ public UpdateTaskResponse updateTaskProcessor(Long taskId, Long userId, UpdateTa Task updateTask = commandTaskPort.save(task); publishNotification(updateTask, NotificationType.PROCESSOR_CHANGED, updateTask.getProcessor().getNickname()); - return TaskMapper.toUpdateTaskResponse(updateTask); + return TaskResponseMapper.toUpdateTaskResponse(updateTask); } @Transactional @@ -105,7 +105,7 @@ public UpdateTaskResponse updateTaskLabel(Long taskId, Long userId, UpdateTaskLa task.updateLabel(label); Task updatetask = commandTaskPort.save(task); - return TaskMapper.toUpdateTaskResponse(updatetask); + return TaskResponseMapper.toUpdateTaskResponse(updatetask); } private void updateAttachments(List attachmentIdsToDelete, List files, Task task) { @@ -113,7 +113,7 @@ private void updateAttachments(List attachmentIdsToDelete, List fileUrls = s3UploadPort.uploadFiles(FilePathConstants.TASK_IMAGE, files); + List fileUrls = s3UploadPort.uploadFiles(FilePathPolicy.TASK_IMAGE, files); List attachments = AttachmentMapper.toTaskAttachments(task, files, fileUrls); commandAttachmentPort.saveAll(attachments); } diff --git a/src/main/java/clap/server/application/service/webhook/SendNotificationService.java b/src/main/java/clap/server/application/service/webhook/SendNotificationService.java index dc31d418..926b9ca0 100644 --- a/src/main/java/clap/server/application/service/webhook/SendNotificationService.java +++ b/src/main/java/clap/server/application/service/webhook/SendNotificationService.java @@ -1,6 +1,6 @@ package clap.server.application.service.webhook; -import clap.server.adapter.inbound.web.dto.notification.SseRequest; +import clap.server.adapter.inbound.web.dto.notification.request.SseRequest; import clap.server.adapter.outbound.api.dto.SendWebhookRequest; import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType; import clap.server.application.port.outbound.notification.CommandNotificationPort; diff --git a/src/main/java/clap/server/application/service/webhook/SendPushNotificationService.java b/src/main/java/clap/server/application/service/webhook/SendPushNotificationService.java index 8c3b1d0d..449a1079 100644 --- a/src/main/java/clap/server/application/service/webhook/SendPushNotificationService.java +++ b/src/main/java/clap/server/application/service/webhook/SendPushNotificationService.java @@ -1,6 +1,6 @@ package clap.server.application.service.webhook; -import clap.server.adapter.inbound.web.dto.notification.SseRequest; +import clap.server.adapter.inbound.web.dto.notification.request.SseRequest; import clap.server.adapter.outbound.api.dto.SendWebhookRequest; import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType; import clap.server.application.port.outbound.notification.CommandNotificationPort; diff --git a/src/main/java/clap/server/application/service/webhook/SendSseService.java b/src/main/java/clap/server/application/service/webhook/SendSseService.java index 6774a110..a50bba72 100644 --- a/src/main/java/clap/server/application/service/webhook/SendSseService.java +++ b/src/main/java/clap/server/application/service/webhook/SendSseService.java @@ -1,6 +1,6 @@ package clap.server.application.service.webhook; -import clap.server.adapter.inbound.web.dto.notification.SseRequest; +import clap.server.adapter.inbound.web.dto.notification.request.SseRequest; import clap.server.application.port.inbound.notification.SendSseUsecase; import clap.server.application.port.outbound.notification.LoadSsePort; import clap.server.common.annotation.architecture.ApplicationService; diff --git a/src/main/java/clap/server/config/annotation/LogType.java b/src/main/java/clap/server/common/annotation/log/LogType.java similarity index 89% rename from src/main/java/clap/server/config/annotation/LogType.java rename to src/main/java/clap/server/common/annotation/log/LogType.java index fc39f225..c6ad9a76 100644 --- a/src/main/java/clap/server/config/annotation/LogType.java +++ b/src/main/java/clap/server/common/annotation/log/LogType.java @@ -1,4 +1,4 @@ -package clap.server.config.annotation; +package clap.server.common.annotation.log; import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus; diff --git a/src/main/java/clap/server/common/annotation/architecture/DevelopOnlyApi.java b/src/main/java/clap/server/common/annotation/swagger/DevelopOnlyApi.java similarity index 83% rename from src/main/java/clap/server/common/annotation/architecture/DevelopOnlyApi.java rename to src/main/java/clap/server/common/annotation/swagger/DevelopOnlyApi.java index 2624d140..191f7bb6 100644 --- a/src/main/java/clap/server/common/annotation/architecture/DevelopOnlyApi.java +++ b/src/main/java/clap/server/common/annotation/swagger/DevelopOnlyApi.java @@ -1,4 +1,4 @@ -package clap.server.common.annotation.architecture; +package clap.server.common.annotation.swagger; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/clap/server/config/aop/LoggingAspect.java b/src/main/java/clap/server/config/aop/LoggingAspect.java index 8c9a47b7..7112b48a 100644 --- a/src/main/java/clap/server/config/aop/LoggingAspect.java +++ b/src/main/java/clap/server/config/aop/LoggingAspect.java @@ -5,9 +5,8 @@ import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus; import clap.server.application.port.inbound.log.CreateAnonymousLogsUsecase; import clap.server.application.port.inbound.log.CreateMemberLogsUsecase; -import clap.server.config.annotation.LogType; +import clap.server.common.annotation.log.LogType; import clap.server.exception.BaseException; -import clap.server.exception.ErrorContext; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.http.HttpServletRequest; @@ -19,11 +18,9 @@ import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; -import org.springframework.http.HttpStatus; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; -import org.springframework.web.server.ResponseStatusException; import org.springframework.web.servlet.HandlerExceptionResolver; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.util.ContentCachingRequestWrapper; diff --git a/src/main/java/clap/server/domain/model/task/Label.java b/src/main/java/clap/server/domain/model/task/Label.java index cbd477a6..4f702d1b 100644 --- a/src/main/java/clap/server/domain/model/task/Label.java +++ b/src/main/java/clap/server/domain/model/task/Label.java @@ -1,7 +1,7 @@ package clap.server.domain.model.task; -import clap.server.adapter.inbound.web.dto.label.CreateLabelRequest; -import clap.server.adapter.inbound.web.dto.label.EditLabelRequest; +import clap.server.adapter.inbound.web.dto.label.request.CreateLabelRequest; +import clap.server.adapter.inbound.web.dto.label.request.EditLabelRequest; import clap.server.adapter.outbound.persistense.entity.task.constant.LabelColor; import clap.server.domain.model.common.BaseTime; import clap.server.domain.model.member.Member; @@ -20,11 +20,11 @@ public class Label extends BaseTime { private LabelColor labelColor; private boolean isDeleted; - public static Label addLabel(Member admin, CreateLabelRequest request) { + public static Label addLabel(Member admin, String labelName, LabelColor labelColor) { return Label.builder() .admin(admin) - .labelName(request.labelName()) - .labelColor(request.labelColor()) + .labelName(labelName) + .labelColor(labelColor) .isDeleted(false) .build(); } diff --git a/src/main/java/clap/server/common/constants/FilePathConstants.java b/src/main/java/clap/server/domain/policy/attachment/FilePathPolicy.java similarity index 77% rename from src/main/java/clap/server/common/constants/FilePathConstants.java rename to src/main/java/clap/server/domain/policy/attachment/FilePathPolicy.java index 3d2e6fd5..8d15a9b9 100644 --- a/src/main/java/clap/server/common/constants/FilePathConstants.java +++ b/src/main/java/clap/server/domain/policy/attachment/FilePathPolicy.java @@ -1,11 +1,11 @@ -package clap.server.common.constants; +package clap.server.domain.policy.attachment; import lombok.Getter; import lombok.RequiredArgsConstructor; @Getter @RequiredArgsConstructor -public enum FilePathConstants { +public enum FilePathPolicy { TASK_IMAGE("task/image"), TASK_DOCUMENT("task/docs"), TASK_COMMENT("task/comments"), diff --git a/src/main/java/clap/server/domain/policy/task/TaskStatisticsPolicy.java b/src/main/java/clap/server/domain/policy/task/TaskStatisticsPolicy.java new file mode 100644 index 00000000..67106ccb --- /dev/null +++ b/src/main/java/clap/server/domain/policy/task/TaskStatisticsPolicy.java @@ -0,0 +1,37 @@ +package clap.server.domain.policy.task; + +import clap.server.common.annotation.architecture.Policy; + +import java.time.DayOfWeek; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.Map; +import java.util.Map.Entry; +import java.util.TreeMap; +import java.util.stream.Collectors; + +@Policy +public class TaskStatisticsPolicy { + private static final String DISPLAY_FORMAT = "MM월 dd일"; + + public Map filterAndFormatWeekdayStatistics(Map statistics) { + return statistics.entrySet().stream() + .filter(this::isWeekday) + .collect(Collectors.toMap( + entry -> formatDate(entry.getKey()), + Entry::getValue, + (v1, v2) -> v1, + TreeMap::new + )); + } + + private boolean isWeekday(Entry entry) { + LocalDate date = LocalDate.parse(entry.getKey()); + return !(date.getDayOfWeek() == DayOfWeek.SATURDAY || date.getDayOfWeek() == DayOfWeek.SUNDAY); + } + + private String formatDate(String dateString) { + LocalDate date = LocalDate.parse(dateString); + return date.format(DateTimeFormatter.ofPattern(DISPLAY_FORMAT)); + } +} diff --git a/src/main/java/clap/server/domain/statistics/Statistics.java b/src/main/java/clap/server/domain/statistics/Statistics.java deleted file mode 100644 index 8df5790b..00000000 --- a/src/main/java/clap/server/domain/statistics/Statistics.java +++ /dev/null @@ -1,31 +0,0 @@ -package clap.server.domain.statistics; - -import lombok.AccessLevel; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import java.time.DayOfWeek; -import java.time.LocalDate; -import java.util.Map; -import java.util.Map.Entry; -import java.util.TreeMap; - -@Getter -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class Statistics { - public static Map transformToWeekdayStatistics(Map statistics) { - TreeMap result = new TreeMap<>(); - - for (Entry statistic : statistics.entrySet()) { - String stringDate = statistic.getKey(); - LocalDate date = LocalDate.parse(stringDate); - - if (!(date.getDayOfWeek() == DayOfWeek.SATURDAY || date.getDayOfWeek() == DayOfWeek.SUNDAY)) { - result.put(stringDate.substring(6, 10).replace("-", "월 ") + "일", statistic.getValue()); - } - } - - return result; - - } -} 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 40018268..c389d366 100644 --- a/src/test/java/clap/server/application/service/task/FindTaskListServiceTest.java +++ b/src/test/java/clap/server/application/service/task/FindTaskListServiceTest.java @@ -3,7 +3,7 @@ import clap.server.adapter.inbound.web.dto.common.PageResponse; 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.mapper.TaskResponseMapper; import clap.server.application.port.inbound.domain.MemberService; import clap.server.application.port.outbound.task.LoadTaskPort; import clap.server.domain.model.task.Task; @@ -59,7 +59,7 @@ void setUp() { pageResponse = new PageImpl<>(List.of(task1, task2), pageable, 2); - expectedResponse = PageResponse.from(pageResponse.map(TaskMapper::toFilterPendingApprovalTasksResponse)); + expectedResponse = PageResponse.from(pageResponse.map(TaskResponseMapper::toFilterPendingApprovalTasksResponse)); } //@Test