Refactor: 어드민 관련 기능 DTO 패키징 수정

IT-Cotato · May 19, 2024 · 5ced07e · 5ced07e
1 parent a96410b
commit 5ced07e
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 25 deletions.
diff --git a/src/main/java/org/cotato/csquiz/api/admin/controller/AdminController.java b/src/main/java/org/cotato/csquiz/api/admin/controller/AdminController.java
@@ -1,12 +1,12 @@
 package org.cotato.csquiz.api.admin.controller;
 
-import org.cotato.csquiz.api.auth.dto.ApplyMemberInfoResponse;
-import org.cotato.csquiz.api.member.dto.MemberApproveRequest;
-import org.cotato.csquiz.api.member.dto.MemberEnrollInfoResponse;
-import org.cotato.csquiz.api.member.dto.MemberRejectRequest;
-import org.cotato.csquiz.api.member.dto.UpdateActiveMemberRoleRequest;
-import org.cotato.csquiz.api.member.dto.UpdateActiveMemberToOldMemberRequest;
-import org.cotato.csquiz.api.member.dto.UpdateOldMemberRoleRequest;
+import org.cotato.csquiz.api.admin.dto.ApplyMemberInfoResponse;
+import org.cotato.csquiz.api.admin.dto.MemberApproveRequest;
+import org.cotato.csquiz.api.admin.dto.MemberEnrollInfoResponse;
+import org.cotato.csquiz.api.admin.dto.MemberRejectRequest;
+import org.cotato.csquiz.api.admin.dto.UpdateActiveMemberRoleRequest;
+import org.cotato.csquiz.api.admin.dto.UpdateActiveMemberToOldMemberRequest;
+import org.cotato.csquiz.api.admin.dto.UpdateOldMemberRoleRequest;
 import org.cotato.csquiz.domain.auth.service.AdminService;
 import jakarta.validation.Valid;
 import java.util.List;

diff --git a/...api/auth/dto/ApplyMemberInfoResponse.java → ...pi/admin/dto/ApplyMemberInfoResponse.java b/...api/auth/dto/ApplyMemberInfoResponse.java → ...pi/admin/dto/ApplyMemberInfoResponse.java
@@ -1,4 +1,4 @@
-package org.cotato.csquiz.api.auth.dto;
+package org.cotato.csquiz.api.admin.dto;
 
 import org.cotato.csquiz.domain.auth.entity.Member;
 

diff --git a/.../api/member/dto/MemberApproveRequest.java → ...z/api/admin/dto/MemberApproveRequest.java b/.../api/member/dto/MemberApproveRequest.java → ...z/api/admin/dto/MemberApproveRequest.java
@@ -1,4 +1,4 @@
-package org.cotato.csquiz.api.member.dto;
+package org.cotato.csquiz.api.admin.dto;
 
 import org.cotato.csquiz.domain.auth.enums.MemberPosition;
 import jakarta.validation.constraints.NotNull;

diff --git a/.../member/dto/MemberEnrollInfoResponse.java → ...i/admin/dto/MemberEnrollInfoResponse.java b/.../member/dto/MemberEnrollInfoResponse.java → ...i/admin/dto/MemberEnrollInfoResponse.java
@@ -1,4 +1,4 @@
-package org.cotato.csquiz.api.member.dto;
+package org.cotato.csquiz.api.admin.dto;
 
 import org.cotato.csquiz.domain.auth.enums.MemberPosition;
 import org.cotato.csquiz.domain.auth.enums.MemberRole;

diff --git a/...quiz/api/auth/dto/MemberInfoResponse.java → ...uiz/api/admin/dto/MemberInfoResponse.java b/...quiz/api/auth/dto/MemberInfoResponse.java → ...uiz/api/admin/dto/MemberInfoResponse.java
@@ -1,4 +1,4 @@
-package org.cotato.csquiz.api.auth.dto;
+package org.cotato.csquiz.api.admin.dto;
 
 import org.cotato.csquiz.domain.auth.enums.MemberRole;
 import org.cotato.csquiz.domain.auth.entity.Member;

diff --git a/...z/api/member/dto/MemberRejectRequest.java → ...iz/api/admin/dto/MemberRejectRequest.java b/...z/api/member/dto/MemberRejectRequest.java → ...iz/api/admin/dto/MemberRejectRequest.java
@@ -1,4 +1,4 @@
-package org.cotato.csquiz.api.member.dto;
+package org.cotato.csquiz.api.admin.dto;
 
 import jakarta.validation.constraints.NotNull;
 

diff --git a/...er/dto/UpdateActiveMemberRoleRequest.java → ...in/dto/UpdateActiveMemberRoleRequest.java b/...er/dto/UpdateActiveMemberRoleRequest.java → ...in/dto/UpdateActiveMemberRoleRequest.java
@@ -1,4 +1,4 @@
-package org.cotato.csquiz.api.member.dto;
+package org.cotato.csquiz.api.admin.dto;
 
 import org.cotato.csquiz.domain.auth.enums.MemberRole;
 import jakarta.validation.constraints.NotNull;

