Refactor: Ver2 디렉토리 구조 변경

IT-Cotato · May 18, 2024 · d2efbdf · d2efbdf
1 parent a6b3585
commit d2efbdf
Show file tree

Hide file tree

Showing 178 changed files with 677 additions and 739 deletions.
diff --git a/src/main/java/cotato/csquiz/domain/entity/Member.java b/src/main/java/cotato/csquiz/domain/entity/Member.java
diff --git a/...java/cotato/csquiz/CsquizApplication.java → .../org/cotato/csquiz/CsquizApplication.java b/...java/cotato/csquiz/CsquizApplication.java → .../org/cotato/csquiz/CsquizApplication.java
@@ -1,4 +1,4 @@
-package cotato.csquiz;
+package org.cotato.csquiz;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

diff --git a/...to/csquiz/controller/AdminController.java → ...api/admin/controller/AdminController.java b/...to/csquiz/controller/AdminController.java → ...api/admin/controller/AdminController.java
@@ -1,13 +1,13 @@
-package cotato.csquiz.controller;
+package org.cotato.csquiz.api.admin.controller;
 
-import cotato.csquiz.controller.dto.auth.ApplyMemberInfoResponse;
-import cotato.csquiz.controller.dto.member.MemberApproveRequest;
-import cotato.csquiz.controller.dto.member.MemberEnrollInfoResponse;
-import cotato.csquiz.controller.dto.member.MemberRejectRequest;
-import cotato.csquiz.controller.dto.member.UpdateActiveMemberRoleRequest;
-import cotato.csquiz.controller.dto.member.UpdateActiveMemberToOldMemberRequest;
-import cotato.csquiz.controller.dto.member.UpdateOldMemberRoleRequest;
-import cotato.csquiz.service.AdminService;
+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.domain.auth.service.AdminService;
 import jakarta.validation.Valid;
 import java.util.List;
 import lombok.RequiredArgsConstructor;

diff --git a/...ato/csquiz/controller/AuthController.java → ...z/api/auth/controller/AuthController.java b/...ato/csquiz/controller/AuthController.java → ...z/api/auth/controller/AuthController.java
@@ -1,16 +1,16 @@
-package cotato.csquiz.controller;
+package org.cotato.csquiz.api.auth.controller;
 
-import cotato.csquiz.controller.dto.auth.FindPasswordResponse;
-import cotato.csquiz.controller.dto.auth.JoinRequest;
-import cotato.csquiz.controller.dto.auth.LogoutRequest;
-import cotato.csquiz.controller.dto.auth.ReissueResponse;
-import cotato.csquiz.controller.dto.email.SendEmailRequest;
-import cotato.csquiz.controller.dto.member.MemberEmailResponse;
-import cotato.csquiz.service.AuthService;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.cotato.csquiz.api.auth.dto.FindPasswordResponse;
+import org.cotato.csquiz.api.auth.dto.JoinRequest;
+import org.cotato.csquiz.api.auth.dto.LogoutRequest;
+import org.cotato.csquiz.api.auth.dto.ReissueResponse;
+import org.cotato.csquiz.api.auth.dto.SendEmailRequest;
+import org.cotato.csquiz.api.member.dto.MemberEmailResponse;
+import org.cotato.csquiz.domain.auth.service.AuthService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CookieValue;

diff --git a/...ler/dto/auth/ApplyMemberInfoResponse.java → ...api/auth/dto/ApplyMemberInfoResponse.java b/...ler/dto/auth/ApplyMemberInfoResponse.java → ...api/auth/dto/ApplyMemberInfoResponse.java
@@ -1,6 +1,6 @@
-package cotato.csquiz.controller.dto.auth;
+package org.cotato.csquiz.api.auth.dto;
 
