From fd31da53e6d188c672c539dcd59c404c418d9831 Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Mon, 3 Feb 2025 21:01:01 +0900 Subject: [PATCH 1/5] =?UTF-8?q?CLAP-246=20Refactor:=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=20=EC=84=9C=EB=B9=84=EC=8A=A4=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistense/ApiLogPersistenceAdapter.java | 2 ++ .../inbound/domain/LogService.java} | 24 ++++++++--------- .../log/CreateAnonymousLogsUsecase.java | 12 --------- .../inbound/log/CreateMemberLogsUsecase.java | 12 --------- .../log/CreateAnonymousLogsService.java | 26 ------------------- .../clap/server/config/aop/LoggingAspect.java | 10 +++---- 6 files changed, 17 insertions(+), 69 deletions(-) rename src/main/java/clap/server/application/{service/log/CreateMemberLogsService.java => port/inbound/domain/LogService.java} (61%) delete mode 100644 src/main/java/clap/server/application/port/inbound/log/CreateAnonymousLogsUsecase.java delete mode 100644 src/main/java/clap/server/application/port/inbound/log/CreateMemberLogsUsecase.java delete mode 100644 src/main/java/clap/server/application/service/log/CreateAnonymousLogsService.java 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 e1a03723..c25947e2 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/ApiLogPersistenceAdapter.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/ApiLogPersistenceAdapter.java @@ -16,6 +16,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; +import org.springframework.transaction.annotation.Transactional; @PersistenceAdapter @@ -28,6 +29,7 @@ public class ApiLogPersistenceAdapter implements CommandLogPort, LoadLogPort { private final ApiLogPersistenceMapper apiLogPersistenceMapper; private final MemberPersistenceMapper memberPersistenceMapper; + @Transactional @Override public void saveMemberLog(MemberLog memberLog) { apiLogRepository.save(apiLogPersistenceMapper.mapMemberLogToEntity(memberLog, memberPersistenceMapper.toEntity(memberLog.getMember()))); diff --git a/src/main/java/clap/server/application/service/log/CreateMemberLogsService.java b/src/main/java/clap/server/application/port/inbound/domain/LogService.java similarity index 61% rename from src/main/java/clap/server/application/service/log/CreateMemberLogsService.java rename to src/main/java/clap/server/application/port/inbound/domain/LogService.java index e1e602f8..206ed552 100644 --- a/src/main/java/clap/server/application/service/log/CreateMemberLogsService.java +++ b/src/main/java/clap/server/application/port/inbound/domain/LogService.java @@ -1,29 +1,27 @@ -package clap.server.application.service.log; +package clap.server.application.port.inbound.domain; -import clap.server.adapter.outbound.persistense.ApiLogPersistenceAdapter; import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus; -import clap.server.application.port.inbound.domain.MemberService; -import clap.server.application.port.inbound.log.CreateMemberLogsUsecase; import clap.server.application.port.outbound.log.CommandLogPort; -import clap.server.common.annotation.architecture.ApplicationService; +import clap.server.domain.model.log.AnonymousLog; import clap.server.domain.model.log.MemberLog; import clap.server.domain.model.member.Member; import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDateTime; - -@ApplicationService +@Service @RequiredArgsConstructor -public class CreateMemberLogsService implements CreateMemberLogsUsecase { - +@Transactional +public class LogService { private final CommandLogPort commandLogPort; private final MemberService memberService; - @Override - @Transactional + public void createAnonymousLog(HttpServletRequest request, int statusCode, String customCode, LogStatus logStatus, Object responseBody, String requestBody, String nickName) { + AnonymousLog anonymousLog = AnonymousLog.createAnonymousLog(request, statusCode,customCode, logStatus, responseBody, requestBody, nickName); + commandLogPort.saveAnonymousLog(anonymousLog); + } + public void createMemberLog(HttpServletRequest request, int statusCode, String customCode,LogStatus logStatus, Object responseBody, String requestBody, Long userId) { Member member = memberService.findById(userId); MemberLog memberLog = MemberLog.createMemberLog(request, statusCode, customCode, logStatus, responseBody, requestBody, member); diff --git a/src/main/java/clap/server/application/port/inbound/log/CreateAnonymousLogsUsecase.java b/src/main/java/clap/server/application/port/inbound/log/CreateAnonymousLogsUsecase.java deleted file mode 100644 index 342dc2ea..00000000 --- a/src/main/java/clap/server/application/port/inbound/log/CreateAnonymousLogsUsecase.java +++ /dev/null @@ -1,12 +0,0 @@ -package clap.server.application.port.inbound.log; - -import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -import java.time.LocalDateTime; - -public interface CreateAnonymousLogsUsecase { - void createAnonymousLog(HttpServletRequest request, int statusCode, String customCode, LogStatus logStatus, Object responseBody, String requestBody, String nickName); - -} diff --git a/src/main/java/clap/server/application/port/inbound/log/CreateMemberLogsUsecase.java b/src/main/java/clap/server/application/port/inbound/log/CreateMemberLogsUsecase.java deleted file mode 100644 index 756ae736..00000000 --- a/src/main/java/clap/server/application/port/inbound/log/CreateMemberLogsUsecase.java +++ /dev/null @@ -1,12 +0,0 @@ -package clap.server.application.port.inbound.log; - -import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -import java.time.LocalDateTime; - -public interface CreateMemberLogsUsecase { - - void createMemberLog(HttpServletRequest request, int statusCode,String customCode, LogStatus logStatus, Object responseBody, String requestBody, Long userId); -} diff --git a/src/main/java/clap/server/application/service/log/CreateAnonymousLogsService.java b/src/main/java/clap/server/application/service/log/CreateAnonymousLogsService.java deleted file mode 100644 index 16d9d002..00000000 --- a/src/main/java/clap/server/application/service/log/CreateAnonymousLogsService.java +++ /dev/null @@ -1,26 +0,0 @@ -package clap.server.application.service.log; - -import clap.server.adapter.outbound.persistense.ApiLogPersistenceAdapter; -import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus; -import clap.server.application.port.inbound.log.CreateAnonymousLogsUsecase; -import clap.server.application.port.outbound.log.CommandLogPort; -import clap.server.common.annotation.architecture.ApplicationService; -import clap.server.domain.model.log.AnonymousLog; - -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import lombok.RequiredArgsConstructor; - -import java.time.LocalDateTime; - -@ApplicationService -@RequiredArgsConstructor -public class CreateAnonymousLogsService implements CreateAnonymousLogsUsecase { - private final CommandLogPort commandLogPort; - - @Override - public void createAnonymousLog(HttpServletRequest request, int statusCode, String customCode, LogStatus logStatus, Object responseBody, String requestBody, String nickName) { - AnonymousLog anonymousLog = AnonymousLog.createAnonymousLog(request, statusCode,customCode, logStatus, responseBody, requestBody, nickName); - commandLogPort.saveAnonymousLog(anonymousLog); - } -} diff --git a/src/main/java/clap/server/config/aop/LoggingAspect.java b/src/main/java/clap/server/config/aop/LoggingAspect.java index b914c6c5..c7c3fda6 100644 --- a/src/main/java/clap/server/config/aop/LoggingAspect.java +++ b/src/main/java/clap/server/config/aop/LoggingAspect.java @@ -3,8 +3,7 @@ import clap.server.adapter.inbound.security.service.SecurityUserDetails; 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.application.port.inbound.domain.LogService; import clap.server.common.annotation.log.LogType; import clap.server.exception.BaseException; import com.fasterxml.jackson.databind.JsonNode; @@ -35,9 +34,8 @@ @RequiredArgsConstructor public class LoggingAspect { private final ObjectMapper objectMapper; - private final CreateAnonymousLogsUsecase createAnonymousLogsUsecase; - private final CreateMemberLogsUsecase createMemberLogsUsecase; private final HandlerExceptionResolver handlerExceptionResolver; + private final LogService logService; @Pointcut("execution(* clap.server.adapter.inbound.web..*Controller.*(..))") public void controllerMethods() { @@ -74,14 +72,14 @@ public Object logApiRequests(ProceedingJoinPoint joinPoint) throws Throwable { if (logStatus != null) { if (LogStatus.LOGIN.equals(logStatus)) { - createAnonymousLogsUsecase.createAnonymousLog(request, statusCode, customCode, logStatus, result, getRequestBody(request), getNicknameFromRequestBody(request)); + logService.createAnonymousLog(request, statusCode, customCode, logStatus, result, getRequestBody(request), getNicknameFromRequestBody(request)); } else { if (!isUserAuthenticated()) { log.error("로그인 시도 로그를 기록할 수 없음"); } else { Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal(); if (principal instanceof SecurityUserDetails userDetails) { - createMemberLogsUsecase.createMemberLog(request, statusCode, customCode, logStatus, result, getRequestBody(request), userDetails.getUserId()); + logService.createMemberLog(request, statusCode, customCode, logStatus, result, getRequestBody(request), userDetails.getUserId()); } } } From 8e8ab49234632d89f70e2aff5105d822432b5946 Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Tue, 4 Feb 2025 09:26:19 +0900 Subject: [PATCH 2/5] =?UTF-8?q?CLAP-246=20Refactor:=20logstatus=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../outbound/persistense/entity/log/constant/LogStatus.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/clap/server/adapter/outbound/persistense/entity/log/constant/LogStatus.java b/src/main/java/clap/server/adapter/outbound/persistense/entity/log/constant/LogStatus.java index 1824c085..85d283c6 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/entity/log/constant/LogStatus.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/entity/log/constant/LogStatus.java @@ -7,6 +7,7 @@ @RequiredArgsConstructor public enum LogStatus { LOGIN("로그인"), + LOGOUT("로그아웃"), REQUEST_CREATED("요청 생성"), REQUEST_UPDATED("요청 수정"), REQUEST_CANCELLED("요청 취소"), @@ -15,8 +16,6 @@ public enum LogStatus { COMMENT_ADDED("댓글 추가"), COMMENT_UPDATED("댓글 수정"), STATUS_CHANGED("작업 상태 변경"), - TASK_COMPLETED("작업 완료"), - TASK_FAILED("작업 실패"), TASK_VIEWED("작업 조회"); private final String description; From 4b76d750f1bfdf4b4acadf1334a41b1ad4af35a1 Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Tue, 4 Feb 2025 09:52:54 +0900 Subject: [PATCH 3/5] =?UTF-8?q?CLAP-246=20Refactor:=20=EC=9E=91=EC=97=85?= =?UTF-8?q?=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20valid=20=EA=B2=80?= =?UTF-8?q?=EC=A6=9D=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/inbound/web/task/FindTaskController.java | 12 ++++++++---- .../java/clap/server/config/aop/LoggingAspect.java | 6 ++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/clap/server/adapter/inbound/web/task/FindTaskController.java b/src/main/java/clap/server/adapter/inbound/web/task/FindTaskController.java index 2ed66abf..8029bc82 100644 --- a/src/main/java/clap/server/adapter/inbound/web/task/FindTaskController.java +++ b/src/main/java/clap/server/adapter/inbound/web/task/FindTaskController.java @@ -4,11 +4,14 @@ 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.*; +import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus; import clap.server.application.port.inbound.task.FindTaskDetailsUsecase; import clap.server.application.port.inbound.task.FindTaskListUsecase; import clap.server.common.annotation.architecture.WebAdapter; +import clap.server.common.annotation.log.LogType; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; @@ -28,12 +31,13 @@ public class FindTaskController { private final FindTaskListUsecase taskListUsecase; @Operation(summary = "사용자 요청 작업 목록 조회") + @LogType(LogStatus.TASK_VIEWED) @Secured({"ROLE_USER", "ROLE_MANAGER"}) @GetMapping("/requests") public ResponseEntity> findTasksRequestedByUser( @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "20") int pageSize, - @ModelAttribute FilterTaskListRequest filterTaskListRequest, + @ModelAttribute @Valid FilterTaskListRequest filterTaskListRequest, @AuthenticationPrincipal SecurityUserDetails userInfo){ Pageable pageable = PageRequest.of(page, pageSize); return ResponseEntity.ok(taskListUsecase.findTasksRequestedByUser(userInfo.getUserId(), pageable, filterTaskListRequest)); @@ -54,7 +58,7 @@ public ResponseEntity findRequestedTaskDetails( public ResponseEntity> findTasksAssignedByManager( @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "20") int pageSize, - @ModelAttribute FilterTaskListRequest filterTaskListRequest, + @ModelAttribute @Valid FilterTaskListRequest filterTaskListRequest, @AuthenticationPrincipal SecurityUserDetails userInfo){ Pageable pageable = PageRequest.of(page, pageSize); return ResponseEntity.ok(taskListUsecase.findTasksAssignedByManager(userInfo.getUserId(), pageable, filterTaskListRequest)); @@ -66,7 +70,7 @@ public ResponseEntity> findTasksAss public ResponseEntity> findPendingApprovalTasks( @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "20") int pageSize, - @ModelAttribute FilterTaskListRequest filterTaskListRequest, + @ModelAttribute @Valid FilterTaskListRequest filterTaskListRequest, @AuthenticationPrincipal SecurityUserDetails userInfo){ Pageable pageable = PageRequest.of(page, pageSize); return ResponseEntity.ok(taskListUsecase.findPendingApprovalTasks(userInfo.getUserId(), pageable, filterTaskListRequest)); @@ -78,7 +82,7 @@ public ResponseEntity> findPendingAp public ResponseEntity> findAllTasks( @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "20") int pageSize, - @ModelAttribute FilterTaskListRequest filterTaskListRequest, + @ModelAttribute @Valid FilterTaskListRequest filterTaskListRequest, @AuthenticationPrincipal SecurityUserDetails userInfo){ Pageable pageable = PageRequest.of(page, pageSize); return ResponseEntity.ok(taskListUsecase.findAllTasks(userInfo.getUserId(), pageable, filterTaskListRequest)); diff --git a/src/main/java/clap/server/config/aop/LoggingAspect.java b/src/main/java/clap/server/config/aop/LoggingAspect.java index c7c3fda6..75eea464 100644 --- a/src/main/java/clap/server/config/aop/LoggingAspect.java +++ b/src/main/java/clap/server/config/aop/LoggingAspect.java @@ -12,6 +12,7 @@ import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.http.HttpStatus; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -56,15 +57,12 @@ public Object logApiRequests(ProceedingJoinPoint joinPoint) throws Throwable { throw ex; } finally { LogStatus logStatus = getLogType((MethodSignature) joinPoint.getSignature()); - int statusCode; + int statusCode = HttpStatus.SC_INTERNAL_SERVER_ERROR; String customCode = null; if (capturedException != null) { if (capturedException instanceof BaseException e) { statusCode = e.getCode().getHttpStatus().value(); customCode = e.getCode().getCustomCode(); - } else { - ModelAndView modelAndView = handlerExceptionResolver.resolveException(request, response, null, capturedException); - statusCode = modelAndView.getStatus().value(); } } else { statusCode = response.getStatus(); From 0c4f65e1c9459c2684f9e8c86a5d2fd7bf77be58 Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Tue, 4 Feb 2025 09:57:07 +0900 Subject: [PATCH 4/5] =?UTF-8?q?CLAP-246=20Refactor:=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=20import=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/inbound/web/admin/AddCategoryController.java | 4 ++-- .../adapter/inbound/web/admin/FindCategoryController.java | 6 +++--- .../adapter/inbound/web/admin/FindMemberController.java | 4 ++-- .../adapter/inbound/web/admin/ManageMemberController.java | 2 +- .../adapter/inbound/web/admin/RegisterMemberController.java | 2 +- .../adapter/inbound/web/admin/SendInvitationController.java | 2 +- .../adapter/inbound/web/admin/UpdateCategoryController.java | 2 +- .../server/adapter/inbound/web/auth/AuthController.java | 4 ++-- .../adapter/inbound/web/auth/ReissueTokenController.java | 2 +- .../web/dto/admin/request/AddMainCategoryRequest.java | 2 +- .../web/dto/admin/request/AddSubCategoryRequest.java | 2 +- .../inbound/web/dto/admin/request/FindMemberRequest.java | 2 +- .../web/dto/admin/request/RegisterMemberRequest.java | 2 +- .../web/dto/admin/request/SendInvitationRequest.java | 2 +- .../web/dto/admin/request/UpdateCategoryRequest.java | 2 +- .../inbound/web/dto/admin/request/UpdateMemberRequest.java | 2 +- .../web/dto/admin/response/FindAllCategoryResponse.java | 2 +- .../web/dto/admin/response/FindMainCategoryResponse.java | 2 +- .../web/dto/admin/response/FindSubCategoryResponse.java | 2 +- .../web/dto/admin/response/RetrieveAllMemberResponse.java | 2 +- .../adapter/inbound/web/dto/auth/request/LoginRequest.java | 2 +- .../inbound/web/dto/auth/response/LoginResponse.java | 2 +- .../inbound/web/dto/auth/response/MemberInfoResponse.java | 2 +- .../inbound/web/dto/auth/response/ReissueTokenResponse.java | 2 +- .../web/dto/history/request/CreateCommentRequest.java | 2 +- .../inbound/web/dto/history/request/EditCommentRequest.java | 2 +- .../outbound/persistense/MemberPersistenceAdapter.java | 2 +- .../repository/member/MemberCustomRepository.java | 2 +- .../repository/member/MemberCustomRepositoryImpl.java | 2 +- .../clap/server/application/mapper/AuthResponseMapper.java | 6 +++--- .../server/application/mapper/CategoryResponseMapper.java | 6 +++--- .../server/application/mapper/RetrieveAllMemberMapper.java | 2 +- .../port/inbound/admin/FindAllCategoryUsecase.java | 2 +- .../port/inbound/admin/FindMainCategoryUsecase.java | 2 +- .../port/inbound/admin/FindMembersWithFilterUsecase.java | 2 +- .../port/inbound/admin/FindSubCategoryUsecase.java | 2 +- .../port/inbound/admin/RegisterMemberUsecase.java | 2 +- .../port/inbound/admin/SendInvitationUsecase.java | 2 +- .../application/port/inbound/admin/UpdateMemberUsecase.java | 2 +- .../server/application/port/inbound/auth/LoginUsecase.java | 2 +- .../application/port/inbound/auth/ReissueTokenUsecase.java | 2 +- .../port/inbound/history/EditCommentUsecase.java | 2 +- .../port/inbound/history/SaveCommentUsecase.java | 2 +- .../inbound/management/FindMembersWithFilterUsecase.java | 2 +- .../application/port/outbound/member/LoadMemberPort.java | 2 +- .../application/service/admin/FindAllCategoryService.java | 4 ++-- .../application/service/admin/FindMainCategoryService.java | 2 +- .../service/admin/FindMembersWithFilterService.java | 2 +- .../application/service/admin/FindSubCategoryService.java | 2 +- .../application/service/admin/RegisterMemberService.java | 2 +- .../application/service/admin/SendInvitationService.java | 2 +- .../application/service/admin/UpdateMemberService.java | 2 +- .../clap/server/application/service/auth/AuthService.java | 2 +- .../application/service/auth/ReissueTokenService.java | 2 +- .../application/service/history/CommandCommentService.java | 2 +- .../application/service/history/PostCommentService.java | 2 +- 56 files changed, 66 insertions(+), 66 deletions(-) diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java index bed16e3f..1d195c1d 100644 --- a/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java +++ b/src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java @@ -1,8 +1,8 @@ package clap.server.adapter.inbound.web.admin; import clap.server.adapter.inbound.security.service.SecurityUserDetails; -import clap.server.adapter.inbound.web.dto.admin.AddMainCategoryRequest; -import clap.server.adapter.inbound.web.dto.admin.AddSubCategoryRequest; +import clap.server.adapter.inbound.web.dto.admin.request.AddMainCategoryRequest; +import clap.server.adapter.inbound.web.dto.admin.request.AddSubCategoryRequest; import clap.server.application.port.inbound.admin.AddMainCategoryUsecase; import clap.server.application.port.inbound.admin.AddSubCategoryUsecase; import clap.server.common.annotation.architecture.WebAdapter; diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java index 16b74c08..00cfd3e4 100644 --- a/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java +++ b/src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java @@ -1,8 +1,8 @@ package clap.server.adapter.inbound.web.admin; -import clap.server.adapter.inbound.web.dto.admin.FindAllCategoryResponse; -import clap.server.adapter.inbound.web.dto.admin.FindMainCategoryResponse; -import clap.server.adapter.inbound.web.dto.admin.FindSubCategoryResponse; +import clap.server.adapter.inbound.web.dto.admin.response.FindAllCategoryResponse; +import clap.server.adapter.inbound.web.dto.admin.response.FindMainCategoryResponse; +import clap.server.adapter.inbound.web.dto.admin.response.FindSubCategoryResponse; import clap.server.application.port.inbound.admin.FindAllCategoryUsecase; import clap.server.application.port.inbound.admin.FindMainCategoryUsecase; import clap.server.application.port.inbound.admin.FindSubCategoryUsecase; diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/FindMemberController.java b/src/main/java/clap/server/adapter/inbound/web/admin/FindMemberController.java index 94f3607b..2a7c9837 100644 --- a/src/main/java/clap/server/adapter/inbound/web/admin/FindMemberController.java +++ b/src/main/java/clap/server/adapter/inbound/web/admin/FindMemberController.java @@ -1,7 +1,7 @@ package clap.server.adapter.inbound.web.admin; -import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest; -import clap.server.adapter.inbound.web.dto.admin.RetrieveAllMemberResponse; +import clap.server.adapter.inbound.web.dto.admin.request.FindMemberRequest; +import clap.server.adapter.inbound.web.dto.admin.response.RetrieveAllMemberResponse; import clap.server.application.mapper.RetrieveAllMemberMapper; import clap.server.application.port.inbound.admin.FindAllMembersUsecase; import clap.server.application.port.inbound.admin.FindMembersWithFilterUsecase; diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/ManageMemberController.java b/src/main/java/clap/server/adapter/inbound/web/admin/ManageMemberController.java index e2147365..6684071c 100644 --- a/src/main/java/clap/server/adapter/inbound/web/admin/ManageMemberController.java +++ b/src/main/java/clap/server/adapter/inbound/web/admin/ManageMemberController.java @@ -1,7 +1,7 @@ package clap.server.adapter.inbound.web.admin; import clap.server.adapter.inbound.security.service.SecurityUserDetails; -import clap.server.adapter.inbound.web.dto.admin.UpdateMemberRequest; +import clap.server.adapter.inbound.web.dto.admin.request.UpdateMemberRequest; import clap.server.application.port.inbound.admin.UpdateMemberUsecase; import clap.server.common.annotation.architecture.WebAdapter; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/RegisterMemberController.java b/src/main/java/clap/server/adapter/inbound/web/admin/RegisterMemberController.java index e04542d8..017b6f98 100644 --- a/src/main/java/clap/server/adapter/inbound/web/admin/RegisterMemberController.java +++ b/src/main/java/clap/server/adapter/inbound/web/admin/RegisterMemberController.java @@ -1,7 +1,7 @@ package clap.server.adapter.inbound.web.admin; import clap.server.adapter.inbound.security.service.SecurityUserDetails; -import clap.server.adapter.inbound.web.dto.admin.RegisterMemberRequest; +import clap.server.adapter.inbound.web.dto.admin.request.RegisterMemberRequest; import clap.server.application.port.inbound.admin.RegisterMemberUsecase; import clap.server.common.annotation.architecture.WebAdapter; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/SendInvitationController.java b/src/main/java/clap/server/adapter/inbound/web/admin/SendInvitationController.java index c82d59b4..36cb4040 100644 --- a/src/main/java/clap/server/adapter/inbound/web/admin/SendInvitationController.java +++ b/src/main/java/clap/server/adapter/inbound/web/admin/SendInvitationController.java @@ -1,6 +1,6 @@ package clap.server.adapter.inbound.web.admin; -import clap.server.adapter.inbound.web.dto.admin.SendInvitationRequest; +import clap.server.adapter.inbound.web.dto.admin.request.SendInvitationRequest; import clap.server.application.port.inbound.admin.SendInvitationUsecase; import clap.server.common.annotation.architecture.WebAdapter; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java b/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java index c1e411d2..3bf301ba 100644 --- a/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java +++ b/src/main/java/clap/server/adapter/inbound/web/admin/UpdateCategoryController.java @@ -1,7 +1,7 @@ package clap.server.adapter.inbound.web.admin; import clap.server.adapter.inbound.security.service.SecurityUserDetails; -import clap.server.adapter.inbound.web.dto.admin.UpdateCategoryRequest; +import clap.server.adapter.inbound.web.dto.admin.request.UpdateCategoryRequest; import clap.server.application.port.inbound.admin.UpdateCategoryUsecase; import clap.server.common.annotation.architecture.WebAdapter; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/clap/server/adapter/inbound/web/auth/AuthController.java b/src/main/java/clap/server/adapter/inbound/web/auth/AuthController.java index 549c193c..5f4b5366 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 @@ -1,8 +1,8 @@ package clap.server.adapter.inbound.web.auth; import clap.server.adapter.inbound.security.service.SecurityUserDetails; -import clap.server.adapter.inbound.web.dto.auth.LoginRequest; -import clap.server.adapter.inbound.web.dto.auth.LoginResponse; +import clap.server.adapter.inbound.web.dto.auth.request.LoginRequest; +import clap.server.adapter.inbound.web.dto.auth.response.LoginResponse; import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus; import clap.server.application.port.inbound.auth.LoginUsecase; import clap.server.application.port.inbound.auth.LogoutUsecase; diff --git a/src/main/java/clap/server/adapter/inbound/web/auth/ReissueTokenController.java b/src/main/java/clap/server/adapter/inbound/web/auth/ReissueTokenController.java index b59880cb..1b93734c 100644 --- a/src/main/java/clap/server/adapter/inbound/web/auth/ReissueTokenController.java +++ b/src/main/java/clap/server/adapter/inbound/web/auth/ReissueTokenController.java @@ -1,6 +1,6 @@ package clap.server.adapter.inbound.web.auth; -import clap.server.adapter.inbound.web.dto.auth.ReissueTokenResponse; +import clap.server.adapter.inbound.web.dto.auth.response.ReissueTokenResponse; import clap.server.application.port.inbound.auth.ReissueTokenUsecase; import clap.server.common.annotation.architecture.WebAdapter; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/AddMainCategoryRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/AddMainCategoryRequest.java index 32e05296..ceb39991 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/AddMainCategoryRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/AddMainCategoryRequest.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.admin; +package clap.server.adapter.inbound.web.dto.admin.request; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/AddSubCategoryRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/AddSubCategoryRequest.java index b43cc025..725ae23a 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/AddSubCategoryRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/AddSubCategoryRequest.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.admin; +package clap.server.adapter.inbound.web.dto.admin.request; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/FindMemberRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/FindMemberRequest.java index c7e6f906..4e557441 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/FindMemberRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/FindMemberRequest.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.admin; +package clap.server.adapter.inbound.web.dto.admin.request; 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/admin/request/RegisterMemberRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/RegisterMemberRequest.java index 1fe5b31b..10f82be1 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/RegisterMemberRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/RegisterMemberRequest.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.admin; +package clap.server.adapter.inbound.web.dto.admin.request; 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/admin/request/SendInvitationRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/SendInvitationRequest.java index 8456c26a..b324c0a2 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/SendInvitationRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/SendInvitationRequest.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.admin; +package clap.server.adapter.inbound.web.dto.admin.request; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/UpdateCategoryRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/UpdateCategoryRequest.java index fb9afd10..4ec1e751 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/UpdateCategoryRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/UpdateCategoryRequest.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.admin; +package clap.server.adapter.inbound.web.dto.admin.request; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/UpdateMemberRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/UpdateMemberRequest.java index 8616fb4c..82ee8719 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/UpdateMemberRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/request/UpdateMemberRequest.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.admin; +package clap.server.adapter.inbound.web.dto.admin.request; 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/admin/response/FindAllCategoryResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindAllCategoryResponse.java index 46febb93..91799bba 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindAllCategoryResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindAllCategoryResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.admin; +package clap.server.adapter.inbound.web.dto.admin.response; import java.util.List; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindMainCategoryResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindMainCategoryResponse.java index 3920fe31..8d8fce5b 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindMainCategoryResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindMainCategoryResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.admin; +package clap.server.adapter.inbound.web.dto.admin.response; public record FindMainCategoryResponse( Long id, diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindSubCategoryResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindSubCategoryResponse.java index 0372dd42..8993ddb2 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindSubCategoryResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/FindSubCategoryResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.admin; +package clap.server.adapter.inbound.web.dto.admin.response; public record FindSubCategoryResponse( Long id, diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/RetrieveAllMemberResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/RetrieveAllMemberResponse.java index 3f488886..985e9620 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/RetrieveAllMemberResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/admin/response/RetrieveAllMemberResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.admin; +package clap.server.adapter.inbound.web.dto.admin.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/auth/request/LoginRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/auth/request/LoginRequest.java index ad777883..51e2c1e8 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/auth/request/LoginRequest.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/auth/request/LoginRequest.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.auth; +package clap.server.adapter.inbound.web.dto.auth.request; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/auth/response/LoginResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/auth/response/LoginResponse.java index abba4b64..87c025dd 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/auth/response/LoginResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/auth/response/LoginResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.auth; +package clap.server.adapter.inbound.web.dto.auth.response; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/auth/response/MemberInfoResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/auth/response/MemberInfoResponse.java index e8dee086..94a8727f 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/auth/response/MemberInfoResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/auth/response/MemberInfoResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.auth; +package clap.server.adapter.inbound.web.dto.auth.response; import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole; import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus; diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/auth/response/ReissueTokenResponse.java b/src/main/java/clap/server/adapter/inbound/web/dto/auth/response/ReissueTokenResponse.java index 128abc3f..64dfef74 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/auth/response/ReissueTokenResponse.java +++ b/src/main/java/clap/server/adapter/inbound/web/dto/auth/response/ReissueTokenResponse.java @@ -1,4 +1,4 @@ -package clap.server.adapter.inbound.web.dto.auth; +package clap.server.adapter.inbound.web.dto.auth.response; public record ReissueTokenResponse( String accessToken, diff --git a/src/main/java/clap/server/adapter/inbound/web/dto/history/request/CreateCommentRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/history/request/CreateCommentRequest.java index 7415c9d4..dd48f872 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/history/request/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.history; +package clap.server.adapter.inbound.web.dto.history.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/history/request/EditCommentRequest.java b/src/main/java/clap/server/adapter/inbound/web/dto/history/request/EditCommentRequest.java index 447f8396..ca1453bc 100644 --- a/src/main/java/clap/server/adapter/inbound/web/dto/history/request/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.history; +package clap.server.adapter.inbound.web.dto.history.request; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java index 7cac7770..d0faa99d 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java @@ -1,6 +1,6 @@ package clap.server.adapter.outbound.persistense; -import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest; +import clap.server.adapter.inbound.web.dto.admin.request.FindMemberRequest; import clap.server.adapter.outbound.persistense.entity.member.MemberEntity; import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole; import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus; diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepository.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepository.java index f6eff057..218020e6 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepository.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepository.java @@ -1,6 +1,6 @@ package clap.server.adapter.outbound.persistense.repository.member; -import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest; +import clap.server.adapter.inbound.web.dto.admin.request.FindMemberRequest; import clap.server.adapter.outbound.persistense.entity.member.MemberEntity; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepositoryImpl.java b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepositoryImpl.java index f9ed9a79..785677d1 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepositoryImpl.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberCustomRepositoryImpl.java @@ -1,6 +1,6 @@ package clap.server.adapter.outbound.persistense.repository.member; -import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest; +import clap.server.adapter.inbound.web.dto.admin.request.FindMemberRequest; import clap.server.adapter.outbound.persistense.entity.member.MemberEntity; import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus; import com.querydsl.core.BooleanBuilder; diff --git a/src/main/java/clap/server/application/mapper/AuthResponseMapper.java b/src/main/java/clap/server/application/mapper/AuthResponseMapper.java index dfa7cfd7..ea7b219b 100644 --- a/src/main/java/clap/server/application/mapper/AuthResponseMapper.java +++ b/src/main/java/clap/server/application/mapper/AuthResponseMapper.java @@ -1,8 +1,8 @@ package clap.server.application.mapper; -import clap.server.adapter.inbound.web.dto.auth.LoginResponse; -import clap.server.adapter.inbound.web.dto.auth.MemberInfoResponse; -import clap.server.adapter.inbound.web.dto.auth.ReissueTokenResponse; +import clap.server.adapter.inbound.web.dto.auth.response.LoginResponse; +import clap.server.adapter.inbound.web.dto.auth.response.MemberInfoResponse; +import clap.server.adapter.inbound.web.dto.auth.response.ReissueTokenResponse; import clap.server.domain.model.auth.CustomJwts; import clap.server.domain.model.member.Member; diff --git a/src/main/java/clap/server/application/mapper/CategoryResponseMapper.java b/src/main/java/clap/server/application/mapper/CategoryResponseMapper.java index 060fedb8..2b6ba4b7 100644 --- a/src/main/java/clap/server/application/mapper/CategoryResponseMapper.java +++ b/src/main/java/clap/server/application/mapper/CategoryResponseMapper.java @@ -1,8 +1,8 @@ package clap.server.application.mapper; -import clap.server.adapter.inbound.web.dto.admin.FindAllCategoryResponse; -import clap.server.adapter.inbound.web.dto.admin.FindMainCategoryResponse; -import clap.server.adapter.inbound.web.dto.admin.FindSubCategoryResponse; +import clap.server.adapter.inbound.web.dto.admin.response.FindAllCategoryResponse; +import clap.server.adapter.inbound.web.dto.admin.response.FindMainCategoryResponse; +import clap.server.adapter.inbound.web.dto.admin.response.FindSubCategoryResponse; import clap.server.domain.model.task.Category; import java.util.List; diff --git a/src/main/java/clap/server/application/mapper/RetrieveAllMemberMapper.java b/src/main/java/clap/server/application/mapper/RetrieveAllMemberMapper.java index 3d50fc71..5e031ac3 100644 --- a/src/main/java/clap/server/application/mapper/RetrieveAllMemberMapper.java +++ b/src/main/java/clap/server/application/mapper/RetrieveAllMemberMapper.java @@ -1,6 +1,6 @@ package clap.server.application.mapper; -import clap.server.adapter.inbound.web.dto.admin.RetrieveAllMemberResponse; +import clap.server.adapter.inbound.web.dto.admin.response.RetrieveAllMemberResponse; import clap.server.domain.model.member.Member; import org.springframework.stereotype.Component; diff --git a/src/main/java/clap/server/application/port/inbound/admin/FindAllCategoryUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/FindAllCategoryUsecase.java index 03968603..87b4f74a 100644 --- a/src/main/java/clap/server/application/port/inbound/admin/FindAllCategoryUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/admin/FindAllCategoryUsecase.java @@ -1,6 +1,6 @@ package clap.server.application.port.inbound.admin; -import clap.server.adapter.inbound.web.dto.admin.FindAllCategoryResponse; +import clap.server.adapter.inbound.web.dto.admin.response.FindAllCategoryResponse; import java.util.List; diff --git a/src/main/java/clap/server/application/port/inbound/admin/FindMainCategoryUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/FindMainCategoryUsecase.java index 42c654d6..88520ebd 100644 --- a/src/main/java/clap/server/application/port/inbound/admin/FindMainCategoryUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/admin/FindMainCategoryUsecase.java @@ -1,6 +1,6 @@ package clap.server.application.port.inbound.admin; -import clap.server.adapter.inbound.web.dto.admin.FindMainCategoryResponse; +import clap.server.adapter.inbound.web.dto.admin.response.FindMainCategoryResponse; import java.util.List; diff --git a/src/main/java/clap/server/application/port/inbound/admin/FindMembersWithFilterUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/FindMembersWithFilterUsecase.java index 4f263b51..526bdfcd 100644 --- a/src/main/java/clap/server/application/port/inbound/admin/FindMembersWithFilterUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/admin/FindMembersWithFilterUsecase.java @@ -1,6 +1,6 @@ package clap.server.application.port.inbound.admin; -import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest; +import clap.server.adapter.inbound.web.dto.admin.request.FindMemberRequest; import clap.server.domain.model.member.Member; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/clap/server/application/port/inbound/admin/FindSubCategoryUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/FindSubCategoryUsecase.java index 4922669b..5b66dd7d 100644 --- a/src/main/java/clap/server/application/port/inbound/admin/FindSubCategoryUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/admin/FindSubCategoryUsecase.java @@ -1,6 +1,6 @@ package clap.server.application.port.inbound.admin; -import clap.server.adapter.inbound.web.dto.admin.FindSubCategoryResponse; +import clap.server.adapter.inbound.web.dto.admin.response.FindSubCategoryResponse; import java.util.List; diff --git a/src/main/java/clap/server/application/port/inbound/admin/RegisterMemberUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/RegisterMemberUsecase.java index 08972e2e..fdafd03f 100644 --- a/src/main/java/clap/server/application/port/inbound/admin/RegisterMemberUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/admin/RegisterMemberUsecase.java @@ -1,6 +1,6 @@ package clap.server.application.port.inbound.admin; -import clap.server.adapter.inbound.web.dto.admin.RegisterMemberRequest; +import clap.server.adapter.inbound.web.dto.admin.request.RegisterMemberRequest; import org.springframework.web.multipart.MultipartFile; public interface RegisterMemberUsecase { diff --git a/src/main/java/clap/server/application/port/inbound/admin/SendInvitationUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/SendInvitationUsecase.java index 64f394df..fec24b53 100644 --- a/src/main/java/clap/server/application/port/inbound/admin/SendInvitationUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/admin/SendInvitationUsecase.java @@ -1,6 +1,6 @@ package clap.server.application.port.inbound.admin; -import clap.server.adapter.inbound.web.dto.admin.SendInvitationRequest; +import clap.server.adapter.inbound.web.dto.admin.request.SendInvitationRequest; public interface SendInvitationUsecase { void sendInvitation(SendInvitationRequest request); diff --git a/src/main/java/clap/server/application/port/inbound/admin/UpdateMemberUsecase.java b/src/main/java/clap/server/application/port/inbound/admin/UpdateMemberUsecase.java index ea4c6c36..fcbaf709 100644 --- a/src/main/java/clap/server/application/port/inbound/admin/UpdateMemberUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/admin/UpdateMemberUsecase.java @@ -1,6 +1,6 @@ package clap.server.application.port.inbound.admin; -import clap.server.adapter.inbound.web.dto.admin.UpdateMemberRequest; +import clap.server.adapter.inbound.web.dto.admin.request.UpdateMemberRequest; public interface UpdateMemberUsecase { void updateMemberInfo(Long adminId, Long memberId, UpdateMemberRequest request); diff --git a/src/main/java/clap/server/application/port/inbound/auth/LoginUsecase.java b/src/main/java/clap/server/application/port/inbound/auth/LoginUsecase.java index 74fc0db0..4a88128c 100644 --- a/src/main/java/clap/server/application/port/inbound/auth/LoginUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/auth/LoginUsecase.java @@ -1,6 +1,6 @@ package clap.server.application.port.inbound.auth; -import clap.server.adapter.inbound.web.dto.auth.LoginResponse; +import clap.server.adapter.inbound.web.dto.auth.response.LoginResponse; public interface LoginUsecase { LoginResponse login(String nickname, String password, String sessionId, String clientIp); diff --git a/src/main/java/clap/server/application/port/inbound/auth/ReissueTokenUsecase.java b/src/main/java/clap/server/application/port/inbound/auth/ReissueTokenUsecase.java index a9df09e2..0ec991ab 100644 --- a/src/main/java/clap/server/application/port/inbound/auth/ReissueTokenUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/auth/ReissueTokenUsecase.java @@ -1,6 +1,6 @@ package clap.server.application.port.inbound.auth; -import clap.server.adapter.inbound.web.dto.auth.ReissueTokenResponse; +import clap.server.adapter.inbound.web.dto.auth.response.ReissueTokenResponse; public interface ReissueTokenUsecase { ReissueTokenResponse reissueToken(String oldRefreshToken); diff --git a/src/main/java/clap/server/application/port/inbound/history/EditCommentUsecase.java b/src/main/java/clap/server/application/port/inbound/history/EditCommentUsecase.java index ff5f6fa1..4de7eb1b 100644 --- a/src/main/java/clap/server/application/port/inbound/history/EditCommentUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/history/EditCommentUsecase.java @@ -1,6 +1,6 @@ package clap.server.application.port.inbound.history; -import clap.server.adapter.inbound.web.dto.history.EditCommentRequest; +import clap.server.adapter.inbound.web.dto.history.request.EditCommentRequest; public interface EditCommentUsecase { diff --git a/src/main/java/clap/server/application/port/inbound/history/SaveCommentUsecase.java b/src/main/java/clap/server/application/port/inbound/history/SaveCommentUsecase.java index 1cfa861b..6d4cc7de 100644 --- a/src/main/java/clap/server/application/port/inbound/history/SaveCommentUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/history/SaveCommentUsecase.java @@ -1,6 +1,6 @@ package clap.server.application.port.inbound.history; -import clap.server.adapter.inbound.web.dto.history.CreateCommentRequest; +import clap.server.adapter.inbound.web.dto.history.request.CreateCommentRequest; public interface SaveCommentUsecase { diff --git a/src/main/java/clap/server/application/port/inbound/management/FindMembersWithFilterUsecase.java b/src/main/java/clap/server/application/port/inbound/management/FindMembersWithFilterUsecase.java index 5ebcd2f7..37034aa8 100644 --- a/src/main/java/clap/server/application/port/inbound/management/FindMembersWithFilterUsecase.java +++ b/src/main/java/clap/server/application/port/inbound/management/FindMembersWithFilterUsecase.java @@ -1,6 +1,6 @@ package clap.server.application.port.inbound.management; -import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest; +import clap.server.adapter.inbound.web.dto.admin.request.FindMemberRequest; import clap.server.domain.model.member.Member; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java b/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java index b5f1cfe9..6faeaf4a 100644 --- a/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java +++ b/src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java @@ -1,6 +1,6 @@ package clap.server.application.port.outbound.member; -import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest; +import clap.server.adapter.inbound.web.dto.admin.request.FindMemberRequest; import clap.server.domain.model.member.Member; import clap.server.domain.model.task.Task; // Task 클래스 임포트 확인 import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus; // TaskStatus 임포트 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 aa20f56d..aa3dbc03 100644 --- a/src/main/java/clap/server/application/service/admin/FindAllCategoryService.java +++ b/src/main/java/clap/server/application/service/admin/FindAllCategoryService.java @@ -1,7 +1,7 @@ package clap.server.application.service.admin; -import clap.server.adapter.inbound.web.dto.admin.FindAllCategoryResponse; -import clap.server.adapter.inbound.web.dto.admin.FindSubCategoryResponse; +import clap.server.adapter.inbound.web.dto.admin.response.FindAllCategoryResponse; +import clap.server.adapter.inbound.web.dto.admin.response.FindSubCategoryResponse; import clap.server.application.mapper.CategoryResponseMapper; import clap.server.application.port.inbound.admin.FindAllCategoryUsecase; import clap.server.application.port.outbound.task.LoadCategoryPort; 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 32c042be..83042b3a 100644 --- a/src/main/java/clap/server/application/service/admin/FindMainCategoryService.java +++ b/src/main/java/clap/server/application/service/admin/FindMainCategoryService.java @@ -1,6 +1,6 @@ package clap.server.application.service.admin; -import clap.server.adapter.inbound.web.dto.admin.FindMainCategoryResponse; +import clap.server.adapter.inbound.web.dto.admin.response.FindMainCategoryResponse; import clap.server.application.mapper.CategoryResponseMapper; import clap.server.application.port.inbound.admin.FindMainCategoryUsecase; import clap.server.application.port.outbound.task.LoadCategoryPort; diff --git a/src/main/java/clap/server/application/service/admin/FindMembersWithFilterService.java b/src/main/java/clap/server/application/service/admin/FindMembersWithFilterService.java index 529ce8ec..0beca493 100644 --- a/src/main/java/clap/server/application/service/admin/FindMembersWithFilterService.java +++ b/src/main/java/clap/server/application/service/admin/FindMembersWithFilterService.java @@ -1,6 +1,6 @@ package clap.server.application.service.admin; -import clap.server.adapter.inbound.web.dto.admin.FindMemberRequest; +import clap.server.adapter.inbound.web.dto.admin.request.FindMemberRequest; import clap.server.application.port.inbound.admin.FindMembersWithFilterUsecase; import clap.server.application.port.outbound.member.LoadMemberPort; import clap.server.domain.model.member.Member; 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 7b81e68b..9e343fe3 100644 --- a/src/main/java/clap/server/application/service/admin/FindSubCategoryService.java +++ b/src/main/java/clap/server/application/service/admin/FindSubCategoryService.java @@ -1,6 +1,6 @@ package clap.server.application.service.admin; -import clap.server.adapter.inbound.web.dto.admin.FindSubCategoryResponse; +import clap.server.adapter.inbound.web.dto.admin.response.FindSubCategoryResponse; import clap.server.application.mapper.CategoryResponseMapper; import clap.server.application.port.inbound.admin.FindSubCategoryUsecase; import clap.server.application.port.outbound.task.LoadCategoryPort; diff --git a/src/main/java/clap/server/application/service/admin/RegisterMemberService.java b/src/main/java/clap/server/application/service/admin/RegisterMemberService.java index 115e9410..aa8eea2f 100644 --- a/src/main/java/clap/server/application/service/admin/RegisterMemberService.java +++ b/src/main/java/clap/server/application/service/admin/RegisterMemberService.java @@ -1,6 +1,6 @@ package clap.server.application.service.admin; -import clap.server.adapter.inbound.web.dto.admin.RegisterMemberRequest; +import clap.server.adapter.inbound.web.dto.admin.request.RegisterMemberRequest; import clap.server.application.port.inbound.admin.RegisterMemberUsecase; import clap.server.application.port.inbound.domain.MemberService; import clap.server.application.port.outbound.member.CommandMemberPort; diff --git a/src/main/java/clap/server/application/service/admin/SendInvitationService.java b/src/main/java/clap/server/application/service/admin/SendInvitationService.java index d58c1b8b..b15b221c 100644 --- a/src/main/java/clap/server/application/service/admin/SendInvitationService.java +++ b/src/main/java/clap/server/application/service/admin/SendInvitationService.java @@ -1,6 +1,6 @@ package clap.server.application.service.admin; -import clap.server.adapter.inbound.web.dto.admin.SendInvitationRequest; +import clap.server.adapter.inbound.web.dto.admin.request.SendInvitationRequest; import clap.server.application.port.inbound.admin.SendInvitationUsecase; import clap.server.application.port.outbound.member.CommandMemberPort; import clap.server.application.port.outbound.member.LoadMemberPort; diff --git a/src/main/java/clap/server/application/service/admin/UpdateMemberService.java b/src/main/java/clap/server/application/service/admin/UpdateMemberService.java index 862a24d5..06237a3f 100644 --- a/src/main/java/clap/server/application/service/admin/UpdateMemberService.java +++ b/src/main/java/clap/server/application/service/admin/UpdateMemberService.java @@ -1,6 +1,6 @@ package clap.server.application.service.admin; -import clap.server.adapter.inbound.web.dto.admin.UpdateMemberRequest; +import clap.server.adapter.inbound.web.dto.admin.request.UpdateMemberRequest; import clap.server.application.port.inbound.admin.UpdateMemberUsecase; import clap.server.application.port.inbound.domain.MemberService; import clap.server.application.port.outbound.member.CommandMemberPort; 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 fb5cfe4d..7b26155e 100644 --- a/src/main/java/clap/server/application/service/auth/AuthService.java +++ b/src/main/java/clap/server/application/service/auth/AuthService.java @@ -1,6 +1,6 @@ package clap.server.application.service.auth; -import clap.server.adapter.inbound.web.dto.auth.LoginResponse; +import clap.server.adapter.inbound.web.dto.auth.response.LoginResponse; import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus; import clap.server.application.mapper.AuthResponseMapper; import clap.server.application.port.inbound.auth.LoginUsecase; 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 4b8efd31..568b9705 100644 --- a/src/main/java/clap/server/application/service/auth/ReissueTokenService.java +++ b/src/main/java/clap/server/application/service/auth/ReissueTokenService.java @@ -1,6 +1,6 @@ package clap.server.application.service.auth; -import clap.server.adapter.inbound.web.dto.auth.ReissueTokenResponse; +import clap.server.adapter.inbound.web.dto.auth.response.ReissueTokenResponse; import clap.server.application.port.inbound.auth.ReissueTokenUsecase; import clap.server.application.port.outbound.auth.CommandRefreshTokenPort; import clap.server.common.annotation.architecture.ApplicationService; diff --git a/src/main/java/clap/server/application/service/history/CommandCommentService.java b/src/main/java/clap/server/application/service/history/CommandCommentService.java index d82ec5cb..431e8169 100644 --- a/src/main/java/clap/server/application/service/history/CommandCommentService.java +++ b/src/main/java/clap/server/application/service/history/CommandCommentService.java @@ -1,6 +1,6 @@ package clap.server.application.service.history; -import clap.server.adapter.inbound.web.dto.history.EditCommentRequest; +import clap.server.adapter.inbound.web.dto.history.request.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; diff --git a/src/main/java/clap/server/application/service/history/PostCommentService.java b/src/main/java/clap/server/application/service/history/PostCommentService.java index a6e138f7..bc51a0a0 100644 --- a/src/main/java/clap/server/application/service/history/PostCommentService.java +++ b/src/main/java/clap/server/application/service/history/PostCommentService.java @@ -1,6 +1,6 @@ package clap.server.application.service.history; -import clap.server.adapter.inbound.web.dto.history.CreateCommentRequest; +import clap.server.adapter.inbound.web.dto.history.request.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; From 27108f59cf84c6bb71a8b2fb9178596fd8766d82 Mon Sep 17 00:00:00 2001 From: parkjaehak Date: Tue, 4 Feb 2025 09:59:59 +0900 Subject: [PATCH 5/5] =?UTF-8?q?CLAP-246=20Refactor:=20useDetails=20import?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/inbound/web/history/CommandCommentController.java | 2 +- .../adapter/inbound/web/history/PostCommentController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/clap/server/adapter/inbound/web/history/CommandCommentController.java b/src/main/java/clap/server/adapter/inbound/web/history/CommandCommentController.java index 81a74390..e7a44d8d 100644 --- a/src/main/java/clap/server/adapter/inbound/web/history/CommandCommentController.java +++ b/src/main/java/clap/server/adapter/inbound/web/history/CommandCommentController.java @@ -1,6 +1,6 @@ package clap.server.adapter.inbound.web.history; -import clap.server.adapter.inbound.security.SecurityUserDetails; +import clap.server.adapter.inbound.security.service.SecurityUserDetails; import clap.server.adapter.inbound.web.dto.history.request.EditCommentRequest; import clap.server.application.port.inbound.history.DeleteCommentUsecase; import clap.server.application.port.inbound.history.EditCommentUsecase; diff --git a/src/main/java/clap/server/adapter/inbound/web/history/PostCommentController.java b/src/main/java/clap/server/adapter/inbound/web/history/PostCommentController.java index c473f6fc..cc2b6207 100644 --- a/src/main/java/clap/server/adapter/inbound/web/history/PostCommentController.java +++ b/src/main/java/clap/server/adapter/inbound/web/history/PostCommentController.java @@ -1,6 +1,6 @@ package clap.server.adapter.inbound.web.history; -import clap.server.adapter.inbound.security.SecurityUserDetails; +import clap.server.adapter.inbound.security.service.SecurityUserDetails; import clap.server.adapter.inbound.web.dto.history.request.CreateCommentRequest; import clap.server.application.port.inbound.history.SaveCommentAttachmentUsecase; import clap.server.application.port.inbound.history.SaveCommentUsecase;