diff --git a/...UpdateActiveMemberToOldMemberRequest.java → ...UpdateActiveMemberToOldMemberRequest.java b/...UpdateActiveMemberToOldMemberRequest.java → ...UpdateActiveMemberToOldMemberRequest.java
@@ -1,4 +1,4 @@
-package org.cotato.csquiz.api.member.dto;
+package org.cotato.csquiz.api.admin.dto;
 
 import jakarta.validation.constraints.NotNull;
 import java.util.List;

diff --git a/...ember/dto/UpdateOldMemberRoleRequest.java → ...admin/dto/UpdateOldMemberRoleRequest.java b/...ember/dto/UpdateOldMemberRoleRequest.java → ...admin/dto/UpdateOldMemberRoleRequest.java
@@ -1,4 +1,4 @@
-package org.cotato.csquiz.api.member.dto;
+package org.cotato.csquiz.api.admin.dto;
 
 import jakarta.validation.constraints.NotNull;
 

diff --git a/src/main/java/org/cotato/csquiz/api/member/controller/MemberController.java b/src/main/java/org/cotato/csquiz/api/member/controller/MemberController.java
@@ -2,7 +2,7 @@
 
 import org.cotato.csquiz.domain.auth.service.MemberService;
 import org.cotato.csquiz.common.config.jwt.JwtTokenProvider;
-import org.cotato.csquiz.api.auth.dto.MemberInfoResponse;
+import org.cotato.csquiz.api.admin.dto.MemberInfoResponse;
 import org.cotato.csquiz.api.member.dto.CheckPasswordRequest;
 import org.cotato.csquiz.api.member.dto.MemberMyPageInfoResponse;
 import org.cotato.csquiz.api.member.dto.UpdatePasswordRequest;

diff --git a/src/main/java/org/cotato/csquiz/domain/auth/service/AdminService.java b/src/main/java/org/cotato/csquiz/domain/auth/service/AdminService.java
@@ -3,19 +3,18 @@
 import jakarta.persistence.EntityNotFoundException;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
-import org.cotato.csquiz.api.auth.dto.ApplyMemberInfoResponse;
-import org.cotato.csquiz.api.member.dto.MemberApproveRequest;
-import org.cotato.csquiz.api.member.dto.MemberEnrollInfoResponse;
-import org.cotato.csquiz.api.member.dto.MemberRejectRequest;
-import org.cotato.csquiz.api.member.dto.UpdateActiveMemberRoleRequest;
-import org.cotato.csquiz.api.member.dto.UpdateActiveMemberToOldMemberRequest;
-import org.cotato.csquiz.api.member.dto.UpdateOldMemberRoleRequest;
+import org.cotato.csquiz.api.admin.dto.ApplyMemberInfoResponse;
+import org.cotato.csquiz.api.admin.dto.MemberApproveRequest;
+import org.cotato.csquiz.api.admin.dto.MemberEnrollInfoResponse;
+import org.cotato.csquiz.api.admin.dto.MemberRejectRequest;
+import org.cotato.csquiz.api.admin.dto.UpdateActiveMemberRoleRequest;
+import org.cotato.csquiz.api.admin.dto.UpdateActiveMemberToOldMemberRequest;
+import org.cotato.csquiz.api.admin.dto.UpdateOldMemberRoleRequest;
 import org.cotato.csquiz.domain.auth.entity.RefusedMember;
 import org.cotato.csquiz.domain.auth.enums.MemberRole;
 import org.cotato.csquiz.domain.auth.enums.MemberRoleGroup;
 import org.cotato.csquiz.domain.generation.entity.Generation;
 import org.cotato.csquiz.domain.auth.entity.Member;
-import org.cotato.csquiz.domain.auth.service.MemberService;
 import org.cotato.csquiz.common.error.exception.AppException;
 import org.cotato.csquiz.common.error.ErrorCode;
 import org.cotato.csquiz.domain.generation.repository.GenerationRepository;

diff --git a/src/main/java/org/cotato/csquiz/domain/auth/service/MemberService.java b/src/main/java/org/cotato/csquiz/domain/auth/service/MemberService.java
@@ -3,7 +3,7 @@
 import jakarta.persistence.EntityNotFoundException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.cotato.csquiz.api.auth.dto.MemberInfoResponse;
+import org.cotato.csquiz.api.admin.dto.MemberInfoResponse;
 import org.cotato.csquiz.api.member.dto.MemberInfo;
 import org.cotato.csquiz.api.member.dto.MemberMyPageInfoResponse;
 import org.cotato.csquiz.common.config.jwt.JwtTokenProvider;