-import cotato.csquiz.domain.entity.Member;
+import org.cotato.csquiz.domain.auth.entity.Member;
 
 public record ApplyMemberInfoResponse(
         Long id,

diff --git a/...roller/dto/auth/FindPasswordResponse.java → ...iz/api/auth/dto/FindPasswordResponse.java b/...roller/dto/auth/FindPasswordResponse.java → ...iz/api/auth/dto/FindPasswordResponse.java
@@ -1,4 +1,4 @@
-package cotato.csquiz.controller.dto.auth;
+package org.cotato.csquiz.api.auth.dto;
 
 public record FindPasswordResponse(
         String accessToken

diff --git a/...quiz/controller/dto/auth/JoinRequest.java → ...tato/csquiz/api/auth/dto/JoinRequest.java b/...quiz/controller/dto/auth/JoinRequest.java → ...tato/csquiz/api/auth/dto/JoinRequest.java
@@ -1,4 +1,4 @@
-package cotato.csquiz.controller.dto.auth;
+package org.cotato.csquiz.api.auth.dto;
 
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;

diff --git a/...iz/controller/dto/auth/LogoutRequest.java → ...to/csquiz/api/auth/dto/LogoutRequest.java b/...iz/controller/dto/auth/LogoutRequest.java → ...to/csquiz/api/auth/dto/LogoutRequest.java
@@ -1,4 +1,4 @@
-package cotato.csquiz.controller.dto.auth;
+package org.cotato.csquiz.api.auth.dto;
 
 import jakarta.validation.constraints.NotNull;
 

diff --git a/...ntroller/dto/auth/MemberInfoResponse.java → ...quiz/api/auth/dto/MemberInfoResponse.java b/...ntroller/dto/auth/MemberInfoResponse.java → ...quiz/api/auth/dto/MemberInfoResponse.java
@@ -1,7 +1,7 @@
-package cotato.csquiz.controller.dto.auth;
+package org.cotato.csquiz.api.auth.dto;
 
-import cotato.csquiz.domain.entity.Member;
-import cotato.csquiz.domain.enums.MemberRole;
+import org.cotato.csquiz.domain.auth.enums.MemberRole;
+import org.cotato.csquiz.domain.auth.entity.Member;
 
 public record MemberInfoResponse(
         Long memberId,

diff --git a/.../controller/dto/auth/ReissueResponse.java → .../csquiz/api/auth/dto/ReissueResponse.java b/.../controller/dto/auth/ReissueResponse.java → .../csquiz/api/auth/dto/ReissueResponse.java
@@ -1,4 +1,4 @@
-package cotato.csquiz.controller.dto.auth;
+package org.cotato.csquiz.api.auth.dto;
 
 public record ReissueResponse(
         String accessToken

diff --git a/...ontroller/dto/email/SendEmailRequest.java → ...csquiz/api/auth/dto/SendEmailRequest.java b/...ontroller/dto/email/SendEmailRequest.java → ...csquiz/api/auth/dto/SendEmailRequest.java
@@ -1,4 +1,4 @@
-package cotato.csquiz.controller.dto.email;
+package org.cotato.csquiz.api.auth.dto;
 
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotNull;

diff --git a/...squiz/controller/EducationController.java → ...ation/controller/EducationController.java b/...squiz/controller/EducationController.java → ...ation/controller/EducationController.java
@@ -1,18 +1,18 @@
-package cotato.csquiz.controller;
+package org.cotato.csquiz.api.education.controller;
 
-import cotato.csquiz.controller.dto.AllEducationResponse;
-import cotato.csquiz.controller.dto.education.CreateEducationRequest;
-import cotato.csquiz.controller.dto.education.CreateEducationResponse;
-import cotato.csquiz.controller.dto.education.EducationIdOfQuizResponse;
-import cotato.csquiz.controller.dto.education.FindEducationStatusResponse;
-import cotato.csquiz.controller.dto.education.UpdateEducationRequest;
-import cotato.csquiz.controller.dto.education.WinnerInfoResponse;
-import cotato.csquiz.controller.dto.quiz.KingMemberInfo;
-import cotato.csquiz.service.EducationService;
 import jakarta.validation.Valid;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.cotato.csquiz.api.education.dto.AllEducationResponse;
+import org.cotato.csquiz.api.education.dto.CreateEducationRequest;
+import org.cotato.csquiz.api.education.dto.CreateEducationResponse;
+import org.cotato.csquiz.api.education.dto.EducationIdOfQuizResponse;
+import org.cotato.csquiz.api.education.dto.FindEducationStatusResponse;
+import org.cotato.csquiz.api.education.dto.UpdateEducationRequest;
+import org.cotato.csquiz.api.education.dto.WinnerInfoResponse;
+import org.cotato.csquiz.api.quiz.dto.KingMemberInfo;
+import org.cotato.csquiz.domain.education.service.EducationService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,7 +38,8 @@ public ResponseEntity<List<AllEducationResponse>> findEducationListByGeneration(
     }
 
     @GetMapping("/status")
-    public ResponseEntity<FindEducationStatusResponse> findEducationStatus(@RequestParam(value = "educationId") Long educationId) {
+    public ResponseEntity<FindEducationStatusResponse> findEducationStatus(
+            @RequestParam(value = "educationId") Long educationId) {
         return ResponseEntity.ok().body(educationService.findEducationStatus(educationId));
     }
 

diff --git a/.../controller/dto/AllEducationResponse.java → ...i/education/dto/AllEducationResponse.java b/.../controller/dto/AllEducationResponse.java → ...i/education/dto/AllEducationResponse.java
@@ -1,6 +1,6 @@
-package cotato.csquiz.controller.dto;
+package org.cotato.csquiz.api.education.dto;
 
-import cotato.csquiz.domain.entity.Education;
+import org.cotato.csquiz.domain.education.entity.Education;
 
 public record AllEducationResponse(
         Long educationId,

diff --git a/...dto/education/CreateEducationRequest.java → ...education/dto/CreateEducationRequest.java b/...dto/education/CreateEducationRequest.java → ...education/dto/CreateEducationRequest.java
@@ -1,4 +1,4 @@
-package cotato.csquiz.controller.dto.education;
+package org.cotato.csquiz.api.education.dto;
 
 import jakarta.validation.constraints.NotNull;
 

diff --git a/...to/education/CreateEducationResponse.java → ...ducation/dto/CreateEducationResponse.java b/...to/education/CreateEducationResponse.java → ...ducation/dto/CreateEducationResponse.java
@@ -1,6 +1,6 @@
-package cotato.csquiz.controller.dto.education;
+package org.cotato.csquiz.api.education.dto;
 
-import cotato.csquiz.domain.entity.Education;
+import org.cotato.csquiz.domain.education.entity.Education;
 
 public record CreateEducationResponse(
         Long educationId

diff --git a/.../education/EducationIdOfQuizResponse.java → ...cation/dto/EducationIdOfQuizResponse.java b/.../education/EducationIdOfQuizResponse.java → ...cation/dto/EducationIdOfQuizResponse.java
@@ -1,6 +1,6 @@
-package cotato.csquiz.controller.dto.education;
+package org.cotato.csquiz.api.education.dto;
 
-import cotato.csquiz.domain.entity.Quiz;
+import org.cotato.csquiz.domain.education.entity.Quiz;
 
 public record EducationIdOfQuizResponse(
         Long educationId

diff --git a/...ducation/FindEducationStatusResponse.java → ...tion/dto/FindEducationStatusResponse.java b/...ducation/FindEducationStatusResponse.java → ...tion/dto/FindEducationStatusResponse.java
@@ -1,7 +1,7 @@
-package cotato.csquiz.controller.dto.education;
+package org.cotato.csquiz.api.education.dto;
 
-import cotato.csquiz.domain.entity.Education;
-import cotato.csquiz.domain.enums.EducationStatus;
+import org.cotato.csquiz.domain.education.entity.Education;
+import org.cotato.csquiz.domain.education.enums.EducationStatus;
 
 public record FindEducationStatusResponse(
         EducationStatus status

diff --git a/.../dto/education/PatchEducationRequest.java → .../education/dto/PatchEducationRequest.java b/.../dto/education/PatchEducationRequest.java → .../education/dto/PatchEducationRequest.java
@@ -1,7 +1,7 @@
-package cotato.csquiz.controller.dto.education;
+package org.cotato.csquiz.api.education.dto;
 
-import cotato.csquiz.domain.enums.EducationStatus;
 import lombok.Data;
+import org.cotato.csquiz.domain.education.enums.EducationStatus;
 
 @Data
 public class PatchEducationRequest {

diff --git a/...ler/dto/education/PatchStatusRequest.java → ...api/education/dto/PatchStatusRequest.java b/...ler/dto/education/PatchStatusRequest.java → ...api/education/dto/PatchStatusRequest.java
@@ -1,7 +1,7 @@
-package cotato.csquiz.controller.dto.education;
+package org.cotato.csquiz.api.education.dto;
 
-import cotato.csquiz.domain.enums.EducationStatus;
 import lombok.Getter;
+import org.cotato.csquiz.domain.education.enums.EducationStatus;
 
 @Getter
 public class PatchStatusRequest {

diff --git a/...dto/education/UpdateEducationRequest.java → ...education/dto/UpdateEducationRequest.java b/...dto/education/UpdateEducationRequest.java → ...education/dto/UpdateEducationRequest.java
@@ -1,4 +1,4 @@
-package cotato.csquiz.controller.dto.education;
+package org.cotato.csquiz.api.education.dto;
 
 import jakarta.validation.constraints.NotNull;
 

diff --git a/...ler/dto/education/WinnerInfoResponse.java → ...api/education/dto/WinnerInfoResponse.java b/...ler/dto/education/WinnerInfoResponse.java → ...api/education/dto/WinnerInfoResponse.java
@@ -1,8 +1,8 @@
-package cotato.csquiz.controller.dto.education;
+package org.cotato.csquiz.api.education.dto;
 
-import cotato.csquiz.domain.entity.Member;
-import cotato.csquiz.domain.entity.Winner;
-import cotato.csquiz.domain.enums.MemberPosition;
+import org.cotato.csquiz.domain.education.entity.Winner;
+import org.cotato.csquiz.domain.auth.enums.MemberPosition;
+import org.cotato.csquiz.domain.auth.entity.Member;
 
 public record WinnerInfoResponse(
         Long memberId,

diff --git a/...quiz/controller/GenerationController.java → ...tion/controller/GenerationController.java b/...quiz/controller/GenerationController.java → ...tion/controller/GenerationController.java
@@ -1,15 +1,15 @@
-package cotato.csquiz.controller;
+package org.cotato.csquiz.api.generation.controller;
 
-import cotato.csquiz.controller.dto.generation.AddGenerationRequest;
-import cotato.csquiz.controller.dto.generation.AddGenerationResponse;
-import cotato.csquiz.controller.dto.generation.ChangeGenerationPeriodRequest;
-import cotato.csquiz.controller.dto.generation.ChangeRecruitingStatusRequest;
-import cotato.csquiz.controller.dto.generation.GenerationInfoResponse;
-import cotato.csquiz.service.GenerationService;
 import jakarta.validation.Valid;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.cotato.csquiz.api.generation.dto.AddGenerationRequest;
+import org.cotato.csquiz.api.generation.dto.AddGenerationResponse;
+import org.cotato.csquiz.api.generation.dto.ChangeGenerationPeriodRequest;
+import org.cotato.csquiz.api.generation.dto.ChangeRecruitingStatusRequest;
+import org.cotato.csquiz.api.generation.dto.GenerationInfoResponse;
+import org.cotato.csquiz.domain.generation.service.GenerationService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;

diff --git a/.../dto/generation/AddGenerationRequest.java → .../generation/dto/AddGenerationRequest.java b/.../dto/generation/AddGenerationRequest.java → .../generation/dto/AddGenerationRequest.java
@@ -1,4 +1,4 @@
-package cotato.csquiz.controller.dto.generation;
+package org.cotato.csquiz.api.generation.dto;
 
 import jakarta.validation.constraints.NotNull;
 import java.time.LocalDate;

diff --git a/...dto/generation/AddGenerationResponse.java → ...generation/dto/AddGenerationResponse.java b/...dto/generation/AddGenerationResponse.java → ...generation/dto/AddGenerationResponse.java
@@ -1,6 +1,6 @@
-package cotato.csquiz.controller.dto.generation;
+package org.cotato.csquiz.api.generation.dto;
 
-import cotato.csquiz.domain.entity.Generation;
+import org.cotato.csquiz.domain.generation.entity.Generation;
 
 public record AddGenerationResponse(
         Long generationId

diff --git a/...ration/ChangeGenerationPeriodRequest.java → ...on/dto/ChangeGenerationPeriodRequest.java b/...ration/ChangeGenerationPeriodRequest.java → ...on/dto/ChangeGenerationPeriodRequest.java
@@ -1,4 +1,4 @@
-package cotato.csquiz.controller.dto.generation;
+package org.cotato.csquiz.api.generation.dto;
 
 import jakarta.validation.constraints.NotNull;
 import java.time.LocalDate;

diff --git a/...ration/ChangeRecruitingStatusRequest.java → ...on/dto/ChangeRecruitingStatusRequest.java b/...ration/ChangeRecruitingStatusRequest.java → ...on/dto/ChangeRecruitingStatusRequest.java
@@ -1,4 +1,4 @@
-package cotato.csquiz.controller.dto.generation;
+package org.cotato.csquiz.api.generation.dto;
 
 
 import jakarta.validation.constraints.NotNull;

diff --git a/...to/generation/GenerationInfoResponse.java → ...eneration/dto/GenerationInfoResponse.java b/...to/generation/GenerationInfoResponse.java → ...eneration/dto/GenerationInfoResponse.java
@@ -1,6 +1,6 @@
-package cotato.csquiz.controller.dto.generation;
+package org.cotato.csquiz.api.generation.dto;
 
-import cotato.csquiz.domain.entity.Generation;
+import org.cotato.csquiz.domain.generation.entity.Generation;
 
 public record GenerationInfoResponse(
         Long generationId,

diff --git a/...o/csquiz/controller/MemberController.java → ...i/member/controller/MemberController.java b/...o/csquiz/controller/MemberController.java → ...i/member/controller/MemberController.java
@@ -1,11 +1,11 @@
-package cotato.csquiz.controller;
+package org.cotato.csquiz.api.member.controller;
 
-import cotato.csquiz.config.jwt.JwtTokenProvider;
-import cotato.csquiz.controller.dto.auth.MemberInfoResponse;
-import cotato.csquiz.controller.dto.member.CheckPasswordRequest;
-import cotato.csquiz.controller.dto.member.MemberMyPageInfoResponse;
-import cotato.csquiz.controller.dto.member.UpdatePasswordRequest;
-import cotato.csquiz.service.MemberService;
+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.member.dto.CheckPasswordRequest;
+import org.cotato.csquiz.api.member.dto.MemberMyPageInfoResponse;
+import org.cotato.csquiz.api.member.dto.UpdatePasswordRequest;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -29,7 +29,8 @@ public class MemberController {
     private final JwtTokenProvider jwtTokenProvider;
 
     @GetMapping("/info")
-    public ResponseEntity<MemberInfoResponse> findMemberInfo(@RequestHeader("Authorization") String authorizationHeader) {
+    public ResponseEntity<MemberInfoResponse> findMemberInfo(
+            @RequestHeader("Authorization") String authorizationHeader) {
         String accessToken = jwtTokenProvider.getBearer(authorizationHeader);
         Long memberId = jwtTokenProvider.getMemberId(accessToken);
         return ResponseEntity.ok().body(memberService.findMemberInfo(memberId));