From d2efbdf7a29fe8283ab2cf6929082dfe7b5fd86a Mon Sep 17 00:00:00 2001 From: Youth Date: Sun, 19 May 2024 02:18:37 +0900 Subject: [PATCH] =?UTF-8?q?Refactor:=20Ver2=20=EB=94=94=EB=A0=89=ED=86=A0?= =?UTF-8?q?=EB=A6=AC=20=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cotato/csquiz/domain/entity/Member.java | 81 ------------------- .../cotato/csquiz/CsquizApplication.java | 2 +- .../admin}/controller/AdminController.java | 18 ++--- .../api/auth}/controller/AuthController.java | 16 ++-- .../auth/dto}/ApplyMemberInfoResponse.java | 4 +- .../api/auth/dto}/FindPasswordResponse.java | 2 +- .../csquiz/api/auth/dto}/JoinRequest.java | 2 +- .../csquiz/api/auth/dto}/LogoutRequest.java | 2 +- .../api/auth/dto}/MemberInfoResponse.java | 6 +- .../csquiz/api/auth/dto}/ReissueResponse.java | 2 +- .../api/auth/dto}/SendEmailRequest.java | 2 +- .../controller/EducationController.java | 23 +++--- .../education}/dto/AllEducationResponse.java | 4 +- .../dto}/CreateEducationRequest.java | 2 +- .../dto}/CreateEducationResponse.java | 4 +- .../dto}/EducationIdOfQuizResponse.java | 4 +- .../dto}/FindEducationStatusResponse.java | 6 +- .../education/dto}/PatchEducationRequest.java | 4 +- .../education/dto}/PatchStatusRequest.java | 4 +- .../dto}/UpdateEducationRequest.java | 2 +- .../education/dto}/WinnerInfoResponse.java | 8 +- .../controller/GenerationController.java | 14 ++-- .../generation/dto}/AddGenerationRequest.java | 2 +- .../dto}/AddGenerationResponse.java | 4 +- .../dto}/ChangeGenerationPeriodRequest.java | 2 +- .../dto}/ChangeRecruitingStatusRequest.java | 2 +- .../dto}/GenerationInfoResponse.java | 4 +- .../member}/controller/MemberController.java | 17 ++-- .../api/member/dto}/CheckPasswordRequest.java | 2 +- .../api/member/dto}/MemberApproveRequest.java | 4 +- .../api/member/dto}/MemberEmailResponse.java | 2 +- .../member/dto}/MemberEnrollInfoResponse.java | 8 +- .../csquiz/api/member/dto}/MemberInfo.java | 8 +- .../member/dto}/MemberMyPageInfoResponse.java | 6 +- .../api/member/dto}/MemberRejectRequest.java | 2 +- .../dto}/UpdateActiveMemberRoleRequest.java | 4 +- .../UpdateActiveMemberToOldMemberRequest.java | 2 +- .../dto}/UpdateOldMemberRoleRequest.java | 2 +- .../member/dto}/UpdatePasswordRequest.java | 2 +- .../mypage}/controller/MyPageController.java | 16 ++-- .../api/mypage/dto}/HallOfFameInfo.java | 4 +- .../api/mypage/dto}/HallOfFameResponse.java | 2 +- .../api/mypage/dto}/MyHallOfFameInfo.java | 4 +- .../mypage/dto}/MyPageMemberInfoResponse.java | 8 +- .../api/quiz}/controller/QuizController.java | 22 ++--- .../quiz/dto}/AddAdditionalAnswerRequest.java | 2 +- .../quiz/dto}/AllQuizzesInCsQuizResponse.java | 2 +- .../api/quiz/dto}/AllQuizzesResponse.java | 2 +- .../csquiz/api/quiz/dto}/ChoiceResponse.java | 6 +- .../api/quiz/dto}/CreateChoiceRequest.java | 4 +- .../quiz/dto}/CreateMultipleQuizRequest.java | 2 +- .../api/quiz/dto}/CreateQuizzesRequest.java | 2 +- .../quiz/dto}/CreateShortAnswerRequest.java | 2 +- .../api/quiz/dto}/CreateShortQuizRequest.java | 2 +- .../api/quiz/dto}/CsAdminQuizResponse.java | 6 +- .../quiz/dto}/FindMultipleQuizResponse.java | 6 +- .../csquiz/api/quiz/dto}/KingMemberInfo.java | 4 +- .../api/quiz/dto}/MultipleQuizResponse.java | 4 +- .../quiz/dto}/QuizInfoInCsQuizResponse.java | 6 +- .../quiz/dto}/QuizKingMembersResponse.java | 2 +- .../csquiz/api/quiz/dto}/QuizResponse.java | 6 +- .../csquiz/api/quiz/dto}/QuizResultInfo.java | 6 +- .../api/quiz/dto}/ShortAnswerResponse.java | 4 +- .../api/quiz/dto}/ShortQuizResponse.java | 4 +- .../record}/controller/RecordController.java | 12 +-- .../api/record/dto}/RecordResponse.java | 6 +- .../record/dto}/RecordsAndScorerResponse.java | 2 +- .../api/record/dto}/RegradeRequest.java | 2 +- .../csquiz/api/record/dto}/ReplyRequest.java | 2 +- .../csquiz/api/record/dto}/ReplyResponse.java | 2 +- .../api/record/dto}/ScorerResponse.java | 6 +- .../controller/SessionController.java | 22 ++--- .../api/session/dto}/AddSessionRequest.java | 8 +- .../api/session/dto}/AddSessionResponse.java | 4 +- .../CsEducationOnSessionNumberResponse.java | 4 +- .../api/session/dto}/SessionListResponse.java | 10 +-- .../dto}/UpdateSessionDescriptionRequest.java | 2 +- .../dto}/UpdateSessionNumberRequest.java | 2 +- .../dto}/UpdateSessionPhotoRequest.java | 2 +- .../session/dto}/UpdateSessionRequest.java | 8 +- .../socket}/controller/SocketController.java | 14 ++-- .../api/socket/dto}/CsQuizStopResponse.java | 2 +- .../socket/dto}/EducationCloseRequest.java | 2 +- .../api/socket/dto}/QuizOpenRequest.java | 2 +- .../api/socket/dto}/QuizSocketRequest.java | 2 +- .../api/socket/dto}/QuizStartResponse.java | 2 +- .../api/socket/dto}/QuizStatusResponse.java | 4 +- .../api/socket/dto}/QuizStopResponse.java | 2 +- .../api/socket/dto}/SocketTokenDto.java | 2 +- .../cotato/csquiz/common}/S3/S3Config.java | 3 +- .../cotato/csquiz/common}/S3/S3Uploader.java | 6 +- .../csquiz/common}/SchedulerService.java | 11 +-- .../csquiz/common}/config/CorsConfig.java | 2 +- .../csquiz/common}/config/EncodeConfig.java | 4 +- .../csquiz/common}/config/JpaConfig.java | 2 +- .../csquiz/common}/config/RedisConfig.java | 2 +- .../csquiz/common}/config/SecurityConfig.java | 12 +-- .../csquiz/common}/config/SwaggerConfig.java | 4 +- .../common/config}/WebSocketConfig.java | 7 +- .../common}/config/auth/PrincipalDetails.java | 4 +- .../config/auth/PrincipalDetailsService.java | 6 +- .../filter/JwtAuthenticationFilter.java | 16 ++-- .../config/filter/JwtAuthorizationFilter.java | 10 +-- .../config/filter/JwtExceptionFilter.java | 8 +- .../csquiz/common}/config/jwt/BlackList.java | 2 +- .../config/jwt/BlackListRepository.java | 2 +- .../common}/config/jwt/JwtTokenProvider.java | 10 +-- .../common}/config/jwt/RefreshToken.java | 2 +- .../config/jwt/RefreshTokenRepository.java | 2 +- .../csquiz/common}/config/jwt/Token.java | 2 +- .../csquiz/common}/entity/BaseTimeEntity.java | 2 +- .../csquiz/common/error}/ErrorCode.java | 2 +- .../common/error}/exception/AppException.java | 3 +- .../FilterAuthenticationException.java | 2 +- .../error}/exception/ImageException.java | 3 +- .../exception/InterceptorException.java | 2 +- .../exception/InterceptorRoleException.java | 2 +- .../handler}/GlobalExceptionHandler.java | 9 ++- .../common/error/response}/ErrorResponse.java | 3 +- .../MethodArgumentErrorResponse.java | 3 +- .../interceptor}/HandshakeInterceptor.java | 10 +-- .../common}/websocket/WebSocketHandler.java | 24 +++--- .../VerificationCodeRedisRepository.java | 2 +- .../domain/auth}/constant/EmailConstants.java | 2 +- .../domain/auth}/constant/TokenConstants.java | 2 +- .../domain/auth}/entity/RefusedMember.java | 5 +- .../domain/auth}/enums/MemberPosition.java | 2 +- .../csquiz/domain/auth}/enums/MemberRole.java | 6 +- .../domain/auth}/enums/MemberRoleGroup.java | 2 +- .../auth}/repository/MemberRepository.java | 6 +- .../repository/RefusedMemberRepository.java | 6 +- .../domain/auth}/service/AdminService.java | 72 ++++++++--------- .../domain/auth}/service/AuthService.java | 36 ++++----- .../service/EmailVerificationService.java | 18 ++--- .../domain/auth}/service/EncryptService.java | 2 +- .../domain/auth}/service/MemberService.java | 18 ++--- .../domain/auth}/service/ValidateService.java | 8 +- .../auth}/utils/EmailFormValidator.java | 6 +- .../cache}/QuizAnswerRedisRepository.java | 26 +++--- .../cache}/ScorerExistRedisRepository.java | 6 +- .../cache}/TicketCountRedisRepository.java | 2 +- .../domain/education}/entity/Choice.java | 8 +- .../domain/education}/entity/Education.java | 6 +- .../domain/education}/entity/KingMember.java | 5 +- .../education}/entity/MultipleQuiz.java | 4 +- .../csquiz/domain/education}/entity/Quiz.java | 8 +- .../domain/education}/entity/Record.java | 5 +- .../domain/education}/entity/Scorer.java | 4 +- .../domain/education}/entity/ShortAnswer.java | 4 +- .../domain/education}/entity/ShortQuiz.java | 4 +- .../domain/education}/entity/Winner.java | 4 +- .../education}/enums/ChoiceCorrect.java | 2 +- .../education}/enums/EducationStatus.java | 2 +- .../domain/education}/enums/QuizStatus.java | 2 +- .../domain/education}/enums/QuizType.java | 2 +- .../repository/ChoiceRepository.java | 6 +- .../repository/EducationRepository.java | 4 +- .../repository/KingMemberRepository.java | 6 +- .../education}/repository/QuizRepository.java | 6 +- .../repository/RecordRepository.java | 6 +- .../repository/ScorerRepository.java | 4 +- .../repository/ShortAnswerRepository.java | 6 +- .../repository/WinnerRepository.java | 6 +- .../education}/service/EducationService.java | 47 +++++------ .../education}/service/KingMemberService.java | 25 +++--- .../education}/service/MyPageService.java | 38 ++++----- .../education}/service/QuizService.java | 77 +++++++++--------- .../education}/service/RecordService.java | 51 ++++++------ .../education}/service/SocketService.java | 34 ++++---- .../domain/generation}/entity/Generation.java | 4 +- .../domain/generation}/entity/Session.java | 10 +-- .../domain/generation}/enums/CSEducation.java | 2 +- .../domain/generation}/enums/ItIssue.java | 2 +- .../domain/generation}/enums/Networking.java | 2 +- .../repository/GenerationRepository.java | 7 +- .../repository/SessionRepository.java | 8 +- .../service/GenerationService.java | 20 ++--- .../generation}/service/SessionService.java | 37 ++++----- 178 files changed, 677 insertions(+), 739 deletions(-) delete mode 100644 src/main/java/cotato/csquiz/domain/entity/Member.java rename src/main/java/{ => org}/cotato/csquiz/CsquizApplication.java (93%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/api/admin}/controller/AdminController.java (86%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/api/auth}/controller/AuthController.java (89%) rename src/main/java/{cotato/csquiz/controller/dto/auth => org/cotato/csquiz/api/auth/dto}/ApplyMemberInfoResponse.java (79%) rename src/main/java/{cotato/csquiz/controller/dto/auth => org/cotato/csquiz/api/auth/dto}/FindPasswordResponse.java (82%) rename src/main/java/{cotato/csquiz/controller/dto/auth => org/cotato/csquiz/api/auth/dto}/JoinRequest.java (95%) rename src/main/java/{cotato/csquiz/controller/dto/auth => org/cotato/csquiz/api/auth/dto}/LogoutRequest.java (74%) rename src/main/java/{cotato/csquiz/controller/dto/auth => org/cotato/csquiz/api/auth/dto}/MemberInfoResponse.java (73%) rename src/main/java/{cotato/csquiz/controller/dto/auth => org/cotato/csquiz/api/auth/dto}/ReissueResponse.java (80%) rename src/main/java/{cotato/csquiz/controller/dto/email => org/cotato/csquiz/api/auth/dto}/SendEmailRequest.java (80%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/api/education}/controller/EducationController.java (79%) rename src/main/java/{cotato/csquiz/controller => org/cotato/csquiz/api/education}/dto/AllEducationResponse.java (77%) rename src/main/java/{cotato/csquiz/controller/dto/education => org/cotato/csquiz/api/education/dto}/CreateEducationRequest.java (82%) rename src/main/java/{cotato/csquiz/controller/dto/education => org/cotato/csquiz/api/education/dto}/CreateEducationResponse.java (66%) rename src/main/java/{cotato/csquiz/controller/dto/education => org/cotato/csquiz/api/education/dto}/EducationIdOfQuizResponse.java (70%) rename src/main/java/{cotato/csquiz/controller/dto/education => org/cotato/csquiz/api/education/dto}/FindEducationStatusResponse.java (57%) rename src/main/java/{cotato/csquiz/controller/dto/education => org/cotato/csquiz/api/education/dto}/PatchEducationRequest.java (54%) rename src/main/java/{cotato/csquiz/controller/dto/education => org/cotato/csquiz/api/education/dto}/PatchStatusRequest.java (54%) rename src/main/java/{cotato/csquiz/controller/dto/education => org/cotato/csquiz/api/education/dto}/UpdateEducationRequest.java (82%) rename src/main/java/{cotato/csquiz/controller/dto/education => org/cotato/csquiz/api/education/dto}/WinnerInfoResponse.java (71%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/api/generation}/controller/GenerationController.java (78%) rename src/main/java/{cotato/csquiz/controller/dto/generation => org/cotato/csquiz/api/generation/dto}/AddGenerationRequest.java (86%) rename src/main/java/{cotato/csquiz/controller/dto/generation => org/cotato/csquiz/api/generation/dto}/AddGenerationResponse.java (65%) rename src/main/java/{cotato/csquiz/controller/dto/generation => org/cotato/csquiz/api/generation/dto}/ChangeGenerationPeriodRequest.java (84%) rename src/main/java/{cotato/csquiz/controller/dto/generation => org/cotato/csquiz/api/generation/dto}/ChangeRecruitingStatusRequest.java (79%) rename src/main/java/{cotato/csquiz/controller/dto/generation => org/cotato/csquiz/api/generation/dto}/GenerationInfoResponse.java (78%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/api/member}/controller/MemberController.java (80%) rename src/main/java/{cotato/csquiz/controller/dto/member => org/cotato/csquiz/api/member/dto}/CheckPasswordRequest.java (74%) rename src/main/java/{cotato/csquiz/controller/dto/member => org/cotato/csquiz/api/member/dto}/MemberApproveRequest.java (68%) rename src/main/java/{cotato/csquiz/controller/dto/member => org/cotato/csquiz/api/member/dto}/MemberEmailResponse.java (79%) rename src/main/java/{cotato/csquiz/controller/dto/member => org/cotato/csquiz/api/member/dto}/MemberEnrollInfoResponse.java (70%) rename src/main/java/{cotato/csquiz/controller/dto/member => org/cotato/csquiz/api/member/dto}/MemberInfo.java (72%) rename src/main/java/{cotato/csquiz/controller/dto/member => org/cotato/csquiz/api/member/dto}/MemberMyPageInfoResponse.java (79%) rename src/main/java/{cotato/csquiz/controller/dto/member => org/cotato/csquiz/api/member/dto}/MemberRejectRequest.java (74%) rename src/main/java/{cotato/csquiz/controller/dto/member => org/cotato/csquiz/api/member/dto}/UpdateActiveMemberRoleRequest.java (65%) rename src/main/java/{cotato/csquiz/controller/dto/member => org/cotato/csquiz/api/member/dto}/UpdateActiveMemberToOldMemberRequest.java (79%) rename src/main/java/{cotato/csquiz/controller/dto/member => org/cotato/csquiz/api/member/dto}/UpdateOldMemberRoleRequest.java (75%) rename src/main/java/{cotato/csquiz/controller/dto/member => org/cotato/csquiz/api/member/dto}/UpdatePasswordRequest.java (74%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/api/mypage}/controller/MyPageController.java (76%) rename src/main/java/{cotato/csquiz/controller/dto/mypage => org/cotato/csquiz/api/mypage/dto}/HallOfFameInfo.java (76%) rename src/main/java/{cotato/csquiz/controller/dto/mypage => org/cotato/csquiz/api/mypage/dto}/HallOfFameResponse.java (91%) rename src/main/java/{cotato/csquiz/controller/dto/mypage => org/cotato/csquiz/api/mypage/dto}/MyHallOfFameInfo.java (78%) rename src/main/java/{cotato/csquiz/controller/dto/mypage => org/cotato/csquiz/api/mypage/dto}/MyPageMemberInfoResponse.java (74%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/api/quiz}/controller/QuizController.java (81%) rename src/main/java/{cotato/csquiz/controller/dto/quiz => org/cotato/csquiz/api/quiz/dto}/AddAdditionalAnswerRequest.java (80%) rename src/main/java/{cotato/csquiz/controller/dto/quiz => org/cotato/csquiz/api/quiz/dto}/AllQuizzesInCsQuizResponse.java (87%) rename src/main/java/{cotato/csquiz/controller/dto/quiz => org/cotato/csquiz/api/quiz/dto}/AllQuizzesResponse.java (86%) rename src/main/java/{cotato/csquiz/controller/dto/quiz => org/cotato/csquiz/api/quiz/dto}/ChoiceResponse.java (80%) rename src/main/java/{cotato/csquiz/controller/dto/quiz => org/cotato/csquiz/api/quiz/dto}/CreateChoiceRequest.java (60%) rename src/main/java/{cotato/csquiz/controller/dto/quiz => org/cotato/csquiz/api/quiz/dto}/CreateMultipleQuizRequest.java (90%) rename src/main/java/{cotato/csquiz/controller/dto/quiz => org/cotato/csquiz/api/quiz/dto}/CreateQuizzesRequest.java (89%) rename src/main/java/{cotato/csquiz/controller/dto/quiz => org/cotato/csquiz/api/quiz/dto}/CreateShortAnswerRequest.java (69%) rename src/main/java/{cotato/csquiz/controller/dto/quiz => org/cotato/csquiz/api/quiz/dto}/CreateShortQuizRequest.java (90%) rename src/main/java/{cotato/csquiz/controller/dto/quiz => org/cotato/csquiz/api/quiz/dto}/CsAdminQuizResponse.java (74%) rename src/main/java/{cotato/csquiz/controller/dto/quiz => org/cotato/csquiz/api/quiz/dto}/FindMultipleQuizResponse.java (85%) rename src/main/java/{cotato/csquiz/controller/dto/quiz => org/cotato/csquiz/api/quiz/dto}/KingMemberInfo.java (78%) rename src/main/java/{cotato/csquiz/controller/dto/quiz => org/cotato/csquiz/api/quiz/dto}/MultipleQuizResponse.java (87%) rename src/main/java/{cotato/csquiz/controller/dto/quiz => org/cotato/csquiz/api/quiz/dto}/QuizInfoInCsQuizResponse.java (76%) rename src/main/java/{cotato/csquiz/controller/dto/quiz => org/cotato/csquiz/api/quiz/dto}/QuizKingMembersResponse.java (85%) rename src/main/java/{cotato/csquiz/controller/dto/quiz => org/cotato/csquiz/api/quiz/dto}/QuizResponse.java (79%) rename src/main/java/{cotato/csquiz/controller/dto/quiz => org/cotato/csquiz/api/quiz/dto}/QuizResultInfo.java (83%) rename src/main/java/{cotato/csquiz/controller/dto/quiz => org/cotato/csquiz/api/quiz/dto}/ShortAnswerResponse.java (69%) rename src/main/java/{cotato/csquiz/controller/dto/quiz => org/cotato/csquiz/api/quiz/dto}/ShortQuizResponse.java (88%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/api/record}/controller/RecordController.java (82%) rename src/main/java/{cotato/csquiz/controller/dto/record => org/cotato/csquiz/api/record/dto}/RecordResponse.java (78%) rename src/main/java/{cotato/csquiz/controller/dto/record => org/cotato/csquiz/api/record/dto}/RecordsAndScorerResponse.java (92%) rename src/main/java/{cotato/csquiz/controller/dto/record => org/cotato/csquiz/api/record/dto}/RegradeRequest.java (78%) rename src/main/java/{cotato/csquiz/controller/dto/record => org/cotato/csquiz/api/record/dto}/ReplyRequest.java (86%) rename src/main/java/{cotato/csquiz/controller/dto/record => org/cotato/csquiz/api/record/dto}/ReplyResponse.java (79%) rename src/main/java/{cotato/csquiz/controller/dto/record => org/cotato/csquiz/api/record/dto}/ScorerResponse.java (73%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/api/session}/controller/SessionController.java (80%) rename src/main/java/{cotato/csquiz/controller/dto/session => org/cotato/csquiz/api/session/dto}/AddSessionRequest.java (61%) rename src/main/java/{cotato/csquiz/controller/dto/session => org/cotato/csquiz/api/session/dto}/AddSessionResponse.java (73%) rename src/main/java/{cotato/csquiz/controller/dto/session => org/cotato/csquiz/api/session/dto}/CsEducationOnSessionNumberResponse.java (76%) rename src/main/java/{cotato/csquiz/controller/dto/session => org/cotato/csquiz/api/session/dto}/SessionListResponse.java (71%) rename src/main/java/{cotato/csquiz/controller/dto/session => org/cotato/csquiz/api/session/dto}/UpdateSessionDescriptionRequest.java (80%) rename src/main/java/{cotato/csquiz/controller/dto/session => org/cotato/csquiz/api/session/dto}/UpdateSessionNumberRequest.java (79%) rename src/main/java/{cotato/csquiz/controller/dto/session => org/cotato/csquiz/api/session/dto}/UpdateSessionPhotoRequest.java (85%) rename src/main/java/{cotato/csquiz/controller/dto/session => org/cotato/csquiz/api/session/dto}/UpdateSessionRequest.java (66%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/api/socket}/controller/SocketController.java (85%) rename src/main/java/{cotato/csquiz/controller/dto/socket => org/cotato/csquiz/api/socket/dto}/CsQuizStopResponse.java (86%) rename src/main/java/{cotato/csquiz/controller/dto/socket => org/cotato/csquiz/api/socket/dto}/EducationCloseRequest.java (74%) rename src/main/java/{cotato/csquiz/controller/dto/socket => org/cotato/csquiz/api/socket/dto}/QuizOpenRequest.java (73%) rename src/main/java/{cotato/csquiz/controller/dto/socket => org/cotato/csquiz/api/socket/dto}/QuizSocketRequest.java (73%) rename src/main/java/{cotato/csquiz/controller/dto/socket => org/cotato/csquiz/api/socket/dto}/QuizStartResponse.java (77%) rename src/main/java/{cotato/csquiz/controller/dto/socket => org/cotato/csquiz/api/socket/dto}/QuizStatusResponse.java (67%) rename src/main/java/{cotato/csquiz/controller/dto/socket => org/cotato/csquiz/api/socket/dto}/QuizStopResponse.java (85%) rename src/main/java/{cotato/csquiz/controller/dto/socket => org/cotato/csquiz/api/socket/dto}/SocketTokenDto.java (81%) rename src/main/java/{cotato/csquiz/global => org/cotato/csquiz/common}/S3/S3Config.java (92%) rename src/main/java/{cotato/csquiz/global => org/cotato/csquiz/common}/S3/S3Uploader.java (95%) rename src/main/java/{cotato/csquiz/service => org/cotato/csquiz/common}/SchedulerService.java (80%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/common}/config/CorsConfig.java (96%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/common}/config/EncodeConfig.java (94%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/common}/config/JpaConfig.java (82%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/common}/config/RedisConfig.java (95%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/common}/config/SecurityConfig.java (92%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/common}/config/SwaggerConfig.java (96%) rename src/main/java/{cotato/csquiz/global/websocket => org/cotato/csquiz/common/config}/WebSocketConfig.java (83%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/common}/config/auth/PrincipalDetails.java (92%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/common}/config/auth/PrincipalDetailsService.java (84%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/common}/config/filter/JwtAuthenticationFilter.java (87%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/common}/config/filter/JwtAuthorizationFilter.java (90%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/common}/config/filter/JwtExceptionFilter.java (89%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/common}/config/jwt/BlackList.java (89%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/common}/config/jwt/BlackListRepository.java (82%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/common}/config/jwt/JwtTokenProvider.java (94%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/common}/config/jwt/RefreshToken.java (91%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/common}/config/jwt/RefreshTokenRepository.java (82%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/common}/config/jwt/Token.java (87%) rename src/main/java/{cotato/csquiz/global => org/cotato/csquiz/common}/entity/BaseTimeEntity.java (93%) rename src/main/java/{cotato/csquiz/exception => org/cotato/csquiz/common/error}/ErrorCode.java (99%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/common/error}/exception/AppException.java (63%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/common/error}/exception/FilterAuthenticationException.java (78%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/common/error}/exception/ImageException.java (67%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/common/error}/exception/InterceptorException.java (78%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/common/error}/exception/InterceptorRoleException.java (78%) rename src/main/java/{cotato/csquiz/exception => org/cotato/csquiz/common/error/handler}/GlobalExceptionHandler.java (90%) rename src/main/java/{cotato/csquiz/exception => org/cotato/csquiz/common/error/response}/ErrorResponse.java (88%) rename src/main/java/{cotato/csquiz/exception => org/cotato/csquiz/common/error/response}/MethodArgumentErrorResponse.java (93%) rename src/main/java/{cotato/csquiz/global/websocket => org/cotato/csquiz/common/interceptor}/HandshakeInterceptor.java (89%) rename src/main/java/{cotato/csquiz/global => org/cotato/csquiz/common}/websocket/WebSocketHandler.java (90%) rename src/main/java/{cotato/csquiz/utils => org/cotato/csquiz/domain/auth/cache}/VerificationCodeRedisRepository.java (95%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/auth}/constant/EmailConstants.java (96%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/auth}/constant/TokenConstants.java (82%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/auth}/entity/RefusedMember.java (87%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/auth}/enums/MemberPosition.java (85%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/auth}/enums/MemberRole.java (80%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/auth}/enums/MemberRoleGroup.java (93%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/auth}/repository/MemberRepository.java (83%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/auth}/repository/RefusedMemberRepository.java (69%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/auth}/service/AdminService.java (74%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/auth}/service/AuthService.java (87%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/auth}/service/EmailVerificationService.java (84%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/auth}/service/EncryptService.java (95%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/auth}/service/MemberService.java (87%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/auth}/service/ValidateService.java (91%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/auth}/utils/EmailFormValidator.java (84%) rename src/main/java/{cotato/csquiz/utils => org/cotato/csquiz/domain/education/cache}/QuizAnswerRedisRepository.java (87%) rename src/main/java/{cotato/csquiz/utils => org/cotato/csquiz/domain/education/cache}/ScorerExistRedisRepository.java (91%) rename src/main/java/{cotato/csquiz/utils => org/cotato/csquiz/domain/education/cache}/TicketCountRedisRepository.java (91%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/education}/entity/Choice.java (88%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/education}/entity/Education.java (90%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/education}/entity/KingMember.java (89%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/education}/entity/MultipleQuiz.java (77%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/education}/entity/Quiz.java (92%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/education}/entity/Record.java (90%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/education}/entity/Scorer.java (91%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/education}/entity/ShortAnswer.java (91%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/education}/entity/ShortQuiz.java (77%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/education}/entity/Winner.java (91%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/education}/enums/ChoiceCorrect.java (82%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/education}/enums/EducationStatus.java (81%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/education}/enums/QuizStatus.java (80%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/education}/enums/QuizType.java (79%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/education}/repository/ChoiceRepository.java (81%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/education}/repository/EducationRepository.java (74%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/education}/repository/KingMemberRepository.java (56%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/education}/repository/QuizRepository.java (85%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/education}/repository/RecordRepository.java (83%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/education}/repository/ScorerRepository.java (86%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/education}/repository/ShortAnswerRepository.java (81%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/education}/repository/WinnerRepository.java (56%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/education}/service/EducationService.java (77%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/education}/service/KingMemberService.java (80%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/education}/service/MyPageService.java (83%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/education}/service/QuizService.java (83%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/education}/service/RecordService.java (83%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/education}/service/SocketService.java (84%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/generation}/entity/Generation.java (93%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/generation}/entity/Session.java (89%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/generation}/enums/CSEducation.java (82%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/generation}/enums/ItIssue.java (79%) rename src/main/java/{cotato/csquiz/domain => org/cotato/csquiz/domain/generation}/enums/Networking.java (82%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/generation}/repository/GenerationRepository.java (65%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/generation}/repository/SessionRepository.java (57%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/generation}/service/GenerationService.java (81%) rename src/main/java/{cotato/csquiz => org/cotato/csquiz/domain/generation}/service/SessionService.java (83%) diff --git a/src/main/java/cotato/csquiz/domain/entity/Member.java b/src/main/java/cotato/csquiz/domain/entity/Member.java deleted file mode 100644 index 4f4582e4..00000000 --- a/src/main/java/cotato/csquiz/domain/entity/Member.java +++ /dev/null @@ -1,81 +0,0 @@ -package cotato.csquiz.domain.entity; - -import cotato.csquiz.domain.enums.MemberPosition; -import cotato.csquiz.domain.enums.MemberRole; -import cotato.csquiz.global.entity.BaseTimeEntity; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.validation.constraints.Email; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import org.hibernate.annotations.ColumnDefault; -import org.hibernate.annotations.DynamicInsert; - -@Entity -@Getter -@DynamicInsert -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class Member extends BaseTimeEntity { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "member_id") - private Long id; - - @Email - @Column(name = "member_email") - private String email; - - @Column(name = "member_password") - private String password; - - @Column(name = "member_phone") - private String phoneNumber; - - @Column(name = "member_name") - private String name; - - @Column(name = "member_position", nullable = false) - @Enumerated(EnumType.STRING) - @ColumnDefault(value = "'NONE'") - private MemberPosition position; - - @Column(name = "member_role") - @Enumerated(EnumType.STRING) - @ColumnDefault(value = "'GENERAL'") - private MemberRole role; - - @Column(name = "passed_generation_number") - private Integer passedGenerationNumber; - - @Builder - public Member(String email, String password, String name, String phoneNumber) { - this.email = email; - this.password = password; - this.name = name; - this.phoneNumber = phoneNumber; - } - - public void updateRole(MemberRole role) { - this.role = role; - } - - public void updatePassword(String password) { - this.password = password; - } - - public void updateGeneration(Integer passedGenerationNumber) { - this.passedGenerationNumber = passedGenerationNumber; - } - - public void updatePosition(MemberPosition position) { - this.position = position; - } -} diff --git a/src/main/java/cotato/csquiz/CsquizApplication.java b/src/main/java/org/cotato/csquiz/CsquizApplication.java similarity index 93% rename from src/main/java/cotato/csquiz/CsquizApplication.java rename to src/main/java/org/cotato/csquiz/CsquizApplication.java index 0d092237..a98b7ba7 100644 --- a/src/main/java/cotato/csquiz/CsquizApplication.java +++ b/src/main/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/src/main/java/cotato/csquiz/controller/AdminController.java b/src/main/java/org/cotato/csquiz/api/admin/controller/AdminController.java similarity index 86% rename from src/main/java/cotato/csquiz/controller/AdminController.java rename to src/main/java/org/cotato/csquiz/api/admin/controller/AdminController.java index 75ce656c..2cb2eb8d 100644 --- a/src/main/java/cotato/csquiz/controller/AdminController.java +++ b/src/main/java/org/cotato/csquiz/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/src/main/java/cotato/csquiz/controller/AuthController.java b/src/main/java/org/cotato/csquiz/api/auth/controller/AuthController.java similarity index 89% rename from src/main/java/cotato/csquiz/controller/AuthController.java rename to src/main/java/org/cotato/csquiz/api/auth/controller/AuthController.java index f359c6b3..ae8e37c0 100644 --- a/src/main/java/cotato/csquiz/controller/AuthController.java +++ b/src/main/java/org/cotato/csquiz/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/src/main/java/cotato/csquiz/controller/dto/auth/ApplyMemberInfoResponse.java b/src/main/java/org/cotato/csquiz/api/auth/dto/ApplyMemberInfoResponse.java similarity index 79% rename from src/main/java/cotato/csquiz/controller/dto/auth/ApplyMemberInfoResponse.java rename to src/main/java/org/cotato/csquiz/api/auth/dto/ApplyMemberInfoResponse.java index 4f68dc32..dc355af7 100644 --- a/src/main/java/cotato/csquiz/controller/dto/auth/ApplyMemberInfoResponse.java +++ b/src/main/java/org/cotato/csquiz/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/src/main/java/cotato/csquiz/controller/dto/auth/FindPasswordResponse.java b/src/main/java/org/cotato/csquiz/api/auth/dto/FindPasswordResponse.java similarity index 82% rename from src/main/java/cotato/csquiz/controller/dto/auth/FindPasswordResponse.java rename to src/main/java/org/cotato/csquiz/api/auth/dto/FindPasswordResponse.java index e5dd24c6..25dfc744 100644 --- a/src/main/java/cotato/csquiz/controller/dto/auth/FindPasswordResponse.java +++ b/src/main/java/org/cotato/csquiz/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/src/main/java/cotato/csquiz/controller/dto/auth/JoinRequest.java b/src/main/java/org/cotato/csquiz/api/auth/dto/JoinRequest.java similarity index 95% rename from src/main/java/cotato/csquiz/controller/dto/auth/JoinRequest.java rename to src/main/java/org/cotato/csquiz/api/auth/dto/JoinRequest.java index a887f786..9cc7b706 100644 --- a/src/main/java/cotato/csquiz/controller/dto/auth/JoinRequest.java +++ b/src/main/java/org/cotato/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/src/main/java/cotato/csquiz/controller/dto/auth/LogoutRequest.java b/src/main/java/org/cotato/csquiz/api/auth/dto/LogoutRequest.java similarity index 74% rename from src/main/java/cotato/csquiz/controller/dto/auth/LogoutRequest.java rename to src/main/java/org/cotato/csquiz/api/auth/dto/LogoutRequest.java index f8beed26..df544163 100644 --- a/src/main/java/cotato/csquiz/controller/dto/auth/LogoutRequest.java +++ b/src/main/java/org/cotato/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/src/main/java/cotato/csquiz/controller/dto/auth/MemberInfoResponse.java b/src/main/java/org/cotato/csquiz/api/auth/dto/MemberInfoResponse.java similarity index 73% rename from src/main/java/cotato/csquiz/controller/dto/auth/MemberInfoResponse.java rename to src/main/java/org/cotato/csquiz/api/auth/dto/MemberInfoResponse.java index b35ac7a5..a4f37a9a 100644 --- a/src/main/java/cotato/csquiz/controller/dto/auth/MemberInfoResponse.java +++ b/src/main/java/org/cotato/csquiz/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/src/main/java/cotato/csquiz/controller/dto/auth/ReissueResponse.java b/src/main/java/org/cotato/csquiz/api/auth/dto/ReissueResponse.java similarity index 80% rename from src/main/java/cotato/csquiz/controller/dto/auth/ReissueResponse.java rename to src/main/java/org/cotato/csquiz/api/auth/dto/ReissueResponse.java index bffb810a..f705579c 100644 --- a/src/main/java/cotato/csquiz/controller/dto/auth/ReissueResponse.java +++ b/src/main/java/org/cotato/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/src/main/java/cotato/csquiz/controller/dto/email/SendEmailRequest.java b/src/main/java/org/cotato/csquiz/api/auth/dto/SendEmailRequest.java similarity index 80% rename from src/main/java/cotato/csquiz/controller/dto/email/SendEmailRequest.java rename to src/main/java/org/cotato/csquiz/api/auth/dto/SendEmailRequest.java index c2fb8ffa..72b95b89 100644 --- a/src/main/java/cotato/csquiz/controller/dto/email/SendEmailRequest.java +++ b/src/main/java/org/cotato/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/src/main/java/cotato/csquiz/controller/EducationController.java b/src/main/java/org/cotato/csquiz/api/education/controller/EducationController.java similarity index 79% rename from src/main/java/cotato/csquiz/controller/EducationController.java rename to src/main/java/org/cotato/csquiz/api/education/controller/EducationController.java index 43f55f63..edf68c03 100644 --- a/src/main/java/cotato/csquiz/controller/EducationController.java +++ b/src/main/java/org/cotato/csquiz/api/education/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> findEducationListByGeneration( } @GetMapping("/status") - public ResponseEntity findEducationStatus(@RequestParam(value = "educationId") Long educationId) { + public ResponseEntity findEducationStatus( + @RequestParam(value = "educationId") Long educationId) { return ResponseEntity.ok().body(educationService.findEducationStatus(educationId)); } diff --git a/src/main/java/cotato/csquiz/controller/dto/AllEducationResponse.java b/src/main/java/org/cotato/csquiz/api/education/dto/AllEducationResponse.java similarity index 77% rename from src/main/java/cotato/csquiz/controller/dto/AllEducationResponse.java rename to src/main/java/org/cotato/csquiz/api/education/dto/AllEducationResponse.java index 4354b0c7..1cbf4f3b 100644 --- a/src/main/java/cotato/csquiz/controller/dto/AllEducationResponse.java +++ b/src/main/java/org/cotato/csquiz/api/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/src/main/java/cotato/csquiz/controller/dto/education/CreateEducationRequest.java b/src/main/java/org/cotato/csquiz/api/education/dto/CreateEducationRequest.java similarity index 82% rename from src/main/java/cotato/csquiz/controller/dto/education/CreateEducationRequest.java rename to src/main/java/org/cotato/csquiz/api/education/dto/CreateEducationRequest.java index 2139cf8f..60e35e31 100644 --- a/src/main/java/cotato/csquiz/controller/dto/education/CreateEducationRequest.java +++ b/src/main/java/org/cotato/csquiz/api/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/src/main/java/cotato/csquiz/controller/dto/education/CreateEducationResponse.java b/src/main/java/org/cotato/csquiz/api/education/dto/CreateEducationResponse.java similarity index 66% rename from src/main/java/cotato/csquiz/controller/dto/education/CreateEducationResponse.java rename to src/main/java/org/cotato/csquiz/api/education/dto/CreateEducationResponse.java index 686a6861..508a5434 100644 --- a/src/main/java/cotato/csquiz/controller/dto/education/CreateEducationResponse.java +++ b/src/main/java/org/cotato/csquiz/api/education/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/src/main/java/cotato/csquiz/controller/dto/education/EducationIdOfQuizResponse.java b/src/main/java/org/cotato/csquiz/api/education/dto/EducationIdOfQuizResponse.java similarity index 70% rename from src/main/java/cotato/csquiz/controller/dto/education/EducationIdOfQuizResponse.java rename to src/main/java/org/cotato/csquiz/api/education/dto/EducationIdOfQuizResponse.java index a6c41298..d6c65632 100644 --- a/src/main/java/cotato/csquiz/controller/dto/education/EducationIdOfQuizResponse.java +++ b/src/main/java/org/cotato/csquiz/api/education/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/src/main/java/cotato/csquiz/controller/dto/education/FindEducationStatusResponse.java b/src/main/java/org/cotato/csquiz/api/education/dto/FindEducationStatusResponse.java similarity index 57% rename from src/main/java/cotato/csquiz/controller/dto/education/FindEducationStatusResponse.java rename to src/main/java/org/cotato/csquiz/api/education/dto/FindEducationStatusResponse.java index cbc0febf..9c2b4b47 100644 --- a/src/main/java/cotato/csquiz/controller/dto/education/FindEducationStatusResponse.java +++ b/src/main/java/org/cotato/csquiz/api/education/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/src/main/java/cotato/csquiz/controller/dto/education/PatchEducationRequest.java b/src/main/java/org/cotato/csquiz/api/education/dto/PatchEducationRequest.java similarity index 54% rename from src/main/java/cotato/csquiz/controller/dto/education/PatchEducationRequest.java rename to src/main/java/org/cotato/csquiz/api/education/dto/PatchEducationRequest.java index 48af316f..1dc21f99 100644 --- a/src/main/java/cotato/csquiz/controller/dto/education/PatchEducationRequest.java +++ b/src/main/java/org/cotato/csquiz/api/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/src/main/java/cotato/csquiz/controller/dto/education/PatchStatusRequest.java b/src/main/java/org/cotato/csquiz/api/education/dto/PatchStatusRequest.java similarity index 54% rename from src/main/java/cotato/csquiz/controller/dto/education/PatchStatusRequest.java rename to src/main/java/org/cotato/csquiz/api/education/dto/PatchStatusRequest.java index 73756850..d9e6a76d 100644 --- a/src/main/java/cotato/csquiz/controller/dto/education/PatchStatusRequest.java +++ b/src/main/java/org/cotato/csquiz/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/src/main/java/cotato/csquiz/controller/dto/education/UpdateEducationRequest.java b/src/main/java/org/cotato/csquiz/api/education/dto/UpdateEducationRequest.java similarity index 82% rename from src/main/java/cotato/csquiz/controller/dto/education/UpdateEducationRequest.java rename to src/main/java/org/cotato/csquiz/api/education/dto/UpdateEducationRequest.java index cf804bd1..e9e950e2 100644 --- a/src/main/java/cotato/csquiz/controller/dto/education/UpdateEducationRequest.java +++ b/src/main/java/org/cotato/csquiz/api/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/src/main/java/cotato/csquiz/controller/dto/education/WinnerInfoResponse.java b/src/main/java/org/cotato/csquiz/api/education/dto/WinnerInfoResponse.java similarity index 71% rename from src/main/java/cotato/csquiz/controller/dto/education/WinnerInfoResponse.java rename to src/main/java/org/cotato/csquiz/api/education/dto/WinnerInfoResponse.java index d5bc24a4..d6d12533 100644 --- a/src/main/java/cotato/csquiz/controller/dto/education/WinnerInfoResponse.java +++ b/src/main/java/org/cotato/csquiz/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/src/main/java/cotato/csquiz/controller/GenerationController.java b/src/main/java/org/cotato/csquiz/api/generation/controller/GenerationController.java similarity index 78% rename from src/main/java/cotato/csquiz/controller/GenerationController.java rename to src/main/java/org/cotato/csquiz/api/generation/controller/GenerationController.java index c5a22bd0..5a23f810 100644 --- a/src/main/java/cotato/csquiz/controller/GenerationController.java +++ b/src/main/java/org/cotato/csquiz/api/generation/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/src/main/java/cotato/csquiz/controller/dto/generation/AddGenerationRequest.java b/src/main/java/org/cotato/csquiz/api/generation/dto/AddGenerationRequest.java similarity index 86% rename from src/main/java/cotato/csquiz/controller/dto/generation/AddGenerationRequest.java rename to src/main/java/org/cotato/csquiz/api/generation/dto/AddGenerationRequest.java index 42792c59..6f4f2e2b 100644 --- a/src/main/java/cotato/csquiz/controller/dto/generation/AddGenerationRequest.java +++ b/src/main/java/org/cotato/csquiz/api/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/src/main/java/cotato/csquiz/controller/dto/generation/AddGenerationResponse.java b/src/main/java/org/cotato/csquiz/api/generation/dto/AddGenerationResponse.java similarity index 65% rename from src/main/java/cotato/csquiz/controller/dto/generation/AddGenerationResponse.java rename to src/main/java/org/cotato/csquiz/api/generation/dto/AddGenerationResponse.java index d660b0d1..d332b959 100644 --- a/src/main/java/cotato/csquiz/controller/dto/generation/AddGenerationResponse.java +++ b/src/main/java/org/cotato/csquiz/api/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/src/main/java/cotato/csquiz/controller/dto/generation/ChangeGenerationPeriodRequest.java b/src/main/java/org/cotato/csquiz/api/generation/dto/ChangeGenerationPeriodRequest.java similarity index 84% rename from src/main/java/cotato/csquiz/controller/dto/generation/ChangeGenerationPeriodRequest.java rename to src/main/java/org/cotato/csquiz/api/generation/dto/ChangeGenerationPeriodRequest.java index 681f7163..a50db084 100644 --- a/src/main/java/cotato/csquiz/controller/dto/generation/ChangeGenerationPeriodRequest.java +++ b/src/main/java/org/cotato/csquiz/api/generation/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/src/main/java/cotato/csquiz/controller/dto/generation/ChangeRecruitingStatusRequest.java b/src/main/java/org/cotato/csquiz/api/generation/dto/ChangeRecruitingStatusRequest.java similarity index 79% rename from src/main/java/cotato/csquiz/controller/dto/generation/ChangeRecruitingStatusRequest.java rename to src/main/java/org/cotato/csquiz/api/generation/dto/ChangeRecruitingStatusRequest.java index dd3c2c74..ddaf79d1 100644 --- a/src/main/java/cotato/csquiz/controller/dto/generation/ChangeRecruitingStatusRequest.java +++ b/src/main/java/org/cotato/csquiz/api/generation/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/src/main/java/cotato/csquiz/controller/dto/generation/GenerationInfoResponse.java b/src/main/java/org/cotato/csquiz/api/generation/dto/GenerationInfoResponse.java similarity index 78% rename from src/main/java/cotato/csquiz/controller/dto/generation/GenerationInfoResponse.java rename to src/main/java/org/cotato/csquiz/api/generation/dto/GenerationInfoResponse.java index 77c3721a..c12147c1 100644 --- a/src/main/java/cotato/csquiz/controller/dto/generation/GenerationInfoResponse.java +++ b/src/main/java/org/cotato/csquiz/api/generation/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/src/main/java/cotato/csquiz/controller/MemberController.java b/src/main/java/org/cotato/csquiz/api/member/controller/MemberController.java similarity index 80% rename from src/main/java/cotato/csquiz/controller/MemberController.java rename to src/main/java/org/cotato/csquiz/api/member/controller/MemberController.java index 8103a515..b187c0e5 100644 --- a/src/main/java/cotato/csquiz/controller/MemberController.java +++ b/src/main/java/org/cotato/csquiz/api/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 findMemberInfo(@RequestHeader("Authorization") String authorizationHeader) { + public ResponseEntity findMemberInfo( + @RequestHeader("Authorization") String authorizationHeader) { String accessToken = jwtTokenProvider.getBearer(authorizationHeader); Long memberId = jwtTokenProvider.getMemberId(accessToken); return ResponseEntity.ok().body(memberService.findMemberInfo(memberId)); diff --git a/src/main/java/cotato/csquiz/controller/dto/member/CheckPasswordRequest.java b/src/main/java/org/cotato/csquiz/api/member/dto/CheckPasswordRequest.java similarity index 74% rename from src/main/java/cotato/csquiz/controller/dto/member/CheckPasswordRequest.java rename to src/main/java/org/cotato/csquiz/api/member/dto/CheckPasswordRequest.java index 5c72c8f5..5ece8571 100644 --- a/src/main/java/cotato/csquiz/controller/dto/member/CheckPasswordRequest.java +++ b/src/main/java/org/cotato/csquiz/api/member/dto/CheckPasswordRequest.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.member; +package org.cotato.csquiz.api.member.dto; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/cotato/csquiz/controller/dto/member/MemberApproveRequest.java b/src/main/java/org/cotato/csquiz/api/member/dto/MemberApproveRequest.java similarity index 68% rename from src/main/java/cotato/csquiz/controller/dto/member/MemberApproveRequest.java rename to src/main/java/org/cotato/csquiz/api/member/dto/MemberApproveRequest.java index 3fea4a8c..07f18b2c 100644 --- a/src/main/java/cotato/csquiz/controller/dto/member/MemberApproveRequest.java +++ b/src/main/java/org/cotato/csquiz/api/member/dto/MemberApproveRequest.java @@ -1,6 +1,6 @@ -package cotato.csquiz.controller.dto.member; +package org.cotato.csquiz.api.member.dto; -import cotato.csquiz.domain.enums.MemberPosition; +import org.cotato.csquiz.domain.auth.enums.MemberPosition; import jakarta.validation.constraints.NotNull; public record MemberApproveRequest( diff --git a/src/main/java/cotato/csquiz/controller/dto/member/MemberEmailResponse.java b/src/main/java/org/cotato/csquiz/api/member/dto/MemberEmailResponse.java similarity index 79% rename from src/main/java/cotato/csquiz/controller/dto/member/MemberEmailResponse.java rename to src/main/java/org/cotato/csquiz/api/member/dto/MemberEmailResponse.java index 15174c7e..f403e505 100644 --- a/src/main/java/cotato/csquiz/controller/dto/member/MemberEmailResponse.java +++ b/src/main/java/org/cotato/csquiz/api/member/dto/MemberEmailResponse.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.member; +package org.cotato.csquiz.api.member.dto; public record MemberEmailResponse( String email diff --git a/src/main/java/cotato/csquiz/controller/dto/member/MemberEnrollInfoResponse.java b/src/main/java/org/cotato/csquiz/api/member/dto/MemberEnrollInfoResponse.java similarity index 70% rename from src/main/java/cotato/csquiz/controller/dto/member/MemberEnrollInfoResponse.java rename to src/main/java/org/cotato/csquiz/api/member/dto/MemberEnrollInfoResponse.java index 03d6a00a..fbdce716 100644 --- a/src/main/java/cotato/csquiz/controller/dto/member/MemberEnrollInfoResponse.java +++ b/src/main/java/org/cotato/csquiz/api/member/dto/MemberEnrollInfoResponse.java @@ -1,8 +1,8 @@ -package cotato.csquiz.controller.dto.member; +package org.cotato.csquiz.api.member.dto; -import cotato.csquiz.domain.entity.Member; -import cotato.csquiz.domain.enums.MemberPosition; -import cotato.csquiz.domain.enums.MemberRole; +import org.cotato.csquiz.domain.auth.enums.MemberPosition; +import org.cotato.csquiz.domain.auth.enums.MemberRole; +import org.cotato.csquiz.domain.auth.entity.Member; public record MemberEnrollInfoResponse( Long memberId, diff --git a/src/main/java/cotato/csquiz/controller/dto/member/MemberInfo.java b/src/main/java/org/cotato/csquiz/api/member/dto/MemberInfo.java similarity index 72% rename from src/main/java/cotato/csquiz/controller/dto/member/MemberInfo.java rename to src/main/java/org/cotato/csquiz/api/member/dto/MemberInfo.java index 917bbfdb..3a2c4dad 100644 --- a/src/main/java/cotato/csquiz/controller/dto/member/MemberInfo.java +++ b/src/main/java/org/cotato/csquiz/api/member/dto/MemberInfo.java @@ -1,8 +1,8 @@ -package cotato.csquiz.controller.dto.member; +package org.cotato.csquiz.api.member.dto; -import cotato.csquiz.domain.entity.Member; -import cotato.csquiz.domain.enums.MemberPosition; -import cotato.csquiz.domain.enums.MemberRole; +import org.cotato.csquiz.domain.auth.enums.MemberPosition; +import org.cotato.csquiz.domain.auth.enums.MemberRole; +import org.cotato.csquiz.domain.auth.entity.Member; public record MemberInfo( Long memberId, diff --git a/src/main/java/cotato/csquiz/controller/dto/member/MemberMyPageInfoResponse.java b/src/main/java/org/cotato/csquiz/api/member/dto/MemberMyPageInfoResponse.java similarity index 79% rename from src/main/java/cotato/csquiz/controller/dto/member/MemberMyPageInfoResponse.java rename to src/main/java/org/cotato/csquiz/api/member/dto/MemberMyPageInfoResponse.java index d7cf2bd8..84ebcba7 100644 --- a/src/main/java/cotato/csquiz/controller/dto/member/MemberMyPageInfoResponse.java +++ b/src/main/java/org/cotato/csquiz/api/member/dto/MemberMyPageInfoResponse.java @@ -1,7 +1,7 @@ -package cotato.csquiz.controller.dto.member; +package org.cotato.csquiz.api.member.dto; -import cotato.csquiz.domain.entity.Member; -import cotato.csquiz.domain.enums.MemberPosition; +import org.cotato.csquiz.domain.auth.enums.MemberPosition; +import org.cotato.csquiz.domain.auth.entity.Member; public record MemberMyPageInfoResponse( Long memberId, diff --git a/src/main/java/cotato/csquiz/controller/dto/member/MemberRejectRequest.java b/src/main/java/org/cotato/csquiz/api/member/dto/MemberRejectRequest.java similarity index 74% rename from src/main/java/cotato/csquiz/controller/dto/member/MemberRejectRequest.java rename to src/main/java/org/cotato/csquiz/api/member/dto/MemberRejectRequest.java index 39421a21..d7d81239 100644 --- a/src/main/java/cotato/csquiz/controller/dto/member/MemberRejectRequest.java +++ b/src/main/java/org/cotato/csquiz/api/member/dto/MemberRejectRequest.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.member; +package org.cotato.csquiz.api.member.dto; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/cotato/csquiz/controller/dto/member/UpdateActiveMemberRoleRequest.java b/src/main/java/org/cotato/csquiz/api/member/dto/UpdateActiveMemberRoleRequest.java similarity index 65% rename from src/main/java/cotato/csquiz/controller/dto/member/UpdateActiveMemberRoleRequest.java rename to src/main/java/org/cotato/csquiz/api/member/dto/UpdateActiveMemberRoleRequest.java index 5ae64b0a..5b3edb51 100644 --- a/src/main/java/cotato/csquiz/controller/dto/member/UpdateActiveMemberRoleRequest.java +++ b/src/main/java/org/cotato/csquiz/api/member/dto/UpdateActiveMemberRoleRequest.java @@ -1,6 +1,6 @@ -package cotato.csquiz.controller.dto.member; +package org.cotato.csquiz.api.member.dto; -import cotato.csquiz.domain.enums.MemberRole; +import org.cotato.csquiz.domain.auth.enums.MemberRole; import jakarta.validation.constraints.NotNull; public record UpdateActiveMemberRoleRequest( diff --git a/src/main/java/cotato/csquiz/controller/dto/member/UpdateActiveMemberToOldMemberRequest.java b/src/main/java/org/cotato/csquiz/api/member/dto/UpdateActiveMemberToOldMemberRequest.java similarity index 79% rename from src/main/java/cotato/csquiz/controller/dto/member/UpdateActiveMemberToOldMemberRequest.java rename to src/main/java/org/cotato/csquiz/api/member/dto/UpdateActiveMemberToOldMemberRequest.java index f5b6ca5d..07ef76af 100644 --- a/src/main/java/cotato/csquiz/controller/dto/member/UpdateActiveMemberToOldMemberRequest.java +++ b/src/main/java/org/cotato/csquiz/api/member/dto/UpdateActiveMemberToOldMemberRequest.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.member; +package org.cotato.csquiz.api.member.dto; import jakarta.validation.constraints.NotNull; import java.util.List; diff --git a/src/main/java/cotato/csquiz/controller/dto/member/UpdateOldMemberRoleRequest.java b/src/main/java/org/cotato/csquiz/api/member/dto/UpdateOldMemberRoleRequest.java similarity index 75% rename from src/main/java/cotato/csquiz/controller/dto/member/UpdateOldMemberRoleRequest.java rename to src/main/java/org/cotato/csquiz/api/member/dto/UpdateOldMemberRoleRequest.java index 627bbe95..c6dc8513 100644 --- a/src/main/java/cotato/csquiz/controller/dto/member/UpdateOldMemberRoleRequest.java +++ b/src/main/java/org/cotato/csquiz/api/member/dto/UpdateOldMemberRoleRequest.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.member; +package org.cotato.csquiz.api.member.dto; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/cotato/csquiz/controller/dto/member/UpdatePasswordRequest.java b/src/main/java/org/cotato/csquiz/api/member/dto/UpdatePasswordRequest.java similarity index 74% rename from src/main/java/cotato/csquiz/controller/dto/member/UpdatePasswordRequest.java rename to src/main/java/org/cotato/csquiz/api/member/dto/UpdatePasswordRequest.java index 10e1da9a..4aa5c00f 100644 --- a/src/main/java/cotato/csquiz/controller/dto/member/UpdatePasswordRequest.java +++ b/src/main/java/org/cotato/csquiz/api/member/dto/UpdatePasswordRequest.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.member; +package org.cotato.csquiz.api.member.dto; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/cotato/csquiz/controller/MyPageController.java b/src/main/java/org/cotato/csquiz/api/mypage/controller/MyPageController.java similarity index 76% rename from src/main/java/cotato/csquiz/controller/MyPageController.java rename to src/main/java/org/cotato/csquiz/api/mypage/controller/MyPageController.java index 2477c76d..c38edb5d 100644 --- a/src/main/java/cotato/csquiz/controller/MyPageController.java +++ b/src/main/java/org/cotato/csquiz/api/mypage/controller/MyPageController.java @@ -1,9 +1,9 @@ -package cotato.csquiz.controller; +package org.cotato.csquiz.api.mypage.controller; -import cotato.csquiz.config.jwt.JwtTokenProvider; -import cotato.csquiz.controller.dto.mypage.HallOfFameResponse; -import cotato.csquiz.controller.dto.mypage.MyPageMemberInfoResponse; -import cotato.csquiz.service.MyPageService; +import org.cotato.csquiz.api.mypage.dto.HallOfFameResponse; +import org.cotato.csquiz.common.config.jwt.JwtTokenProvider; +import org.cotato.csquiz.api.mypage.dto.MyPageMemberInfoResponse; +import org.cotato.csquiz.domain.education.service.MyPageService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; @@ -24,9 +24,9 @@ public class MyPageController { @GetMapping("/hall-of-fame") public ResponseEntity findHallOfFame(@RequestParam("generationId") Long generationId, - @RequestHeader("Authorization") String authorizationHeader) { + @RequestHeader("Authorization") String authorizationHeader) { String accessToken = jwtTokenProvider.getBearer(authorizationHeader); - + return ResponseEntity.ok(myPageService.findHallOfFame(generationId, jwtTokenProvider.getMemberId(accessToken))); } @@ -34,7 +34,7 @@ public ResponseEntity findHallOfFame(@RequestParam("generati public ResponseEntity findUserInfo( @RequestHeader("Authorization") String authorizationHeader) { String accessToken = jwtTokenProvider.getBearer(authorizationHeader); - + return ResponseEntity.ok(myPageService.findMemberInfo(jwtTokenProvider.getMemberId(accessToken))); } } diff --git a/src/main/java/cotato/csquiz/controller/dto/mypage/HallOfFameInfo.java b/src/main/java/org/cotato/csquiz/api/mypage/dto/HallOfFameInfo.java similarity index 76% rename from src/main/java/cotato/csquiz/controller/dto/mypage/HallOfFameInfo.java rename to src/main/java/org/cotato/csquiz/api/mypage/dto/HallOfFameInfo.java index 9bb71319..de7fceec 100644 --- a/src/main/java/cotato/csquiz/controller/dto/mypage/HallOfFameInfo.java +++ b/src/main/java/org/cotato/csquiz/api/mypage/dto/HallOfFameInfo.java @@ -1,6 +1,6 @@ -package cotato.csquiz.controller.dto.mypage; +package org.cotato.csquiz.api.mypage.dto; -import cotato.csquiz.domain.entity.Member; +import org.cotato.csquiz.domain.auth.entity.Member; public record HallOfFameInfo( Long memberId, diff --git a/src/main/java/cotato/csquiz/controller/dto/mypage/HallOfFameResponse.java b/src/main/java/org/cotato/csquiz/api/mypage/dto/HallOfFameResponse.java similarity index 91% rename from src/main/java/cotato/csquiz/controller/dto/mypage/HallOfFameResponse.java rename to src/main/java/org/cotato/csquiz/api/mypage/dto/HallOfFameResponse.java index 4076adee..a767eefd 100644 --- a/src/main/java/cotato/csquiz/controller/dto/mypage/HallOfFameResponse.java +++ b/src/main/java/org/cotato/csquiz/api/mypage/dto/HallOfFameResponse.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.mypage; +package org.cotato.csquiz.api.mypage.dto; import java.util.List; diff --git a/src/main/java/cotato/csquiz/controller/dto/mypage/MyHallOfFameInfo.java b/src/main/java/org/cotato/csquiz/api/mypage/dto/MyHallOfFameInfo.java similarity index 78% rename from src/main/java/cotato/csquiz/controller/dto/mypage/MyHallOfFameInfo.java rename to src/main/java/org/cotato/csquiz/api/mypage/dto/MyHallOfFameInfo.java index 978ac1be..14caecfe 100644 --- a/src/main/java/cotato/csquiz/controller/dto/mypage/MyHallOfFameInfo.java +++ b/src/main/java/org/cotato/csquiz/api/mypage/dto/MyHallOfFameInfo.java @@ -1,6 +1,6 @@ -package cotato.csquiz.controller.dto.mypage; +package org.cotato.csquiz.api.mypage.dto; -import cotato.csquiz.domain.entity.Member; +import org.cotato.csquiz.domain.auth.entity.Member; public record MyHallOfFameInfo( Long memberId, diff --git a/src/main/java/cotato/csquiz/controller/dto/mypage/MyPageMemberInfoResponse.java b/src/main/java/org/cotato/csquiz/api/mypage/dto/MyPageMemberInfoResponse.java similarity index 74% rename from src/main/java/cotato/csquiz/controller/dto/mypage/MyPageMemberInfoResponse.java rename to src/main/java/org/cotato/csquiz/api/mypage/dto/MyPageMemberInfoResponse.java index cf869ea5..d7827c5a 100644 --- a/src/main/java/cotato/csquiz/controller/dto/mypage/MyPageMemberInfoResponse.java +++ b/src/main/java/org/cotato/csquiz/api/mypage/dto/MyPageMemberInfoResponse.java @@ -1,8 +1,8 @@ -package cotato.csquiz.controller.dto.mypage; +package org.cotato.csquiz.api.mypage.dto; -import cotato.csquiz.domain.entity.Member; -import cotato.csquiz.domain.enums.MemberPosition; -import cotato.csquiz.domain.enums.MemberRole; +import org.cotato.csquiz.domain.auth.enums.MemberPosition; +import org.cotato.csquiz.domain.auth.enums.MemberRole; +import org.cotato.csquiz.domain.auth.entity.Member; public record MyPageMemberInfoResponse( Long memberId, diff --git a/src/main/java/cotato/csquiz/controller/QuizController.java b/src/main/java/org/cotato/csquiz/api/quiz/controller/QuizController.java similarity index 81% rename from src/main/java/cotato/csquiz/controller/QuizController.java rename to src/main/java/org/cotato/csquiz/api/quiz/controller/QuizController.java index d2fdd812..0559e98a 100644 --- a/src/main/java/cotato/csquiz/controller/QuizController.java +++ b/src/main/java/org/cotato/csquiz/api/quiz/controller/QuizController.java @@ -1,19 +1,19 @@ -package cotato.csquiz.controller; +package org.cotato.csquiz.api.quiz.controller; -import cotato.csquiz.controller.dto.quiz.AddAdditionalAnswerRequest; -import cotato.csquiz.controller.dto.quiz.AllQuizzesInCsQuizResponse; -import cotato.csquiz.controller.dto.quiz.AllQuizzesResponse; -import cotato.csquiz.controller.dto.quiz.CreateQuizzesRequest; -import cotato.csquiz.controller.dto.quiz.QuizInfoInCsQuizResponse; -import cotato.csquiz.controller.dto.quiz.QuizResponse; -import cotato.csquiz.controller.dto.quiz.QuizResultInfo; -import cotato.csquiz.exception.ImageException; -import cotato.csquiz.service.QuizService; -import cotato.csquiz.service.RecordService; import jakarta.validation.Valid; import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.cotato.csquiz.api.quiz.dto.AddAdditionalAnswerRequest; +import org.cotato.csquiz.api.quiz.dto.AllQuizzesInCsQuizResponse; +import org.cotato.csquiz.api.quiz.dto.AllQuizzesResponse; +import org.cotato.csquiz.api.quiz.dto.CreateQuizzesRequest; +import org.cotato.csquiz.api.quiz.dto.QuizInfoInCsQuizResponse; +import org.cotato.csquiz.api.quiz.dto.QuizResponse; +import org.cotato.csquiz.api.quiz.dto.QuizResultInfo; +import org.cotato.csquiz.domain.education.service.QuizService; +import org.cotato.csquiz.domain.education.service.RecordService; +import org.cotato.csquiz.common.error.exception.ImageException; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/cotato/csquiz/controller/dto/quiz/AddAdditionalAnswerRequest.java b/src/main/java/org/cotato/csquiz/api/quiz/dto/AddAdditionalAnswerRequest.java similarity index 80% rename from src/main/java/cotato/csquiz/controller/dto/quiz/AddAdditionalAnswerRequest.java rename to src/main/java/org/cotato/csquiz/api/quiz/dto/AddAdditionalAnswerRequest.java index a3b0358f..13b096fa 100644 --- a/src/main/java/cotato/csquiz/controller/dto/quiz/AddAdditionalAnswerRequest.java +++ b/src/main/java/org/cotato/csquiz/api/quiz/dto/AddAdditionalAnswerRequest.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.quiz; +package org.cotato.csquiz.api.quiz.dto; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/cotato/csquiz/controller/dto/quiz/AllQuizzesInCsQuizResponse.java b/src/main/java/org/cotato/csquiz/api/quiz/dto/AllQuizzesInCsQuizResponse.java similarity index 87% rename from src/main/java/cotato/csquiz/controller/dto/quiz/AllQuizzesInCsQuizResponse.java rename to src/main/java/org/cotato/csquiz/api/quiz/dto/AllQuizzesInCsQuizResponse.java index f160ddfe..6178e565 100644 --- a/src/main/java/cotato/csquiz/controller/dto/quiz/AllQuizzesInCsQuizResponse.java +++ b/src/main/java/org/cotato/csquiz/api/quiz/dto/AllQuizzesInCsQuizResponse.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.quiz; +package org.cotato.csquiz.api.quiz.dto; import java.util.List; diff --git a/src/main/java/cotato/csquiz/controller/dto/quiz/AllQuizzesResponse.java b/src/main/java/org/cotato/csquiz/api/quiz/dto/AllQuizzesResponse.java similarity index 86% rename from src/main/java/cotato/csquiz/controller/dto/quiz/AllQuizzesResponse.java rename to src/main/java/org/cotato/csquiz/api/quiz/dto/AllQuizzesResponse.java index 25eba5d3..1ba42219 100644 --- a/src/main/java/cotato/csquiz/controller/dto/quiz/AllQuizzesResponse.java +++ b/src/main/java/org/cotato/csquiz/api/quiz/dto/AllQuizzesResponse.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.quiz; +package org.cotato.csquiz.api.quiz.dto; import java.util.List; import lombok.AllArgsConstructor; diff --git a/src/main/java/cotato/csquiz/controller/dto/quiz/ChoiceResponse.java b/src/main/java/org/cotato/csquiz/api/quiz/dto/ChoiceResponse.java similarity index 80% rename from src/main/java/cotato/csquiz/controller/dto/quiz/ChoiceResponse.java rename to src/main/java/org/cotato/csquiz/api/quiz/dto/ChoiceResponse.java index 64df5203..fe9649f0 100644 --- a/src/main/java/cotato/csquiz/controller/dto/quiz/ChoiceResponse.java +++ b/src/main/java/org/cotato/csquiz/api/quiz/dto/ChoiceResponse.java @@ -1,7 +1,7 @@ -package cotato.csquiz.controller.dto.quiz; +package org.cotato.csquiz.api.quiz.dto; -import cotato.csquiz.domain.entity.Choice; -import cotato.csquiz.domain.enums.ChoiceCorrect; +import org.cotato.csquiz.domain.education.entity.Choice; +import org.cotato.csquiz.domain.education.enums.ChoiceCorrect; public record ChoiceResponse( Long choiceId, diff --git a/src/main/java/cotato/csquiz/controller/dto/quiz/CreateChoiceRequest.java b/src/main/java/org/cotato/csquiz/api/quiz/dto/CreateChoiceRequest.java similarity index 60% rename from src/main/java/cotato/csquiz/controller/dto/quiz/CreateChoiceRequest.java rename to src/main/java/org/cotato/csquiz/api/quiz/dto/CreateChoiceRequest.java index 902a2534..f0c43f5f 100644 --- a/src/main/java/cotato/csquiz/controller/dto/quiz/CreateChoiceRequest.java +++ b/src/main/java/org/cotato/csquiz/api/quiz/dto/CreateChoiceRequest.java @@ -1,6 +1,6 @@ -package cotato.csquiz.controller.dto.quiz; +package org.cotato.csquiz.api.quiz.dto; -import cotato.csquiz.domain.enums.ChoiceCorrect; +import org.cotato.csquiz.domain.education.enums.ChoiceCorrect; import lombok.Data; @Data diff --git a/src/main/java/cotato/csquiz/controller/dto/quiz/CreateMultipleQuizRequest.java b/src/main/java/org/cotato/csquiz/api/quiz/dto/CreateMultipleQuizRequest.java similarity index 90% rename from src/main/java/cotato/csquiz/controller/dto/quiz/CreateMultipleQuizRequest.java rename to src/main/java/org/cotato/csquiz/api/quiz/dto/CreateMultipleQuizRequest.java index c2d52ed7..d245fa11 100644 --- a/src/main/java/cotato/csquiz/controller/dto/quiz/CreateMultipleQuizRequest.java +++ b/src/main/java/org/cotato/csquiz/api/quiz/dto/CreateMultipleQuizRequest.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.quiz; +package org.cotato.csquiz.api.quiz.dto; import java.util.List; import lombok.AllArgsConstructor; diff --git a/src/main/java/cotato/csquiz/controller/dto/quiz/CreateQuizzesRequest.java b/src/main/java/org/cotato/csquiz/api/quiz/dto/CreateQuizzesRequest.java similarity index 89% rename from src/main/java/cotato/csquiz/controller/dto/quiz/CreateQuizzesRequest.java rename to src/main/java/org/cotato/csquiz/api/quiz/dto/CreateQuizzesRequest.java index acc7a79b..12d30756 100644 --- a/src/main/java/cotato/csquiz/controller/dto/quiz/CreateQuizzesRequest.java +++ b/src/main/java/org/cotato/csquiz/api/quiz/dto/CreateQuizzesRequest.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.quiz; +package org.cotato.csquiz.api.quiz.dto; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/cotato/csquiz/controller/dto/quiz/CreateShortAnswerRequest.java b/src/main/java/org/cotato/csquiz/api/quiz/dto/CreateShortAnswerRequest.java similarity index 69% rename from src/main/java/cotato/csquiz/controller/dto/quiz/CreateShortAnswerRequest.java rename to src/main/java/org/cotato/csquiz/api/quiz/dto/CreateShortAnswerRequest.java index 71f9079d..260e27b7 100644 --- a/src/main/java/cotato/csquiz/controller/dto/quiz/CreateShortAnswerRequest.java +++ b/src/main/java/org/cotato/csquiz/api/quiz/dto/CreateShortAnswerRequest.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.quiz; +package org.cotato.csquiz.api.quiz.dto; import lombok.Data; diff --git a/src/main/java/cotato/csquiz/controller/dto/quiz/CreateShortQuizRequest.java b/src/main/java/org/cotato/csquiz/api/quiz/dto/CreateShortQuizRequest.java similarity index 90% rename from src/main/java/cotato/csquiz/controller/dto/quiz/CreateShortQuizRequest.java rename to src/main/java/org/cotato/csquiz/api/quiz/dto/CreateShortQuizRequest.java index 047f1008..6b1aaabf 100644 --- a/src/main/java/cotato/csquiz/controller/dto/quiz/CreateShortQuizRequest.java +++ b/src/main/java/org/cotato/csquiz/api/quiz/dto/CreateShortQuizRequest.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.quiz; +package org.cotato.csquiz.api.quiz.dto; import java.util.List; import lombok.AllArgsConstructor; diff --git a/src/main/java/cotato/csquiz/controller/dto/quiz/CsAdminQuizResponse.java b/src/main/java/org/cotato/csquiz/api/quiz/dto/CsAdminQuizResponse.java similarity index 74% rename from src/main/java/cotato/csquiz/controller/dto/quiz/CsAdminQuizResponse.java rename to src/main/java/org/cotato/csquiz/api/quiz/dto/CsAdminQuizResponse.java index c2792b22..d2106a99 100644 --- a/src/main/java/cotato/csquiz/controller/dto/quiz/CsAdminQuizResponse.java +++ b/src/main/java/org/cotato/csquiz/api/quiz/dto/CsAdminQuizResponse.java @@ -1,7 +1,7 @@ -package cotato.csquiz.controller.dto.quiz; +package org.cotato.csquiz.api.quiz.dto; -import cotato.csquiz.domain.entity.Quiz; -import cotato.csquiz.domain.enums.QuizStatus; +import org.cotato.csquiz.domain.education.entity.Quiz; +import org.cotato.csquiz.domain.education.enums.QuizStatus; public record CsAdminQuizResponse( Long quizId, diff --git a/src/main/java/cotato/csquiz/controller/dto/quiz/FindMultipleQuizResponse.java b/src/main/java/org/cotato/csquiz/api/quiz/dto/FindMultipleQuizResponse.java similarity index 85% rename from src/main/java/cotato/csquiz/controller/dto/quiz/FindMultipleQuizResponse.java rename to src/main/java/org/cotato/csquiz/api/quiz/dto/FindMultipleQuizResponse.java index cc79c96c..ca9b9dad 100644 --- a/src/main/java/cotato/csquiz/controller/dto/quiz/FindMultipleQuizResponse.java +++ b/src/main/java/org/cotato/csquiz/api/quiz/dto/FindMultipleQuizResponse.java @@ -1,7 +1,7 @@ -package cotato.csquiz.controller.dto.quiz; +package org.cotato.csquiz.api.quiz.dto; -import cotato.csquiz.domain.entity.Quiz; -import cotato.csquiz.domain.enums.QuizType; +import org.cotato.csquiz.domain.education.entity.Quiz; +import org.cotato.csquiz.domain.education.enums.QuizType; import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/cotato/csquiz/controller/dto/quiz/KingMemberInfo.java b/src/main/java/org/cotato/csquiz/api/quiz/dto/KingMemberInfo.java similarity index 78% rename from src/main/java/cotato/csquiz/controller/dto/quiz/KingMemberInfo.java rename to src/main/java/org/cotato/csquiz/api/quiz/dto/KingMemberInfo.java index cd5ec7e0..1f7f6a47 100644 --- a/src/main/java/cotato/csquiz/controller/dto/quiz/KingMemberInfo.java +++ b/src/main/java/org/cotato/csquiz/api/quiz/dto/KingMemberInfo.java @@ -1,6 +1,6 @@ -package cotato.csquiz.controller.dto.quiz; +package org.cotato.csquiz.api.quiz.dto; -import cotato.csquiz.domain.entity.Member; +import org.cotato.csquiz.domain.auth.entity.Member; public record KingMemberInfo( Long memberId, diff --git a/src/main/java/cotato/csquiz/controller/dto/quiz/MultipleQuizResponse.java b/src/main/java/org/cotato/csquiz/api/quiz/dto/MultipleQuizResponse.java similarity index 87% rename from src/main/java/cotato/csquiz/controller/dto/quiz/MultipleQuizResponse.java rename to src/main/java/org/cotato/csquiz/api/quiz/dto/MultipleQuizResponse.java index 1a816256..b8a2ee7b 100644 --- a/src/main/java/cotato/csquiz/controller/dto/quiz/MultipleQuizResponse.java +++ b/src/main/java/org/cotato/csquiz/api/quiz/dto/MultipleQuizResponse.java @@ -1,6 +1,6 @@ -package cotato.csquiz.controller.dto.quiz; +package org.cotato.csquiz.api.quiz.dto; -import cotato.csquiz.domain.entity.Quiz; +import org.cotato.csquiz.domain.education.entity.Quiz; import java.util.ArrayList; import java.util.List; import lombok.AllArgsConstructor; diff --git a/src/main/java/cotato/csquiz/controller/dto/quiz/QuizInfoInCsQuizResponse.java b/src/main/java/org/cotato/csquiz/api/quiz/dto/QuizInfoInCsQuizResponse.java similarity index 76% rename from src/main/java/cotato/csquiz/controller/dto/quiz/QuizInfoInCsQuizResponse.java rename to src/main/java/org/cotato/csquiz/api/quiz/dto/QuizInfoInCsQuizResponse.java index 9bcc5b6d..847b59b2 100644 --- a/src/main/java/cotato/csquiz/controller/dto/quiz/QuizInfoInCsQuizResponse.java +++ b/src/main/java/org/cotato/csquiz/api/quiz/dto/QuizInfoInCsQuizResponse.java @@ -1,7 +1,7 @@ -package cotato.csquiz.controller.dto.quiz; +package org.cotato.csquiz.api.quiz.dto; -import cotato.csquiz.domain.entity.Quiz; -import cotato.csquiz.domain.enums.QuizType; +import org.cotato.csquiz.domain.education.entity.Quiz; +import org.cotato.csquiz.domain.education.enums.QuizType; import java.util.List; public record QuizInfoInCsQuizResponse( diff --git a/src/main/java/cotato/csquiz/controller/dto/quiz/QuizKingMembersResponse.java b/src/main/java/org/cotato/csquiz/api/quiz/dto/QuizKingMembersResponse.java similarity index 85% rename from src/main/java/cotato/csquiz/controller/dto/quiz/QuizKingMembersResponse.java rename to src/main/java/org/cotato/csquiz/api/quiz/dto/QuizKingMembersResponse.java index f741a658..9ffe3477 100644 --- a/src/main/java/cotato/csquiz/controller/dto/quiz/QuizKingMembersResponse.java +++ b/src/main/java/org/cotato/csquiz/api/quiz/dto/QuizKingMembersResponse.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.quiz; +package org.cotato.csquiz.api.quiz.dto; import java.util.List; diff --git a/src/main/java/cotato/csquiz/controller/dto/quiz/QuizResponse.java b/src/main/java/org/cotato/csquiz/api/quiz/dto/QuizResponse.java similarity index 79% rename from src/main/java/cotato/csquiz/controller/dto/quiz/QuizResponse.java rename to src/main/java/org/cotato/csquiz/api/quiz/dto/QuizResponse.java index 7fb07cbe..4b45ddad 100644 --- a/src/main/java/cotato/csquiz/controller/dto/quiz/QuizResponse.java +++ b/src/main/java/org/cotato/csquiz/api/quiz/dto/QuizResponse.java @@ -1,7 +1,7 @@ -package cotato.csquiz.controller.dto.quiz; +package org.cotato.csquiz.api.quiz.dto; -import cotato.csquiz.domain.entity.ShortQuiz; -import cotato.csquiz.domain.enums.QuizType; +import org.cotato.csquiz.domain.education.entity.ShortQuiz; +import org.cotato.csquiz.domain.education.enums.QuizType; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/cotato/csquiz/controller/dto/quiz/QuizResultInfo.java b/src/main/java/org/cotato/csquiz/api/quiz/dto/QuizResultInfo.java similarity index 83% rename from src/main/java/cotato/csquiz/controller/dto/quiz/QuizResultInfo.java rename to src/main/java/org/cotato/csquiz/api/quiz/dto/QuizResultInfo.java index 790966d5..b718a5c6 100644 --- a/src/main/java/cotato/csquiz/controller/dto/quiz/QuizResultInfo.java +++ b/src/main/java/org/cotato/csquiz/api/quiz/dto/QuizResultInfo.java @@ -1,7 +1,7 @@ -package cotato.csquiz.controller.dto.quiz; +package org.cotato.csquiz.api.quiz.dto; -import cotato.csquiz.domain.entity.Member; -import cotato.csquiz.domain.entity.Quiz; +import org.cotato.csquiz.domain.education.entity.Quiz; +import org.cotato.csquiz.domain.auth.entity.Member; public record QuizResultInfo( Long quizId, diff --git a/src/main/java/cotato/csquiz/controller/dto/quiz/ShortAnswerResponse.java b/src/main/java/org/cotato/csquiz/api/quiz/dto/ShortAnswerResponse.java similarity index 69% rename from src/main/java/cotato/csquiz/controller/dto/quiz/ShortAnswerResponse.java rename to src/main/java/org/cotato/csquiz/api/quiz/dto/ShortAnswerResponse.java index 281a1102..8fd1a341 100644 --- a/src/main/java/cotato/csquiz/controller/dto/quiz/ShortAnswerResponse.java +++ b/src/main/java/org/cotato/csquiz/api/quiz/dto/ShortAnswerResponse.java @@ -1,6 +1,6 @@ -package cotato.csquiz.controller.dto.quiz; +package org.cotato.csquiz.api.quiz.dto; -import cotato.csquiz.domain.entity.ShortAnswer; +import org.cotato.csquiz.domain.education.entity.ShortAnswer; public record ShortAnswerResponse( String answer diff --git a/src/main/java/cotato/csquiz/controller/dto/quiz/ShortQuizResponse.java b/src/main/java/org/cotato/csquiz/api/quiz/dto/ShortQuizResponse.java similarity index 88% rename from src/main/java/cotato/csquiz/controller/dto/quiz/ShortQuizResponse.java rename to src/main/java/org/cotato/csquiz/api/quiz/dto/ShortQuizResponse.java index c902451c..fd46c7eb 100644 --- a/src/main/java/cotato/csquiz/controller/dto/quiz/ShortQuizResponse.java +++ b/src/main/java/org/cotato/csquiz/api/quiz/dto/ShortQuizResponse.java @@ -1,6 +1,6 @@ -package cotato.csquiz.controller.dto.quiz; +package org.cotato.csquiz.api.quiz.dto; -import cotato.csquiz.domain.entity.Quiz; +import org.cotato.csquiz.domain.education.entity.Quiz; import java.util.ArrayList; import java.util.List; import lombok.AllArgsConstructor; diff --git a/src/main/java/cotato/csquiz/controller/RecordController.java b/src/main/java/org/cotato/csquiz/api/record/controller/RecordController.java similarity index 82% rename from src/main/java/cotato/csquiz/controller/RecordController.java rename to src/main/java/org/cotato/csquiz/api/record/controller/RecordController.java index 1ae0d21a..a9f67bef 100644 --- a/src/main/java/cotato/csquiz/controller/RecordController.java +++ b/src/main/java/org/cotato/csquiz/api/record/controller/RecordController.java @@ -1,13 +1,13 @@ -package cotato.csquiz.controller; +package org.cotato.csquiz.api.record.controller; -import cotato.csquiz.controller.dto.record.RecordsAndScorerResponse; -import cotato.csquiz.controller.dto.record.RegradeRequest; -import cotato.csquiz.controller.dto.record.ReplyRequest; -import cotato.csquiz.controller.dto.record.ReplyResponse; -import cotato.csquiz.service.RecordService; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.cotato.csquiz.api.record.dto.RecordsAndScorerResponse; +import org.cotato.csquiz.api.record.dto.RegradeRequest; +import org.cotato.csquiz.api.record.dto.ReplyRequest; +import org.cotato.csquiz.api.record.dto.ReplyResponse; +import org.cotato.csquiz.domain.education.service.RecordService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/cotato/csquiz/controller/dto/record/RecordResponse.java b/src/main/java/org/cotato/csquiz/api/record/dto/RecordResponse.java similarity index 78% rename from src/main/java/cotato/csquiz/controller/dto/record/RecordResponse.java rename to src/main/java/org/cotato/csquiz/api/record/dto/RecordResponse.java index eb466c36..f529cb5c 100644 --- a/src/main/java/cotato/csquiz/controller/dto/record/RecordResponse.java +++ b/src/main/java/org/cotato/csquiz/api/record/dto/RecordResponse.java @@ -1,7 +1,7 @@ -package cotato.csquiz.controller.dto.record; +package org.cotato.csquiz.api.record.dto; -import cotato.csquiz.controller.dto.member.MemberInfo; -import cotato.csquiz.domain.entity.Record; +import org.cotato.csquiz.api.member.dto.MemberInfo; +import org.cotato.csquiz.domain.education.entity.Record; public record RecordResponse( Long recordId, diff --git a/src/main/java/cotato/csquiz/controller/dto/record/RecordsAndScorerResponse.java b/src/main/java/org/cotato/csquiz/api/record/dto/RecordsAndScorerResponse.java similarity index 92% rename from src/main/java/cotato/csquiz/controller/dto/record/RecordsAndScorerResponse.java rename to src/main/java/org/cotato/csquiz/api/record/dto/RecordsAndScorerResponse.java index 2d26c6a6..8dbf19f1 100644 --- a/src/main/java/cotato/csquiz/controller/dto/record/RecordsAndScorerResponse.java +++ b/src/main/java/org/cotato/csquiz/api/record/dto/RecordsAndScorerResponse.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.record; +package org.cotato.csquiz.api.record.dto; import java.util.List; diff --git a/src/main/java/cotato/csquiz/controller/dto/record/RegradeRequest.java b/src/main/java/org/cotato/csquiz/api/record/dto/RegradeRequest.java similarity index 78% rename from src/main/java/cotato/csquiz/controller/dto/record/RegradeRequest.java rename to src/main/java/org/cotato/csquiz/api/record/dto/RegradeRequest.java index b12e1c19..1d987dde 100644 --- a/src/main/java/cotato/csquiz/controller/dto/record/RegradeRequest.java +++ b/src/main/java/org/cotato/csquiz/api/record/dto/RegradeRequest.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.record; +package org.cotato.csquiz.api.record.dto; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/cotato/csquiz/controller/dto/record/ReplyRequest.java b/src/main/java/org/cotato/csquiz/api/record/dto/ReplyRequest.java similarity index 86% rename from src/main/java/cotato/csquiz/controller/dto/record/ReplyRequest.java rename to src/main/java/org/cotato/csquiz/api/record/dto/ReplyRequest.java index 71e25b48..5e07e389 100644 --- a/src/main/java/cotato/csquiz/controller/dto/record/ReplyRequest.java +++ b/src/main/java/org/cotato/csquiz/api/record/dto/ReplyRequest.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.record; +package org.cotato.csquiz.api.record.dto; import jakarta.validation.constraints.NotNull; import java.util.List; diff --git a/src/main/java/cotato/csquiz/controller/dto/record/ReplyResponse.java b/src/main/java/org/cotato/csquiz/api/record/dto/ReplyResponse.java similarity index 79% rename from src/main/java/cotato/csquiz/controller/dto/record/ReplyResponse.java rename to src/main/java/org/cotato/csquiz/api/record/dto/ReplyResponse.java index 0ddb6302..8a0c8ef5 100644 --- a/src/main/java/cotato/csquiz/controller/dto/record/ReplyResponse.java +++ b/src/main/java/org/cotato/csquiz/api/record/dto/ReplyResponse.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.record; +package org.cotato.csquiz.api.record.dto; public record ReplyResponse( String result diff --git a/src/main/java/cotato/csquiz/controller/dto/record/ScorerResponse.java b/src/main/java/org/cotato/csquiz/api/record/dto/ScorerResponse.java similarity index 73% rename from src/main/java/cotato/csquiz/controller/dto/record/ScorerResponse.java rename to src/main/java/org/cotato/csquiz/api/record/dto/ScorerResponse.java index 29ea8d4f..0f88c6d9 100644 --- a/src/main/java/cotato/csquiz/controller/dto/record/ScorerResponse.java +++ b/src/main/java/org/cotato/csquiz/api/record/dto/ScorerResponse.java @@ -1,7 +1,7 @@ -package cotato.csquiz.controller.dto.record; +package org.cotato.csquiz.api.record.dto; -import cotato.csquiz.domain.entity.Member; -import cotato.csquiz.domain.entity.Scorer; +import org.cotato.csquiz.domain.education.entity.Scorer; +import org.cotato.csquiz.domain.auth.entity.Member; public record ScorerResponse( Long scorerId, diff --git a/src/main/java/cotato/csquiz/controller/SessionController.java b/src/main/java/org/cotato/csquiz/api/session/controller/SessionController.java similarity index 80% rename from src/main/java/cotato/csquiz/controller/SessionController.java rename to src/main/java/org/cotato/csquiz/api/session/controller/SessionController.java index beb74eac..3dd3d156 100644 --- a/src/main/java/cotato/csquiz/controller/SessionController.java +++ b/src/main/java/org/cotato/csquiz/api/session/controller/SessionController.java @@ -1,19 +1,19 @@ -package cotato.csquiz.controller; +package org.cotato.csquiz.api.session.controller; -import cotato.csquiz.controller.dto.session.AddSessionRequest; -import cotato.csquiz.controller.dto.session.AddSessionResponse; -import cotato.csquiz.controller.dto.session.CsEducationOnSessionNumberResponse; -import cotato.csquiz.controller.dto.session.UpdateSessionDescriptionRequest; -import cotato.csquiz.controller.dto.session.SessionListResponse; -import cotato.csquiz.controller.dto.session.UpdateSessionPhotoRequest; -import cotato.csquiz.controller.dto.session.UpdateSessionNumberRequest; -import cotato.csquiz.controller.dto.session.UpdateSessionRequest; -import cotato.csquiz.exception.ImageException; -import cotato.csquiz.service.SessionService; import jakarta.validation.Valid; import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.cotato.csquiz.api.session.dto.AddSessionRequest; +import org.cotato.csquiz.api.session.dto.AddSessionResponse; +import org.cotato.csquiz.api.session.dto.CsEducationOnSessionNumberResponse; +import org.cotato.csquiz.api.session.dto.SessionListResponse; +import org.cotato.csquiz.api.session.dto.UpdateSessionDescriptionRequest; +import org.cotato.csquiz.api.session.dto.UpdateSessionNumberRequest; +import org.cotato.csquiz.api.session.dto.UpdateSessionPhotoRequest; +import org.cotato.csquiz.api.session.dto.UpdateSessionRequest; +import org.cotato.csquiz.domain.generation.service.SessionService; +import org.cotato.csquiz.common.error.exception.ImageException; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/cotato/csquiz/controller/dto/session/AddSessionRequest.java b/src/main/java/org/cotato/csquiz/api/session/dto/AddSessionRequest.java similarity index 61% rename from src/main/java/cotato/csquiz/controller/dto/session/AddSessionRequest.java rename to src/main/java/org/cotato/csquiz/api/session/dto/AddSessionRequest.java index d045dbcd..166f34e6 100644 --- a/src/main/java/cotato/csquiz/controller/dto/session/AddSessionRequest.java +++ b/src/main/java/org/cotato/csquiz/api/session/dto/AddSessionRequest.java @@ -1,8 +1,8 @@ -package cotato.csquiz.controller.dto.session; +package org.cotato.csquiz.api.session.dto; -import cotato.csquiz.domain.enums.CSEducation; -import cotato.csquiz.domain.enums.ItIssue; -import cotato.csquiz.domain.enums.Networking; +import org.cotato.csquiz.domain.generation.enums.CSEducation; +import org.cotato.csquiz.domain.generation.enums.ItIssue; +import org.cotato.csquiz.domain.generation.enums.Networking; import jakarta.validation.constraints.NotNull; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/cotato/csquiz/controller/dto/session/AddSessionResponse.java b/src/main/java/org/cotato/csquiz/api/session/dto/AddSessionResponse.java similarity index 73% rename from src/main/java/cotato/csquiz/controller/dto/session/AddSessionResponse.java rename to src/main/java/org/cotato/csquiz/api/session/dto/AddSessionResponse.java index 08875219..e968b70c 100644 --- a/src/main/java/cotato/csquiz/controller/dto/session/AddSessionResponse.java +++ b/src/main/java/org/cotato/csquiz/api/session/dto/AddSessionResponse.java @@ -1,6 +1,6 @@ -package cotato.csquiz.controller.dto.session; +package org.cotato.csquiz.api.session.dto; -import cotato.csquiz.domain.entity.Session; +import org.cotato.csquiz.domain.generation.entity.Session; public record AddSessionResponse( Long sessionId, diff --git a/src/main/java/cotato/csquiz/controller/dto/session/CsEducationOnSessionNumberResponse.java b/src/main/java/org/cotato/csquiz/api/session/dto/CsEducationOnSessionNumberResponse.java similarity index 76% rename from src/main/java/cotato/csquiz/controller/dto/session/CsEducationOnSessionNumberResponse.java rename to src/main/java/org/cotato/csquiz/api/session/dto/CsEducationOnSessionNumberResponse.java index e42036a4..30e52f4f 100644 --- a/src/main/java/cotato/csquiz/controller/dto/session/CsEducationOnSessionNumberResponse.java +++ b/src/main/java/org/cotato/csquiz/api/session/dto/CsEducationOnSessionNumberResponse.java @@ -1,6 +1,6 @@ -package cotato.csquiz.controller.dto.session; +package org.cotato.csquiz.api.session.dto; -import cotato.csquiz.domain.entity.Session; +import org.cotato.csquiz.domain.generation.entity.Session; public record CsEducationOnSessionNumberResponse( Long sessionId, diff --git a/src/main/java/cotato/csquiz/controller/dto/session/SessionListResponse.java b/src/main/java/org/cotato/csquiz/api/session/dto/SessionListResponse.java similarity index 71% rename from src/main/java/cotato/csquiz/controller/dto/session/SessionListResponse.java rename to src/main/java/org/cotato/csquiz/api/session/dto/SessionListResponse.java index eafe7ff3..eb48a207 100644 --- a/src/main/java/cotato/csquiz/controller/dto/session/SessionListResponse.java +++ b/src/main/java/org/cotato/csquiz/api/session/dto/SessionListResponse.java @@ -1,9 +1,9 @@ -package cotato.csquiz.controller.dto.session; +package org.cotato.csquiz.api.session.dto; -import cotato.csquiz.domain.entity.Session; -import cotato.csquiz.domain.enums.CSEducation; -import cotato.csquiz.domain.enums.ItIssue; -import cotato.csquiz.domain.enums.Networking; +import org.cotato.csquiz.domain.generation.enums.CSEducation; +import org.cotato.csquiz.domain.generation.enums.ItIssue; +import org.cotato.csquiz.domain.generation.enums.Networking; +import org.cotato.csquiz.domain.generation.entity.Session; public record SessionListResponse( Long sessionId, diff --git a/src/main/java/cotato/csquiz/controller/dto/session/UpdateSessionDescriptionRequest.java b/src/main/java/org/cotato/csquiz/api/session/dto/UpdateSessionDescriptionRequest.java similarity index 80% rename from src/main/java/cotato/csquiz/controller/dto/session/UpdateSessionDescriptionRequest.java rename to src/main/java/org/cotato/csquiz/api/session/dto/UpdateSessionDescriptionRequest.java index d8e40e11..99fe7022 100644 --- a/src/main/java/cotato/csquiz/controller/dto/session/UpdateSessionDescriptionRequest.java +++ b/src/main/java/org/cotato/csquiz/api/session/dto/UpdateSessionDescriptionRequest.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.session; +package org.cotato.csquiz.api.session.dto; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/cotato/csquiz/controller/dto/session/UpdateSessionNumberRequest.java b/src/main/java/org/cotato/csquiz/api/session/dto/UpdateSessionNumberRequest.java similarity index 79% rename from src/main/java/cotato/csquiz/controller/dto/session/UpdateSessionNumberRequest.java rename to src/main/java/org/cotato/csquiz/api/session/dto/UpdateSessionNumberRequest.java index 45abfe40..e1c5c53a 100644 --- a/src/main/java/cotato/csquiz/controller/dto/session/UpdateSessionNumberRequest.java +++ b/src/main/java/org/cotato/csquiz/api/session/dto/UpdateSessionNumberRequest.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.session; +package org.cotato.csquiz.api.session.dto; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/cotato/csquiz/controller/dto/session/UpdateSessionPhotoRequest.java b/src/main/java/org/cotato/csquiz/api/session/dto/UpdateSessionPhotoRequest.java similarity index 85% rename from src/main/java/cotato/csquiz/controller/dto/session/UpdateSessionPhotoRequest.java rename to src/main/java/org/cotato/csquiz/api/session/dto/UpdateSessionPhotoRequest.java index 4343dfe4..e11f7d15 100644 --- a/src/main/java/cotato/csquiz/controller/dto/session/UpdateSessionPhotoRequest.java +++ b/src/main/java/org/cotato/csquiz/api/session/dto/UpdateSessionPhotoRequest.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.session; +package org.cotato.csquiz.api.session.dto; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/cotato/csquiz/controller/dto/session/UpdateSessionRequest.java b/src/main/java/org/cotato/csquiz/api/session/dto/UpdateSessionRequest.java similarity index 66% rename from src/main/java/cotato/csquiz/controller/dto/session/UpdateSessionRequest.java rename to src/main/java/org/cotato/csquiz/api/session/dto/UpdateSessionRequest.java index c1ac4036..d5094abe 100644 --- a/src/main/java/cotato/csquiz/controller/dto/session/UpdateSessionRequest.java +++ b/src/main/java/org/cotato/csquiz/api/session/dto/UpdateSessionRequest.java @@ -1,8 +1,8 @@ -package cotato.csquiz.controller.dto.session; +package org.cotato.csquiz.api.session.dto; -import cotato.csquiz.domain.enums.CSEducation; -import cotato.csquiz.domain.enums.ItIssue; -import cotato.csquiz.domain.enums.Networking; +import org.cotato.csquiz.domain.generation.enums.CSEducation; +import org.cotato.csquiz.domain.generation.enums.ItIssue; +import org.cotato.csquiz.domain.generation.enums.Networking; import jakarta.validation.constraints.NotNull; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/cotato/csquiz/controller/SocketController.java b/src/main/java/org/cotato/csquiz/api/socket/controller/SocketController.java similarity index 85% rename from src/main/java/cotato/csquiz/controller/SocketController.java rename to src/main/java/org/cotato/csquiz/api/socket/controller/SocketController.java index 80a25ae5..f5a5b7c0 100644 --- a/src/main/java/cotato/csquiz/controller/SocketController.java +++ b/src/main/java/org/cotato/csquiz/api/socket/controller/SocketController.java @@ -1,14 +1,14 @@ -package cotato.csquiz.controller; +package org.cotato.csquiz.api.socket.controller; -import cotato.csquiz.controller.dto.socket.EducationCloseRequest; -import cotato.csquiz.controller.dto.socket.QuizOpenRequest; -import cotato.csquiz.controller.dto.socket.QuizSocketRequest; -import cotato.csquiz.controller.dto.socket.SocketTokenDto; -import cotato.csquiz.service.RecordService; -import cotato.csquiz.service.SocketService; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.cotato.csquiz.api.socket.dto.EducationCloseRequest; +import org.cotato.csquiz.api.socket.dto.QuizOpenRequest; +import org.cotato.csquiz.api.socket.dto.QuizSocketRequest; +import org.cotato.csquiz.api.socket.dto.SocketTokenDto; +import org.cotato.csquiz.domain.education.service.RecordService; +import org.cotato.csquiz.domain.education.service.SocketService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/cotato/csquiz/controller/dto/socket/CsQuizStopResponse.java b/src/main/java/org/cotato/csquiz/api/socket/dto/CsQuizStopResponse.java similarity index 86% rename from src/main/java/cotato/csquiz/controller/dto/socket/CsQuizStopResponse.java rename to src/main/java/org/cotato/csquiz/api/socket/dto/CsQuizStopResponse.java index 3d38c993..bafef32d 100644 --- a/src/main/java/cotato/csquiz/controller/dto/socket/CsQuizStopResponse.java +++ b/src/main/java/org/cotato/csquiz/api/socket/dto/CsQuizStopResponse.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.socket; +package org.cotato.csquiz.api.socket.dto; public record CsQuizStopResponse( String command, diff --git a/src/main/java/cotato/csquiz/controller/dto/socket/EducationCloseRequest.java b/src/main/java/org/cotato/csquiz/api/socket/dto/EducationCloseRequest.java similarity index 74% rename from src/main/java/cotato/csquiz/controller/dto/socket/EducationCloseRequest.java rename to src/main/java/org/cotato/csquiz/api/socket/dto/EducationCloseRequest.java index 2954b3cb..4cb3e8f2 100644 --- a/src/main/java/cotato/csquiz/controller/dto/socket/EducationCloseRequest.java +++ b/src/main/java/org/cotato/csquiz/api/socket/dto/EducationCloseRequest.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.socket; +package org.cotato.csquiz.api.socket.dto; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/cotato/csquiz/controller/dto/socket/QuizOpenRequest.java b/src/main/java/org/cotato/csquiz/api/socket/dto/QuizOpenRequest.java similarity index 73% rename from src/main/java/cotato/csquiz/controller/dto/socket/QuizOpenRequest.java rename to src/main/java/org/cotato/csquiz/api/socket/dto/QuizOpenRequest.java index d88d0fcf..5a5f2528 100644 --- a/src/main/java/cotato/csquiz/controller/dto/socket/QuizOpenRequest.java +++ b/src/main/java/org/cotato/csquiz/api/socket/dto/QuizOpenRequest.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.socket; +package org.cotato.csquiz.api.socket.dto; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/cotato/csquiz/controller/dto/socket/QuizSocketRequest.java b/src/main/java/org/cotato/csquiz/api/socket/dto/QuizSocketRequest.java similarity index 73% rename from src/main/java/cotato/csquiz/controller/dto/socket/QuizSocketRequest.java rename to src/main/java/org/cotato/csquiz/api/socket/dto/QuizSocketRequest.java index 72402afa..89e81021 100644 --- a/src/main/java/cotato/csquiz/controller/dto/socket/QuizSocketRequest.java +++ b/src/main/java/org/cotato/csquiz/api/socket/dto/QuizSocketRequest.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.socket; +package org.cotato.csquiz.api.socket.dto; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/cotato/csquiz/controller/dto/socket/QuizStartResponse.java b/src/main/java/org/cotato/csquiz/api/socket/dto/QuizStartResponse.java similarity index 77% rename from src/main/java/cotato/csquiz/controller/dto/socket/QuizStartResponse.java rename to src/main/java/org/cotato/csquiz/api/socket/dto/QuizStartResponse.java index b7e9f347..d86636f6 100644 --- a/src/main/java/cotato/csquiz/controller/dto/socket/QuizStartResponse.java +++ b/src/main/java/org/cotato/csquiz/api/socket/dto/QuizStartResponse.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.socket; +package org.cotato.csquiz.api.socket.dto; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/cotato/csquiz/controller/dto/socket/QuizStatusResponse.java b/src/main/java/org/cotato/csquiz/api/socket/dto/QuizStatusResponse.java similarity index 67% rename from src/main/java/cotato/csquiz/controller/dto/socket/QuizStatusResponse.java rename to src/main/java/org/cotato/csquiz/api/socket/dto/QuizStatusResponse.java index 8340dd73..23e94552 100644 --- a/src/main/java/cotato/csquiz/controller/dto/socket/QuizStatusResponse.java +++ b/src/main/java/org/cotato/csquiz/api/socket/dto/QuizStatusResponse.java @@ -1,6 +1,6 @@ -package cotato.csquiz.controller.dto.socket; +package org.cotato.csquiz.api.socket.dto; -import cotato.csquiz.domain.enums.QuizStatus; +import org.cotato.csquiz.domain.education.enums.QuizStatus; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/cotato/csquiz/controller/dto/socket/QuizStopResponse.java b/src/main/java/org/cotato/csquiz/api/socket/dto/QuizStopResponse.java similarity index 85% rename from src/main/java/cotato/csquiz/controller/dto/socket/QuizStopResponse.java rename to src/main/java/org/cotato/csquiz/api/socket/dto/QuizStopResponse.java index 4764e575..d1d78ac5 100644 --- a/src/main/java/cotato/csquiz/controller/dto/socket/QuizStopResponse.java +++ b/src/main/java/org/cotato/csquiz/api/socket/dto/QuizStopResponse.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.socket; +package org.cotato.csquiz.api.socket.dto; public record QuizStopResponse( String command, diff --git a/src/main/java/cotato/csquiz/controller/dto/socket/SocketTokenDto.java b/src/main/java/org/cotato/csquiz/api/socket/dto/SocketTokenDto.java similarity index 81% rename from src/main/java/cotato/csquiz/controller/dto/socket/SocketTokenDto.java rename to src/main/java/org/cotato/csquiz/api/socket/dto/SocketTokenDto.java index 1f4d752d..9f5f37f1 100644 --- a/src/main/java/cotato/csquiz/controller/dto/socket/SocketTokenDto.java +++ b/src/main/java/org/cotato/csquiz/api/socket/dto/SocketTokenDto.java @@ -1,4 +1,4 @@ -package cotato.csquiz.controller.dto.socket; +package org.cotato.csquiz.api.socket.dto; public record SocketTokenDto( String socketToken diff --git a/src/main/java/cotato/csquiz/global/S3/S3Config.java b/src/main/java/org/cotato/csquiz/common/S3/S3Config.java similarity index 92% rename from src/main/java/cotato/csquiz/global/S3/S3Config.java rename to src/main/java/org/cotato/csquiz/common/S3/S3Config.java index 7eeb4214..3aa0815d 100644 --- a/src/main/java/cotato/csquiz/global/S3/S3Config.java +++ b/src/main/java/org/cotato/csquiz/common/S3/S3Config.java @@ -1,4 +1,4 @@ -package cotato.csquiz.global.S3; +package org.cotato.csquiz.common.S3; import com.amazonaws.auth.AWSStaticCredentialsProvider; import com.amazonaws.auth.BasicAWSCredentials; @@ -9,7 +9,6 @@ import org.springframework.context.annotation.Bean; import com.amazonaws.services.s3.AmazonS3Client; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; @Slf4j @Configuration diff --git a/src/main/java/cotato/csquiz/global/S3/S3Uploader.java b/src/main/java/org/cotato/csquiz/common/S3/S3Uploader.java similarity index 95% rename from src/main/java/cotato/csquiz/global/S3/S3Uploader.java rename to src/main/java/org/cotato/csquiz/common/S3/S3Uploader.java index 5e90ec56..5e73863a 100644 --- a/src/main/java/cotato/csquiz/global/S3/S3Uploader.java +++ b/src/main/java/org/cotato/csquiz/common/S3/S3Uploader.java @@ -1,11 +1,11 @@ -package cotato.csquiz.global.S3; +package org.cotato.csquiz.common.S3; import com.amazonaws.SdkClientException; import com.amazonaws.services.s3.AmazonS3Client; import com.amazonaws.services.s3.model.CannedAccessControlList; import com.amazonaws.services.s3.model.PutObjectRequest; -import cotato.csquiz.exception.ErrorCode; -import cotato.csquiz.exception.ImageException; +import org.cotato.csquiz.common.error.ErrorCode; +import org.cotato.csquiz.common.error.exception.ImageException; import java.util.UUID; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/cotato/csquiz/service/SchedulerService.java b/src/main/java/org/cotato/csquiz/common/SchedulerService.java similarity index 80% rename from src/main/java/cotato/csquiz/service/SchedulerService.java rename to src/main/java/org/cotato/csquiz/common/SchedulerService.java index 2ddce59e..8acae9e2 100644 --- a/src/main/java/cotato/csquiz/service/SchedulerService.java +++ b/src/main/java/org/cotato/csquiz/common/SchedulerService.java @@ -1,13 +1,14 @@ -package cotato.csquiz.service; +package org.cotato.csquiz.common; -import cotato.csquiz.domain.entity.RefusedMember; -import cotato.csquiz.domain.enums.MemberRole; -import cotato.csquiz.repository.MemberRepository; -import cotato.csquiz.repository.RefusedMemberRepository; import java.time.LocalDateTime; import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.cotato.csquiz.domain.auth.entity.RefusedMember; +import org.cotato.csquiz.domain.education.service.SocketService; +import org.cotato.csquiz.domain.auth.enums.MemberRole; +import org.cotato.csquiz.domain.auth.repository.MemberRepository; +import org.cotato.csquiz.domain.auth.repository.RefusedMemberRepository; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/cotato/csquiz/config/CorsConfig.java b/src/main/java/org/cotato/csquiz/common/config/CorsConfig.java similarity index 96% rename from src/main/java/cotato/csquiz/config/CorsConfig.java rename to src/main/java/org/cotato/csquiz/common/config/CorsConfig.java index c3102f91..4e286455 100644 --- a/src/main/java/cotato/csquiz/config/CorsConfig.java +++ b/src/main/java/org/cotato/csquiz/common/config/CorsConfig.java @@ -1,4 +1,4 @@ -package cotato.csquiz.config; +package org.cotato.csquiz.common.config; import java.util.List; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/cotato/csquiz/config/EncodeConfig.java b/src/main/java/org/cotato/csquiz/common/config/EncodeConfig.java similarity index 94% rename from src/main/java/cotato/csquiz/config/EncodeConfig.java rename to src/main/java/org/cotato/csquiz/common/config/EncodeConfig.java index 408cbcff..0255a9e8 100644 --- a/src/main/java/cotato/csquiz/config/EncodeConfig.java +++ b/src/main/java/org/cotato/csquiz/common/config/EncodeConfig.java @@ -1,4 +1,4 @@ -package cotato.csquiz.config; +package org.cotato.csquiz.common.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; @@ -14,7 +14,7 @@ public class EncodeConfig { @Value("${aes.secret.salt}") String salt; - + @Bean public BCryptPasswordEncoder encoder() { return new BCryptPasswordEncoder(); diff --git a/src/main/java/cotato/csquiz/config/JpaConfig.java b/src/main/java/org/cotato/csquiz/common/config/JpaConfig.java similarity index 82% rename from src/main/java/cotato/csquiz/config/JpaConfig.java rename to src/main/java/org/cotato/csquiz/common/config/JpaConfig.java index 486ca64a..4d8b441b 100644 --- a/src/main/java/cotato/csquiz/config/JpaConfig.java +++ b/src/main/java/org/cotato/csquiz/common/config/JpaConfig.java @@ -1,4 +1,4 @@ -package cotato.csquiz.config; +package org.cotato.csquiz.common.config; import org.springframework.context.annotation.Configuration; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; diff --git a/src/main/java/cotato/csquiz/config/RedisConfig.java b/src/main/java/org/cotato/csquiz/common/config/RedisConfig.java similarity index 95% rename from src/main/java/cotato/csquiz/config/RedisConfig.java rename to src/main/java/org/cotato/csquiz/common/config/RedisConfig.java index 81c8787e..08ac8bbb 100644 --- a/src/main/java/cotato/csquiz/config/RedisConfig.java +++ b/src/main/java/org/cotato/csquiz/common/config/RedisConfig.java @@ -1,4 +1,4 @@ -package cotato.csquiz.config; +package org.cotato.csquiz.common.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/cotato/csquiz/config/SecurityConfig.java b/src/main/java/org/cotato/csquiz/common/config/SecurityConfig.java similarity index 92% rename from src/main/java/cotato/csquiz/config/SecurityConfig.java rename to src/main/java/org/cotato/csquiz/common/config/SecurityConfig.java index 6415e1cb..0f21f2f8 100644 --- a/src/main/java/cotato/csquiz/config/SecurityConfig.java +++ b/src/main/java/org/cotato/csquiz/common/config/SecurityConfig.java @@ -1,10 +1,10 @@ -package cotato.csquiz.config; +package org.cotato.csquiz.common.config; -import cotato.csquiz.config.filter.JwtAuthenticationFilter; -import cotato.csquiz.config.filter.JwtAuthorizationFilter; -import cotato.csquiz.config.filter.JwtExceptionFilter; -import cotato.csquiz.config.jwt.JwtTokenProvider; -import cotato.csquiz.config.jwt.RefreshTokenRepository; +import org.cotato.csquiz.common.config.filter.JwtAuthenticationFilter; +import org.cotato.csquiz.common.config.filter.JwtAuthorizationFilter; +import org.cotato.csquiz.common.config.filter.JwtExceptionFilter; +import org.cotato.csquiz.common.config.jwt.JwtTokenProvider; +import org.cotato.csquiz.common.config.jwt.RefreshTokenRepository; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/cotato/csquiz/config/SwaggerConfig.java b/src/main/java/org/cotato/csquiz/common/config/SwaggerConfig.java similarity index 96% rename from src/main/java/cotato/csquiz/config/SwaggerConfig.java rename to src/main/java/org/cotato/csquiz/common/config/SwaggerConfig.java index 99b59b8a..d5969875 100644 --- a/src/main/java/cotato/csquiz/config/SwaggerConfig.java +++ b/src/main/java/org/cotato/csquiz/common/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package cotato.csquiz.config; +package org.cotato.csquiz.common.config; import io.swagger.v3.oas.annotations.OpenAPIDefinition; @@ -17,7 +17,7 @@ ) @Configuration public class SwaggerConfig { - + @Bean public OpenAPI customOpenAPI() { return new OpenAPI() diff --git a/src/main/java/cotato/csquiz/global/websocket/WebSocketConfig.java b/src/main/java/org/cotato/csquiz/common/config/WebSocketConfig.java similarity index 83% rename from src/main/java/cotato/csquiz/global/websocket/WebSocketConfig.java rename to src/main/java/org/cotato/csquiz/common/config/WebSocketConfig.java index 17d712de..f7e33981 100644 --- a/src/main/java/cotato/csquiz/global/websocket/WebSocketConfig.java +++ b/src/main/java/org/cotato/csquiz/common/config/WebSocketConfig.java @@ -1,7 +1,8 @@ -package cotato.csquiz.global.websocket; +package org.cotato.csquiz.common.config; -import cotato.csquiz.config.jwt.JwtTokenProvider; +import org.cotato.csquiz.common.config.jwt.JwtTokenProvider; import lombok.RequiredArgsConstructor; +import org.cotato.csquiz.common.interceptor.HandshakeInterceptor; import org.springframework.context.annotation.Configuration; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.config.annotation.EnableWebSocket; @@ -22,4 +23,4 @@ public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { registry.addHandler(webSocketHandler, "/websocket/csquiz").setAllowedOrigins("*") .addInterceptors(new HandshakeInterceptor(jwtTokenProvider)); } -} \ No newline at end of file +} diff --git a/src/main/java/cotato/csquiz/config/auth/PrincipalDetails.java b/src/main/java/org/cotato/csquiz/common/config/auth/PrincipalDetails.java similarity index 92% rename from src/main/java/cotato/csquiz/config/auth/PrincipalDetails.java rename to src/main/java/org/cotato/csquiz/common/config/auth/PrincipalDetails.java index 06b8c485..92ccf76c 100644 --- a/src/main/java/cotato/csquiz/config/auth/PrincipalDetails.java +++ b/src/main/java/org/cotato/csquiz/common/config/auth/PrincipalDetails.java @@ -1,9 +1,9 @@ -package cotato.csquiz.config.auth; +package org.cotato.csquiz.common.config.auth; -import cotato.csquiz.domain.entity.Member; import java.util.Collection; import java.util.List; import lombok.Data; +import org.cotato.csquiz.domain.auth.entity.Member; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; diff --git a/src/main/java/cotato/csquiz/config/auth/PrincipalDetailsService.java b/src/main/java/org/cotato/csquiz/common/config/auth/PrincipalDetailsService.java similarity index 84% rename from src/main/java/cotato/csquiz/config/auth/PrincipalDetailsService.java rename to src/main/java/org/cotato/csquiz/common/config/auth/PrincipalDetailsService.java index d1501325..4aea27da 100644 --- a/src/main/java/cotato/csquiz/config/auth/PrincipalDetailsService.java +++ b/src/main/java/org/cotato/csquiz/common/config/auth/PrincipalDetailsService.java @@ -1,9 +1,9 @@ -package cotato.csquiz.config.auth; +package org.cotato.csquiz.common.config.auth; -import cotato.csquiz.domain.entity.Member; -import cotato.csquiz.repository.MemberRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.cotato.csquiz.domain.auth.entity.Member; +import org.cotato.csquiz.domain.auth.repository.MemberRepository; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; diff --git a/src/main/java/cotato/csquiz/config/filter/JwtAuthenticationFilter.java b/src/main/java/org/cotato/csquiz/common/config/filter/JwtAuthenticationFilter.java similarity index 87% rename from src/main/java/cotato/csquiz/config/filter/JwtAuthenticationFilter.java rename to src/main/java/org/cotato/csquiz/common/config/filter/JwtAuthenticationFilter.java index 38875f38..2a1fedba 100644 --- a/src/main/java/cotato/csquiz/config/filter/JwtAuthenticationFilter.java +++ b/src/main/java/org/cotato/csquiz/common/config/filter/JwtAuthenticationFilter.java @@ -1,13 +1,6 @@ -package cotato.csquiz.config.filter; +package org.cotato.csquiz.common.config.filter; import com.fasterxml.jackson.databind.ObjectMapper; -import cotato.csquiz.config.auth.PrincipalDetails; -import cotato.csquiz.config.jwt.JwtTokenProvider; -import cotato.csquiz.config.jwt.RefreshToken; -import cotato.csquiz.config.jwt.RefreshTokenRepository; -import cotato.csquiz.config.jwt.Token; -import cotato.csquiz.domain.entity.Member; -import cotato.csquiz.exception.FilterAuthenticationException; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.Cookie; @@ -18,6 +11,13 @@ import java.time.ZonedDateTime; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.cotato.csquiz.common.config.auth.PrincipalDetails; +import org.cotato.csquiz.common.config.jwt.JwtTokenProvider; +import org.cotato.csquiz.common.config.jwt.RefreshToken; +import org.cotato.csquiz.common.config.jwt.RefreshTokenRepository; +import org.cotato.csquiz.common.config.jwt.Token; +import org.cotato.csquiz.domain.auth.entity.Member; +import org.cotato.csquiz.common.error.exception.FilterAuthenticationException; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; diff --git a/src/main/java/cotato/csquiz/config/filter/JwtAuthorizationFilter.java b/src/main/java/org/cotato/csquiz/common/config/filter/JwtAuthorizationFilter.java similarity index 90% rename from src/main/java/cotato/csquiz/config/filter/JwtAuthorizationFilter.java rename to src/main/java/org/cotato/csquiz/common/config/filter/JwtAuthorizationFilter.java index da277df0..228db3c7 100644 --- a/src/main/java/cotato/csquiz/config/filter/JwtAuthorizationFilter.java +++ b/src/main/java/org/cotato/csquiz/common/config/filter/JwtAuthorizationFilter.java @@ -1,9 +1,5 @@ -package cotato.csquiz.config.filter; +package org.cotato.csquiz.common.config.filter; -import cotato.csquiz.config.jwt.JwtTokenProvider; -import cotato.csquiz.domain.entity.Member; -import cotato.csquiz.exception.FilterAuthenticationException; -import cotato.csquiz.repository.MemberRepository; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; @@ -12,6 +8,10 @@ import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.cotato.csquiz.common.config.jwt.JwtTokenProvider; +import org.cotato.csquiz.domain.auth.entity.Member; +import org.cotato.csquiz.common.error.exception.FilterAuthenticationException; +import org.cotato.csquiz.domain.auth.repository.MemberRepository; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/src/main/java/cotato/csquiz/config/filter/JwtExceptionFilter.java b/src/main/java/org/cotato/csquiz/common/config/filter/JwtExceptionFilter.java similarity index 89% rename from src/main/java/cotato/csquiz/config/filter/JwtExceptionFilter.java rename to src/main/java/org/cotato/csquiz/common/config/filter/JwtExceptionFilter.java index 6e250f3a..152b67c5 100644 --- a/src/main/java/cotato/csquiz/config/filter/JwtExceptionFilter.java +++ b/src/main/java/org/cotato/csquiz/common/config/filter/JwtExceptionFilter.java @@ -1,10 +1,10 @@ -package cotato.csquiz.config.filter; +package org.cotato.csquiz.common.config.filter; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import cotato.csquiz.exception.ErrorCode; -import cotato.csquiz.exception.ErrorResponse; -import cotato.csquiz.exception.FilterAuthenticationException; +import org.cotato.csquiz.common.error.ErrorCode; +import org.cotato.csquiz.common.error.response.ErrorResponse; +import org.cotato.csquiz.common.error.exception.FilterAuthenticationException; import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.MalformedJwtException; import io.jsonwebtoken.SignatureException; diff --git a/src/main/java/cotato/csquiz/config/jwt/BlackList.java b/src/main/java/org/cotato/csquiz/common/config/jwt/BlackList.java similarity index 89% rename from src/main/java/cotato/csquiz/config/jwt/BlackList.java rename to src/main/java/org/cotato/csquiz/common/config/jwt/BlackList.java index dd2183a5..ee42d136 100644 --- a/src/main/java/cotato/csquiz/config/jwt/BlackList.java +++ b/src/main/java/org/cotato/csquiz/common/config/jwt/BlackList.java @@ -1,4 +1,4 @@ -package cotato.csquiz.config.jwt; +package org.cotato.csquiz.common.config.jwt; import jakarta.persistence.Id; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/cotato/csquiz/config/jwt/BlackListRepository.java b/src/main/java/org/cotato/csquiz/common/config/jwt/BlackListRepository.java similarity index 82% rename from src/main/java/cotato/csquiz/config/jwt/BlackListRepository.java rename to src/main/java/org/cotato/csquiz/common/config/jwt/BlackListRepository.java index b07647f0..3777719f 100644 --- a/src/main/java/cotato/csquiz/config/jwt/BlackListRepository.java +++ b/src/main/java/org/cotato/csquiz/common/config/jwt/BlackListRepository.java @@ -1,4 +1,4 @@ -package cotato.csquiz.config.jwt; +package org.cotato.csquiz.common.config.jwt; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/cotato/csquiz/config/jwt/JwtTokenProvider.java b/src/main/java/org/cotato/csquiz/common/config/jwt/JwtTokenProvider.java similarity index 94% rename from src/main/java/cotato/csquiz/config/jwt/JwtTokenProvider.java rename to src/main/java/org/cotato/csquiz/common/config/jwt/JwtTokenProvider.java index d7b2c25a..43b67fbf 100644 --- a/src/main/java/cotato/csquiz/config/jwt/JwtTokenProvider.java +++ b/src/main/java/org/cotato/csquiz/common/config/jwt/JwtTokenProvider.java @@ -1,14 +1,14 @@ -package cotato.csquiz.config.jwt; +package org.cotato.csquiz.common.config.jwt; -import cotato.csquiz.domain.constant.TokenConstants; -import cotato.csquiz.exception.FilterAuthenticationException; -import cotato.csquiz.exception.InterceptorException; -import cotato.csquiz.repository.MemberRepository; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; import java.util.Date; import lombok.RequiredArgsConstructor; +import org.cotato.csquiz.domain.auth.constant.TokenConstants; +import org.cotato.csquiz.common.error.exception.FilterAuthenticationException; +import org.cotato.csquiz.common.error.exception.InterceptorException; +import org.cotato.csquiz.domain.auth.repository.MemberRepository; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/cotato/csquiz/config/jwt/RefreshToken.java b/src/main/java/org/cotato/csquiz/common/config/jwt/RefreshToken.java similarity index 91% rename from src/main/java/cotato/csquiz/config/jwt/RefreshToken.java rename to src/main/java/org/cotato/csquiz/common/config/jwt/RefreshToken.java index 4cfc2add..af5f741f 100644 --- a/src/main/java/cotato/csquiz/config/jwt/RefreshToken.java +++ b/src/main/java/org/cotato/csquiz/common/config/jwt/RefreshToken.java @@ -1,4 +1,4 @@ -package cotato.csquiz.config.jwt; +package org.cotato.csquiz.common.config.jwt; import jakarta.persistence.Id; import lombok.AllArgsConstructor; diff --git a/src/main/java/cotato/csquiz/config/jwt/RefreshTokenRepository.java b/src/main/java/org/cotato/csquiz/common/config/jwt/RefreshTokenRepository.java similarity index 82% rename from src/main/java/cotato/csquiz/config/jwt/RefreshTokenRepository.java rename to src/main/java/org/cotato/csquiz/common/config/jwt/RefreshTokenRepository.java index 444bc440..9919690a 100644 --- a/src/main/java/cotato/csquiz/config/jwt/RefreshTokenRepository.java +++ b/src/main/java/org/cotato/csquiz/common/config/jwt/RefreshTokenRepository.java @@ -1,4 +1,4 @@ -package cotato.csquiz.config.jwt; +package org.cotato.csquiz.common.config.jwt; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/cotato/csquiz/config/jwt/Token.java b/src/main/java/org/cotato/csquiz/common/config/jwt/Token.java similarity index 87% rename from src/main/java/cotato/csquiz/config/jwt/Token.java rename to src/main/java/org/cotato/csquiz/common/config/jwt/Token.java index e5ac4528..fb29a378 100644 --- a/src/main/java/cotato/csquiz/config/jwt/Token.java +++ b/src/main/java/org/cotato/csquiz/common/config/jwt/Token.java @@ -1,4 +1,4 @@ -package cotato.csquiz.config.jwt; +package org.cotato.csquiz.common.config.jwt; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/cotato/csquiz/global/entity/BaseTimeEntity.java b/src/main/java/org/cotato/csquiz/common/entity/BaseTimeEntity.java similarity index 93% rename from src/main/java/cotato/csquiz/global/entity/BaseTimeEntity.java rename to src/main/java/org/cotato/csquiz/common/entity/BaseTimeEntity.java index f0389d2e..0bbd9eb9 100644 --- a/src/main/java/cotato/csquiz/global/entity/BaseTimeEntity.java +++ b/src/main/java/org/cotato/csquiz/common/entity/BaseTimeEntity.java @@ -1,4 +1,4 @@ -package cotato.csquiz.global.entity; +package org.cotato.csquiz.common.entity; import jakarta.persistence.Column; import jakarta.persistence.EntityListeners; diff --git a/src/main/java/cotato/csquiz/exception/ErrorCode.java b/src/main/java/org/cotato/csquiz/common/error/ErrorCode.java similarity index 99% rename from src/main/java/cotato/csquiz/exception/ErrorCode.java rename to src/main/java/org/cotato/csquiz/common/error/ErrorCode.java index 6420cf2b..cddde6a1 100644 --- a/src/main/java/cotato/csquiz/exception/ErrorCode.java +++ b/src/main/java/org/cotato/csquiz/common/error/ErrorCode.java @@ -1,4 +1,4 @@ -package cotato.csquiz.exception; +package org.cotato.csquiz.common.error; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/cotato/csquiz/exception/AppException.java b/src/main/java/org/cotato/csquiz/common/error/exception/AppException.java similarity index 63% rename from src/main/java/cotato/csquiz/exception/AppException.java rename to src/main/java/org/cotato/csquiz/common/error/exception/AppException.java index 9f940def..5065968d 100644 --- a/src/main/java/cotato/csquiz/exception/AppException.java +++ b/src/main/java/org/cotato/csquiz/common/error/exception/AppException.java @@ -1,7 +1,8 @@ -package cotato.csquiz.exception; +package org.cotato.csquiz.common.error.exception; import lombok.AllArgsConstructor; import lombok.Getter; +import org.cotato.csquiz.common.error.ErrorCode; @AllArgsConstructor @Getter diff --git a/src/main/java/cotato/csquiz/exception/FilterAuthenticationException.java b/src/main/java/org/cotato/csquiz/common/error/exception/FilterAuthenticationException.java similarity index 78% rename from src/main/java/cotato/csquiz/exception/FilterAuthenticationException.java rename to src/main/java/org/cotato/csquiz/common/error/exception/FilterAuthenticationException.java index 26970109..d1049617 100644 --- a/src/main/java/cotato/csquiz/exception/FilterAuthenticationException.java +++ b/src/main/java/org/cotato/csquiz/common/error/exception/FilterAuthenticationException.java @@ -1,4 +1,4 @@ -package cotato.csquiz.exception; +package org.cotato.csquiz.common.error.exception; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/cotato/csquiz/exception/ImageException.java b/src/main/java/org/cotato/csquiz/common/error/exception/ImageException.java similarity index 67% rename from src/main/java/cotato/csquiz/exception/ImageException.java rename to src/main/java/org/cotato/csquiz/common/error/exception/ImageException.java index 657382d1..1fecceb9 100644 --- a/src/main/java/cotato/csquiz/exception/ImageException.java +++ b/src/main/java/org/cotato/csquiz/common/error/exception/ImageException.java @@ -1,9 +1,10 @@ -package cotato.csquiz.exception; +package org.cotato.csquiz.common.error.exception; import lombok.AllArgsConstructor; import lombok.Getter; import java.io.IOException; +import org.cotato.csquiz.common.error.ErrorCode; @AllArgsConstructor @Getter diff --git a/src/main/java/cotato/csquiz/exception/InterceptorException.java b/src/main/java/org/cotato/csquiz/common/error/exception/InterceptorException.java similarity index 78% rename from src/main/java/cotato/csquiz/exception/InterceptorException.java rename to src/main/java/org/cotato/csquiz/common/error/exception/InterceptorException.java index facb593b..a1e2626f 100644 --- a/src/main/java/cotato/csquiz/exception/InterceptorException.java +++ b/src/main/java/org/cotato/csquiz/common/error/exception/InterceptorException.java @@ -1,4 +1,4 @@ -package cotato.csquiz.exception; +package org.cotato.csquiz.common.error.exception; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/cotato/csquiz/exception/InterceptorRoleException.java b/src/main/java/org/cotato/csquiz/common/error/exception/InterceptorRoleException.java similarity index 78% rename from src/main/java/cotato/csquiz/exception/InterceptorRoleException.java rename to src/main/java/org/cotato/csquiz/common/error/exception/InterceptorRoleException.java index a5679fd7..2eaf56de 100644 --- a/src/main/java/cotato/csquiz/exception/InterceptorRoleException.java +++ b/src/main/java/org/cotato/csquiz/common/error/exception/InterceptorRoleException.java @@ -1,4 +1,4 @@ -package cotato.csquiz.exception; +package org.cotato.csquiz.common.error.exception; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/cotato/csquiz/exception/GlobalExceptionHandler.java b/src/main/java/org/cotato/csquiz/common/error/handler/GlobalExceptionHandler.java similarity index 90% rename from src/main/java/cotato/csquiz/exception/GlobalExceptionHandler.java rename to src/main/java/org/cotato/csquiz/common/error/handler/GlobalExceptionHandler.java index 1dcc022f..1f57ccf9 100644 --- a/src/main/java/cotato/csquiz/exception/GlobalExceptionHandler.java +++ b/src/main/java/org/cotato/csquiz/common/error/handler/GlobalExceptionHandler.java @@ -1,11 +1,16 @@ -package cotato.csquiz.exception; +package org.cotato.csquiz.common.error.handler; -import cotato.csquiz.exception.MethodArgumentErrorResponse.FieldErrorResponse; +import org.cotato.csquiz.common.error.exception.AppException; +import org.cotato.csquiz.common.error.exception.ImageException; +import org.cotato.csquiz.common.error.response.ErrorResponse; +import org.cotato.csquiz.common.error.response.MethodArgumentErrorResponse; +import org.cotato.csquiz.common.error.response.MethodArgumentErrorResponse.FieldErrorResponse; import jakarta.persistence.EntityNotFoundException; import jakarta.servlet.http.HttpServletRequest; import java.sql.SQLException; import java.util.List; import lombok.extern.slf4j.Slf4j; +import org.cotato.csquiz.common.error.ErrorCode; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatusCode; diff --git a/src/main/java/cotato/csquiz/exception/ErrorResponse.java b/src/main/java/org/cotato/csquiz/common/error/response/ErrorResponse.java similarity index 88% rename from src/main/java/cotato/csquiz/exception/ErrorResponse.java rename to src/main/java/org/cotato/csquiz/common/error/response/ErrorResponse.java index 5e072a61..12dba67b 100644 --- a/src/main/java/cotato/csquiz/exception/ErrorResponse.java +++ b/src/main/java/org/cotato/csquiz/common/error/response/ErrorResponse.java @@ -1,6 +1,7 @@ -package cotato.csquiz.exception; +package org.cotato.csquiz.common.error.response; import jakarta.servlet.http.HttpServletRequest; +import org.cotato.csquiz.common.error.ErrorCode; public record ErrorResponse( String code, diff --git a/src/main/java/cotato/csquiz/exception/MethodArgumentErrorResponse.java b/src/main/java/org/cotato/csquiz/common/error/response/MethodArgumentErrorResponse.java similarity index 93% rename from src/main/java/cotato/csquiz/exception/MethodArgumentErrorResponse.java rename to src/main/java/org/cotato/csquiz/common/error/response/MethodArgumentErrorResponse.java index ab21b8fb..e0fff5e9 100644 --- a/src/main/java/cotato/csquiz/exception/MethodArgumentErrorResponse.java +++ b/src/main/java/org/cotato/csquiz/common/error/response/MethodArgumentErrorResponse.java @@ -1,4 +1,4 @@ -package cotato.csquiz.exception; +package org.cotato.csquiz.common.error.response; import jakarta.servlet.http.HttpServletRequest; import java.util.List; @@ -6,6 +6,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; +import org.cotato.csquiz.common.error.ErrorCode; import org.springframework.validation.FieldError; public record MethodArgumentErrorResponse( diff --git a/src/main/java/cotato/csquiz/global/websocket/HandshakeInterceptor.java b/src/main/java/org/cotato/csquiz/common/interceptor/HandshakeInterceptor.java similarity index 89% rename from src/main/java/cotato/csquiz/global/websocket/HandshakeInterceptor.java rename to src/main/java/org/cotato/csquiz/common/interceptor/HandshakeInterceptor.java index 580da45f..0221ce98 100644 --- a/src/main/java/cotato/csquiz/global/websocket/HandshakeInterceptor.java +++ b/src/main/java/org/cotato/csquiz/common/interceptor/HandshakeInterceptor.java @@ -1,9 +1,9 @@ -package cotato.csquiz.global.websocket; +package org.cotato.csquiz.common.interceptor; -import cotato.csquiz.config.jwt.JwtTokenProvider; -import cotato.csquiz.domain.enums.MemberRole; -import cotato.csquiz.exception.InterceptorException; -import cotato.csquiz.exception.InterceptorRoleException; +import org.cotato.csquiz.common.config.jwt.JwtTokenProvider; +import org.cotato.csquiz.domain.auth.enums.MemberRole; +import org.cotato.csquiz.common.error.exception.InterceptorException; +import org.cotato.csquiz.common.error.exception.InterceptorRoleException; import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.MalformedJwtException; import io.jsonwebtoken.SignatureException; diff --git a/src/main/java/cotato/csquiz/global/websocket/WebSocketHandler.java b/src/main/java/org/cotato/csquiz/common/websocket/WebSocketHandler.java similarity index 90% rename from src/main/java/cotato/csquiz/global/websocket/WebSocketHandler.java rename to src/main/java/org/cotato/csquiz/common/websocket/WebSocketHandler.java index ddced2b5..2b72604d 100644 --- a/src/main/java/cotato/csquiz/global/websocket/WebSocketHandler.java +++ b/src/main/java/org/cotato/csquiz/common/websocket/WebSocketHandler.java @@ -1,17 +1,17 @@ -package cotato.csquiz.global.websocket; +package org.cotato.csquiz.common.websocket; import com.fasterxml.jackson.databind.ObjectMapper; -import cotato.csquiz.controller.dto.socket.CsQuizStopResponse; -import cotato.csquiz.controller.dto.socket.QuizStartResponse; -import cotato.csquiz.controller.dto.socket.QuizStatusResponse; -import cotato.csquiz.controller.dto.socket.QuizStopResponse; -import cotato.csquiz.domain.entity.Quiz; -import cotato.csquiz.domain.enums.MemberRole; -import cotato.csquiz.domain.enums.MemberRoleGroup; -import cotato.csquiz.domain.enums.QuizStatus; -import cotato.csquiz.exception.AppException; -import cotato.csquiz.exception.ErrorCode; -import cotato.csquiz.repository.QuizRepository; +import org.cotato.csquiz.api.socket.dto.CsQuizStopResponse; +import org.cotato.csquiz.api.socket.dto.QuizStartResponse; +import org.cotato.csquiz.api.socket.dto.QuizStatusResponse; +import org.cotato.csquiz.api.socket.dto.QuizStopResponse; +import org.cotato.csquiz.domain.education.entity.Quiz; +import org.cotato.csquiz.domain.auth.enums.MemberRole; +import org.cotato.csquiz.domain.auth.enums.MemberRoleGroup; +import org.cotato.csquiz.common.error.exception.AppException; +import org.cotato.csquiz.domain.education.repository.QuizRepository; +import org.cotato.csquiz.domain.education.enums.QuizStatus; +import org.cotato.csquiz.common.error.ErrorCode; import java.io.IOException; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/cotato/csquiz/utils/VerificationCodeRedisRepository.java b/src/main/java/org/cotato/csquiz/domain/auth/cache/VerificationCodeRedisRepository.java similarity index 95% rename from src/main/java/cotato/csquiz/utils/VerificationCodeRedisRepository.java rename to src/main/java/org/cotato/csquiz/domain/auth/cache/VerificationCodeRedisRepository.java index d4cd6960..a0ab6077 100644 --- a/src/main/java/cotato/csquiz/utils/VerificationCodeRedisRepository.java +++ b/src/main/java/org/cotato/csquiz/domain/auth/cache/VerificationCodeRedisRepository.java @@ -1,4 +1,4 @@ -package cotato.csquiz.utils; +package org.cotato.csquiz.domain.auth.cache; import java.util.concurrent.TimeUnit; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/cotato/csquiz/domain/constant/EmailConstants.java b/src/main/java/org/cotato/csquiz/domain/auth/constant/EmailConstants.java similarity index 96% rename from src/main/java/cotato/csquiz/domain/constant/EmailConstants.java rename to src/main/java/org/cotato/csquiz/domain/auth/constant/EmailConstants.java index e735a7d6..e41d9c86 100644 --- a/src/main/java/cotato/csquiz/domain/constant/EmailConstants.java +++ b/src/main/java/org/cotato/csquiz/domain/auth/constant/EmailConstants.java @@ -1,4 +1,4 @@ -package cotato.csquiz.domain.constant; +package org.cotato.csquiz.domain.auth.constant; public class EmailConstants { diff --git a/src/main/java/cotato/csquiz/domain/constant/TokenConstants.java b/src/main/java/org/cotato/csquiz/domain/auth/constant/TokenConstants.java similarity index 82% rename from src/main/java/cotato/csquiz/domain/constant/TokenConstants.java rename to src/main/java/org/cotato/csquiz/domain/auth/constant/TokenConstants.java index 78ee548e..29ed7a78 100644 --- a/src/main/java/cotato/csquiz/domain/constant/TokenConstants.java +++ b/src/main/java/org/cotato/csquiz/domain/auth/constant/TokenConstants.java @@ -1,4 +1,4 @@ -package cotato.csquiz.domain.constant; +package org.cotato.csquiz.domain.auth.constant; public class TokenConstants { public static final String SOCKET_TOKEN = "SOCKET_TOKEN"; diff --git a/src/main/java/cotato/csquiz/domain/entity/RefusedMember.java b/src/main/java/org/cotato/csquiz/domain/auth/entity/RefusedMember.java similarity index 87% rename from src/main/java/cotato/csquiz/domain/entity/RefusedMember.java rename to src/main/java/org/cotato/csquiz/domain/auth/entity/RefusedMember.java index 111a6b79..1b78a77d 100644 --- a/src/main/java/cotato/csquiz/domain/entity/RefusedMember.java +++ b/src/main/java/org/cotato/csquiz/domain/auth/entity/RefusedMember.java @@ -1,11 +1,9 @@ -package cotato.csquiz.domain.entity; +package org.cotato.csquiz.domain.auth.entity; import static jakarta.persistence.FetchType.LAZY; -import cotato.csquiz.global.entity.BaseTimeEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; @@ -15,6 +13,7 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import org.cotato.csquiz.common.entity.BaseTimeEntity; @Entity @Getter diff --git a/src/main/java/cotato/csquiz/domain/enums/MemberPosition.java b/src/main/java/org/cotato/csquiz/domain/auth/enums/MemberPosition.java similarity index 85% rename from src/main/java/cotato/csquiz/domain/enums/MemberPosition.java rename to src/main/java/org/cotato/csquiz/domain/auth/enums/MemberPosition.java index 4df557a1..d139ae84 100644 --- a/src/main/java/cotato/csquiz/domain/enums/MemberPosition.java +++ b/src/main/java/org/cotato/csquiz/domain/auth/enums/MemberPosition.java @@ -1,4 +1,4 @@ -package cotato.csquiz.domain.enums; +package org.cotato.csquiz.domain.auth.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/cotato/csquiz/domain/enums/MemberRole.java b/src/main/java/org/cotato/csquiz/domain/auth/enums/MemberRole.java similarity index 80% rename from src/main/java/cotato/csquiz/domain/enums/MemberRole.java rename to src/main/java/org/cotato/csquiz/domain/auth/enums/MemberRole.java index 665574f3..cef0d65e 100644 --- a/src/main/java/cotato/csquiz/domain/enums/MemberRole.java +++ b/src/main/java/org/cotato/csquiz/domain/auth/enums/MemberRole.java @@ -1,7 +1,7 @@ -package cotato.csquiz.domain.enums; +package org.cotato.csquiz.domain.auth.enums; -import cotato.csquiz.exception.AppException; -import cotato.csquiz.exception.ErrorCode; +import org.cotato.csquiz.common.error.exception.AppException; +import org.cotato.csquiz.common.error.ErrorCode; import java.util.Arrays; import lombok.Getter; diff --git a/src/main/java/cotato/csquiz/domain/enums/MemberRoleGroup.java b/src/main/java/org/cotato/csquiz/domain/auth/enums/MemberRoleGroup.java similarity index 93% rename from src/main/java/cotato/csquiz/domain/enums/MemberRoleGroup.java rename to src/main/java/org/cotato/csquiz/domain/auth/enums/MemberRoleGroup.java index 5402c2a2..e74b48cd 100644 --- a/src/main/java/cotato/csquiz/domain/enums/MemberRoleGroup.java +++ b/src/main/java/org/cotato/csquiz/domain/auth/enums/MemberRoleGroup.java @@ -1,4 +1,4 @@ -package cotato.csquiz.domain.enums; +package org.cotato.csquiz.domain.auth.enums; import java.util.List; import lombok.AllArgsConstructor; diff --git a/src/main/java/cotato/csquiz/repository/MemberRepository.java b/src/main/java/org/cotato/csquiz/domain/auth/repository/MemberRepository.java similarity index 83% rename from src/main/java/cotato/csquiz/repository/MemberRepository.java rename to src/main/java/org/cotato/csquiz/domain/auth/repository/MemberRepository.java index 451206a5..28027675 100644 --- a/src/main/java/cotato/csquiz/repository/MemberRepository.java +++ b/src/main/java/org/cotato/csquiz/domain/auth/repository/MemberRepository.java @@ -1,9 +1,9 @@ -package cotato.csquiz.repository; +package org.cotato.csquiz.domain.auth.repository; -import cotato.csquiz.domain.entity.Member; -import cotato.csquiz.domain.enums.MemberRole; import java.util.List; import java.util.Optional; +import org.cotato.csquiz.domain.auth.enums.MemberRole; +import org.cotato.csquiz.domain.auth.entity.Member; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/cotato/csquiz/repository/RefusedMemberRepository.java b/src/main/java/org/cotato/csquiz/domain/auth/repository/RefusedMemberRepository.java similarity index 69% rename from src/main/java/cotato/csquiz/repository/RefusedMemberRepository.java rename to src/main/java/org/cotato/csquiz/domain/auth/repository/RefusedMemberRepository.java index d6219116..3eb0a745 100644 --- a/src/main/java/cotato/csquiz/repository/RefusedMemberRepository.java +++ b/src/main/java/org/cotato/csquiz/domain/auth/repository/RefusedMemberRepository.java @@ -1,10 +1,10 @@ -package cotato.csquiz.repository; +package org.cotato.csquiz.domain.auth.repository; -import cotato.csquiz.domain.entity.Member; -import cotato.csquiz.domain.entity.RefusedMember; import java.time.LocalDateTime; import java.util.List; import java.util.Optional; +import org.cotato.csquiz.domain.auth.entity.RefusedMember; +import org.cotato.csquiz.domain.auth.entity.Member; import org.springframework.data.jpa.repository.JpaRepository; public interface RefusedMemberRepository extends JpaRepository { diff --git a/src/main/java/cotato/csquiz/service/AdminService.java b/src/main/java/org/cotato/csquiz/domain/auth/service/AdminService.java similarity index 74% rename from src/main/java/cotato/csquiz/service/AdminService.java rename to src/main/java/org/cotato/csquiz/domain/auth/service/AdminService.java index c5d7317e..6f776d80 100644 --- a/src/main/java/cotato/csquiz/service/AdminService.java +++ b/src/main/java/org/cotato/csquiz/domain/auth/service/AdminService.java @@ -1,30 +1,26 @@ -package cotato.csquiz.service; - -import static cotato.csquiz.domain.enums.MemberRole.GENERAL; -import static cotato.csquiz.domain.enums.MemberRole.MEMBER; -import static cotato.csquiz.domain.enums.MemberRole.OLD_MEMBER; -import static cotato.csquiz.domain.enums.MemberRole.REFUSED; - -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.domain.entity.Generation; -import cotato.csquiz.domain.entity.Member; -import cotato.csquiz.domain.entity.RefusedMember; -import cotato.csquiz.domain.enums.MemberRole; -import cotato.csquiz.domain.enums.MemberRoleGroup; -import cotato.csquiz.exception.AppException; -import cotato.csquiz.exception.ErrorCode; -import cotato.csquiz.repository.GenerationRepository; -import cotato.csquiz.repository.MemberRepository; -import cotato.csquiz.repository.RefusedMemberRepository; +package org.cotato.csquiz.domain.auth.service; + 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.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; +import org.cotato.csquiz.domain.auth.repository.MemberRepository; +import org.cotato.csquiz.domain.auth.repository.RefusedMemberRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -39,11 +35,11 @@ public class AdminService { private final MemberService memberService; public List findApplicantList() { - return createApplyInfoList(memberRepository.findAllByRole(GENERAL)); + return createApplyInfoList(memberRepository.findAllByRole(MemberRole.GENERAL)); } public List findRejectApplicantList() { - return createApplyInfoList(memberRepository.findAllByRole(REFUSED)); + return createApplyInfoList(memberRepository.findAllByRole(MemberRole.REFUSED)); } @Transactional @@ -51,9 +47,9 @@ public void approveApplicant(MemberApproveRequest request) { Member member = findMember(request.memberId()); checkMemberRoleIsGeneral(member); - if (member.getRole() == GENERAL) { + if (member.getRole() == MemberRole.GENERAL) { Generation findGeneration = findGeneration(request.generationId()); - member.updateRole(MEMBER); + member.updateRole(MemberRole.MEMBER); member.updateGeneration(findGeneration.getNumber()); member.updatePosition(request.position()); memberRepository.save(member); @@ -64,9 +60,9 @@ public void approveApplicant(MemberApproveRequest request) { public void reapproveApplicant(MemberApproveRequest request) { Member member = findMember(request.memberId()); - if (member.getRole() == REFUSED) { + if (member.getRole() == MemberRole.REFUSED) { Generation findGeneration = findGeneration(request.generationId()); - member.updateRole(MEMBER); + member.updateRole(MemberRole.MEMBER); member.updateGeneration(findGeneration.getNumber()); member.updatePosition(request.position()); deleteRefusedMember(member); @@ -77,8 +73,8 @@ public void reapproveApplicant(MemberApproveRequest request) { public void rejectApplicant(MemberRejectRequest request) { Member member = findMember(request.memberId()); checkMemberRoleIsGeneral(member); - if (member.getRole() == GENERAL) { - member.updateRole(REFUSED); + if (member.getRole() == MemberRole.GENERAL) { + member.updateRole(MemberRole.REFUSED); memberRepository.save(member); addRefusedMember(member); } @@ -90,7 +86,7 @@ private Member findMember(Long memberId) { } private void checkMemberRoleIsGeneral(Member member) { - if (member.getRole() != GENERAL) { + if (member.getRole() != MemberRole.GENERAL) { throw new AppException(ErrorCode.ROLE_IS_NOT_MATCH); } } @@ -121,13 +117,13 @@ public void updateActiveMembersToOldMembers(UpdateActiveMemberToOldMemberRequest if (!MemberRoleGroup.hasRole(MemberRoleGroup.ACTIVE_MEMBERS, member.getRole())) { throw new AppException(ErrorCode.ROLE_IS_NOT_MATCH); } - member.updateRole(OLD_MEMBER); + member.updateRole(MemberRole.OLD_MEMBER); memberRepository.save(member); } } public List findOldMembers() { - List oldMembers = memberRepository.findAllByRole(OLD_MEMBER); + List oldMembers = memberRepository.findAllByRole(MemberRole.OLD_MEMBER); return oldMembers.stream() .map(MemberEnrollInfoResponse::of) .toList(); @@ -137,14 +133,14 @@ public List findOldMembers() { public void updateOldMemberToActiveGeneration(UpdateOldMemberRoleRequest request) { Member member = findMember(request.memberId()); checkMemberRoleIsOldMember(member); - if (member.getRole() == OLD_MEMBER) { - member.updateRole(MEMBER); + if (member.getRole() == MemberRole.OLD_MEMBER) { + member.updateRole(MemberRole.MEMBER); memberRepository.save(member); } } private void checkMemberRoleIsOldMember(Member member) { - if (member.getRole() != OLD_MEMBER) { + if (member.getRole() != MemberRole.OLD_MEMBER) { throw new AppException(ErrorCode.ROLE_IS_NOT_OLD_MEMBER); } } diff --git a/src/main/java/cotato/csquiz/service/AuthService.java b/src/main/java/org/cotato/csquiz/domain/auth/service/AuthService.java similarity index 87% rename from src/main/java/cotato/csquiz/service/AuthService.java rename to src/main/java/org/cotato/csquiz/domain/auth/service/AuthService.java index 0b4fc7a2..c12ec405 100644 --- a/src/main/java/cotato/csquiz/service/AuthService.java +++ b/src/main/java/org/cotato/csquiz/domain/auth/service/AuthService.java @@ -1,26 +1,26 @@ -package cotato.csquiz.service; - -import cotato.csquiz.config.jwt.BlackListRepository; -import cotato.csquiz.config.jwt.JwtTokenProvider; -import cotato.csquiz.config.jwt.RefreshToken; -import cotato.csquiz.config.jwt.RefreshTokenRepository; -import cotato.csquiz.config.jwt.Token; -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.domain.constant.EmailConstants; -import cotato.csquiz.domain.entity.Member; -import cotato.csquiz.exception.AppException; -import cotato.csquiz.exception.ErrorCode; -import cotato.csquiz.repository.MemberRepository; +package org.cotato.csquiz.domain.auth.service; + import jakarta.persistence.EntityNotFoundException; import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletResponse; 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.common.config.jwt.BlackListRepository; +import org.cotato.csquiz.common.config.jwt.JwtTokenProvider; +import org.cotato.csquiz.common.config.jwt.RefreshToken; +import org.cotato.csquiz.common.config.jwt.RefreshTokenRepository; +import org.cotato.csquiz.common.config.jwt.Token; +import org.cotato.csquiz.domain.auth.constant.EmailConstants; +import org.cotato.csquiz.domain.auth.entity.Member; +import org.cotato.csquiz.common.error.exception.AppException; +import org.cotato.csquiz.common.error.ErrorCode; +import org.cotato.csquiz.domain.auth.repository.MemberRepository; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; diff --git a/src/main/java/cotato/csquiz/service/EmailVerificationService.java b/src/main/java/org/cotato/csquiz/domain/auth/service/EmailVerificationService.java similarity index 84% rename from src/main/java/cotato/csquiz/service/EmailVerificationService.java rename to src/main/java/org/cotato/csquiz/domain/auth/service/EmailVerificationService.java index 0d244584..e8c62f11 100644 --- a/src/main/java/cotato/csquiz/service/EmailVerificationService.java +++ b/src/main/java/org/cotato/csquiz/domain/auth/service/EmailVerificationService.java @@ -1,14 +1,10 @@ -package cotato.csquiz.service; +package org.cotato.csquiz.domain.auth.service; -import static cotato.csquiz.domain.constant.EmailConstants.MESSAGE_PREFIX; -import static cotato.csquiz.domain.constant.EmailConstants.MESSAGE_SUFFIX; -import static cotato.csquiz.domain.constant.EmailConstants.SENDER_EMAIL; -import static cotato.csquiz.domain.constant.EmailConstants.SENDER_PERSONAL; +import static org.cotato.csquiz.domain.auth.constant.EmailConstants.MESSAGE_PREFIX; +import static org.cotato.csquiz.domain.auth.constant.EmailConstants.MESSAGE_SUFFIX; +import static org.cotato.csquiz.domain.auth.constant.EmailConstants.SENDER_EMAIL; +import static org.cotato.csquiz.domain.auth.constant.EmailConstants.SENDER_PERSONAL; -import cotato.csquiz.exception.AppException; -import cotato.csquiz.exception.ErrorCode; -import cotato.csquiz.utils.EmailFormValidator; -import cotato.csquiz.utils.VerificationCodeRedisRepository; import jakarta.mail.Message.RecipientType; import jakarta.mail.MessagingException; import jakarta.mail.internet.InternetAddress; @@ -17,6 +13,10 @@ import java.util.concurrent.ThreadLocalRandom; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.cotato.csquiz.common.error.exception.AppException; +import org.cotato.csquiz.common.error.ErrorCode; +import org.cotato.csquiz.domain.auth.utils.EmailFormValidator; +import org.cotato.csquiz.domain.auth.cache.VerificationCodeRedisRepository; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/cotato/csquiz/service/EncryptService.java b/src/main/java/org/cotato/csquiz/domain/auth/service/EncryptService.java similarity index 95% rename from src/main/java/cotato/csquiz/service/EncryptService.java rename to src/main/java/org/cotato/csquiz/domain/auth/service/EncryptService.java index a2b7fa38..0a64f4ab 100644 --- a/src/main/java/cotato/csquiz/service/EncryptService.java +++ b/src/main/java/org/cotato/csquiz/domain/auth/service/EncryptService.java @@ -1,4 +1,4 @@ -package cotato.csquiz.service; +package org.cotato.csquiz.domain.auth.service; import java.nio.charset.StandardCharsets; import java.util.Base64; diff --git a/src/main/java/cotato/csquiz/service/MemberService.java b/src/main/java/org/cotato/csquiz/domain/auth/service/MemberService.java similarity index 87% rename from src/main/java/cotato/csquiz/service/MemberService.java rename to src/main/java/org/cotato/csquiz/domain/auth/service/MemberService.java index 799da0ea..e5ab6e4e 100644 --- a/src/main/java/cotato/csquiz/service/MemberService.java +++ b/src/main/java/org/cotato/csquiz/domain/auth/service/MemberService.java @@ -1,16 +1,16 @@ -package cotato.csquiz.service; +package org.cotato.csquiz.domain.auth.service; -import cotato.csquiz.config.jwt.JwtTokenProvider; -import cotato.csquiz.controller.dto.auth.MemberInfoResponse; -import cotato.csquiz.controller.dto.member.MemberInfo; -import cotato.csquiz.controller.dto.member.MemberMyPageInfoResponse; -import cotato.csquiz.domain.entity.Member; -import cotato.csquiz.exception.AppException; -import cotato.csquiz.exception.ErrorCode; -import cotato.csquiz.repository.MemberRepository; 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.member.dto.MemberInfo; +import org.cotato.csquiz.api.member.dto.MemberMyPageInfoResponse; +import org.cotato.csquiz.common.config.jwt.JwtTokenProvider; +import org.cotato.csquiz.domain.auth.entity.Member; +import org.cotato.csquiz.common.error.exception.AppException; +import org.cotato.csquiz.common.error.ErrorCode; +import org.cotato.csquiz.domain.auth.repository.MemberRepository; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/cotato/csquiz/service/ValidateService.java b/src/main/java/org/cotato/csquiz/domain/auth/service/ValidateService.java similarity index 91% rename from src/main/java/cotato/csquiz/service/ValidateService.java rename to src/main/java/org/cotato/csquiz/domain/auth/service/ValidateService.java index e16d20b1..2bfc4e28 100644 --- a/src/main/java/cotato/csquiz/service/ValidateService.java +++ b/src/main/java/org/cotato/csquiz/domain/auth/service/ValidateService.java @@ -1,8 +1,8 @@ -package cotato.csquiz.service; +package org.cotato.csquiz.domain.auth.service; -import cotato.csquiz.exception.AppException; -import cotato.csquiz.exception.ErrorCode; -import cotato.csquiz.repository.MemberRepository; +import org.cotato.csquiz.common.error.exception.AppException; +import org.cotato.csquiz.common.error.ErrorCode; +import org.cotato.csquiz.domain.auth.repository.MemberRepository; import java.util.regex.Matcher; import java.util.regex.Pattern; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/cotato/csquiz/utils/EmailFormValidator.java b/src/main/java/org/cotato/csquiz/domain/auth/utils/EmailFormValidator.java similarity index 84% rename from src/main/java/cotato/csquiz/utils/EmailFormValidator.java rename to src/main/java/org/cotato/csquiz/domain/auth/utils/EmailFormValidator.java index 83ecc030..942e5ce9 100644 --- a/src/main/java/cotato/csquiz/utils/EmailFormValidator.java +++ b/src/main/java/org/cotato/csquiz/domain/auth/utils/EmailFormValidator.java @@ -1,7 +1,7 @@ -package cotato.csquiz.utils; +package org.cotato.csquiz.domain.auth.utils; -import cotato.csquiz.exception.AppException; -import cotato.csquiz.exception.ErrorCode; +import org.cotato.csquiz.common.error.exception.AppException; +import org.cotato.csquiz.common.error.ErrorCode; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/cotato/csquiz/utils/QuizAnswerRedisRepository.java b/src/main/java/org/cotato/csquiz/domain/education/cache/QuizAnswerRedisRepository.java similarity index 87% rename from src/main/java/cotato/csquiz/utils/QuizAnswerRedisRepository.java rename to src/main/java/org/cotato/csquiz/domain/education/cache/QuizAnswerRedisRepository.java index 96005bef..e37cc021 100644 --- a/src/main/java/cotato/csquiz/utils/QuizAnswerRedisRepository.java +++ b/src/main/java/org/cotato/csquiz/domain/education/cache/QuizAnswerRedisRepository.java @@ -1,16 +1,16 @@ -package cotato.csquiz.utils; - -import cotato.csquiz.domain.entity.Choice; -import cotato.csquiz.domain.entity.MultipleQuiz; -import cotato.csquiz.domain.entity.Quiz; -import cotato.csquiz.domain.entity.ShortAnswer; -import cotato.csquiz.domain.entity.ShortQuiz; -import cotato.csquiz.domain.enums.ChoiceCorrect; -import cotato.csquiz.exception.AppException; -import cotato.csquiz.exception.ErrorCode; -import cotato.csquiz.repository.ChoiceRepository; -import cotato.csquiz.repository.QuizRepository; -import cotato.csquiz.repository.ShortAnswerRepository; +package org.cotato.csquiz.domain.education.cache; + +import org.cotato.csquiz.domain.education.entity.Quiz; +import org.cotato.csquiz.common.error.exception.AppException; +import org.cotato.csquiz.domain.education.repository.ChoiceRepository; +import org.cotato.csquiz.domain.education.repository.QuizRepository; +import org.cotato.csquiz.domain.education.repository.ShortAnswerRepository; +import org.cotato.csquiz.domain.education.entity.Choice; +import org.cotato.csquiz.domain.education.entity.MultipleQuiz; +import org.cotato.csquiz.domain.education.entity.ShortAnswer; +import org.cotato.csquiz.domain.education.entity.ShortQuiz; +import org.cotato.csquiz.domain.education.enums.ChoiceCorrect; +import org.cotato.csquiz.common.error.ErrorCode; import java.util.List; import java.util.Objects; import java.util.Set; diff --git a/src/main/java/cotato/csquiz/utils/ScorerExistRedisRepository.java b/src/main/java/org/cotato/csquiz/domain/education/cache/ScorerExistRedisRepository.java similarity index 91% rename from src/main/java/cotato/csquiz/utils/ScorerExistRedisRepository.java rename to src/main/java/org/cotato/csquiz/domain/education/cache/ScorerExistRedisRepository.java index 92e8ce49..2ca4ed5d 100644 --- a/src/main/java/cotato/csquiz/utils/ScorerExistRedisRepository.java +++ b/src/main/java/org/cotato/csquiz/domain/education/cache/ScorerExistRedisRepository.java @@ -1,7 +1,7 @@ -package cotato.csquiz.utils; +package org.cotato.csquiz.domain.education.cache; -import cotato.csquiz.domain.entity.Quiz; -import cotato.csquiz.repository.QuizRepository; +import org.cotato.csquiz.domain.education.entity.Quiz; +import org.cotato.csquiz.domain.education.repository.QuizRepository; import java.util.List; import java.util.concurrent.TimeUnit; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/cotato/csquiz/utils/TicketCountRedisRepository.java b/src/main/java/org/cotato/csquiz/domain/education/cache/TicketCountRedisRepository.java similarity index 91% rename from src/main/java/cotato/csquiz/utils/TicketCountRedisRepository.java rename to src/main/java/org/cotato/csquiz/domain/education/cache/TicketCountRedisRepository.java index 074806b6..77242759 100644 --- a/src/main/java/cotato/csquiz/utils/TicketCountRedisRepository.java +++ b/src/main/java/org/cotato/csquiz/domain/education/cache/TicketCountRedisRepository.java @@ -1,4 +1,4 @@ -package cotato.csquiz.utils; +package org.cotato.csquiz.domain.education.cache; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.core.RedisTemplate; diff --git a/src/main/java/cotato/csquiz/domain/entity/Choice.java b/src/main/java/org/cotato/csquiz/domain/education/entity/Choice.java similarity index 88% rename from src/main/java/cotato/csquiz/domain/entity/Choice.java rename to src/main/java/org/cotato/csquiz/domain/education/entity/Choice.java index 79e21dc1..a13d87db 100644 --- a/src/main/java/cotato/csquiz/domain/entity/Choice.java +++ b/src/main/java/org/cotato/csquiz/domain/education/entity/Choice.java @@ -1,10 +1,10 @@ -package cotato.csquiz.domain.entity; +package org.cotato.csquiz.domain.education.entity; import static jakarta.persistence.FetchType.LAZY; -import cotato.csquiz.controller.dto.quiz.CreateChoiceRequest; -import cotato.csquiz.domain.enums.ChoiceCorrect; -import cotato.csquiz.global.entity.BaseTimeEntity; +import org.cotato.csquiz.api.quiz.dto.CreateChoiceRequest; +import org.cotato.csquiz.domain.education.enums.ChoiceCorrect; +import org.cotato.csquiz.common.entity.BaseTimeEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; diff --git a/src/main/java/cotato/csquiz/domain/entity/Education.java b/src/main/java/org/cotato/csquiz/domain/education/entity/Education.java similarity index 90% rename from src/main/java/cotato/csquiz/domain/entity/Education.java rename to src/main/java/org/cotato/csquiz/domain/education/entity/Education.java index f914aab0..1c6f01eb 100644 --- a/src/main/java/cotato/csquiz/domain/entity/Education.java +++ b/src/main/java/org/cotato/csquiz/domain/education/entity/Education.java @@ -1,7 +1,7 @@ -package cotato.csquiz.domain.entity; +package org.cotato.csquiz.domain.education.entity; -import cotato.csquiz.domain.enums.EducationStatus; -import cotato.csquiz.global.entity.BaseTimeEntity; +import org.cotato.csquiz.common.entity.BaseTimeEntity; +import org.cotato.csquiz.domain.education.enums.EducationStatus; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; diff --git a/src/main/java/cotato/csquiz/domain/entity/KingMember.java b/src/main/java/org/cotato/csquiz/domain/education/entity/KingMember.java similarity index 89% rename from src/main/java/cotato/csquiz/domain/entity/KingMember.java rename to src/main/java/org/cotato/csquiz/domain/education/entity/KingMember.java index a0349d04..611d540c 100644 --- a/src/main/java/cotato/csquiz/domain/entity/KingMember.java +++ b/src/main/java/org/cotato/csquiz/domain/education/entity/KingMember.java @@ -1,8 +1,7 @@ -package cotato.csquiz.domain.entity; +package org.cotato.csquiz.domain.education.entity; import static jakarta.persistence.FetchType.LAZY; -import cotato.csquiz.global.entity.BaseTimeEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -15,6 +14,8 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; +import org.cotato.csquiz.domain.auth.entity.Member; +import org.cotato.csquiz.common.entity.BaseTimeEntity; @Entity @Getter diff --git a/src/main/java/cotato/csquiz/domain/entity/MultipleQuiz.java b/src/main/java/org/cotato/csquiz/domain/education/entity/MultipleQuiz.java similarity index 77% rename from src/main/java/cotato/csquiz/domain/entity/MultipleQuiz.java rename to src/main/java/org/cotato/csquiz/domain/education/entity/MultipleQuiz.java index 4a8441c4..b61d863c 100644 --- a/src/main/java/cotato/csquiz/domain/entity/MultipleQuiz.java +++ b/src/main/java/org/cotato/csquiz/domain/education/entity/MultipleQuiz.java @@ -1,10 +1,12 @@ -package cotato.csquiz.domain.entity; +package org.cotato.csquiz.domain.education.entity; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; import lombok.AccessLevel; import lombok.Builder; import lombok.NoArgsConstructor; +import org.cotato.csquiz.domain.education.entity.Education; +import org.cotato.csquiz.domain.education.entity.Quiz; import org.hibernate.annotations.DynamicInsert; @Entity diff --git a/src/main/java/cotato/csquiz/domain/entity/Quiz.java b/src/main/java/org/cotato/csquiz/domain/education/entity/Quiz.java similarity index 92% rename from src/main/java/cotato/csquiz/domain/entity/Quiz.java rename to src/main/java/org/cotato/csquiz/domain/education/entity/Quiz.java index 618d7e48..c0619c3e 100644 --- a/src/main/java/cotato/csquiz/domain/entity/Quiz.java +++ b/src/main/java/org/cotato/csquiz/domain/education/entity/Quiz.java @@ -1,10 +1,10 @@ -package cotato.csquiz.domain.entity; +package org.cotato.csquiz.domain.education.entity; import static jakarta.persistence.FetchType.LAZY; -import cotato.csquiz.domain.enums.QuizStatus; -import cotato.csquiz.domain.enums.QuizType; -import cotato.csquiz.global.entity.BaseTimeEntity; +import org.cotato.csquiz.common.entity.BaseTimeEntity; +import org.cotato.csquiz.domain.education.enums.QuizStatus; +import org.cotato.csquiz.domain.education.enums.QuizType; import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorColumn; import jakarta.persistence.DiscriminatorType; diff --git a/src/main/java/cotato/csquiz/domain/entity/Record.java b/src/main/java/org/cotato/csquiz/domain/education/entity/Record.java similarity index 90% rename from src/main/java/cotato/csquiz/domain/entity/Record.java rename to src/main/java/org/cotato/csquiz/domain/education/entity/Record.java index 04f1e6cb..01b70dbe 100644 --- a/src/main/java/cotato/csquiz/domain/entity/Record.java +++ b/src/main/java/org/cotato/csquiz/domain/education/entity/Record.java @@ -1,8 +1,7 @@ -package cotato.csquiz.domain.entity; +package org.cotato.csquiz.domain.education.entity; import static jakarta.persistence.FetchType.LAZY; -import cotato.csquiz.global.entity.BaseTimeEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -13,6 +12,8 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; +import org.cotato.csquiz.domain.auth.entity.Member; +import org.cotato.csquiz.common.entity.BaseTimeEntity; @Entity @Getter diff --git a/src/main/java/cotato/csquiz/domain/entity/Scorer.java b/src/main/java/org/cotato/csquiz/domain/education/entity/Scorer.java similarity index 91% rename from src/main/java/cotato/csquiz/domain/entity/Scorer.java rename to src/main/java/org/cotato/csquiz/domain/education/entity/Scorer.java index 48332e70..9f3f8d4c 100644 --- a/src/main/java/cotato/csquiz/domain/entity/Scorer.java +++ b/src/main/java/org/cotato/csquiz/domain/education/entity/Scorer.java @@ -1,6 +1,6 @@ -package cotato.csquiz.domain.entity; +package org.cotato.csquiz.domain.education.entity; -import cotato.csquiz.global.entity.BaseTimeEntity; +import org.cotato.csquiz.common.entity.BaseTimeEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/cotato/csquiz/domain/entity/ShortAnswer.java b/src/main/java/org/cotato/csquiz/domain/education/entity/ShortAnswer.java similarity index 91% rename from src/main/java/cotato/csquiz/domain/entity/ShortAnswer.java rename to src/main/java/org/cotato/csquiz/domain/education/entity/ShortAnswer.java index 002e1fbd..6409b5b3 100644 --- a/src/main/java/cotato/csquiz/domain/entity/ShortAnswer.java +++ b/src/main/java/org/cotato/csquiz/domain/education/entity/ShortAnswer.java @@ -1,8 +1,8 @@ -package cotato.csquiz.domain.entity; +package org.cotato.csquiz.domain.education.entity; import static jakarta.persistence.FetchType.LAZY; -import cotato.csquiz.global.entity.BaseTimeEntity; +import org.cotato.csquiz.common.entity.BaseTimeEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/cotato/csquiz/domain/entity/ShortQuiz.java b/src/main/java/org/cotato/csquiz/domain/education/entity/ShortQuiz.java similarity index 77% rename from src/main/java/cotato/csquiz/domain/entity/ShortQuiz.java rename to src/main/java/org/cotato/csquiz/domain/education/entity/ShortQuiz.java index f35dea79..728abdbe 100644 --- a/src/main/java/cotato/csquiz/domain/entity/ShortQuiz.java +++ b/src/main/java/org/cotato/csquiz/domain/education/entity/ShortQuiz.java @@ -1,10 +1,12 @@ -package cotato.csquiz.domain.entity; +package org.cotato.csquiz.domain.education.entity; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; import lombok.AccessLevel; import lombok.Builder; import lombok.NoArgsConstructor; +import org.cotato.csquiz.domain.education.entity.Education; +import org.cotato.csquiz.domain.education.entity.Quiz; import org.hibernate.annotations.DynamicInsert; @Entity diff --git a/src/main/java/cotato/csquiz/domain/entity/Winner.java b/src/main/java/org/cotato/csquiz/domain/education/entity/Winner.java similarity index 91% rename from src/main/java/cotato/csquiz/domain/entity/Winner.java rename to src/main/java/org/cotato/csquiz/domain/education/entity/Winner.java index b1fe57cf..a605ef5e 100644 --- a/src/main/java/cotato/csquiz/domain/entity/Winner.java +++ b/src/main/java/org/cotato/csquiz/domain/education/entity/Winner.java @@ -1,8 +1,7 @@ -package cotato.csquiz.domain.entity; +package org.cotato.csquiz.domain.education.entity; import static jakarta.persistence.FetchType.LAZY; -import cotato.csquiz.global.entity.BaseTimeEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -13,6 +12,7 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; +import org.cotato.csquiz.common.entity.BaseTimeEntity; @Entity @Getter diff --git a/src/main/java/cotato/csquiz/domain/enums/ChoiceCorrect.java b/src/main/java/org/cotato/csquiz/domain/education/enums/ChoiceCorrect.java similarity index 82% rename from src/main/java/cotato/csquiz/domain/enums/ChoiceCorrect.java rename to src/main/java/org/cotato/csquiz/domain/education/enums/ChoiceCorrect.java index 3fd56a79..efa18911 100644 --- a/src/main/java/cotato/csquiz/domain/enums/ChoiceCorrect.java +++ b/src/main/java/org/cotato/csquiz/domain/education/enums/ChoiceCorrect.java @@ -1,4 +1,4 @@ -package cotato.csquiz.domain.enums; +package org.cotato.csquiz.domain.education.enums; import lombok.AllArgsConstructor; diff --git a/src/main/java/cotato/csquiz/domain/enums/EducationStatus.java b/src/main/java/org/cotato/csquiz/domain/education/enums/EducationStatus.java similarity index 81% rename from src/main/java/cotato/csquiz/domain/enums/EducationStatus.java rename to src/main/java/org/cotato/csquiz/domain/education/enums/EducationStatus.java index 437ef24a..6521a2e8 100644 --- a/src/main/java/cotato/csquiz/domain/enums/EducationStatus.java +++ b/src/main/java/org/cotato/csquiz/domain/education/enums/EducationStatus.java @@ -1,4 +1,4 @@ -package cotato.csquiz.domain.enums; +package org.cotato.csquiz.domain.education.enums; import lombok.AllArgsConstructor; diff --git a/src/main/java/cotato/csquiz/domain/enums/QuizStatus.java b/src/main/java/org/cotato/csquiz/domain/education/enums/QuizStatus.java similarity index 80% rename from src/main/java/cotato/csquiz/domain/enums/QuizStatus.java rename to src/main/java/org/cotato/csquiz/domain/education/enums/QuizStatus.java index 99868ee2..91e148ce 100644 --- a/src/main/java/cotato/csquiz/domain/enums/QuizStatus.java +++ b/src/main/java/org/cotato/csquiz/domain/education/enums/QuizStatus.java @@ -1,4 +1,4 @@ -package cotato.csquiz.domain.enums; +package org.cotato.csquiz.domain.education.enums; import lombok.Getter; diff --git a/src/main/java/cotato/csquiz/domain/enums/QuizType.java b/src/main/java/org/cotato/csquiz/domain/education/enums/QuizType.java similarity index 79% rename from src/main/java/cotato/csquiz/domain/enums/QuizType.java rename to src/main/java/org/cotato/csquiz/domain/education/enums/QuizType.java index 5509f9a5..e0469748 100644 --- a/src/main/java/cotato/csquiz/domain/enums/QuizType.java +++ b/src/main/java/org/cotato/csquiz/domain/education/enums/QuizType.java @@ -1,4 +1,4 @@ -package cotato.csquiz.domain.enums; +package org.cotato.csquiz.domain.education.enums; import lombok.AllArgsConstructor; diff --git a/src/main/java/cotato/csquiz/repository/ChoiceRepository.java b/src/main/java/org/cotato/csquiz/domain/education/repository/ChoiceRepository.java similarity index 81% rename from src/main/java/cotato/csquiz/repository/ChoiceRepository.java rename to src/main/java/org/cotato/csquiz/domain/education/repository/ChoiceRepository.java index 29a47da5..4e94c211 100644 --- a/src/main/java/cotato/csquiz/repository/ChoiceRepository.java +++ b/src/main/java/org/cotato/csquiz/domain/education/repository/ChoiceRepository.java @@ -1,7 +1,7 @@ -package cotato.csquiz.repository; +package org.cotato.csquiz.domain.education.repository; -import cotato.csquiz.domain.entity.Choice; -import cotato.csquiz.domain.entity.MultipleQuiz; +import org.cotato.csquiz.domain.education.entity.Choice; +import org.cotato.csquiz.domain.education.entity.MultipleQuiz; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/cotato/csquiz/repository/EducationRepository.java b/src/main/java/org/cotato/csquiz/domain/education/repository/EducationRepository.java similarity index 74% rename from src/main/java/cotato/csquiz/repository/EducationRepository.java rename to src/main/java/org/cotato/csquiz/domain/education/repository/EducationRepository.java index ae891038..93d92a1a 100644 --- a/src/main/java/cotato/csquiz/repository/EducationRepository.java +++ b/src/main/java/org/cotato/csquiz/domain/education/repository/EducationRepository.java @@ -1,6 +1,6 @@ -package cotato.csquiz.repository; +package org.cotato.csquiz.domain.education.repository; -import cotato.csquiz.domain.entity.Education; +import org.cotato.csquiz.domain.education.entity.Education; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/cotato/csquiz/repository/KingMemberRepository.java b/src/main/java/org/cotato/csquiz/domain/education/repository/KingMemberRepository.java similarity index 56% rename from src/main/java/cotato/csquiz/repository/KingMemberRepository.java rename to src/main/java/org/cotato/csquiz/domain/education/repository/KingMemberRepository.java index bacbe0aa..80841862 100644 --- a/src/main/java/cotato/csquiz/repository/KingMemberRepository.java +++ b/src/main/java/org/cotato/csquiz/domain/education/repository/KingMemberRepository.java @@ -1,8 +1,8 @@ -package cotato.csquiz.repository; +package org.cotato.csquiz.domain.education.repository; -import cotato.csquiz.domain.entity.Education; -import cotato.csquiz.domain.entity.KingMember; import java.util.List; +import org.cotato.csquiz.domain.education.entity.Education; +import org.cotato.csquiz.domain.education.entity.KingMember; import org.springframework.data.jpa.repository.JpaRepository; public interface KingMemberRepository extends JpaRepository { diff --git a/src/main/java/cotato/csquiz/repository/QuizRepository.java b/src/main/java/org/cotato/csquiz/domain/education/repository/QuizRepository.java similarity index 85% rename from src/main/java/cotato/csquiz/repository/QuizRepository.java rename to src/main/java/org/cotato/csquiz/domain/education/repository/QuizRepository.java index 90f9be50..078cb08f 100644 --- a/src/main/java/cotato/csquiz/repository/QuizRepository.java +++ b/src/main/java/org/cotato/csquiz/domain/education/repository/QuizRepository.java @@ -1,7 +1,7 @@ -package cotato.csquiz.repository; +package org.cotato.csquiz.domain.education.repository; -import cotato.csquiz.domain.entity.Quiz; -import cotato.csquiz.domain.enums.QuizStatus; +import org.cotato.csquiz.domain.education.entity.Quiz; +import org.cotato.csquiz.domain.education.enums.QuizStatus; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/cotato/csquiz/repository/RecordRepository.java b/src/main/java/org/cotato/csquiz/domain/education/repository/RecordRepository.java similarity index 83% rename from src/main/java/cotato/csquiz/repository/RecordRepository.java rename to src/main/java/org/cotato/csquiz/domain/education/repository/RecordRepository.java index 6a180f9b..143730ad 100644 --- a/src/main/java/cotato/csquiz/repository/RecordRepository.java +++ b/src/main/java/org/cotato/csquiz/domain/education/repository/RecordRepository.java @@ -1,7 +1,7 @@ -package cotato.csquiz.repository; +package org.cotato.csquiz.domain.education.repository; -import cotato.csquiz.domain.entity.Quiz; -import cotato.csquiz.domain.entity.Record; +import org.cotato.csquiz.domain.education.entity.Quiz; +import org.cotato.csquiz.domain.education.entity.Record; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/cotato/csquiz/repository/ScorerRepository.java b/src/main/java/org/cotato/csquiz/domain/education/repository/ScorerRepository.java similarity index 86% rename from src/main/java/cotato/csquiz/repository/ScorerRepository.java rename to src/main/java/org/cotato/csquiz/domain/education/repository/ScorerRepository.java index 1012593a..a24b319a 100644 --- a/src/main/java/cotato/csquiz/repository/ScorerRepository.java +++ b/src/main/java/org/cotato/csquiz/domain/education/repository/ScorerRepository.java @@ -1,6 +1,6 @@ -package cotato.csquiz.repository; +package org.cotato.csquiz.domain.education.repository; -import cotato.csquiz.domain.entity.Scorer; +import org.cotato.csquiz.domain.education.entity.Scorer; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/cotato/csquiz/repository/ShortAnswerRepository.java b/src/main/java/org/cotato/csquiz/domain/education/repository/ShortAnswerRepository.java similarity index 81% rename from src/main/java/cotato/csquiz/repository/ShortAnswerRepository.java rename to src/main/java/org/cotato/csquiz/domain/education/repository/ShortAnswerRepository.java index 6f08cbad..423f3c7e 100644 --- a/src/main/java/cotato/csquiz/repository/ShortAnswerRepository.java +++ b/src/main/java/org/cotato/csquiz/domain/education/repository/ShortAnswerRepository.java @@ -1,7 +1,7 @@ -package cotato.csquiz.repository; +package org.cotato.csquiz.domain.education.repository; -import cotato.csquiz.domain.entity.ShortAnswer; -import cotato.csquiz.domain.entity.ShortQuiz; +import org.cotato.csquiz.domain.education.entity.ShortAnswer; +import org.cotato.csquiz.domain.education.entity.ShortQuiz; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/cotato/csquiz/repository/WinnerRepository.java b/src/main/java/org/cotato/csquiz/domain/education/repository/WinnerRepository.java similarity index 56% rename from src/main/java/cotato/csquiz/repository/WinnerRepository.java rename to src/main/java/org/cotato/csquiz/domain/education/repository/WinnerRepository.java index 91880a21..3af17527 100644 --- a/src/main/java/cotato/csquiz/repository/WinnerRepository.java +++ b/src/main/java/org/cotato/csquiz/domain/education/repository/WinnerRepository.java @@ -1,8 +1,8 @@ -package cotato.csquiz.repository; +package org.cotato.csquiz.domain.education.repository; -import cotato.csquiz.domain.entity.Education; -import cotato.csquiz.domain.entity.Winner; import java.util.Optional; +import org.cotato.csquiz.domain.education.entity.Education; +import org.cotato.csquiz.domain.education.entity.Winner; import org.springframework.data.jpa.repository.JpaRepository; public interface WinnerRepository extends JpaRepository { diff --git a/src/main/java/cotato/csquiz/service/EducationService.java b/src/main/java/org/cotato/csquiz/domain/education/service/EducationService.java similarity index 77% rename from src/main/java/cotato/csquiz/service/EducationService.java rename to src/main/java/org/cotato/csquiz/domain/education/service/EducationService.java index 6e6f3d30..02572c8e 100644 --- a/src/main/java/cotato/csquiz/service/EducationService.java +++ b/src/main/java/org/cotato/csquiz/domain/education/service/EducationService.java @@ -1,31 +1,32 @@ -package cotato.csquiz.service; - -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.domain.entity.Education; -import cotato.csquiz.domain.entity.KingMember; -import cotato.csquiz.domain.entity.Member; -import cotato.csquiz.domain.entity.Quiz; -import cotato.csquiz.domain.entity.Session; -import cotato.csquiz.domain.entity.Winner; -import cotato.csquiz.exception.AppException; -import cotato.csquiz.exception.ErrorCode; -import cotato.csquiz.repository.EducationRepository; -import cotato.csquiz.repository.KingMemberRepository; -import cotato.csquiz.repository.QuizRepository; -import cotato.csquiz.repository.SessionRepository; -import cotato.csquiz.repository.WinnerRepository; +package org.cotato.csquiz.domain.education.service; + import jakarta.persistence.EntityNotFoundException; import java.util.List; import java.util.Optional; 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.entity.Education; +import org.cotato.csquiz.domain.education.entity.KingMember; +import org.cotato.csquiz.domain.education.entity.Quiz; +import org.cotato.csquiz.domain.education.entity.Winner; +import org.cotato.csquiz.domain.education.repository.EducationRepository; +import org.cotato.csquiz.domain.education.repository.QuizRepository; +import org.cotato.csquiz.domain.generation.entity.Session; +import org.cotato.csquiz.domain.auth.entity.Member; +import org.cotato.csquiz.common.error.exception.AppException; +import org.cotato.csquiz.common.error.ErrorCode; +import org.cotato.csquiz.domain.education.repository.KingMemberRepository; +import org.cotato.csquiz.domain.generation.repository.SessionRepository; +import org.cotato.csquiz.domain.education.repository.WinnerRepository; +import org.cotato.csquiz.domain.auth.service.MemberService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/cotato/csquiz/service/KingMemberService.java b/src/main/java/org/cotato/csquiz/domain/education/service/KingMemberService.java similarity index 80% rename from src/main/java/cotato/csquiz/service/KingMemberService.java rename to src/main/java/org/cotato/csquiz/domain/education/service/KingMemberService.java index 774c3687..61315924 100644 --- a/src/main/java/cotato/csquiz/service/KingMemberService.java +++ b/src/main/java/org/cotato/csquiz/domain/education/service/KingMemberService.java @@ -1,16 +1,5 @@ -package cotato.csquiz.service; +package org.cotato.csquiz.domain.education.service; -import cotato.csquiz.domain.entity.Education; -import cotato.csquiz.domain.entity.KingMember; -import cotato.csquiz.domain.entity.Member; -import cotato.csquiz.domain.entity.Quiz; -import cotato.csquiz.domain.entity.Scorer; -import cotato.csquiz.domain.entity.Winner; -import cotato.csquiz.repository.KingMemberRepository; -import cotato.csquiz.repository.MemberRepository; -import cotato.csquiz.repository.QuizRepository; -import cotato.csquiz.repository.ScorerRepository; -import cotato.csquiz.repository.WinnerRepository; import jakarta.persistence.EntityNotFoundException; import java.util.List; import java.util.Map; @@ -19,6 +8,18 @@ import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.cotato.csquiz.domain.education.entity.Education; +import org.cotato.csquiz.domain.education.entity.KingMember; +import org.cotato.csquiz.domain.education.entity.Quiz; +import org.cotato.csquiz.domain.education.entity.Scorer; +import org.cotato.csquiz.domain.education.entity.Winner; +import org.cotato.csquiz.domain.education.repository.QuizRepository; +import org.cotato.csquiz.domain.education.repository.ScorerRepository; +import org.cotato.csquiz.domain.auth.entity.Member; +import org.cotato.csquiz.domain.education.repository.KingMemberRepository; +import org.cotato.csquiz.domain.auth.repository.MemberRepository; +import org.cotato.csquiz.domain.education.repository.WinnerRepository; +import org.cotato.csquiz.domain.auth.service.MemberService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/cotato/csquiz/service/MyPageService.java b/src/main/java/org/cotato/csquiz/domain/education/service/MyPageService.java similarity index 83% rename from src/main/java/cotato/csquiz/service/MyPageService.java rename to src/main/java/org/cotato/csquiz/domain/education/service/MyPageService.java index 34c12517..18b800fe 100644 --- a/src/main/java/cotato/csquiz/service/MyPageService.java +++ b/src/main/java/org/cotato/csquiz/domain/education/service/MyPageService.java @@ -1,21 +1,5 @@ -package cotato.csquiz.service; - -import cotato.csquiz.controller.dto.mypage.HallOfFameInfo; -import cotato.csquiz.controller.dto.mypage.HallOfFameResponse; -import cotato.csquiz.controller.dto.mypage.MyHallOfFameInfo; -import cotato.csquiz.controller.dto.mypage.MyPageMemberInfoResponse; -import cotato.csquiz.domain.entity.Education; -import cotato.csquiz.domain.entity.Generation; -import cotato.csquiz.domain.entity.Member; -import cotato.csquiz.domain.entity.Quiz; -import cotato.csquiz.domain.entity.Record; -import cotato.csquiz.domain.entity.Scorer; -import cotato.csquiz.repository.EducationRepository; -import cotato.csquiz.repository.GenerationRepository; -import cotato.csquiz.repository.MemberRepository; -import cotato.csquiz.repository.QuizRepository; -import cotato.csquiz.repository.RecordRepository; -import cotato.csquiz.repository.ScorerRepository; +package org.cotato.csquiz.domain.education.service; + import jakarta.persistence.EntityNotFoundException; import java.util.Comparator; import java.util.List; @@ -24,6 +8,24 @@ import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.cotato.csquiz.api.mypage.dto.HallOfFameInfo; +import org.cotato.csquiz.api.mypage.dto.HallOfFameResponse; +import org.cotato.csquiz.api.mypage.dto.MyHallOfFameInfo; +import org.cotato.csquiz.api.mypage.dto.MyPageMemberInfoResponse; +import org.cotato.csquiz.domain.education.entity.Education; +import org.cotato.csquiz.domain.education.entity.Quiz; +import org.cotato.csquiz.domain.education.entity.Record; +import org.cotato.csquiz.domain.education.entity.Scorer; +import org.cotato.csquiz.domain.education.repository.EducationRepository; +import org.cotato.csquiz.domain.education.repository.QuizRepository; +import org.cotato.csquiz.domain.education.repository.RecordRepository; +import org.cotato.csquiz.domain.education.repository.ScorerRepository; +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.domain.generation.repository.GenerationRepository; +import org.cotato.csquiz.domain.auth.repository.MemberRepository; +import org.cotato.csquiz.domain.auth.service.EncryptService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/cotato/csquiz/service/QuizService.java b/src/main/java/org/cotato/csquiz/domain/education/service/QuizService.java similarity index 83% rename from src/main/java/cotato/csquiz/service/QuizService.java rename to src/main/java/org/cotato/csquiz/domain/education/service/QuizService.java index 18405325..a3698a9e 100644 --- a/src/main/java/cotato/csquiz/service/QuizService.java +++ b/src/main/java/org/cotato/csquiz/domain/education/service/QuizService.java @@ -1,41 +1,5 @@ -package cotato.csquiz.service; - -import cotato.csquiz.controller.dto.quiz.AddAdditionalAnswerRequest; -import cotato.csquiz.controller.dto.quiz.AllQuizzesInCsQuizResponse; -import cotato.csquiz.controller.dto.quiz.AllQuizzesResponse; -import cotato.csquiz.controller.dto.quiz.ChoiceResponse; -import cotato.csquiz.controller.dto.quiz.CreateChoiceRequest; -import cotato.csquiz.controller.dto.quiz.CreateMultipleQuizRequest; -import cotato.csquiz.controller.dto.quiz.CreateQuizzesRequest; -import cotato.csquiz.controller.dto.quiz.CreateShortAnswerRequest; -import cotato.csquiz.controller.dto.quiz.CreateShortQuizRequest; -import cotato.csquiz.controller.dto.quiz.CsAdminQuizResponse; -import cotato.csquiz.controller.dto.quiz.FindMultipleQuizResponse; -import cotato.csquiz.controller.dto.quiz.MultipleQuizResponse; -import cotato.csquiz.controller.dto.quiz.QuizInfoInCsQuizResponse; -import cotato.csquiz.controller.dto.quiz.QuizResponse; -import cotato.csquiz.controller.dto.quiz.QuizResultInfo; -import cotato.csquiz.controller.dto.quiz.ShortAnswerResponse; -import cotato.csquiz.controller.dto.quiz.ShortQuizResponse; -import cotato.csquiz.domain.entity.Choice; -import cotato.csquiz.domain.entity.Education; -import cotato.csquiz.domain.entity.Member; -import cotato.csquiz.domain.entity.MultipleQuiz; -import cotato.csquiz.domain.entity.Quiz; -import cotato.csquiz.domain.entity.Scorer; -import cotato.csquiz.domain.entity.ShortAnswer; -import cotato.csquiz.domain.entity.ShortQuiz; -import cotato.csquiz.domain.enums.ChoiceCorrect; -import cotato.csquiz.domain.enums.EducationStatus; -import cotato.csquiz.exception.AppException; -import cotato.csquiz.exception.ErrorCode; -import cotato.csquiz.exception.ImageException; -import cotato.csquiz.global.S3.S3Uploader; -import cotato.csquiz.repository.ChoiceRepository; -import cotato.csquiz.repository.EducationRepository; -import cotato.csquiz.repository.QuizRepository; -import cotato.csquiz.repository.ScorerRepository; -import cotato.csquiz.repository.ShortAnswerRepository; +package org.cotato.csquiz.domain.education.service; + import jakarta.persistence.EntityNotFoundException; import java.util.HashSet; import java.util.List; @@ -45,6 +9,43 @@ import java.util.stream.Stream; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.cotato.csquiz.api.quiz.dto.AddAdditionalAnswerRequest; +import org.cotato.csquiz.api.quiz.dto.AllQuizzesInCsQuizResponse; +import org.cotato.csquiz.api.quiz.dto.AllQuizzesResponse; +import org.cotato.csquiz.api.quiz.dto.ChoiceResponse; +import org.cotato.csquiz.api.quiz.dto.CreateChoiceRequest; +import org.cotato.csquiz.api.quiz.dto.CreateMultipleQuizRequest; +import org.cotato.csquiz.api.quiz.dto.CreateQuizzesRequest; +import org.cotato.csquiz.api.quiz.dto.CreateShortAnswerRequest; +import org.cotato.csquiz.api.quiz.dto.CreateShortQuizRequest; +import org.cotato.csquiz.api.quiz.dto.CsAdminQuizResponse; +import org.cotato.csquiz.api.quiz.dto.FindMultipleQuizResponse; +import org.cotato.csquiz.api.quiz.dto.MultipleQuizResponse; +import org.cotato.csquiz.api.quiz.dto.QuizInfoInCsQuizResponse; +import org.cotato.csquiz.api.quiz.dto.QuizResponse; +import org.cotato.csquiz.api.quiz.dto.QuizResultInfo; +import org.cotato.csquiz.api.quiz.dto.ShortAnswerResponse; +import org.cotato.csquiz.api.quiz.dto.ShortQuizResponse; +import org.cotato.csquiz.domain.education.entity.Choice; +import org.cotato.csquiz.domain.education.entity.Education; +import org.cotato.csquiz.domain.education.entity.MultipleQuiz; +import org.cotato.csquiz.domain.education.entity.Quiz; +import org.cotato.csquiz.domain.education.entity.Scorer; +import org.cotato.csquiz.domain.education.entity.ShortAnswer; +import org.cotato.csquiz.domain.education.entity.ShortQuiz; +import org.cotato.csquiz.domain.education.enums.ChoiceCorrect; +import org.cotato.csquiz.domain.education.repository.ChoiceRepository; +import org.cotato.csquiz.domain.education.repository.EducationRepository; +import org.cotato.csquiz.domain.education.repository.QuizRepository; +import org.cotato.csquiz.domain.education.repository.ScorerRepository; +import org.cotato.csquiz.domain.education.repository.ShortAnswerRepository; +import org.cotato.csquiz.domain.education.enums.EducationStatus; +import org.cotato.csquiz.domain.auth.entity.Member; +import org.cotato.csquiz.common.error.exception.AppException; +import org.cotato.csquiz.common.error.ErrorCode; +import org.cotato.csquiz.common.error.exception.ImageException; +import org.cotato.csquiz.common.S3.S3Uploader; +import org.cotato.csquiz.domain.auth.service.MemberService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/cotato/csquiz/service/RecordService.java b/src/main/java/org/cotato/csquiz/domain/education/service/RecordService.java similarity index 83% rename from src/main/java/cotato/csquiz/service/RecordService.java rename to src/main/java/org/cotato/csquiz/domain/education/service/RecordService.java index d2ebc689..ad51e7bf 100644 --- a/src/main/java/cotato/csquiz/service/RecordService.java +++ b/src/main/java/org/cotato/csquiz/domain/education/service/RecordService.java @@ -1,34 +1,35 @@ -package cotato.csquiz.service; - -import cotato.csquiz.controller.dto.quiz.AddAdditionalAnswerRequest; -import cotato.csquiz.controller.dto.record.RecordResponse; -import cotato.csquiz.controller.dto.record.RecordsAndScorerResponse; -import cotato.csquiz.controller.dto.record.RegradeRequest; -import cotato.csquiz.controller.dto.record.ReplyRequest; -import cotato.csquiz.controller.dto.record.ReplyResponse; -import cotato.csquiz.controller.dto.record.ScorerResponse; -import cotato.csquiz.controller.dto.socket.QuizOpenRequest; -import cotato.csquiz.controller.dto.socket.QuizSocketRequest; -import cotato.csquiz.domain.entity.Member; -import cotato.csquiz.domain.entity.MultipleQuiz; -import cotato.csquiz.domain.entity.Quiz; -import cotato.csquiz.domain.entity.Record; -import cotato.csquiz.domain.entity.Scorer; -import cotato.csquiz.exception.AppException; -import cotato.csquiz.exception.ErrorCode; -import cotato.csquiz.repository.MemberRepository; -import cotato.csquiz.repository.QuizRepository; -import cotato.csquiz.repository.RecordRepository; -import cotato.csquiz.repository.ScorerRepository; -import cotato.csquiz.utils.QuizAnswerRedisRepository; -import cotato.csquiz.utils.ScorerExistRedisRepository; -import cotato.csquiz.utils.TicketCountRedisRepository; +package org.cotato.csquiz.domain.education.service; + import jakarta.persistence.EntityNotFoundException; import java.util.Comparator; import java.util.List; import java.util.Optional; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.cotato.csquiz.api.quiz.dto.AddAdditionalAnswerRequest; +import org.cotato.csquiz.api.record.dto.RecordResponse; +import org.cotato.csquiz.api.record.dto.RecordsAndScorerResponse; +import org.cotato.csquiz.api.record.dto.RegradeRequest; +import org.cotato.csquiz.api.record.dto.ReplyRequest; +import org.cotato.csquiz.api.record.dto.ReplyResponse; +import org.cotato.csquiz.api.record.dto.ScorerResponse; +import org.cotato.csquiz.api.socket.dto.QuizOpenRequest; +import org.cotato.csquiz.api.socket.dto.QuizSocketRequest; +import org.cotato.csquiz.domain.education.entity.MultipleQuiz; +import org.cotato.csquiz.domain.education.entity.Quiz; +import org.cotato.csquiz.domain.education.entity.Record; +import org.cotato.csquiz.domain.education.entity.Scorer; +import org.cotato.csquiz.domain.education.repository.QuizRepository; +import org.cotato.csquiz.domain.education.repository.RecordRepository; +import org.cotato.csquiz.domain.education.repository.ScorerRepository; +import org.cotato.csquiz.domain.auth.entity.Member; +import org.cotato.csquiz.common.error.exception.AppException; +import org.cotato.csquiz.common.error.ErrorCode; +import org.cotato.csquiz.domain.auth.repository.MemberRepository; +import org.cotato.csquiz.domain.auth.service.MemberService; +import org.cotato.csquiz.domain.education.cache.QuizAnswerRedisRepository; +import org.cotato.csquiz.domain.education.cache.ScorerExistRedisRepository; +import org.cotato.csquiz.domain.education.cache.TicketCountRedisRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/cotato/csquiz/service/SocketService.java b/src/main/java/org/cotato/csquiz/domain/education/service/SocketService.java similarity index 84% rename from src/main/java/cotato/csquiz/service/SocketService.java rename to src/main/java/org/cotato/csquiz/domain/education/service/SocketService.java index 69ef7454..4f60e9a4 100644 --- a/src/main/java/cotato/csquiz/service/SocketService.java +++ b/src/main/java/org/cotato/csquiz/domain/education/service/SocketService.java @@ -1,24 +1,24 @@ -package cotato.csquiz.service; - -import cotato.csquiz.config.jwt.JwtTokenProvider; -import cotato.csquiz.controller.dto.socket.EducationCloseRequest; -import cotato.csquiz.controller.dto.socket.QuizOpenRequest; -import cotato.csquiz.controller.dto.socket.QuizSocketRequest; -import cotato.csquiz.controller.dto.socket.SocketTokenDto; -import cotato.csquiz.domain.entity.Education; -import cotato.csquiz.domain.entity.KingMember; -import cotato.csquiz.domain.entity.Quiz; -import cotato.csquiz.domain.enums.EducationStatus; -import cotato.csquiz.domain.enums.QuizStatus; -import cotato.csquiz.exception.AppException; -import cotato.csquiz.exception.ErrorCode; -import cotato.csquiz.global.websocket.WebSocketHandler; -import cotato.csquiz.repository.EducationRepository; -import cotato.csquiz.repository.QuizRepository; +package org.cotato.csquiz.domain.education.service; + import jakarta.persistence.EntityNotFoundException; import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.cotato.csquiz.api.socket.dto.EducationCloseRequest; +import org.cotato.csquiz.api.socket.dto.QuizOpenRequest; +import org.cotato.csquiz.api.socket.dto.QuizSocketRequest; +import org.cotato.csquiz.api.socket.dto.SocketTokenDto; +import org.cotato.csquiz.common.config.jwt.JwtTokenProvider; +import org.cotato.csquiz.domain.education.entity.Education; +import org.cotato.csquiz.domain.education.entity.KingMember; +import org.cotato.csquiz.domain.education.entity.Quiz; +import org.cotato.csquiz.domain.education.enums.QuizStatus; +import org.cotato.csquiz.domain.education.repository.EducationRepository; +import org.cotato.csquiz.domain.education.repository.QuizRepository; +import org.cotato.csquiz.domain.education.enums.EducationStatus; +import org.cotato.csquiz.common.error.exception.AppException; +import org.cotato.csquiz.common.error.ErrorCode; +import org.cotato.csquiz.common.websocket.WebSocketHandler; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/cotato/csquiz/domain/entity/Generation.java b/src/main/java/org/cotato/csquiz/domain/generation/entity/Generation.java similarity index 93% rename from src/main/java/cotato/csquiz/domain/entity/Generation.java rename to src/main/java/org/cotato/csquiz/domain/generation/entity/Generation.java index fb15392b..03d7e4f2 100644 --- a/src/main/java/cotato/csquiz/domain/entity/Generation.java +++ b/src/main/java/org/cotato/csquiz/domain/generation/entity/Generation.java @@ -1,6 +1,5 @@ -package cotato.csquiz.domain.entity; +package org.cotato.csquiz.domain.generation.entity; -import cotato.csquiz.global.entity.BaseTimeEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -11,6 +10,7 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import org.cotato.csquiz.common.entity.BaseTimeEntity; @Entity @Getter diff --git a/src/main/java/cotato/csquiz/domain/entity/Session.java b/src/main/java/org/cotato/csquiz/domain/generation/entity/Session.java similarity index 89% rename from src/main/java/cotato/csquiz/domain/entity/Session.java rename to src/main/java/org/cotato/csquiz/domain/generation/entity/Session.java index c17c38f1..5d86a240 100644 --- a/src/main/java/cotato/csquiz/domain/entity/Session.java +++ b/src/main/java/org/cotato/csquiz/domain/generation/entity/Session.java @@ -1,11 +1,7 @@ -package cotato.csquiz.domain.entity; +package org.cotato.csquiz.domain.generation.entity; import static jakarta.persistence.FetchType.LAZY; -import cotato.csquiz.domain.enums.CSEducation; -import cotato.csquiz.domain.enums.ItIssue; -import cotato.csquiz.domain.enums.Networking; -import cotato.csquiz.global.entity.BaseTimeEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; @@ -19,6 +15,10 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import org.cotato.csquiz.domain.generation.enums.CSEducation; +import org.cotato.csquiz.domain.generation.enums.ItIssue; +import org.cotato.csquiz.domain.generation.enums.Networking; +import org.cotato.csquiz.common.entity.BaseTimeEntity; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; diff --git a/src/main/java/cotato/csquiz/domain/enums/CSEducation.java b/src/main/java/org/cotato/csquiz/domain/generation/enums/CSEducation.java similarity index 82% rename from src/main/java/cotato/csquiz/domain/enums/CSEducation.java rename to src/main/java/org/cotato/csquiz/domain/generation/enums/CSEducation.java index 7540dfc6..7b150761 100644 --- a/src/main/java/cotato/csquiz/domain/enums/CSEducation.java +++ b/src/main/java/org/cotato/csquiz/domain/generation/enums/CSEducation.java @@ -1,4 +1,4 @@ -package cotato.csquiz.domain.enums; +package org.cotato.csquiz.domain.generation.enums; import lombok.Getter; diff --git a/src/main/java/cotato/csquiz/domain/enums/ItIssue.java b/src/main/java/org/cotato/csquiz/domain/generation/enums/ItIssue.java similarity index 79% rename from src/main/java/cotato/csquiz/domain/enums/ItIssue.java rename to src/main/java/org/cotato/csquiz/domain/generation/enums/ItIssue.java index ec4fd713..96074908 100644 --- a/src/main/java/cotato/csquiz/domain/enums/ItIssue.java +++ b/src/main/java/org/cotato/csquiz/domain/generation/enums/ItIssue.java @@ -1,4 +1,4 @@ -package cotato.csquiz.domain.enums; +package org.cotato.csquiz.domain.generation.enums; import lombok.Getter; diff --git a/src/main/java/cotato/csquiz/domain/enums/Networking.java b/src/main/java/org/cotato/csquiz/domain/generation/enums/Networking.java similarity index 82% rename from src/main/java/cotato/csquiz/domain/enums/Networking.java rename to src/main/java/org/cotato/csquiz/domain/generation/enums/Networking.java index f467eb7b..d1dafeb3 100644 --- a/src/main/java/cotato/csquiz/domain/enums/Networking.java +++ b/src/main/java/org/cotato/csquiz/domain/generation/enums/Networking.java @@ -1,4 +1,4 @@ -package cotato.csquiz.domain.enums; +package org.cotato.csquiz.domain.generation.enums; import lombok.Getter; diff --git a/src/main/java/cotato/csquiz/repository/GenerationRepository.java b/src/main/java/org/cotato/csquiz/domain/generation/repository/GenerationRepository.java similarity index 65% rename from src/main/java/cotato/csquiz/repository/GenerationRepository.java rename to src/main/java/org/cotato/csquiz/domain/generation/repository/GenerationRepository.java index 3f9f3e32..7a4b01e9 100644 --- a/src/main/java/cotato/csquiz/repository/GenerationRepository.java +++ b/src/main/java/org/cotato/csquiz/domain/generation/repository/GenerationRepository.java @@ -1,9 +1,8 @@ -package cotato.csquiz.repository; - -import cotato.csquiz.domain.entity.Generation; -import org.springframework.data.jpa.repository.JpaRepository; +package org.cotato.csquiz.domain.generation.repository; import java.util.Optional; +import org.cotato.csquiz.domain.generation.entity.Generation; +import org.springframework.data.jpa.repository.JpaRepository; public interface GenerationRepository extends JpaRepository { Optional findByNumber(int number); diff --git a/src/main/java/cotato/csquiz/repository/SessionRepository.java b/src/main/java/org/cotato/csquiz/domain/generation/repository/SessionRepository.java similarity index 57% rename from src/main/java/cotato/csquiz/repository/SessionRepository.java rename to src/main/java/org/cotato/csquiz/domain/generation/repository/SessionRepository.java index 798c56a4..376c1264 100644 --- a/src/main/java/cotato/csquiz/repository/SessionRepository.java +++ b/src/main/java/org/cotato/csquiz/domain/generation/repository/SessionRepository.java @@ -1,9 +1,9 @@ -package cotato.csquiz.repository; +package org.cotato.csquiz.domain.generation.repository; -import cotato.csquiz.domain.entity.Generation; -import cotato.csquiz.domain.entity.Session; -import cotato.csquiz.domain.enums.CSEducation; import java.util.List; +import org.cotato.csquiz.domain.generation.enums.CSEducation; +import org.cotato.csquiz.domain.generation.entity.Generation; +import org.cotato.csquiz.domain.generation.entity.Session; import org.springframework.data.jpa.repository.JpaRepository; public interface SessionRepository extends JpaRepository { diff --git a/src/main/java/cotato/csquiz/service/GenerationService.java b/src/main/java/org/cotato/csquiz/domain/generation/service/GenerationService.java similarity index 81% rename from src/main/java/cotato/csquiz/service/GenerationService.java rename to src/main/java/org/cotato/csquiz/domain/generation/service/GenerationService.java index cc7f250b..7fe54cc3 100644 --- a/src/main/java/cotato/csquiz/service/GenerationService.java +++ b/src/main/java/org/cotato/csquiz/domain/generation/service/GenerationService.java @@ -1,19 +1,19 @@ -package cotato.csquiz.service; +package org.cotato.csquiz.domain.generation.service; -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.domain.entity.Generation; -import cotato.csquiz.exception.AppException; -import cotato.csquiz.exception.ErrorCode; -import cotato.csquiz.repository.GenerationRepository; import jakarta.persistence.EntityNotFoundException; import java.time.LocalDate; 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.entity.Generation; +import org.cotato.csquiz.common.error.exception.AppException; +import org.cotato.csquiz.common.error.ErrorCode; +import org.cotato.csquiz.domain.generation.repository.GenerationRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/cotato/csquiz/service/SessionService.java b/src/main/java/org/cotato/csquiz/domain/generation/service/SessionService.java similarity index 83% rename from src/main/java/cotato/csquiz/service/SessionService.java rename to src/main/java/org/cotato/csquiz/domain/generation/service/SessionService.java index ee85ee22..a4c998a0 100644 --- a/src/main/java/cotato/csquiz/service/SessionService.java +++ b/src/main/java/org/cotato/csquiz/domain/generation/service/SessionService.java @@ -1,25 +1,26 @@ -package cotato.csquiz.service; - -import cotato.csquiz.controller.dto.session.AddSessionRequest; -import cotato.csquiz.controller.dto.session.AddSessionResponse; -import cotato.csquiz.controller.dto.session.CsEducationOnSessionNumberResponse; -import cotato.csquiz.controller.dto.session.SessionListResponse; -import cotato.csquiz.controller.dto.session.UpdateSessionDescriptionRequest; -import cotato.csquiz.controller.dto.session.UpdateSessionNumberRequest; -import cotato.csquiz.controller.dto.session.UpdateSessionPhotoRequest; -import cotato.csquiz.controller.dto.session.UpdateSessionRequest; -import cotato.csquiz.domain.entity.Education; -import cotato.csquiz.domain.entity.Generation; -import cotato.csquiz.domain.entity.Session; -import cotato.csquiz.domain.enums.CSEducation; -import cotato.csquiz.exception.ImageException; -import cotato.csquiz.global.S3.S3Uploader; -import cotato.csquiz.repository.GenerationRepository; -import cotato.csquiz.repository.SessionRepository; +package org.cotato.csquiz.domain.generation.service; + import jakarta.persistence.EntityNotFoundException; import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.cotato.csquiz.api.session.dto.AddSessionRequest; +import org.cotato.csquiz.api.session.dto.AddSessionResponse; +import org.cotato.csquiz.api.session.dto.CsEducationOnSessionNumberResponse; +import org.cotato.csquiz.api.session.dto.SessionListResponse; +import org.cotato.csquiz.api.session.dto.UpdateSessionDescriptionRequest; +import org.cotato.csquiz.api.session.dto.UpdateSessionNumberRequest; +import org.cotato.csquiz.api.session.dto.UpdateSessionPhotoRequest; +import org.cotato.csquiz.api.session.dto.UpdateSessionRequest; +import org.cotato.csquiz.domain.education.entity.Education; +import org.cotato.csquiz.domain.education.service.EducationService; +import org.cotato.csquiz.domain.generation.enums.CSEducation; +import org.cotato.csquiz.domain.generation.entity.Generation; +import org.cotato.csquiz.domain.generation.entity.Session; +import org.cotato.csquiz.common.error.exception.ImageException; +import org.cotato.csquiz.common.S3.S3Uploader; +import org.cotato.csquiz.domain.generation.repository.GenerationRepository; +import org.cotato.csquiz.domain.generation.repository.SessionRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile;