conflict 해결

Sihun23 · Sihun23 · commit 193f98daa190 · 2025-02-04T10:26:15.000+09:00
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
@@ -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
@@ -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
@@ -3,18 +3,12 @@
 import clap.server.adapter.inbound.web.dto.admin.request.FindMemberRequest;
 import clap.server.adapter.inbound.web.dto.admin.response.RetrieveAllMemberResponse;
 import clap.server.adapter.inbound.web.dto.common.PageResponse;
-import clap.server.application.mapper.RetrieveAllMemberMapper;
-import clap.server.application.port.inbound.admin.FindAllMembersUsecase;
 import clap.server.application.port.inbound.admin.FindMembersWithFilterUsecase;
-import clap.server.domain.model.member.Member;
-import clap.server.exception.ApplicationException;
-import clap.server.exception.code.MemberErrorCode;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.Page;
+import jakarta.validation.Valid;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/clap/server/adapter/inbound/web/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/history/CommandCommentController.java b/src/main/java/clap/server/adapter/inbound/web/history/CommandCommentController.java
@@ -1,7 +1,7 @@
 package clap.server.adapter.inbound.web.history;
 
 import clap.server.adapter.inbound.security.service.SecurityUserDetails;
-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.common.annotation.architecture.WebAdapter;
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
@@ -1,7 +1,7 @@
 package clap.server.adapter.inbound.web.history;
 
 import clap.server.adapter.inbound.security.service.SecurityUserDetails;
-import clap.server.adapter.inbound.web.dto.history.CreateCommentRequest;
+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;
 import clap.server.common.annotation.architecture.WebAdapter;
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
@@ -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<PageResponse<FilterRequestedTasksResponse>> 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<FindTaskDetailsResponse> findRequestedTaskDetails(
     public ResponseEntity<PageResponse<FilterAssignedTaskListResponse>> 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<PageResponse<FilterAssignedTaskListResponse>> findTasksAss
     public ResponseEntity<PageResponse<FilterPendingApprovalResponse>> 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<PageResponse<FilterPendingApprovalResponse>> findPendingAp
     public ResponseEntity<PageResponse<FilterAllTasksResponse>> 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/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/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;
diff --git 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
@@ -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/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
@@ -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
@@ -3,7 +3,7 @@
 import clap.server.adapter.inbound.web.dto.admin.request.FindMemberRequest;
 import clap.server.adapter.inbound.web.dto.admin.response.RetrieveAllMemberResponse;
 import clap.server.adapter.inbound.web.dto.common.PageResponse;
-import org.springframework.data.domain.Page;
+
 import org.springframework.data.domain.Pageable;
 
 public interface FindMembersWithFilterUsecase {
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/domain/LogService.java b/src/main/java/clap/server/application/port/inbound/domain/LogService.java
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
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
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
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
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
diff --git a/src/main/java/clap/server/application/service/admin/FindAllCategoryService.java b/src/main/java/clap/server/application/service/admin/FindAllCategoryService.java
diff --git a/src/main/java/clap/server/application/service/admin/FindMainCategoryService.java b/src/main/java/clap/server/application/service/admin/FindMainCategoryService.java
diff --git a/src/main/java/clap/server/application/service/admin/FindSubCategoryService.java b/src/main/java/clap/server/application/service/admin/FindSubCategoryService.java
diff --git a/src/main/java/clap/server/application/service/admin/RegisterMemberService.java b/src/main/java/clap/server/application/service/admin/RegisterMemberService.java
diff --git a/src/main/java/clap/server/application/service/admin/SendInvitationService.java b/src/main/java/clap/server/application/service/admin/SendInvitationService.java
diff --git a/src/main/java/clap/server/application/service/admin/UpdateMemberService.java b/src/main/java/clap/server/application/service/admin/UpdateMemberService.java
diff --git a/src/main/java/clap/server/application/service/auth/AuthService.java b/src/main/java/clap/server/application/service/auth/AuthService.java
diff --git a/src/main/java/clap/server/application/service/auth/ReissueTokenService.java b/src/main/java/clap/server/application/service/auth/ReissueTokenService.java
diff --git a/src/main/java/clap/server/application/service/history/CommandCommentService.java b/src/main/java/clap/server/application/service/history/CommandCommentService.java
diff --git a/src/main/java/clap/server/application/service/history/PostCommentService.java b/src/main/java/clap/server/application/service/history/PostCommentService.java
diff --git a/src/main/java/clap/server/application/service/log/CreateAnonymousLogsService.java b/src/main/java/clap/server/application/service/log/CreateAnonymousLogsService.java
diff --git a/src/main/java/clap/server/application/service/task/UpdateTaskService.java b/src/main/java/clap/server/application/service/task/UpdateTaskService.java
diff --git a/src/main/java/clap/server/config/aop/LoggingAspect.java b/src/main/java/clap/server/config/aop/LoggingAspect.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package clap.server.adapter.inbound.web.dto.admin;`
	`1`	`+package clap.server.adapter.inbound.web.dto.admin.request;`
`2`	`2`
`3`	`3`	`import jakarta.validation.constraints.NotBlank;`
`4`	`4`	`import jakarta.validation.constraints.Pattern;`