From c8b26762b51c39903abfb011f299993e0c66f1cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=86=90=ED=99=8D=EC=84=9D?= <78216059+bayy1216@users.noreply.github.com> Date: Sun, 1 Sep 2024 17:32:31 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[Feat]:=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?= =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EB=8C=80=EA=B3=B5=EC=82=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller}/AdminController.java | 10 +++--- .../admin => admin/controller}/AdminReq.java | 8 ++--- .../controller}/AuthController.java | 6 ++-- .../auth => auth/controller}/AuthReq.java | 6 ++-- .../auth => auth/controller}/AuthRes.java | 6 ++-- .../auth => auth/domain}/AuthService.java | 4 +-- .../auth => auth/domain}/OAuth2Client.java | 2 +- .../auth => auth/domain}/OAuth2Provider.java | 2 +- .../domain}/OAuthUserInfoModel.java | 4 +-- .../infrastructure}/AuthTokenGenerator.java | 4 +-- .../infrastructure}/KakaoOAuth2Client.java | 8 ++--- .../infrastructure}/KakaoTokenResponse.java | 2 +- .../KakaoUserInfoResponse.java | 2 +- .../infrastructure}/NaverOAuth2Client.java | 8 ++--- .../infrastructure}/NaverTokenResponse.java | 2 +- .../NaverUserInfoResponse.java | 2 +- .../controller}/ChallengeGroupController.java | 14 ++++---- .../controller/ChallengeGroupReq.java | 5 +++ .../controller}/ChallengeGroupRes.java | 14 ++++---- .../domain}/Challenge.java | 4 +-- .../domain}/ChallengeCategory.java | 2 +- .../domain}/ChallengeCommand.java | 2 +- .../domain}/ChallengeGroup.java | 4 +-- .../domain}/ChallengeGroupCommand.java | 4 +-- .../domain}/ChallengeGroupImage.java | 5 ++- .../domain}/DayType.java | 2 +- .../application/ChallengeGroupModel.java | 8 ++--- .../ChallengeGroupQueryService.java | 12 +++---- .../application/ChallengeGroupService.java | 10 +++--- .../domain}/application/ChallengeModel.java | 6 ++-- .../port/ChallengeGroupImageReader.java | 4 +-- .../domain}/port/ChallengeGroupReader.java | 9 +++-- .../domain}/port/ChallengeGroupStore.java | 4 +-- .../domain}/port/ChallengeReader.java | 4 +-- .../ChallengeGroupImageRepository.java | 4 +-- .../ChallengeGroupRepository.java | 4 +-- .../infrastructure}/ChallengeRepository.java | 4 +-- .../ChallengeGroupImageReaderImpl.java | 8 ++--- .../adapter/ChallengeGroupReaderImpl.java | 24 ++++++------- .../adapter/ChallengeGroupStoreImpl.java | 8 ++--- .../adapter/ChallengeReaderImpl.java | 8 ++--- .../controller/HealthCheckController.java | 2 +- .../controller/PagingRequest.java | 2 +- .../controller/PagingResponse.java | 2 +- .../{ => common}/domain/BaseTimeEntity.java | 2 +- .../{ => common}/domain/ImageUploader.java | 2 +- .../infrastructure/S3ImageUploader.java | 4 +-- .../challengegroup/ChallengeGroupReq.java | 5 --- .../port/ChallengeReviewStore.java | 9 ----- .../port/UserChallengeStore.java | 8 ----- .../controller}/UserController.java | 10 +++--- .../user => user/controller}/UserReq.java | 4 +-- .../user => user/controller}/UserRes.java | 6 ++-- .../user => user/domain}/TierSystem.java | 2 +- .../{domain/user => user/domain}/User.java | 6 ++-- .../user => user/domain}/UserCommand.java | 4 +-- .../user => user/domain}/UserModel.java | 2 +- .../user => user/domain}/UserReader.java | 2 +- .../user => user/domain}/UserService.java | 6 ++-- .../user => user/domain}/UserStore.java | 2 +- .../infrastructure}/UserReaderImpl.java | 8 ++--- .../infrastructure}/UserRepository.java | 4 +-- .../infrastructure}/UserStoreImpl.java | 6 ++-- .../controller}/ChallengeController.java | 18 +++++----- .../controller}/ChallengeReq.java | 4 +-- .../controller}/ChallengeRes.java | 10 +++--- .../ChallengeReviewController.java | 13 ++++--- .../controller}/ChallengeReviewRes.java | 10 +++--- .../domain}/ChallengeGroupUserExp.java | 6 ++-- .../domain}/ChallengeReview.java | 6 ++-- .../domain}/ChallengeStatus.java | 2 +- .../domain}/ChallengeVerification.java | 6 ++-- .../domain}/ChallengeVerificationStatus.java | 2 +- .../domain}/DayCountType.java | 2 +- .../domain}/UserChallenge.java | 11 +++--- .../AddUserExpByVerificationEvent.java | 2 +- .../AddUserExpByVerificationUseCase.java | 8 ++--- .../ChallengeGroupRankingModel.java | 6 ++-- .../application/ChallengeRankingService.java | 8 ++--- .../application/ChallengeRecordService.java | 14 ++++---- .../application/ChallengeReviewModel.java | 12 +++---- .../application/ChallengeReviewService.java | 14 ++++---- .../ChallengeVerificationModel.java | 4 +-- .../application/UserChallengeModel.java | 12 +++---- .../application/UserChallengeService.java | 27 +++++++-------- .../port/ChallengeGroupUserExpReader.java | 4 +-- .../port/ChallengeGroupUserExpStore.java | 4 +-- .../domain}/port/ChallengeReviewReader.java | 4 +-- .../domain/port/ChallengeReviewStore.java | 9 +++++ .../port/ChallengeVerificationReader.java | 4 +-- .../domain}/port/UserChallengeReader.java | 6 ++-- .../domain/port/UserChallengeStore.java | 8 +++++ .../ChallengeGroupUserExpRepository.java | 4 +-- .../ChallengeReviewRepository.java | 7 ++-- .../ChallengeVerificationRepository.java | 4 +-- .../UserChallengeRepository.java | 6 ++-- .../ChallengeGroupUserExpReaderStoreImpl.java | 12 +++---- .../adapter/ChallengeReviewReaderImpl.java | 10 +++--- .../adapter/ChallengeReviewStoreImpl.java | 8 ++--- .../ChallengeVerificationReaderImpl.java | 8 ++--- .../adapter/UserChallengeReaderImpl.java | 14 ++++---- .../adapter/UserChallengeStoreImpl.java | 8 ++--- .../auth => auth/domain}/AuthServiceTest.java | 8 ++--- .../ChallengeGroupQueryServiceTest.java | 11 +++--- .../ChallengeGroupServiceTest.java | 8 ++--- .../user => user/domain}/UserServiceTest.java | 3 +- .../application}/RecordServiceTest.java | 19 +++++------ .../application}/UserRecordServiceTest.java | 34 ++++++++----------- 108 files changed, 365 insertions(+), 382 deletions(-) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{controller/admin => admin/controller}/AdminController.java (84%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{controller/admin => admin/controller}/AdminReq.java (91%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{controller/auth => auth/controller}/AuthController.java (95%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{controller/auth => auth/controller}/AuthReq.java (90%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{controller/auth => auth/controller}/AuthRes.java (86%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/auth => auth/domain}/AuthService.java (98%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/auth => auth/domain}/OAuth2Client.java (91%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/auth => auth/domain}/OAuth2Provider.java (56%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/auth => auth/domain}/OAuthUserInfoModel.java (81%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/auth => auth/infrastructure}/AuthTokenGenerator.java (78%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/auth => auth/infrastructure}/KakaoOAuth2Client.java (94%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/auth => auth/infrastructure}/KakaoTokenResponse.java (90%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/auth => auth/infrastructure}/KakaoUserInfoResponse.java (91%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/auth => auth/infrastructure}/NaverOAuth2Client.java (94%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/auth => auth/infrastructure}/NaverTokenResponse.java (87%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/auth => auth/infrastructure}/NaverUserInfoResponse.java (83%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{controller/challengegroup => challengegroup/controller}/ChallengeGroupController.java (89%) create mode 100644 zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/controller/ChallengeGroupReq.java rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{controller/challengegroup => challengegroup/controller}/ChallengeGroupRes.java (92%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/challengegroup => challengegroup/domain}/Challenge.java (94%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/challengegroup => challengegroup/domain}/ChallengeCategory.java (82%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/challengegroup => challengegroup/domain}/ChallengeCommand.java (97%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/challengegroup => challengegroup/domain}/ChallengeGroup.java (93%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/challengegroup => challengegroup/domain}/ChallengeGroupCommand.java (93%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/challengegroup => challengegroup/domain}/ChallengeGroupImage.java (79%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/challengegroup => challengegroup/domain}/DayType.java (50%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/challengegroup => challengegroup/domain}/application/ChallengeGroupModel.java (93%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/challengegroup => challengegroup/domain}/application/ChallengeGroupQueryService.java (81%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/challengegroup => challengegroup/domain}/application/ChallengeGroupService.java (72%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/challengegroup => challengegroup/domain}/application/ChallengeModel.java (90%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/challengegroup => challengegroup/domain}/port/ChallengeGroupImageReader.java (56%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/challengegroup => challengegroup/domain}/port/ChallengeGroupReader.java (63%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/challengegroup => challengegroup/domain}/port/ChallengeGroupStore.java (53%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/challengegroup => challengegroup/domain}/port/ChallengeReader.java (55%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/challengegroup => challengegroup/infrastructure}/ChallengeGroupImageRepository.java (68%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/challengegroup => challengegroup/infrastructure}/ChallengeGroupRepository.java (77%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/challengegroup => challengegroup/infrastructure}/ChallengeRepository.java (55%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/challengegroup => challengegroup/infrastructure}/adapter/ChallengeGroupImageReaderImpl.java (68%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/challengegroup => challengegroup/infrastructure}/adapter/ChallengeGroupReaderImpl.java (87%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/challengegroup => challengegroup/infrastructure}/adapter/ChallengeGroupStoreImpl.java (69%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/challengegroup => challengegroup/infrastructure}/adapter/ChallengeReaderImpl.java (70%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{ => common}/controller/HealthCheckController.java (91%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{ => common}/controller/PagingRequest.java (94%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{ => common}/controller/PagingResponse.java (95%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{ => common}/domain/BaseTimeEntity.java (93%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{ => common}/domain/ImageUploader.java (76%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{ => common}/infrastructure/S3ImageUploader.java (95%) delete mode 100644 zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challengegroup/ChallengeGroupReq.java delete mode 100644 zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/port/ChallengeReviewStore.java delete mode 100644 zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/port/UserChallengeStore.java rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{controller/user => user/controller}/UserController.java (91%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{controller/user => user/controller}/UserReq.java (91%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{controller/user => user/controller}/UserRes.java (94%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/user => user/domain}/TierSystem.java (97%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/user => user/domain}/User.java (94%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/user => user/domain}/UserCommand.java (96%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/user => user/domain}/UserModel.java (98%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/user => user/domain}/UserReader.java (90%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/user => user/domain}/UserService.java (90%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/user => user/domain}/UserStore.java (59%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/user => user/infrastructure}/UserReaderImpl.java (89%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/user => user/infrastructure}/UserRepository.java (76%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/user => user/infrastructure}/UserStoreImpl.java (69%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{controller/challenge => userchallenge/controller}/ChallengeController.java (90%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{controller/challenge => userchallenge/controller}/ChallengeReq.java (87%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{controller/challenge => userchallenge/controller}/ChallengeRes.java (91%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{controller/challengereview => userchallenge/controller}/ChallengeReviewController.java (89%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{controller/challengereview => userchallenge/controller}/ChallengeReviewRes.java (88%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/userchallenge => userchallenge/domain}/ChallengeGroupUserExp.java (88%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/userchallenge => userchallenge/domain}/ChallengeReview.java (87%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/userchallenge => userchallenge/domain}/ChallengeStatus.java (84%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/userchallenge => userchallenge/domain}/ChallengeVerification.java (85%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/userchallenge => userchallenge/domain}/ChallengeVerificationStatus.java (81%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/userchallenge => userchallenge/domain}/DayCountType.java (69%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/userchallenge => userchallenge/domain}/UserChallenge.java (90%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/userchallenge => userchallenge/domain/application}/AddUserExpByVerificationEvent.java (79%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/userchallenge => userchallenge/domain}/application/AddUserExpByVerificationUseCase.java (68%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/userchallenge => userchallenge/domain}/application/ChallengeGroupRankingModel.java (77%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/userchallenge => userchallenge/domain}/application/ChallengeRankingService.java (85%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/userchallenge => userchallenge/domain}/application/ChallengeRecordService.java (77%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/userchallenge => userchallenge/domain}/application/ChallengeReviewModel.java (89%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/userchallenge => userchallenge/domain}/application/ChallengeReviewService.java (86%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/userchallenge => userchallenge/domain}/application/ChallengeVerificationModel.java (84%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/userchallenge => userchallenge/domain}/application/UserChallengeModel.java (89%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/userchallenge => userchallenge/domain}/application/UserChallengeService.java (84%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/userchallenge => userchallenge/domain}/port/ChallengeGroupUserExpReader.java (77%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/userchallenge => userchallenge/domain}/port/ChallengeGroupUserExpStore.java (53%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/userchallenge => userchallenge/domain}/port/ChallengeReviewReader.java (85%) create mode 100644 zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeReviewStore.java rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/userchallenge => userchallenge/domain}/port/ChallengeVerificationReader.java (78%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{domain/userchallenge => userchallenge/domain}/port/UserChallengeReader.java (83%) create mode 100644 zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/UserChallengeStore.java rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/userchallenge => userchallenge/infrastructure}/ChallengeGroupUserExpRepository.java (58%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/userchallenge => userchallenge/infrastructure}/ChallengeReviewRepository.java (74%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/userchallenge => userchallenge/infrastructure}/ChallengeVerificationRepository.java (80%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/userchallenge => userchallenge/infrastructure}/UserChallengeRepository.java (93%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/userchallenge => userchallenge/infrastructure}/adapter/ChallengeGroupUserExpReaderStoreImpl.java (85%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/userchallenge => userchallenge/infrastructure}/adapter/ChallengeReviewReaderImpl.java (93%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/userchallenge => userchallenge/infrastructure}/adapter/ChallengeReviewStoreImpl.java (64%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/userchallenge => userchallenge/infrastructure}/adapter/ChallengeVerificationReaderImpl.java (82%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/userchallenge => userchallenge/infrastructure}/adapter/UserChallengeReaderImpl.java (92%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{infrastructure/userchallenge => userchallenge/infrastructure}/adapter/UserChallengeStoreImpl.java (63%) rename zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/{domain/auth => auth/domain}/AuthServiceTest.java (93%) rename zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/{domain/challengegroup => challengegroup/domain/application}/ChallengeGroupQueryServiceTest.java (90%) rename zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/{domain/challengegroup => challengegroup/domain/application}/ChallengeGroupServiceTest.java (93%) rename zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/{domain/user => user/domain}/UserServiceTest.java (97%) rename zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/{domain/challengegroup/challenge => userchallenge/domain/application}/RecordServiceTest.java (92%) rename zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/{domain/challengegroup/userchallenge => userchallenge/domain/application}/UserRecordServiceTest.java (87%) diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/admin/AdminController.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/admin/controller/AdminController.java similarity index 84% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/admin/AdminController.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/admin/controller/AdminController.java index 0fe06cba..e7c3cebd 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/admin/AdminController.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/admin/controller/AdminController.java @@ -1,15 +1,14 @@ -package org.haedal.zzansuni.controller.admin; +package org.haedal.zzansuni.admin.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.controller.auth.AuthReq; +import org.haedal.zzansuni.auth.controller.AuthReq; +import org.haedal.zzansuni.auth.domain.AuthService; +import org.haedal.zzansuni.challengegroup.domain.application.ChallengeGroupService; import org.haedal.zzansuni.core.api.ApiResponse; -import org.haedal.zzansuni.domain.auth.AuthService; -import org.haedal.zzansuni.domain.challengegroup.application.ChallengeGroupService; import org.springframework.http.HttpStatus; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.web.bind.annotation.*; @Tag(name = "admin", description = "관리자 API") @@ -19,7 +18,6 @@ public class AdminController { private final AuthService authService; private final ChallengeGroupService challengeGroupService; - private final BCryptPasswordEncoder passwordEncoder; @ResponseStatus(HttpStatus.CREATED) @Operation(summary = "매니저 등록", description = "매니저를 등록한다.") diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/admin/AdminReq.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/admin/controller/AdminReq.java similarity index 91% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/admin/AdminReq.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/admin/controller/AdminReq.java index 408fc4ac..de47092d 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/admin/AdminReq.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/admin/controller/AdminReq.java @@ -1,10 +1,10 @@ -package org.haedal.zzansuni.controller.admin; +package org.haedal.zzansuni.admin.controller; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import org.haedal.zzansuni.domain.challengegroup.ChallengeCategory; -import org.haedal.zzansuni.domain.challengegroup.ChallengeGroupCommand; -import org.haedal.zzansuni.domain.challengegroup.DayType; +import org.haedal.zzansuni.challengegroup.domain.ChallengeCategory; +import org.haedal.zzansuni.challengegroup.domain.ChallengeGroupCommand; +import org.haedal.zzansuni.challengegroup.domain.DayType; import java.time.LocalDate; import java.util.List; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/auth/AuthController.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/controller/AuthController.java similarity index 95% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/auth/AuthController.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/controller/AuthController.java index db1bff1f..27ef6922 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/auth/AuthController.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/controller/AuthController.java @@ -1,12 +1,12 @@ -package org.haedal.zzansuni.controller.auth; +package org.haedal.zzansuni.auth.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.haedal.zzansuni.core.api.ApiResponse; -import org.haedal.zzansuni.domain.auth.AuthService; -import org.haedal.zzansuni.domain.user.UserModel; +import org.haedal.zzansuni.auth.domain.AuthService; +import org.haedal.zzansuni.user.domain.UserModel; import org.haedal.zzansuni.global.jwt.JwtToken; import org.springframework.data.util.Pair; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/auth/AuthReq.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/controller/AuthReq.java similarity index 90% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/auth/AuthReq.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/controller/AuthReq.java index b8c5ddf5..3c3ff59a 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/auth/AuthReq.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/controller/AuthReq.java @@ -1,10 +1,10 @@ -package org.haedal.zzansuni.controller.auth; +package org.haedal.zzansuni.auth.controller; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import org.haedal.zzansuni.domain.auth.OAuth2Provider; -import org.haedal.zzansuni.domain.user.UserCommand; +import org.haedal.zzansuni.auth.domain.OAuth2Provider; +import org.haedal.zzansuni.user.domain.UserCommand; public class AuthReq { public record OAuth2LoginRequest( diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/auth/AuthRes.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/controller/AuthRes.java similarity index 86% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/auth/AuthRes.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/controller/AuthRes.java index 739f5349..2d45c388 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/auth/AuthRes.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/controller/AuthRes.java @@ -1,8 +1,8 @@ -package org.haedal.zzansuni.controller.auth; +package org.haedal.zzansuni.auth.controller; import lombok.Builder; -import org.haedal.zzansuni.controller.user.UserRes; -import org.haedal.zzansuni.domain.user.UserModel; +import org.haedal.zzansuni.user.controller.UserRes; +import org.haedal.zzansuni.user.domain.UserModel; import org.haedal.zzansuni.global.jwt.JwtToken; public class AuthRes { diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/auth/AuthService.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/domain/AuthService.java similarity index 98% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/auth/AuthService.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/domain/AuthService.java index 44a1fce5..11f23402 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/auth/AuthService.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/domain/AuthService.java @@ -1,10 +1,10 @@ -package org.haedal.zzansuni.domain.auth; +package org.haedal.zzansuni.auth.domain; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.domain.user.*; import org.haedal.zzansuni.global.jwt.JwtToken; import org.haedal.zzansuni.global.jwt.JwtUser; import org.haedal.zzansuni.global.jwt.JwtUtils; +import org.haedal.zzansuni.user.domain.*; import org.springframework.data.util.Pair; import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/auth/OAuth2Client.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/domain/OAuth2Client.java similarity index 91% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/auth/OAuth2Client.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/domain/OAuth2Client.java index 52e1a04e..187a3c4b 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/auth/OAuth2Client.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/domain/OAuth2Client.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.domain.auth; +package org.haedal.zzansuni.auth.domain; import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/auth/OAuth2Provider.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/domain/OAuth2Provider.java similarity index 56% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/auth/OAuth2Provider.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/domain/OAuth2Provider.java index 7398b008..18a8abb6 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/auth/OAuth2Provider.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/domain/OAuth2Provider.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.domain.auth; +package org.haedal.zzansuni.auth.domain; public enum OAuth2Provider { KAKAO, diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/auth/OAuthUserInfoModel.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/domain/OAuthUserInfoModel.java similarity index 81% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/auth/OAuthUserInfoModel.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/domain/OAuthUserInfoModel.java index e835997b..f45cb09f 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/auth/OAuthUserInfoModel.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/domain/OAuthUserInfoModel.java @@ -1,7 +1,7 @@ -package org.haedal.zzansuni.domain.auth; +package org.haedal.zzansuni.auth.domain; import lombok.Builder; -import org.haedal.zzansuni.domain.user.UserCommand; +import org.haedal.zzansuni.user.domain.UserCommand; @Builder public record OAuthUserInfoModel( diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/auth/AuthTokenGenerator.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/infrastructure/AuthTokenGenerator.java similarity index 78% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/auth/AuthTokenGenerator.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/infrastructure/AuthTokenGenerator.java index c459a3fd..729fa7ab 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/auth/AuthTokenGenerator.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/infrastructure/AuthTokenGenerator.java @@ -1,6 +1,6 @@ -package org.haedal.zzansuni.infrastructure.auth; +package org.haedal.zzansuni.auth.infrastructure; -import org.haedal.zzansuni.domain.auth.OAuth2Provider; +import org.haedal.zzansuni.auth.domain.OAuth2Provider; import org.springframework.stereotype.Component; /** diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/auth/KakaoOAuth2Client.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/infrastructure/KakaoOAuth2Client.java similarity index 94% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/auth/KakaoOAuth2Client.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/infrastructure/KakaoOAuth2Client.java index b96dc83c..0eff55d8 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/auth/KakaoOAuth2Client.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/infrastructure/KakaoOAuth2Client.java @@ -1,8 +1,8 @@ -package org.haedal.zzansuni.infrastructure.auth; +package org.haedal.zzansuni.auth.infrastructure; -import org.haedal.zzansuni.domain.auth.OAuth2Client; -import org.haedal.zzansuni.domain.auth.OAuth2Provider; -import org.haedal.zzansuni.domain.auth.OAuthUserInfoModel; +import org.haedal.zzansuni.auth.domain.OAuth2Client; +import org.haedal.zzansuni.auth.domain.OAuth2Provider; +import org.haedal.zzansuni.auth.domain.OAuthUserInfoModel; import org.haedal.zzansuni.global.exception.ExternalServerConnectionException; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/auth/KakaoTokenResponse.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/infrastructure/KakaoTokenResponse.java similarity index 90% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/auth/KakaoTokenResponse.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/infrastructure/KakaoTokenResponse.java index cd529170..7f12e200 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/auth/KakaoTokenResponse.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/infrastructure/KakaoTokenResponse.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.infrastructure.auth; +package org.haedal.zzansuni.auth.infrastructure; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/auth/KakaoUserInfoResponse.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/infrastructure/KakaoUserInfoResponse.java similarity index 91% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/auth/KakaoUserInfoResponse.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/infrastructure/KakaoUserInfoResponse.java index 3ce08f5a..e709ead9 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/auth/KakaoUserInfoResponse.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/infrastructure/KakaoUserInfoResponse.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.infrastructure.auth; +package org.haedal.zzansuni.auth.infrastructure; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/auth/NaverOAuth2Client.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/infrastructure/NaverOAuth2Client.java similarity index 94% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/auth/NaverOAuth2Client.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/infrastructure/NaverOAuth2Client.java index 28d14a6a..b7354d11 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/auth/NaverOAuth2Client.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/infrastructure/NaverOAuth2Client.java @@ -1,9 +1,9 @@ -package org.haedal.zzansuni.infrastructure.auth; +package org.haedal.zzansuni.auth.infrastructure; -import org.haedal.zzansuni.domain.auth.OAuth2Client; -import org.haedal.zzansuni.domain.auth.OAuth2Provider; -import org.haedal.zzansuni.domain.auth.OAuthUserInfoModel; +import org.haedal.zzansuni.auth.domain.OAuth2Client; +import org.haedal.zzansuni.auth.domain.OAuth2Provider; +import org.haedal.zzansuni.auth.domain.OAuthUserInfoModel; import org.haedal.zzansuni.global.exception.ExternalServerConnectionException; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/auth/NaverTokenResponse.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/infrastructure/NaverTokenResponse.java similarity index 87% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/auth/NaverTokenResponse.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/infrastructure/NaverTokenResponse.java index 58777079..67bab39f 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/auth/NaverTokenResponse.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/infrastructure/NaverTokenResponse.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.infrastructure.auth; +package org.haedal.zzansuni.auth.infrastructure; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/auth/NaverUserInfoResponse.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/infrastructure/NaverUserInfoResponse.java similarity index 83% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/auth/NaverUserInfoResponse.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/infrastructure/NaverUserInfoResponse.java index f6470159..52777cbd 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/auth/NaverUserInfoResponse.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/auth/infrastructure/NaverUserInfoResponse.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.infrastructure.auth; +package org.haedal.zzansuni.auth.infrastructure; public record NaverUserInfoResponse( String resultcode, diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challengegroup/ChallengeGroupController.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/controller/ChallengeGroupController.java similarity index 89% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challengegroup/ChallengeGroupController.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/controller/ChallengeGroupController.java index e0f9c7db..0ce3b29c 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challengegroup/ChallengeGroupController.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/controller/ChallengeGroupController.java @@ -1,17 +1,17 @@ -package org.haedal.zzansuni.controller.challengegroup; +package org.haedal.zzansuni.challengegroup.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.controller.PagingRequest; -import org.haedal.zzansuni.controller.PagingResponse; +import org.haedal.zzansuni.common.controller.PagingRequest; +import org.haedal.zzansuni.common.controller.PagingResponse; import org.haedal.zzansuni.core.api.ApiResponse; -import org.haedal.zzansuni.domain.challengegroup.ChallengeCategory; -import org.haedal.zzansuni.domain.challengegroup.application.ChallengeGroupModel; -import org.haedal.zzansuni.domain.challengegroup.application.ChallengeGroupQueryService; -import org.haedal.zzansuni.domain.userchallenge.application.ChallengeRankingService; +import org.haedal.zzansuni.challengegroup.domain.ChallengeCategory; +import org.haedal.zzansuni.challengegroup.domain.application.ChallengeGroupModel; +import org.haedal.zzansuni.challengegroup.domain.application.ChallengeGroupQueryService; +import org.haedal.zzansuni.userchallenge.domain.application.ChallengeRankingService; import org.haedal.zzansuni.global.jwt.JwtUser; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.GetMapping; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/controller/ChallengeGroupReq.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/controller/ChallengeGroupReq.java new file mode 100644 index 00000000..6c0d40b5 --- /dev/null +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/controller/ChallengeGroupReq.java @@ -0,0 +1,5 @@ +package org.haedal.zzansuni.challengegroup.controller; + +public class ChallengeGroupReq { + +} diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challengegroup/ChallengeGroupRes.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/controller/ChallengeGroupRes.java similarity index 92% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challengegroup/ChallengeGroupRes.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/controller/ChallengeGroupRes.java index 42d85f9c..6c9cf4b4 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challengegroup/ChallengeGroupRes.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/controller/ChallengeGroupRes.java @@ -1,12 +1,12 @@ -package org.haedal.zzansuni.controller.challengegroup; +package org.haedal.zzansuni.challengegroup.controller; import lombok.Builder; -import org.haedal.zzansuni.controller.user.UserRes; -import org.haedal.zzansuni.domain.challengegroup.ChallengeCategory; -import org.haedal.zzansuni.domain.challengegroup.application.ChallengeGroupModel; -import org.haedal.zzansuni.domain.challengegroup.DayType; -import org.haedal.zzansuni.domain.challengegroup.application.ChallengeModel; -import org.haedal.zzansuni.domain.userchallenge.application.ChallengeGroupRankingModel; +import org.haedal.zzansuni.user.controller.UserRes; +import org.haedal.zzansuni.challengegroup.domain.ChallengeCategory; +import org.haedal.zzansuni.challengegroup.domain.application.ChallengeGroupModel; +import org.haedal.zzansuni.challengegroup.domain.DayType; +import org.haedal.zzansuni.challengegroup.domain.application.ChallengeModel; +import org.haedal.zzansuni.userchallenge.domain.application.ChallengeGroupRankingModel; import org.springframework.data.domain.Page; import java.time.LocalDate; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/Challenge.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/Challenge.java similarity index 94% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/Challenge.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/Challenge.java index 497aa888..8300c77a 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/Challenge.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/Challenge.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.domain.challengegroup; +package org.haedal.zzansuni.challengegroup.domain; import jakarta.persistence.*; @@ -8,7 +8,7 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.haedal.zzansuni.domain.BaseTimeEntity; +import org.haedal.zzansuni.common.domain.BaseTimeEntity; @Entity @AllArgsConstructor diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/ChallengeCategory.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/ChallengeCategory.java similarity index 82% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/ChallengeCategory.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/ChallengeCategory.java index 8ddd0c3a..4269cf0d 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/ChallengeCategory.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/ChallengeCategory.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.domain.challengegroup; +package org.haedal.zzansuni.challengegroup.domain; import lombok.RequiredArgsConstructor; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/ChallengeCommand.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/ChallengeCommand.java similarity index 97% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/ChallengeCommand.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/ChallengeCommand.java index e8dfd5e1..dc1a2054 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/ChallengeCommand.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/ChallengeCommand.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.domain.challengegroup; +package org.haedal.zzansuni.challengegroup.domain; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/ChallengeGroup.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/ChallengeGroup.java similarity index 93% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/ChallengeGroup.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/ChallengeGroup.java index bc357af7..ac7f4d8c 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/ChallengeGroup.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/ChallengeGroup.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.domain.challengegroup; +package org.haedal.zzansuni.challengegroup.domain; import jakarta.persistence.*; import lombok.AccessLevel; @@ -6,7 +6,7 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.haedal.zzansuni.domain.BaseTimeEntity; +import org.haedal.zzansuni.common.domain.BaseTimeEntity; import java.util.ArrayList; import java.util.List; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/ChallengeGroupCommand.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/ChallengeGroupCommand.java similarity index 93% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/ChallengeGroupCommand.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/ChallengeGroupCommand.java index 3c3ed8ea..162d2b5d 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/ChallengeGroupCommand.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/ChallengeGroupCommand.java @@ -1,12 +1,10 @@ -package org.haedal.zzansuni.domain.challengegroup; +package org.haedal.zzansuni.challengegroup.domain; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Builder; import lombok.Getter; import org.haedal.zzansuni.core.utils.SelfValidating; -import org.haedal.zzansuni.domain.challengegroup.ChallengeCategory; -import org.haedal.zzansuni.domain.challengegroup.DayType; import java.time.LocalDate; import java.util.List; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/ChallengeGroupImage.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/ChallengeGroupImage.java similarity index 79% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/ChallengeGroupImage.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/ChallengeGroupImage.java index 9656341c..f0ff9552 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/ChallengeGroupImage.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/ChallengeGroupImage.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.domain.challengegroup; +package org.haedal.zzansuni.challengegroup.domain; import jakarta.persistence.*; import lombok.AccessLevel; @@ -6,8 +6,7 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.haedal.zzansuni.domain.BaseTimeEntity; -import org.haedal.zzansuni.domain.challengegroup.ChallengeGroup; +import org.haedal.zzansuni.common.domain.BaseTimeEntity; @Entity @NoArgsConstructor(access = AccessLevel.PROTECTED) diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/DayType.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/DayType.java similarity index 50% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/DayType.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/DayType.java index 39b42090..255e2cca 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/DayType.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/DayType.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.domain.challengegroup; +package org.haedal.zzansuni.challengegroup.domain; public enum DayType { DAY, WEEK, MONTH, YEAR diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/application/ChallengeGroupModel.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/application/ChallengeGroupModel.java similarity index 93% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/application/ChallengeGroupModel.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/application/ChallengeGroupModel.java index e893f7a6..c63b7d07 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/application/ChallengeGroupModel.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/application/ChallengeGroupModel.java @@ -1,9 +1,9 @@ -package org.haedal.zzansuni.domain.challengegroup.application; +package org.haedal.zzansuni.challengegroup.domain.application; import lombok.Builder; -import org.haedal.zzansuni.domain.challengegroup.ChallengeCategory; -import org.haedal.zzansuni.domain.challengegroup.ChallengeGroup; -import org.haedal.zzansuni.domain.challengegroup.ChallengeGroupImage; +import org.haedal.zzansuni.challengegroup.domain.ChallengeCategory; +import org.haedal.zzansuni.challengegroup.domain.ChallengeGroup; +import org.haedal.zzansuni.challengegroup.domain.ChallengeGroupImage; import java.time.LocalDate; import java.util.List; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/application/ChallengeGroupQueryService.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/application/ChallengeGroupQueryService.java similarity index 81% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/application/ChallengeGroupQueryService.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/application/ChallengeGroupQueryService.java index 22e20ef0..d9fa2358 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/application/ChallengeGroupQueryService.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/application/ChallengeGroupQueryService.java @@ -1,11 +1,11 @@ -package org.haedal.zzansuni.domain.challengegroup.application; +package org.haedal.zzansuni.challengegroup.domain.application; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.domain.challengegroup.ChallengeCategory; -import org.haedal.zzansuni.domain.challengegroup.ChallengeGroup; -import org.haedal.zzansuni.domain.challengegroup.ChallengeGroupImage; -import org.haedal.zzansuni.domain.challengegroup.port.ChallengeGroupImageReader; -import org.haedal.zzansuni.domain.challengegroup.port.ChallengeGroupReader; +import org.haedal.zzansuni.challengegroup.domain.ChallengeCategory; +import org.haedal.zzansuni.challengegroup.domain.ChallengeGroup; +import org.haedal.zzansuni.challengegroup.domain.ChallengeGroupImage; +import org.haedal.zzansuni.challengegroup.domain.port.ChallengeGroupImageReader; +import org.haedal.zzansuni.challengegroup.domain.port.ChallengeGroupReader; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/application/ChallengeGroupService.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/application/ChallengeGroupService.java similarity index 72% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/application/ChallengeGroupService.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/application/ChallengeGroupService.java index d51cc660..b295bd8f 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/application/ChallengeGroupService.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/application/ChallengeGroupService.java @@ -1,10 +1,10 @@ -package org.haedal.zzansuni.domain.challengegroup.application; +package org.haedal.zzansuni.challengegroup.domain.application; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.domain.challengegroup.ChallengeGroup; -import org.haedal.zzansuni.domain.challengegroup.ChallengeGroupCommand; -import org.haedal.zzansuni.domain.challengegroup.port.ChallengeGroupReader; -import org.haedal.zzansuni.domain.challengegroup.port.ChallengeGroupStore; +import org.haedal.zzansuni.challengegroup.domain.ChallengeGroup; +import org.haedal.zzansuni.challengegroup.domain.ChallengeGroupCommand; +import org.haedal.zzansuni.challengegroup.domain.port.ChallengeGroupReader; +import org.haedal.zzansuni.challengegroup.domain.port.ChallengeGroupStore; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/application/ChallengeModel.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/application/ChallengeModel.java similarity index 90% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/application/ChallengeModel.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/application/ChallengeModel.java index dcfb7165..81516061 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/application/ChallengeModel.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/application/ChallengeModel.java @@ -1,9 +1,9 @@ -package org.haedal.zzansuni.domain.challengegroup.application; +package org.haedal.zzansuni.challengegroup.domain.application; import lombok.Builder; import lombok.Getter; -import org.haedal.zzansuni.domain.challengegroup.Challenge; -import org.haedal.zzansuni.domain.challengegroup.DayType; +import org.haedal.zzansuni.challengegroup.domain.Challenge; +import org.haedal.zzansuni.challengegroup.domain.DayType; import java.time.LocalDate; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/port/ChallengeGroupImageReader.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/port/ChallengeGroupImageReader.java similarity index 56% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/port/ChallengeGroupImageReader.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/port/ChallengeGroupImageReader.java index f217b74a..ef01120e 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/port/ChallengeGroupImageReader.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/port/ChallengeGroupImageReader.java @@ -1,6 +1,6 @@ -package org.haedal.zzansuni.domain.challengegroup.port; +package org.haedal.zzansuni.challengegroup.domain.port; -import org.haedal.zzansuni.domain.challengegroup.ChallengeGroupImage; +import org.haedal.zzansuni.challengegroup.domain.ChallengeGroupImage; import java.util.List; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/port/ChallengeGroupReader.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/port/ChallengeGroupReader.java similarity index 63% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/port/ChallengeGroupReader.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/port/ChallengeGroupReader.java index 82da7ac5..70e4baa1 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/port/ChallengeGroupReader.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/port/ChallengeGroupReader.java @@ -1,9 +1,8 @@ -package org.haedal.zzansuni.domain.challengegroup.port; +package org.haedal.zzansuni.challengegroup.domain.port; -import org.haedal.zzansuni.domain.challengegroup.ChallengeCategory; -import org.haedal.zzansuni.domain.challengegroup.ChallengeGroup; -import org.haedal.zzansuni.domain.challengegroup.application.ChallengeGroupModel; -import org.haedal.zzansuni.domain.userchallenge.application.ChallengeGroupRankingModel; +import org.haedal.zzansuni.challengegroup.domain.ChallengeCategory; +import org.haedal.zzansuni.challengegroup.domain.ChallengeGroup; +import org.haedal.zzansuni.userchallenge.domain.application.ChallengeGroupRankingModel; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/port/ChallengeGroupStore.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/port/ChallengeGroupStore.java similarity index 53% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/port/ChallengeGroupStore.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/port/ChallengeGroupStore.java index 273336ea..5f3ebcfd 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/port/ChallengeGroupStore.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/port/ChallengeGroupStore.java @@ -1,6 +1,6 @@ -package org.haedal.zzansuni.domain.challengegroup.port; +package org.haedal.zzansuni.challengegroup.domain.port; -import org.haedal.zzansuni.domain.challengegroup.ChallengeGroup; +import org.haedal.zzansuni.challengegroup.domain.ChallengeGroup; public interface ChallengeGroupStore { ChallengeGroup save(ChallengeGroup challengeGroup); diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/port/ChallengeReader.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/port/ChallengeReader.java similarity index 55% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/port/ChallengeReader.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/port/ChallengeReader.java index 848928ab..c3a853a6 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/challengegroup/port/ChallengeReader.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/domain/port/ChallengeReader.java @@ -1,6 +1,6 @@ -package org.haedal.zzansuni.domain.challengegroup.port; +package org.haedal.zzansuni.challengegroup.domain.port; -import org.haedal.zzansuni.domain.challengegroup.Challenge; +import org.haedal.zzansuni.challengegroup.domain.Challenge; import java.util.Optional; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/ChallengeGroupImageRepository.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/infrastructure/ChallengeGroupImageRepository.java similarity index 68% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/ChallengeGroupImageRepository.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/infrastructure/ChallengeGroupImageRepository.java index 3f81892b..050991e4 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/ChallengeGroupImageRepository.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/infrastructure/ChallengeGroupImageRepository.java @@ -1,6 +1,6 @@ -package org.haedal.zzansuni.infrastructure.challengegroup; +package org.haedal.zzansuni.challengegroup.infrastructure; -import org.haedal.zzansuni.domain.challengegroup.ChallengeGroupImage; +import org.haedal.zzansuni.challengegroup.domain.ChallengeGroupImage; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/ChallengeGroupRepository.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/infrastructure/ChallengeGroupRepository.java similarity index 77% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/ChallengeGroupRepository.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/infrastructure/ChallengeGroupRepository.java index 19b344ab..11bfe6e5 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/ChallengeGroupRepository.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/infrastructure/ChallengeGroupRepository.java @@ -1,6 +1,6 @@ -package org.haedal.zzansuni.infrastructure.challengegroup; +package org.haedal.zzansuni.challengegroup.infrastructure; -import org.haedal.zzansuni.domain.challengegroup.ChallengeGroup; +import org.haedal.zzansuni.challengegroup.domain.ChallengeGroup; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/ChallengeRepository.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/infrastructure/ChallengeRepository.java similarity index 55% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/ChallengeRepository.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/infrastructure/ChallengeRepository.java index 1f51756b..d525cd74 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/ChallengeRepository.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/infrastructure/ChallengeRepository.java @@ -1,6 +1,6 @@ -package org.haedal.zzansuni.infrastructure.challengegroup; +package org.haedal.zzansuni.challengegroup.infrastructure; -import org.haedal.zzansuni.domain.challengegroup.Challenge; +import org.haedal.zzansuni.challengegroup.domain.Challenge; import org.springframework.data.jpa.repository.JpaRepository; public interface ChallengeRepository extends JpaRepository { diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/adapter/ChallengeGroupImageReaderImpl.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/infrastructure/adapter/ChallengeGroupImageReaderImpl.java similarity index 68% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/adapter/ChallengeGroupImageReaderImpl.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/infrastructure/adapter/ChallengeGroupImageReaderImpl.java index 58cabc70..059fd024 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/adapter/ChallengeGroupImageReaderImpl.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/infrastructure/adapter/ChallengeGroupImageReaderImpl.java @@ -1,9 +1,9 @@ -package org.haedal.zzansuni.infrastructure.challengegroup.adapter; +package org.haedal.zzansuni.challengegroup.infrastructure.adapter; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.domain.challengegroup.ChallengeGroupImage; -import org.haedal.zzansuni.domain.challengegroup.port.ChallengeGroupImageReader; -import org.haedal.zzansuni.infrastructure.challengegroup.ChallengeGroupImageRepository; +import org.haedal.zzansuni.challengegroup.domain.ChallengeGroupImage; +import org.haedal.zzansuni.challengegroup.domain.port.ChallengeGroupImageReader; +import org.haedal.zzansuni.challengegroup.infrastructure.ChallengeGroupImageRepository; import org.springframework.stereotype.Component; import java.util.List; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/adapter/ChallengeGroupReaderImpl.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/infrastructure/adapter/ChallengeGroupReaderImpl.java similarity index 87% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/adapter/ChallengeGroupReaderImpl.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/infrastructure/adapter/ChallengeGroupReaderImpl.java index e816dcf5..0d571514 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/adapter/ChallengeGroupReaderImpl.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/infrastructure/adapter/ChallengeGroupReaderImpl.java @@ -1,20 +1,20 @@ -package org.haedal.zzansuni.infrastructure.challengegroup.adapter; +package org.haedal.zzansuni.challengegroup.infrastructure.adapter; import com.querydsl.core.types.OrderSpecifier; import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.core.types.dsl.Expressions; import com.querydsl.jpa.impl.JPAQueryFactory; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.domain.challengegroup.ChallengeCategory; -import org.haedal.zzansuni.domain.challengegroup.ChallengeGroup; -import org.haedal.zzansuni.domain.challengegroup.port.ChallengeGroupReader; -import org.haedal.zzansuni.domain.user.User; -import org.haedal.zzansuni.domain.user.UserModel; -import org.haedal.zzansuni.domain.userchallenge.ChallengeGroupUserExp; -import org.haedal.zzansuni.domain.userchallenge.QChallengeGroupUserExp; -import org.haedal.zzansuni.domain.userchallenge.application.ChallengeGroupRankingModel; -import org.haedal.zzansuni.infrastructure.challengegroup.ChallengeGroupRepository; -import org.haedal.zzansuni.infrastructure.user.UserRepository; +import org.haedal.zzansuni.challengegroup.domain.ChallengeCategory; +import org.haedal.zzansuni.challengegroup.domain.ChallengeGroup; +import org.haedal.zzansuni.challengegroup.domain.port.ChallengeGroupReader; +import org.haedal.zzansuni.user.domain.User; +import org.haedal.zzansuni.user.domain.UserModel; +import org.haedal.zzansuni.userchallenge.domain.ChallengeGroupUserExp; +import org.haedal.zzansuni.userchallenge.domain.QChallengeGroupUserExp; +import org.haedal.zzansuni.userchallenge.domain.application.ChallengeGroupRankingModel; +import org.haedal.zzansuni.challengegroup.infrastructure.ChallengeGroupRepository; +import org.haedal.zzansuni.user.infrastructure.UserRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; @@ -23,7 +23,7 @@ import java.util.List; import java.util.NoSuchElementException; -import static org.haedal.zzansuni.domain.challengegroup.QChallengeGroup.challengeGroup; +import static org.haedal.zzansuni.challengegroup.domain.QChallengeGroup.challengeGroup; @Component diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/adapter/ChallengeGroupStoreImpl.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/infrastructure/adapter/ChallengeGroupStoreImpl.java similarity index 69% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/adapter/ChallengeGroupStoreImpl.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/infrastructure/adapter/ChallengeGroupStoreImpl.java index 68e40fbc..458f1d85 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/adapter/ChallengeGroupStoreImpl.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/infrastructure/adapter/ChallengeGroupStoreImpl.java @@ -1,9 +1,9 @@ -package org.haedal.zzansuni.infrastructure.challengegroup.adapter; +package org.haedal.zzansuni.challengegroup.infrastructure.adapter; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.domain.challengegroup.ChallengeGroup; -import org.haedal.zzansuni.domain.challengegroup.port.ChallengeGroupStore; -import org.haedal.zzansuni.infrastructure.challengegroup.ChallengeGroupRepository; +import org.haedal.zzansuni.challengegroup.domain.ChallengeGroup; +import org.haedal.zzansuni.challengegroup.domain.port.ChallengeGroupStore; +import org.haedal.zzansuni.challengegroup.infrastructure.ChallengeGroupRepository; import org.springframework.stereotype.Component; @Component diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/adapter/ChallengeReaderImpl.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/infrastructure/adapter/ChallengeReaderImpl.java similarity index 70% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/adapter/ChallengeReaderImpl.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/infrastructure/adapter/ChallengeReaderImpl.java index cc88dd7f..00230085 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/challengegroup/adapter/ChallengeReaderImpl.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengegroup/infrastructure/adapter/ChallengeReaderImpl.java @@ -1,11 +1,11 @@ -package org.haedal.zzansuni.infrastructure.challengegroup.adapter; +package org.haedal.zzansuni.challengegroup.infrastructure.adapter; import java.util.NoSuchElementException; import java.util.Optional; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.domain.challengegroup.Challenge; -import org.haedal.zzansuni.domain.challengegroup.port.ChallengeReader; -import org.haedal.zzansuni.infrastructure.challengegroup.ChallengeRepository; +import org.haedal.zzansuni.challengegroup.domain.Challenge; +import org.haedal.zzansuni.challengegroup.domain.port.ChallengeReader; +import org.haedal.zzansuni.challengegroup.infrastructure.ChallengeRepository; import org.springframework.stereotype.Component; @Component diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/HealthCheckController.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/common/controller/HealthCheckController.java similarity index 91% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/HealthCheckController.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/common/controller/HealthCheckController.java index 3351b191..801b4aa3 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/HealthCheckController.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/common/controller/HealthCheckController.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.controller; +package org.haedal.zzansuni.common.controller; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/PagingRequest.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/common/controller/PagingRequest.java similarity index 94% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/PagingRequest.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/common/controller/PagingRequest.java index 2fc0f0a8..e0f4b866 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/PagingRequest.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/common/controller/PagingRequest.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.controller; +package org.haedal.zzansuni.common.controller; import io.swagger.v3.oas.annotations.Parameter; import org.springdoc.core.annotations.ParameterObject; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/PagingResponse.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/common/controller/PagingResponse.java similarity index 95% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/PagingResponse.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/common/controller/PagingResponse.java index 0bfa93ac..4d178e5f 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/PagingResponse.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/common/controller/PagingResponse.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.controller; +package org.haedal.zzansuni.common.controller; import lombok.Builder; import org.springframework.data.domain.Page; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/BaseTimeEntity.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/common/domain/BaseTimeEntity.java similarity index 93% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/BaseTimeEntity.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/common/domain/BaseTimeEntity.java index d48f4c9b..efde64a2 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/BaseTimeEntity.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/common/domain/BaseTimeEntity.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.domain; +package org.haedal.zzansuni.common.domain; import jakarta.persistence.Column; import jakarta.persistence.EntityListeners; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/ImageUploader.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/common/domain/ImageUploader.java similarity index 76% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/ImageUploader.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/common/domain/ImageUploader.java index 5ca9a0b3..93265b89 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/ImageUploader.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/common/domain/ImageUploader.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.domain; +package org.haedal.zzansuni.common.domain; import org.springframework.web.multipart.MultipartFile; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/S3ImageUploader.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/common/infrastructure/S3ImageUploader.java similarity index 95% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/S3ImageUploader.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/common/infrastructure/S3ImageUploader.java index 3be53986..84437811 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/S3ImageUploader.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/common/infrastructure/S3ImageUploader.java @@ -1,10 +1,10 @@ -package org.haedal.zzansuni.infrastructure; +package org.haedal.zzansuni.common.infrastructure; import com.amazonaws.services.s3.AmazonS3; import com.amazonaws.services.s3.model.ObjectMetadata; import com.amazonaws.services.s3.model.PutObjectRequest; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.domain.ImageUploader; +import org.haedal.zzansuni.common.domain.ImageUploader; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Profile; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challengegroup/ChallengeGroupReq.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challengegroup/ChallengeGroupReq.java deleted file mode 100644 index 440b95bf..00000000 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challengegroup/ChallengeGroupReq.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.haedal.zzansuni.controller.challengegroup; - -public class ChallengeGroupReq { - -} diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/port/ChallengeReviewStore.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/port/ChallengeReviewStore.java deleted file mode 100644 index def5fea3..00000000 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/port/ChallengeReviewStore.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.haedal.zzansuni.domain.userchallenge.port; - -import org.haedal.zzansuni.domain.userchallenge.ChallengeReview; - -public interface ChallengeReviewStore { - - ChallengeReview store(ChallengeReview challengeReview); - -} diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/port/UserChallengeStore.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/port/UserChallengeStore.java deleted file mode 100644 index 4b345c53..00000000 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/port/UserChallengeStore.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.haedal.zzansuni.domain.userchallenge.port; - -import org.haedal.zzansuni.domain.userchallenge.UserChallenge; - -public interface UserChallengeStore { - - UserChallenge store(UserChallenge userChallenge); -} diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/user/UserController.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/controller/UserController.java similarity index 91% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/user/UserController.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/controller/UserController.java index f0b8d921..292032c1 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/user/UserController.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/controller/UserController.java @@ -1,20 +1,18 @@ -package org.haedal.zzansuni.controller.user; +package org.haedal.zzansuni.user.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.controller.PagingRequest; -import org.haedal.zzansuni.controller.PagingResponse; +import org.haedal.zzansuni.common.controller.PagingRequest; +import org.haedal.zzansuni.common.controller.PagingResponse; import org.haedal.zzansuni.core.api.ApiResponse; -import org.haedal.zzansuni.domain.user.UserService; +import org.haedal.zzansuni.user.domain.UserService; import org.haedal.zzansuni.global.jwt.JwtUser; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; -import java.time.LocalDate; - @Tag(name = "user", description = "유저 API") @RequiredArgsConstructor @RestController diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/user/UserReq.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/controller/UserReq.java similarity index 91% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/user/UserReq.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/controller/UserReq.java index ed004d2c..b7bc3895 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/user/UserReq.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/controller/UserReq.java @@ -1,8 +1,8 @@ -package org.haedal.zzansuni.controller.user; +package org.haedal.zzansuni.user.controller; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; -import org.haedal.zzansuni.domain.user.UserCommand; +import org.haedal.zzansuni.user.domain.UserCommand; import org.springdoc.core.annotations.ParameterObject; import java.time.LocalDate; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/user/UserRes.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/controller/UserRes.java similarity index 94% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/user/UserRes.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/controller/UserRes.java index 2f971d7a..b28ed1d8 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/user/UserRes.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/controller/UserRes.java @@ -1,8 +1,8 @@ -package org.haedal.zzansuni.controller.user; +package org.haedal.zzansuni.user.controller; import lombok.Builder; -import org.haedal.zzansuni.domain.user.TierSystem; -import org.haedal.zzansuni.domain.user.UserModel; +import org.haedal.zzansuni.user.domain.TierSystem; +import org.haedal.zzansuni.user.domain.UserModel; import java.time.LocalDate; import java.util.List; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/user/TierSystem.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/domain/TierSystem.java similarity index 97% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/user/TierSystem.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/domain/TierSystem.java index e10bf24c..6e005764 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/user/TierSystem.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/domain/TierSystem.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.domain.user; +package org.haedal.zzansuni.user.domain; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/user/User.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/domain/User.java similarity index 94% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/user/User.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/domain/User.java index cec1df86..b852223e 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/user/User.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/domain/User.java @@ -1,9 +1,9 @@ -package org.haedal.zzansuni.domain.user; +package org.haedal.zzansuni.user.domain; import jakarta.persistence.*; import lombok.*; -import org.haedal.zzansuni.domain.BaseTimeEntity; -import org.haedal.zzansuni.domain.auth.OAuth2Provider; +import org.haedal.zzansuni.common.domain.BaseTimeEntity; +import org.haedal.zzansuni.auth.domain.OAuth2Provider; import org.haedal.zzansuni.global.security.Role; @Getter diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/user/UserCommand.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/domain/UserCommand.java similarity index 96% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/user/UserCommand.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/domain/UserCommand.java index 72cd1adc..bca508f9 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/user/UserCommand.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/domain/UserCommand.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.domain.user; +package org.haedal.zzansuni.user.domain; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; @@ -6,7 +6,7 @@ import lombok.Builder; import lombok.Getter; import org.haedal.zzansuni.core.utils.SelfValidating; -import org.haedal.zzansuni.domain.auth.OAuth2Provider; +import org.haedal.zzansuni.auth.domain.OAuth2Provider; public class UserCommand { diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/user/UserModel.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/domain/UserModel.java similarity index 98% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/user/UserModel.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/domain/UserModel.java index 3aa0b8b2..b7f9070f 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/user/UserModel.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/domain/UserModel.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.domain.user; +package org.haedal.zzansuni.user.domain; import lombok.Builder; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/user/UserReader.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/domain/UserReader.java similarity index 90% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/user/UserReader.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/domain/UserReader.java index 09d87fd1..adc56dab 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/user/UserReader.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/domain/UserReader.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.domain.user; +package org.haedal.zzansuni.user.domain; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/user/UserService.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/domain/UserService.java similarity index 90% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/user/UserService.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/domain/UserService.java index d53b0bf4..a3081be4 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/user/UserService.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/domain/UserService.java @@ -1,8 +1,8 @@ -package org.haedal.zzansuni.domain.user; +package org.haedal.zzansuni.user.domain; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.domain.userchallenge.port.UserChallengeReader; -import org.haedal.zzansuni.domain.userchallenge.DayCountType; +import org.haedal.zzansuni.userchallenge.domain.DayCountType; +import org.haedal.zzansuni.userchallenge.domain.port.UserChallengeReader; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/user/UserStore.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/domain/UserStore.java similarity index 59% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/user/UserStore.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/domain/UserStore.java index ddcd726f..d3a809c2 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/user/UserStore.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/domain/UserStore.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.domain.user; +package org.haedal.zzansuni.user.domain; public interface UserStore { User store(User user); diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/user/UserReaderImpl.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/infrastructure/UserReaderImpl.java similarity index 89% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/user/UserReaderImpl.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/infrastructure/UserReaderImpl.java index fe13f724..2deab68a 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/user/UserReaderImpl.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/infrastructure/UserReaderImpl.java @@ -1,10 +1,10 @@ -package org.haedal.zzansuni.infrastructure.user; +package org.haedal.zzansuni.user.infrastructure; import com.querydsl.jpa.impl.JPAQueryFactory; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.domain.user.QUser; -import org.haedal.zzansuni.domain.user.User; -import org.haedal.zzansuni.domain.user.UserReader; +import org.haedal.zzansuni.user.domain.QUser; +import org.haedal.zzansuni.user.domain.User; +import org.haedal.zzansuni.user.domain.UserReader; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/user/UserRepository.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/infrastructure/UserRepository.java similarity index 76% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/user/UserRepository.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/infrastructure/UserRepository.java index 7a36b89a..cf097f0f 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/user/UserRepository.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/infrastructure/UserRepository.java @@ -1,6 +1,6 @@ -package org.haedal.zzansuni.infrastructure.user; +package org.haedal.zzansuni.user.infrastructure; -import org.haedal.zzansuni.domain.user.User; +import org.haedal.zzansuni.user.domain.User; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/user/UserStoreImpl.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/infrastructure/UserStoreImpl.java similarity index 69% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/user/UserStoreImpl.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/infrastructure/UserStoreImpl.java index 05fe0ee8..687f2d87 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/user/UserStoreImpl.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/user/infrastructure/UserStoreImpl.java @@ -1,8 +1,8 @@ -package org.haedal.zzansuni.infrastructure.user; +package org.haedal.zzansuni.user.infrastructure; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.domain.user.User; -import org.haedal.zzansuni.domain.user.UserStore; +import org.haedal.zzansuni.user.domain.User; +import org.haedal.zzansuni.user.domain.UserStore; import org.springframework.stereotype.Component; @Component diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challenge/ChallengeController.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/controller/ChallengeController.java similarity index 90% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challenge/ChallengeController.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/controller/ChallengeController.java index 3cedae95..6e598da7 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challenge/ChallengeController.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/controller/ChallengeController.java @@ -1,19 +1,19 @@ -package org.haedal.zzansuni.controller.challenge; +package org.haedal.zzansuni.userchallenge.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.haedal.zzansuni.controller.PagingRequest; -import org.haedal.zzansuni.controller.PagingResponse; -import org.haedal.zzansuni.controller.challenge.ChallengeRes.ChallengeCompleteResponse; +import org.haedal.zzansuni.common.controller.PagingRequest; +import org.haedal.zzansuni.common.controller.PagingResponse; +import org.haedal.zzansuni.userchallenge.controller.ChallengeRes.ChallengeCompleteResponse; import org.haedal.zzansuni.core.api.ApiResponse; -import org.haedal.zzansuni.domain.ImageUploader; -import org.haedal.zzansuni.domain.challengegroup.ChallengeCommand; -import org.haedal.zzansuni.domain.userchallenge.application.ChallengeRecordService; -import org.haedal.zzansuni.domain.userchallenge.application.UserChallengeModel; -import org.haedal.zzansuni.domain.userchallenge.application.UserChallengeService; +import org.haedal.zzansuni.common.domain.ImageUploader; +import org.haedal.zzansuni.challengegroup.domain.ChallengeCommand; +import org.haedal.zzansuni.userchallenge.domain.application.ChallengeRecordService; +import org.haedal.zzansuni.userchallenge.domain.application.UserChallengeModel; +import org.haedal.zzansuni.userchallenge.domain.application.UserChallengeService; import org.haedal.zzansuni.global.jwt.JwtUser; import org.springframework.data.domain.Page; import org.springframework.http.HttpStatus; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challenge/ChallengeReq.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/controller/ChallengeReq.java similarity index 87% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challenge/ChallengeReq.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/controller/ChallengeReq.java index 204a371d..ef56bf31 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challenge/ChallengeReq.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/controller/ChallengeReq.java @@ -1,7 +1,7 @@ -package org.haedal.zzansuni.controller.challenge; +package org.haedal.zzansuni.userchallenge.controller; import io.swagger.v3.oas.annotations.media.Schema; -import org.haedal.zzansuni.domain.challengegroup.ChallengeCommand; +import org.haedal.zzansuni.challengegroup.domain.ChallengeCommand; import org.springframework.web.multipart.MultipartFile; public class ChallengeReq { diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challenge/ChallengeRes.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/controller/ChallengeRes.java similarity index 91% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challenge/ChallengeRes.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/controller/ChallengeRes.java index 4d69c624..37c7236f 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challenge/ChallengeRes.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/controller/ChallengeRes.java @@ -1,10 +1,10 @@ -package org.haedal.zzansuni.controller.challenge; +package org.haedal.zzansuni.userchallenge.controller; import lombok.Builder; -import org.haedal.zzansuni.domain.challengegroup.ChallengeCategory; -import org.haedal.zzansuni.domain.challengegroup.application.ChallengeModel; -import org.haedal.zzansuni.domain.userchallenge.application.ChallengeVerificationModel; -import org.haedal.zzansuni.domain.userchallenge.application.UserChallengeModel; +import org.haedal.zzansuni.challengegroup.domain.ChallengeCategory; +import org.haedal.zzansuni.challengegroup.domain.application.ChallengeModel; +import org.haedal.zzansuni.userchallenge.domain.application.ChallengeVerificationModel; +import org.haedal.zzansuni.userchallenge.domain.application.UserChallengeModel; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challengereview/ChallengeReviewController.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/controller/ChallengeReviewController.java similarity index 89% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challengereview/ChallengeReviewController.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/controller/ChallengeReviewController.java index 97479c9f..d46dea38 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challengereview/ChallengeReviewController.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/controller/ChallengeReviewController.java @@ -1,16 +1,15 @@ -package org.haedal.zzansuni.controller.challengereview; +package org.haedal.zzansuni.userchallenge.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.controller.PagingRequest; -import org.haedal.zzansuni.controller.PagingResponse; -import org.haedal.zzansuni.controller.challenge.ChallengeReq; +import org.haedal.zzansuni.common.controller.PagingRequest; +import org.haedal.zzansuni.common.controller.PagingResponse; import org.haedal.zzansuni.core.api.ApiResponse; -import org.haedal.zzansuni.domain.userchallenge.application.ChallengeReviewModel.ChallengeReviewWithChallenge; -import org.haedal.zzansuni.domain.userchallenge.application.ChallengeReviewModel.ChallengeReviewWithUserInfo; -import org.haedal.zzansuni.domain.userchallenge.application.ChallengeReviewService; +import org.haedal.zzansuni.userchallenge.domain.application.ChallengeReviewModel.ChallengeReviewWithChallenge; +import org.haedal.zzansuni.userchallenge.domain.application.ChallengeReviewModel.ChallengeReviewWithUserInfo; +import org.haedal.zzansuni.userchallenge.domain.application.ChallengeReviewService; import org.haedal.zzansuni.global.jwt.JwtUser; import org.springframework.data.domain.Page; import org.springframework.http.HttpStatus; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challengereview/ChallengeReviewRes.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/controller/ChallengeReviewRes.java similarity index 88% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challengereview/ChallengeReviewRes.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/controller/ChallengeReviewRes.java index 1f298d06..506202c2 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/controller/challengereview/ChallengeReviewRes.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/controller/ChallengeReviewRes.java @@ -1,11 +1,11 @@ -package org.haedal.zzansuni.controller.challengereview; +package org.haedal.zzansuni.userchallenge.controller; import java.util.Map; import lombok.Builder; -import org.haedal.zzansuni.controller.user.UserRes; -import org.haedal.zzansuni.domain.userchallenge.application.ChallengeReviewModel; -import org.haedal.zzansuni.domain.userchallenge.application.ChallengeReviewModel.ChallengeReviewWithChallenge; -import org.haedal.zzansuni.domain.userchallenge.application.ChallengeReviewModel.ChallengeReviewWithUserInfo; +import org.haedal.zzansuni.user.controller.UserRes; +import org.haedal.zzansuni.userchallenge.domain.application.ChallengeReviewModel; +import org.haedal.zzansuni.userchallenge.domain.application.ChallengeReviewModel.ChallengeReviewWithChallenge; +import org.haedal.zzansuni.userchallenge.domain.application.ChallengeReviewModel.ChallengeReviewWithUserInfo; public class ChallengeReviewRes { diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/ChallengeGroupUserExp.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/ChallengeGroupUserExp.java similarity index 88% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/ChallengeGroupUserExp.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/ChallengeGroupUserExp.java index dde10417..f6ac3e3c 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/ChallengeGroupUserExp.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/ChallengeGroupUserExp.java @@ -1,9 +1,9 @@ -package org.haedal.zzansuni.domain.userchallenge; +package org.haedal.zzansuni.userchallenge.domain; import jakarta.persistence.*; import lombok.*; -import org.haedal.zzansuni.domain.challengegroup.ChallengeGroup; -import org.haedal.zzansuni.domain.user.User; +import org.haedal.zzansuni.challengegroup.domain.ChallengeGroup; +import org.haedal.zzansuni.user.domain.User; @Getter @Entity diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/ChallengeReview.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/ChallengeReview.java similarity index 87% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/ChallengeReview.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/ChallengeReview.java index 0f4a7891..49eeeca0 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/ChallengeReview.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/ChallengeReview.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.domain.userchallenge; +package org.haedal.zzansuni.userchallenge.domain; import jakarta.persistence.*; import lombok.AccessLevel; @@ -6,8 +6,8 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.haedal.zzansuni.domain.BaseTimeEntity; -import org.haedal.zzansuni.domain.challengegroup.ChallengeCommand; +import org.haedal.zzansuni.common.domain.BaseTimeEntity; +import org.haedal.zzansuni.challengegroup.domain.ChallengeCommand; @Entity @AllArgsConstructor diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/ChallengeStatus.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/ChallengeStatus.java similarity index 84% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/ChallengeStatus.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/ChallengeStatus.java index b057bb7f..e2ec7392 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/ChallengeStatus.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/ChallengeStatus.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.domain.userchallenge; +package org.haedal.zzansuni.userchallenge.domain; import lombok.RequiredArgsConstructor; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/ChallengeVerification.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/ChallengeVerification.java similarity index 85% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/ChallengeVerification.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/ChallengeVerification.java index f110d4ee..a6dccadb 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/ChallengeVerification.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/ChallengeVerification.java @@ -1,9 +1,9 @@ -package org.haedal.zzansuni.domain.userchallenge; +package org.haedal.zzansuni.userchallenge.domain; import jakarta.persistence.*; import lombok.*; -import org.haedal.zzansuni.domain.BaseTimeEntity; -import org.haedal.zzansuni.domain.challengegroup.ChallengeCommand; +import org.haedal.zzansuni.common.domain.BaseTimeEntity; +import org.haedal.zzansuni.challengegroup.domain.ChallengeCommand; @Entity @AllArgsConstructor diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/ChallengeVerificationStatus.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/ChallengeVerificationStatus.java similarity index 81% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/ChallengeVerificationStatus.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/ChallengeVerificationStatus.java index 50e5d0d6..244ed63f 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/ChallengeVerificationStatus.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/ChallengeVerificationStatus.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.domain.userchallenge; +package org.haedal.zzansuni.userchallenge.domain; import lombok.RequiredArgsConstructor; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/DayCountType.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/DayCountType.java similarity index 69% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/DayCountType.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/DayCountType.java index 898310d9..480cd431 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/DayCountType.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/DayCountType.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.domain.userchallenge; +package org.haedal.zzansuni.userchallenge.domain; import java.time.LocalDate; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/UserChallenge.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/UserChallenge.java similarity index 90% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/UserChallenge.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/UserChallenge.java index 2c5edb65..e34f4e34 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/UserChallenge.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/UserChallenge.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.domain.userchallenge; +package org.haedal.zzansuni.userchallenge.domain; import jakarta.persistence.*; import lombok.AccessLevel; @@ -6,10 +6,11 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.haedal.zzansuni.domain.BaseTimeEntity; -import org.haedal.zzansuni.domain.challengegroup.Challenge; -import org.haedal.zzansuni.domain.challengegroup.ChallengeCommand; -import org.haedal.zzansuni.domain.user.User; +import org.haedal.zzansuni.common.domain.BaseTimeEntity; +import org.haedal.zzansuni.challengegroup.domain.Challenge; +import org.haedal.zzansuni.challengegroup.domain.ChallengeCommand; +import org.haedal.zzansuni.user.domain.User; +import org.haedal.zzansuni.userchallenge.domain.application.AddUserExpByVerificationEvent; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/AddUserExpByVerificationEvent.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/AddUserExpByVerificationEvent.java similarity index 79% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/AddUserExpByVerificationEvent.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/AddUserExpByVerificationEvent.java index 9ecdcfca..7a905d68 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/AddUserExpByVerificationEvent.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/AddUserExpByVerificationEvent.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.domain.userchallenge; +package org.haedal.zzansuni.userchallenge.domain.application; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/AddUserExpByVerificationUseCase.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/AddUserExpByVerificationUseCase.java similarity index 68% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/AddUserExpByVerificationUseCase.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/AddUserExpByVerificationUseCase.java index 5870d9b7..c70b89e6 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/AddUserExpByVerificationUseCase.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/AddUserExpByVerificationUseCase.java @@ -1,10 +1,8 @@ -package org.haedal.zzansuni.domain.userchallenge.application; +package org.haedal.zzansuni.userchallenge.domain.application; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.domain.challengegroup.port.ChallengeGroupReader; -import org.haedal.zzansuni.domain.userchallenge.AddUserExpByVerificationEvent; -import org.haedal.zzansuni.domain.userchallenge.ChallengeGroupUserExp; -import org.haedal.zzansuni.domain.userchallenge.port.ChallengeGroupUserExpReader; +import org.haedal.zzansuni.userchallenge.domain.port.ChallengeGroupUserExpReader; +import org.haedal.zzansuni.userchallenge.domain.ChallengeGroupUserExp; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/ChallengeGroupRankingModel.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/ChallengeGroupRankingModel.java similarity index 77% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/ChallengeGroupRankingModel.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/ChallengeGroupRankingModel.java index 19b2a686..aba00711 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/ChallengeGroupRankingModel.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/ChallengeGroupRankingModel.java @@ -1,8 +1,8 @@ -package org.haedal.zzansuni.domain.userchallenge.application; +package org.haedal.zzansuni.userchallenge.domain.application; import lombok.Builder; -import org.haedal.zzansuni.domain.user.UserModel; -import org.haedal.zzansuni.domain.userchallenge.ChallengeGroupUserExp; +import org.haedal.zzansuni.user.domain.UserModel; +import org.haedal.zzansuni.userchallenge.domain.ChallengeGroupUserExp; public class ChallengeGroupRankingModel { @Builder diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/ChallengeRankingService.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/ChallengeRankingService.java similarity index 85% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/ChallengeRankingService.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/ChallengeRankingService.java index f90dcc59..2e745a61 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/ChallengeRankingService.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/ChallengeRankingService.java @@ -1,9 +1,9 @@ -package org.haedal.zzansuni.domain.userchallenge.application; +package org.haedal.zzansuni.userchallenge.domain.application; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.domain.challengegroup.port.ChallengeGroupReader; -import org.haedal.zzansuni.domain.userchallenge.ChallengeGroupUserExp; -import org.haedal.zzansuni.domain.userchallenge.port.ChallengeGroupUserExpReader; +import org.haedal.zzansuni.challengegroup.domain.port.ChallengeGroupReader; +import org.haedal.zzansuni.userchallenge.domain.port.ChallengeGroupUserExpReader; +import org.haedal.zzansuni.userchallenge.domain.ChallengeGroupUserExp; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/ChallengeRecordService.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/ChallengeRecordService.java similarity index 77% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/ChallengeRecordService.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/ChallengeRecordService.java index 472d8793..c83f4777 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/ChallengeRecordService.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/ChallengeRecordService.java @@ -1,13 +1,13 @@ -package org.haedal.zzansuni.domain.userchallenge.application; +package org.haedal.zzansuni.userchallenge.domain.application; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.haedal.zzansuni.domain.challengegroup.Challenge; -import org.haedal.zzansuni.domain.challengegroup.port.ChallengeReader; -import org.haedal.zzansuni.domain.userchallenge.ChallengeVerification; -import org.haedal.zzansuni.domain.userchallenge.UserChallenge; -import org.haedal.zzansuni.domain.userchallenge.port.ChallengeVerificationReader; -import org.haedal.zzansuni.domain.userchallenge.port.UserChallengeReader; +import org.haedal.zzansuni.challengegroup.domain.Challenge; +import org.haedal.zzansuni.challengegroup.domain.port.ChallengeReader; +import org.haedal.zzansuni.userchallenge.domain.port.ChallengeVerificationReader; +import org.haedal.zzansuni.userchallenge.domain.port.UserChallengeReader; +import org.haedal.zzansuni.userchallenge.domain.ChallengeVerification; +import org.haedal.zzansuni.userchallenge.domain.UserChallenge; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/ChallengeReviewModel.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/ChallengeReviewModel.java similarity index 89% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/ChallengeReviewModel.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/ChallengeReviewModel.java index f5b3e1d3..6460a4e4 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/ChallengeReviewModel.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/ChallengeReviewModel.java @@ -1,14 +1,14 @@ -package org.haedal.zzansuni.domain.userchallenge.application; +package org.haedal.zzansuni.userchallenge.domain.application; import java.util.HashMap; import java.util.List; import java.util.Map; import lombok.Builder; -import org.haedal.zzansuni.domain.challengegroup.ChallengeGroup; -import org.haedal.zzansuni.domain.challengegroup.Challenge; -import org.haedal.zzansuni.domain.user.UserModel; -import org.haedal.zzansuni.domain.userchallenge.UserChallenge; -import org.haedal.zzansuni.domain.userchallenge.ChallengeReview; +import org.haedal.zzansuni.challengegroup.domain.ChallengeGroup; +import org.haedal.zzansuni.challengegroup.domain.Challenge; +import org.haedal.zzansuni.user.domain.UserModel; +import org.haedal.zzansuni.userchallenge.domain.ChallengeReview; +import org.haedal.zzansuni.userchallenge.domain.UserChallenge; public class ChallengeReviewModel { diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/ChallengeReviewService.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/ChallengeReviewService.java similarity index 86% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/ChallengeReviewService.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/ChallengeReviewService.java index 040da4ec..5c37270e 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/ChallengeReviewService.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/ChallengeReviewService.java @@ -1,13 +1,13 @@ -package org.haedal.zzansuni.domain.userchallenge.application; +package org.haedal.zzansuni.userchallenge.domain.application; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.haedal.zzansuni.domain.challengegroup.ChallengeCommand; -import org.haedal.zzansuni.domain.userchallenge.ChallengeReview; -import org.haedal.zzansuni.domain.userchallenge.UserChallenge; -import org.haedal.zzansuni.domain.userchallenge.port.ChallengeReviewReader; -import org.haedal.zzansuni.domain.userchallenge.port.ChallengeReviewStore; -import org.haedal.zzansuni.domain.userchallenge.port.UserChallengeReader; +import org.haedal.zzansuni.challengegroup.domain.ChallengeCommand; +import org.haedal.zzansuni.userchallenge.domain.port.ChallengeReviewReader; +import org.haedal.zzansuni.userchallenge.domain.port.ChallengeReviewStore; +import org.haedal.zzansuni.userchallenge.domain.port.UserChallengeReader; +import org.haedal.zzansuni.userchallenge.domain.ChallengeReview; +import org.haedal.zzansuni.userchallenge.domain.UserChallenge; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/ChallengeVerificationModel.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/ChallengeVerificationModel.java similarity index 84% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/ChallengeVerificationModel.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/ChallengeVerificationModel.java index 52d14040..a7d780fe 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/ChallengeVerificationModel.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/ChallengeVerificationModel.java @@ -1,9 +1,9 @@ -package org.haedal.zzansuni.domain.userchallenge.application; +package org.haedal.zzansuni.userchallenge.domain.application; import java.time.LocalDateTime; import lombok.Builder; import lombok.Getter; -import org.haedal.zzansuni.domain.userchallenge.ChallengeVerification; +import org.haedal.zzansuni.userchallenge.domain.ChallengeVerification; @Getter @Builder diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/UserChallengeModel.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/UserChallengeModel.java similarity index 89% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/UserChallengeModel.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/UserChallengeModel.java index 6889adbf..3f877c22 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/UserChallengeModel.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/UserChallengeModel.java @@ -1,11 +1,11 @@ -package org.haedal.zzansuni.domain.userchallenge.application; +package org.haedal.zzansuni.userchallenge.domain.application; import lombok.Builder; -import org.haedal.zzansuni.domain.challengegroup.Challenge; -import org.haedal.zzansuni.domain.challengegroup.ChallengeCategory; -import org.haedal.zzansuni.domain.challengegroup.ChallengeGroup; -import org.haedal.zzansuni.domain.userchallenge.ChallengeVerification; -import org.haedal.zzansuni.domain.userchallenge.UserChallenge; +import org.haedal.zzansuni.challengegroup.domain.Challenge; +import org.haedal.zzansuni.challengegroup.domain.ChallengeCategory; +import org.haedal.zzansuni.challengegroup.domain.ChallengeGroup; +import org.haedal.zzansuni.userchallenge.domain.ChallengeVerification; +import org.haedal.zzansuni.userchallenge.domain.UserChallenge; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/UserChallengeService.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/UserChallengeService.java similarity index 84% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/UserChallengeService.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/UserChallengeService.java index f4422335..26ae219b 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/application/UserChallengeService.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/UserChallengeService.java @@ -1,22 +1,21 @@ -package org.haedal.zzansuni.domain.userchallenge.application; +package org.haedal.zzansuni.userchallenge.domain.application; import java.util.List; import java.util.Map; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.haedal.zzansuni.domain.userchallenge.AddUserExpByVerificationEvent; -import org.haedal.zzansuni.domain.userchallenge.UserChallenge; -import org.haedal.zzansuni.domain.userchallenge.port.UserChallengeReader; -import org.haedal.zzansuni.domain.userchallenge.port.UserChallengeStore; -import org.haedal.zzansuni.domain.userchallenge.ChallengeGroupUserExp; -import org.haedal.zzansuni.domain.userchallenge.port.ChallengeGroupUserExpStore; -import org.haedal.zzansuni.domain.challengegroup.Challenge; -import org.haedal.zzansuni.domain.challengegroup.ChallengeCommand; -import org.haedal.zzansuni.domain.challengegroup.application.ChallengeModel; -import org.haedal.zzansuni.domain.challengegroup.port.ChallengeReader; -import org.haedal.zzansuni.domain.userchallenge.port.ChallengeReviewReader; -import org.haedal.zzansuni.domain.user.User; -import org.haedal.zzansuni.domain.user.UserReader; +import org.haedal.zzansuni.userchallenge.domain.port.UserChallengeReader; +import org.haedal.zzansuni.userchallenge.domain.port.UserChallengeStore; +import org.haedal.zzansuni.userchallenge.domain.port.ChallengeGroupUserExpStore; +import org.haedal.zzansuni.challengegroup.domain.Challenge; +import org.haedal.zzansuni.challengegroup.domain.ChallengeCommand; +import org.haedal.zzansuni.challengegroup.domain.application.ChallengeModel; +import org.haedal.zzansuni.challengegroup.domain.port.ChallengeReader; +import org.haedal.zzansuni.userchallenge.domain.port.ChallengeReviewReader; +import org.haedal.zzansuni.user.domain.User; +import org.haedal.zzansuni.user.domain.UserReader; +import org.haedal.zzansuni.userchallenge.domain.ChallengeGroupUserExp; +import org.haedal.zzansuni.userchallenge.domain.UserChallenge; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/port/ChallengeGroupUserExpReader.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeGroupUserExpReader.java similarity index 77% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/port/ChallengeGroupUserExpReader.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeGroupUserExpReader.java index d3434a27..48ae6bc2 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/port/ChallengeGroupUserExpReader.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeGroupUserExpReader.java @@ -1,6 +1,6 @@ -package org.haedal.zzansuni.domain.userchallenge.port; +package org.haedal.zzansuni.userchallenge.domain.port; -import org.haedal.zzansuni.domain.userchallenge.ChallengeGroupUserExp; +import org.haedal.zzansuni.userchallenge.domain.ChallengeGroupUserExp; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/port/ChallengeGroupUserExpStore.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeGroupUserExpStore.java similarity index 53% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/port/ChallengeGroupUserExpStore.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeGroupUserExpStore.java index 03cfc933..d1d17449 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/port/ChallengeGroupUserExpStore.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeGroupUserExpStore.java @@ -1,6 +1,6 @@ -package org.haedal.zzansuni.domain.userchallenge.port; +package org.haedal.zzansuni.userchallenge.domain.port; -import org.haedal.zzansuni.domain.userchallenge.ChallengeGroupUserExp; +import org.haedal.zzansuni.userchallenge.domain.ChallengeGroupUserExp; public interface ChallengeGroupUserExpStore { ChallengeGroupUserExp store(ChallengeGroupUserExp challengeGroupUserExp); diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/port/ChallengeReviewReader.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeReviewReader.java similarity index 85% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/port/ChallengeReviewReader.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeReviewReader.java index 1ea38dd7..de90e0e1 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/port/ChallengeReviewReader.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeReviewReader.java @@ -1,10 +1,10 @@ -package org.haedal.zzansuni.domain.userchallenge.port; +package org.haedal.zzansuni.userchallenge.domain.port; import java.util.List; import java.util.Map; import java.util.Optional; -import org.haedal.zzansuni.domain.userchallenge.ChallengeReview; +import org.haedal.zzansuni.userchallenge.domain.ChallengeReview; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeReviewStore.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeReviewStore.java new file mode 100644 index 00000000..c766ddcf --- /dev/null +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeReviewStore.java @@ -0,0 +1,9 @@ +package org.haedal.zzansuni.userchallenge.domain.port; + +import org.haedal.zzansuni.userchallenge.domain.ChallengeReview; + +public interface ChallengeReviewStore { + + ChallengeReview store(ChallengeReview challengeReview); + +} diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/port/ChallengeVerificationReader.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeVerificationReader.java similarity index 78% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/port/ChallengeVerificationReader.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeVerificationReader.java index eef54de9..2fd93872 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/port/ChallengeVerificationReader.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeVerificationReader.java @@ -1,6 +1,6 @@ -package org.haedal.zzansuni.domain.userchallenge.port; +package org.haedal.zzansuni.userchallenge.domain.port; -import org.haedal.zzansuni.domain.userchallenge.ChallengeVerification; +import org.haedal.zzansuni.userchallenge.domain.ChallengeVerification; import java.util.List; import java.util.Optional; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/port/UserChallengeReader.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/UserChallengeReader.java similarity index 83% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/port/UserChallengeReader.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/UserChallengeReader.java index 9521fcea..f30ef62c 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/domain/userchallenge/port/UserChallengeReader.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/UserChallengeReader.java @@ -1,11 +1,11 @@ -package org.haedal.zzansuni.domain.userchallenge.port; +package org.haedal.zzansuni.userchallenge.domain.port; import java.time.LocalDate; import java.util.List; import java.util.Optional; -import org.haedal.zzansuni.domain.userchallenge.DayCountType; -import org.haedal.zzansuni.domain.userchallenge.UserChallenge; +import org.haedal.zzansuni.userchallenge.domain.DayCountType; +import org.haedal.zzansuni.userchallenge.domain.UserChallenge; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/UserChallengeStore.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/UserChallengeStore.java new file mode 100644 index 00000000..c7bc0356 --- /dev/null +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/UserChallengeStore.java @@ -0,0 +1,8 @@ +package org.haedal.zzansuni.userchallenge.domain.port; + +import org.haedal.zzansuni.userchallenge.domain.UserChallenge; + +public interface UserChallengeStore { + + UserChallenge store(UserChallenge userChallenge); +} diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/ChallengeGroupUserExpRepository.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/ChallengeGroupUserExpRepository.java similarity index 58% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/ChallengeGroupUserExpRepository.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/ChallengeGroupUserExpRepository.java index ee8b4c62..9faaf153 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/ChallengeGroupUserExpRepository.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/ChallengeGroupUserExpRepository.java @@ -1,6 +1,6 @@ -package org.haedal.zzansuni.infrastructure.userchallenge; +package org.haedal.zzansuni.userchallenge.infrastructure; -import org.haedal.zzansuni.domain.userchallenge.ChallengeGroupUserExp; +import org.haedal.zzansuni.userchallenge.domain.ChallengeGroupUserExp; import org.springframework.data.jpa.repository.JpaRepository; public interface ChallengeGroupUserExpRepository extends JpaRepository { diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/ChallengeReviewRepository.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/ChallengeReviewRepository.java similarity index 74% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/ChallengeReviewRepository.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/ChallengeReviewRepository.java index 4ca1ac29..ba4d63d6 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/ChallengeReviewRepository.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/ChallengeReviewRepository.java @@ -1,9 +1,10 @@ -package org.haedal.zzansuni.infrastructure.userchallenge; +package org.haedal.zzansuni.userchallenge.infrastructure; + +import org.haedal.zzansuni.userchallenge.domain.ChallengeReview; +import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; import java.util.Optional; -import org.haedal.zzansuni.domain.userchallenge.ChallengeReview; -import org.springframework.data.jpa.repository.JpaRepository; public interface ChallengeReviewRepository extends JpaRepository { diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/ChallengeVerificationRepository.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/ChallengeVerificationRepository.java similarity index 80% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/ChallengeVerificationRepository.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/ChallengeVerificationRepository.java index e8dfb6b7..0a8fe236 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/ChallengeVerificationRepository.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/ChallengeVerificationRepository.java @@ -1,7 +1,7 @@ -package org.haedal.zzansuni.infrastructure.userchallenge; +package org.haedal.zzansuni.userchallenge.infrastructure; import java.util.List; -import org.haedal.zzansuni.domain.userchallenge.ChallengeVerification; +import org.haedal.zzansuni.userchallenge.domain.ChallengeVerification; import org.springframework.data.jpa.repository.JpaRepository; public interface ChallengeVerificationRepository extends diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/UserChallengeRepository.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/UserChallengeRepository.java similarity index 93% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/UserChallengeRepository.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/UserChallengeRepository.java index 9e84ba7d..e9580211 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/UserChallengeRepository.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/UserChallengeRepository.java @@ -1,12 +1,12 @@ -package org.haedal.zzansuni.infrastructure.userchallenge; +package org.haedal.zzansuni.userchallenge.infrastructure; import java.time.LocalDate; import java.util.List; import java.util.Optional; -import org.haedal.zzansuni.domain.userchallenge.DayCountType; -import org.haedal.zzansuni.domain.userchallenge.UserChallenge; +import org.haedal.zzansuni.userchallenge.domain.DayCountType; +import org.haedal.zzansuni.userchallenge.domain.UserChallenge; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/adapter/ChallengeGroupUserExpReaderStoreImpl.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/adapter/ChallengeGroupUserExpReaderStoreImpl.java similarity index 85% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/adapter/ChallengeGroupUserExpReaderStoreImpl.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/adapter/ChallengeGroupUserExpReaderStoreImpl.java index 9a3eb0d6..a59b40ac 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/adapter/ChallengeGroupUserExpReaderStoreImpl.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/adapter/ChallengeGroupUserExpReaderStoreImpl.java @@ -1,11 +1,11 @@ -package org.haedal.zzansuni.infrastructure.userchallenge.adapter; +package org.haedal.zzansuni.userchallenge.infrastructure.adapter; import com.querydsl.jpa.JPQLQueryFactory; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.domain.userchallenge.ChallengeGroupUserExp; -import org.haedal.zzansuni.domain.userchallenge.port.ChallengeGroupUserExpReader; -import org.haedal.zzansuni.domain.userchallenge.port.ChallengeGroupUserExpStore; -import org.haedal.zzansuni.infrastructure.userchallenge.ChallengeGroupUserExpRepository; +import org.haedal.zzansuni.userchallenge.domain.ChallengeGroupUserExp; +import org.haedal.zzansuni.userchallenge.domain.port.ChallengeGroupUserExpReader; +import org.haedal.zzansuni.userchallenge.domain.port.ChallengeGroupUserExpStore; +import org.haedal.zzansuni.userchallenge.infrastructure.ChallengeGroupUserExpRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; @@ -14,7 +14,7 @@ import java.util.List; import java.util.Optional; -import static org.haedal.zzansuni.domain.userchallenge.QChallengeGroupUserExp.challengeGroupUserExp; +import static org.haedal.zzansuni.userchallenge.domain.QChallengeGroupUserExp.challengeGroupUserExp; @Component @RequiredArgsConstructor diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/adapter/ChallengeReviewReaderImpl.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/adapter/ChallengeReviewReaderImpl.java similarity index 93% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/adapter/ChallengeReviewReaderImpl.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/adapter/ChallengeReviewReaderImpl.java index 213c9e15..26c5b6bd 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/adapter/ChallengeReviewReaderImpl.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/adapter/ChallengeReviewReaderImpl.java @@ -1,10 +1,10 @@ -package org.haedal.zzansuni.infrastructure.userchallenge.adapter; +package org.haedal.zzansuni.userchallenge.infrastructure.adapter; import com.querydsl.jpa.impl.JPAQueryFactory; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.domain.userchallenge.ChallengeReview; -import org.haedal.zzansuni.domain.userchallenge.port.ChallengeReviewReader; -import org.haedal.zzansuni.infrastructure.userchallenge.ChallengeReviewRepository; +import org.haedal.zzansuni.userchallenge.domain.port.ChallengeReviewReader; +import org.haedal.zzansuni.userchallenge.domain.ChallengeReview; +import org.haedal.zzansuni.userchallenge.infrastructure.ChallengeReviewRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; @@ -12,7 +12,7 @@ import java.util.*; -import static org.haedal.zzansuni.domain.userchallenge.QChallengeReview.challengeReview; +import static org.haedal.zzansuni.userchallenge.domain.QChallengeReview.challengeReview; @Component diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/adapter/ChallengeReviewStoreImpl.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/adapter/ChallengeReviewStoreImpl.java similarity index 64% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/adapter/ChallengeReviewStoreImpl.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/adapter/ChallengeReviewStoreImpl.java index 5013384b..bbbe4fbf 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/adapter/ChallengeReviewStoreImpl.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/adapter/ChallengeReviewStoreImpl.java @@ -1,9 +1,9 @@ -package org.haedal.zzansuni.infrastructure.userchallenge.adapter; +package org.haedal.zzansuni.userchallenge.infrastructure.adapter; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.domain.userchallenge.ChallengeReview; -import org.haedal.zzansuni.domain.userchallenge.port.ChallengeReviewStore; -import org.haedal.zzansuni.infrastructure.userchallenge.ChallengeReviewRepository; +import org.haedal.zzansuni.userchallenge.domain.ChallengeReview; +import org.haedal.zzansuni.userchallenge.domain.port.ChallengeReviewStore; +import org.haedal.zzansuni.userchallenge.infrastructure.ChallengeReviewRepository; import org.springframework.stereotype.Component; @Component diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/adapter/ChallengeVerificationReaderImpl.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/adapter/ChallengeVerificationReaderImpl.java similarity index 82% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/adapter/ChallengeVerificationReaderImpl.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/adapter/ChallengeVerificationReaderImpl.java index a58bb4a8..5406b95b 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/adapter/ChallengeVerificationReaderImpl.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/adapter/ChallengeVerificationReaderImpl.java @@ -1,12 +1,12 @@ -package org.haedal.zzansuni.infrastructure.userchallenge.adapter; +package org.haedal.zzansuni.userchallenge.infrastructure.adapter; import java.util.List; import java.util.NoSuchElementException; import java.util.Optional; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.domain.userchallenge.ChallengeVerification; -import org.haedal.zzansuni.domain.userchallenge.port.ChallengeVerificationReader; -import org.haedal.zzansuni.infrastructure.userchallenge.ChallengeVerificationRepository; +import org.haedal.zzansuni.userchallenge.domain.ChallengeVerification; +import org.haedal.zzansuni.userchallenge.domain.port.ChallengeVerificationReader; +import org.haedal.zzansuni.userchallenge.infrastructure.ChallengeVerificationRepository; import org.springframework.stereotype.Component; @Component diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/adapter/UserChallengeReaderImpl.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/adapter/UserChallengeReaderImpl.java similarity index 92% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/adapter/UserChallengeReaderImpl.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/adapter/UserChallengeReaderImpl.java index 886ccefa..b407bb12 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/adapter/UserChallengeReaderImpl.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/adapter/UserChallengeReaderImpl.java @@ -1,13 +1,13 @@ -package org.haedal.zzansuni.infrastructure.userchallenge.adapter; +package org.haedal.zzansuni.userchallenge.infrastructure.adapter; import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.jpa.impl.JPAQueryFactory; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.domain.userchallenge.ChallengeStatus; -import org.haedal.zzansuni.domain.userchallenge.DayCountType; -import org.haedal.zzansuni.domain.userchallenge.UserChallenge; -import org.haedal.zzansuni.domain.userchallenge.port.UserChallengeReader; -import org.haedal.zzansuni.infrastructure.userchallenge.UserChallengeRepository; +import org.haedal.zzansuni.userchallenge.domain.ChallengeStatus; +import org.haedal.zzansuni.userchallenge.domain.DayCountType; +import org.haedal.zzansuni.userchallenge.domain.UserChallenge; +import org.haedal.zzansuni.userchallenge.domain.port.UserChallengeReader; +import org.haedal.zzansuni.userchallenge.infrastructure.UserChallengeRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; @@ -18,7 +18,7 @@ import java.util.NoSuchElementException; import java.util.Optional; -import static org.haedal.zzansuni.domain.userchallenge.QUserChallenge.userChallenge; +import static org.haedal.zzansuni.userchallenge.domain.QUserChallenge.userChallenge; @Component @RequiredArgsConstructor diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/adapter/UserChallengeStoreImpl.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/adapter/UserChallengeStoreImpl.java similarity index 63% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/adapter/UserChallengeStoreImpl.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/adapter/UserChallengeStoreImpl.java index 632557f4..f4c34659 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/infrastructure/userchallenge/adapter/UserChallengeStoreImpl.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/adapter/UserChallengeStoreImpl.java @@ -1,9 +1,9 @@ -package org.haedal.zzansuni.infrastructure.userchallenge.adapter; +package org.haedal.zzansuni.userchallenge.infrastructure.adapter; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.domain.userchallenge.UserChallenge; -import org.haedal.zzansuni.domain.userchallenge.port.UserChallengeStore; -import org.haedal.zzansuni.infrastructure.userchallenge.UserChallengeRepository; +import org.haedal.zzansuni.userchallenge.domain.UserChallenge; +import org.haedal.zzansuni.userchallenge.domain.port.UserChallengeStore; +import org.haedal.zzansuni.userchallenge.infrastructure.UserChallengeRepository; import org.springframework.stereotype.Component; @Component diff --git a/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/domain/auth/AuthServiceTest.java b/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/auth/domain/AuthServiceTest.java similarity index 93% rename from zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/domain/auth/AuthServiceTest.java rename to zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/auth/domain/AuthServiceTest.java index 88d40749..949e08bc 100644 --- a/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/domain/auth/AuthServiceTest.java +++ b/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/auth/domain/AuthServiceTest.java @@ -1,10 +1,10 @@ -package org.haedal.zzansuni.domain.auth; +package org.haedal.zzansuni.auth.domain; import jakarta.persistence.EntityManager; -import org.haedal.zzansuni.domain.user.User; -import org.haedal.zzansuni.domain.user.UserModel; +import org.haedal.zzansuni.user.domain.User; +import org.haedal.zzansuni.user.domain.UserModel; import org.haedal.zzansuni.global.jwt.JwtToken; -import org.haedal.zzansuni.infrastructure.user.UserRepository; +import org.haedal.zzansuni.user.infrastructure.UserRepository; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/domain/challengegroup/ChallengeGroupQueryServiceTest.java b/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/challengegroup/domain/application/ChallengeGroupQueryServiceTest.java similarity index 90% rename from zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/domain/challengegroup/ChallengeGroupQueryServiceTest.java rename to zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/challengegroup/domain/application/ChallengeGroupQueryServiceTest.java index 695b984f..f0422ec1 100644 --- a/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/domain/challengegroup/ChallengeGroupQueryServiceTest.java +++ b/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/challengegroup/domain/application/ChallengeGroupQueryServiceTest.java @@ -1,11 +1,10 @@ -package org.haedal.zzansuni.domain.challengegroup; +package org.haedal.zzansuni.challengegroup.domain.application; import jakarta.persistence.EntityManager; -import org.haedal.zzansuni.domain.challengegroup.application.ChallengeGroupModel; -import org.haedal.zzansuni.domain.challengegroup.application.ChallengeGroupQueryService; -import org.haedal.zzansuni.infrastructure.challengegroup.ChallengeGroupImageRepository; -import org.haedal.zzansuni.infrastructure.challengegroup.ChallengeGroupRepository; -import org.haedal.zzansuni.infrastructure.challengegroup.ChallengeRepository; +import org.haedal.zzansuni.challengegroup.domain.*; +import org.haedal.zzansuni.challengegroup.infrastructure.ChallengeGroupImageRepository; +import org.haedal.zzansuni.challengegroup.infrastructure.ChallengeGroupRepository; +import org.haedal.zzansuni.challengegroup.infrastructure.ChallengeRepository; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/domain/challengegroup/ChallengeGroupServiceTest.java b/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/challengegroup/domain/application/ChallengeGroupServiceTest.java similarity index 93% rename from zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/domain/challengegroup/ChallengeGroupServiceTest.java rename to zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/challengegroup/domain/application/ChallengeGroupServiceTest.java index ff0b0e28..9a0ac093 100644 --- a/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/domain/challengegroup/ChallengeGroupServiceTest.java +++ b/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/challengegroup/domain/application/ChallengeGroupServiceTest.java @@ -1,8 +1,8 @@ -package org.haedal.zzansuni.domain.challengegroup; +package org.haedal.zzansuni.challengegroup.domain.application; -import org.haedal.zzansuni.domain.challengegroup.application.ChallengeGroupService; -import org.haedal.zzansuni.infrastructure.challengegroup.ChallengeGroupRepository; -import org.haedal.zzansuni.infrastructure.challengegroup.ChallengeRepository; +import org.haedal.zzansuni.challengegroup.domain.*; +import org.haedal.zzansuni.challengegroup.infrastructure.ChallengeGroupRepository; +import org.haedal.zzansuni.challengegroup.infrastructure.ChallengeRepository; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/domain/user/UserServiceTest.java b/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/user/domain/UserServiceTest.java similarity index 97% rename from zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/domain/user/UserServiceTest.java rename to zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/user/domain/UserServiceTest.java index dfe52b3c..e3845e25 100644 --- a/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/domain/user/UserServiceTest.java +++ b/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/user/domain/UserServiceTest.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.domain.user; +package org.haedal.zzansuni.user.domain; import org.haedal.zzansuni.global.security.Role; import org.junit.jupiter.api.DisplayName; @@ -7,7 +7,6 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; diff --git a/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/domain/challengegroup/challenge/RecordServiceTest.java b/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/userchallenge/domain/application/RecordServiceTest.java similarity index 92% rename from zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/domain/challengegroup/challenge/RecordServiceTest.java rename to zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/userchallenge/domain/application/RecordServiceTest.java index af350c01..33c24ba4 100644 --- a/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/domain/challengegroup/challenge/RecordServiceTest.java +++ b/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/userchallenge/domain/application/RecordServiceTest.java @@ -1,16 +1,15 @@ -package org.haedal.zzansuni.domain.challengegroup.challenge; +package org.haedal.zzansuni.userchallenge.domain.application; import java.time.LocalDate; -import org.haedal.zzansuni.domain.challengegroup.*; -import org.haedal.zzansuni.domain.userchallenge.*; -import org.haedal.zzansuni.domain.userchallenge.application.*; -import org.haedal.zzansuni.domain.challengegroup.port.ChallengeReader; -import org.haedal.zzansuni.domain.userchallenge.port.ChallengeReviewReader; -import org.haedal.zzansuni.domain.userchallenge.port.ChallengeReviewStore; -import org.haedal.zzansuni.domain.userchallenge.port.UserChallengeReader; -import org.haedal.zzansuni.domain.userchallenge.port.ChallengeVerificationReader; -import org.haedal.zzansuni.domain.user.User; +import org.haedal.zzansuni.challengegroup.domain.*; +import org.haedal.zzansuni.challengegroup.domain.port.ChallengeReader; +import org.haedal.zzansuni.userchallenge.domain.*; +import org.haedal.zzansuni.userchallenge.domain.port.ChallengeReviewReader; +import org.haedal.zzansuni.userchallenge.domain.port.ChallengeReviewStore; +import org.haedal.zzansuni.userchallenge.domain.port.ChallengeVerificationReader; +import org.haedal.zzansuni.userchallenge.domain.port.UserChallengeReader; +import org.haedal.zzansuni.user.domain.User; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/domain/challengegroup/userchallenge/UserRecordServiceTest.java b/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/userchallenge/domain/application/UserRecordServiceTest.java similarity index 87% rename from zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/domain/challengegroup/userchallenge/UserRecordServiceTest.java rename to zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/userchallenge/domain/application/UserRecordServiceTest.java index 603b2149..b711d252 100644 --- a/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/domain/challengegroup/userchallenge/UserRecordServiceTest.java +++ b/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/userchallenge/domain/application/UserRecordServiceTest.java @@ -1,24 +1,19 @@ -package org.haedal.zzansuni.domain.challengegroup.userchallenge; +package org.haedal.zzansuni.userchallenge.domain.application; -import java.util.ArrayList; - -import org.haedal.zzansuni.domain.challengegroup.*; -import org.haedal.zzansuni.domain.challengegroup.application.ChallengeModel; -import org.haedal.zzansuni.domain.challengegroup.port.ChallengeGroupReader; -import org.haedal.zzansuni.domain.challengegroup.port.ChallengeReader; -import org.haedal.zzansuni.domain.userchallenge.application.AddUserExpByVerificationUseCase; -import org.haedal.zzansuni.domain.userchallenge.ChallengeStatus; -import org.haedal.zzansuni.domain.userchallenge.application.UserChallengeModel; -import org.haedal.zzansuni.domain.userchallenge.port.ChallengeReviewReader; -import org.haedal.zzansuni.domain.userchallenge.UserChallenge; -import org.haedal.zzansuni.domain.userchallenge.port.UserChallengeReader; -import org.haedal.zzansuni.domain.userchallenge.application.UserChallengeService; -import org.haedal.zzansuni.domain.userchallenge.port.UserChallengeStore; -import org.haedal.zzansuni.domain.userchallenge.port.ChallengeGroupUserExpStore; -import org.haedal.zzansuni.domain.userchallenge.ChallengeGroupUserExp; -import org.haedal.zzansuni.domain.user.User; -import org.haedal.zzansuni.domain.user.UserReader; +import org.haedal.zzansuni.challengegroup.domain.*; +import org.haedal.zzansuni.challengegroup.domain.application.ChallengeModel; +import org.haedal.zzansuni.challengegroup.domain.port.ChallengeGroupReader; +import org.haedal.zzansuni.challengegroup.domain.port.ChallengeReader; import org.haedal.zzansuni.global.security.Role; +import org.haedal.zzansuni.user.domain.User; +import org.haedal.zzansuni.user.domain.UserReader; +import org.haedal.zzansuni.userchallenge.domain.ChallengeGroupUserExp; +import org.haedal.zzansuni.userchallenge.domain.ChallengeStatus; +import org.haedal.zzansuni.userchallenge.domain.UserChallenge; +import org.haedal.zzansuni.userchallenge.domain.port.ChallengeGroupUserExpStore; +import org.haedal.zzansuni.userchallenge.domain.port.ChallengeReviewReader; +import org.haedal.zzansuni.userchallenge.domain.port.UserChallengeReader; +import org.haedal.zzansuni.userchallenge.domain.port.UserChallengeStore; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -31,6 +26,7 @@ import org.springframework.data.domain.Pageable; import java.time.LocalDate; +import java.util.ArrayList; import java.util.Collections; import java.util.Optional; From 9c6d0ed96c4f4b3f772f6504a3f05cc718b42a91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=86=90=ED=99=8D=EC=84=9D?= <78216059+bayy1216@users.noreply.github.com> Date: Sun, 1 Sep 2024 17:56:58 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[Feat]:=20=EC=B1=8C=EB=A6=B0=EC=A7=80=20?= =?UTF-8?q?=EB=A6=AC=EB=B7=B0=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EB=B6=84?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ChallengeReviewController.java | 9 +++++---- .../controller/ChallengeReviewRes.java | 8 ++++---- .../domain/ChallengeReview.java | 3 ++- .../domain}/ChallengeReviewModel.java | 3 +-- .../domain}/ChallengeReviewReader.java | 4 ++-- .../domain}/ChallengeReviewService.java | 5 +---- .../challengereview/domain/ChallengeReviewStore.java | 8 ++++++++ .../infrastructure}/ChallengeReviewReaderImpl.java | 9 ++++----- .../infrastructure/ChallengeReviewRepository.java | 4 ++-- .../infrastructure}/ChallengeReviewStoreImpl.java | 7 +++---- .../domain/application/UserChallengeService.java | 2 +- .../userchallenge/domain/port/ChallengeReviewStore.java | 9 --------- .../domain/application/RecordServiceTest.java | 7 +++++-- .../domain/application/UserRecordServiceTest.java | 2 +- 14 files changed, 39 insertions(+), 41 deletions(-) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{userchallenge => challengereview}/controller/ChallengeReviewController.java (90%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{userchallenge => challengereview}/controller/ChallengeReviewRes.java (86%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{userchallenge => challengereview}/domain/ChallengeReview.java (92%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{userchallenge/domain/application => challengereview/domain}/ChallengeReviewModel.java (96%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{userchallenge/domain/port => challengereview/domain}/ChallengeReviewReader.java (85%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{userchallenge/domain/application => challengereview/domain}/ChallengeReviewService.java (91%) create mode 100644 zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/domain/ChallengeReviewStore.java rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{userchallenge/infrastructure/adapter => challengereview/infrastructure}/ChallengeReviewReaderImpl.java (91%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{userchallenge => challengereview}/infrastructure/ChallengeReviewRepository.java (74%) rename zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/{userchallenge/infrastructure/adapter => challengereview/infrastructure}/ChallengeReviewStoreImpl.java (59%) delete mode 100644 zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeReviewStore.java diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/controller/ChallengeReviewController.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/controller/ChallengeReviewController.java similarity index 90% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/controller/ChallengeReviewController.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/controller/ChallengeReviewController.java index d46dea38..6ff93218 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/controller/ChallengeReviewController.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/controller/ChallengeReviewController.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.userchallenge.controller; +package org.haedal.zzansuni.challengereview.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -7,9 +7,10 @@ import org.haedal.zzansuni.common.controller.PagingRequest; import org.haedal.zzansuni.common.controller.PagingResponse; import org.haedal.zzansuni.core.api.ApiResponse; -import org.haedal.zzansuni.userchallenge.domain.application.ChallengeReviewModel.ChallengeReviewWithChallenge; -import org.haedal.zzansuni.userchallenge.domain.application.ChallengeReviewModel.ChallengeReviewWithUserInfo; -import org.haedal.zzansuni.userchallenge.domain.application.ChallengeReviewService; +import org.haedal.zzansuni.userchallenge.controller.ChallengeReq; +import org.haedal.zzansuni.challengereview.domain.ChallengeReviewModel.ChallengeReviewWithChallenge; +import org.haedal.zzansuni.challengereview.domain.ChallengeReviewModel.ChallengeReviewWithUserInfo; +import org.haedal.zzansuni.challengereview.domain.ChallengeReviewService; import org.haedal.zzansuni.global.jwt.JwtUser; import org.springframework.data.domain.Page; import org.springframework.http.HttpStatus; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/controller/ChallengeReviewRes.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/controller/ChallengeReviewRes.java similarity index 86% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/controller/ChallengeReviewRes.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/controller/ChallengeReviewRes.java index 506202c2..94d05791 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/controller/ChallengeReviewRes.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/controller/ChallengeReviewRes.java @@ -1,11 +1,11 @@ -package org.haedal.zzansuni.userchallenge.controller; +package org.haedal.zzansuni.challengereview.controller; import java.util.Map; import lombok.Builder; import org.haedal.zzansuni.user.controller.UserRes; -import org.haedal.zzansuni.userchallenge.domain.application.ChallengeReviewModel; -import org.haedal.zzansuni.userchallenge.domain.application.ChallengeReviewModel.ChallengeReviewWithChallenge; -import org.haedal.zzansuni.userchallenge.domain.application.ChallengeReviewModel.ChallengeReviewWithUserInfo; +import org.haedal.zzansuni.challengereview.domain.ChallengeReviewModel; +import org.haedal.zzansuni.challengereview.domain.ChallengeReviewModel.ChallengeReviewWithChallenge; +import org.haedal.zzansuni.challengereview.domain.ChallengeReviewModel.ChallengeReviewWithUserInfo; public class ChallengeReviewRes { diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/ChallengeReview.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/domain/ChallengeReview.java similarity index 92% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/ChallengeReview.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/domain/ChallengeReview.java index 49eeeca0..12653239 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/ChallengeReview.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/domain/ChallengeReview.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.userchallenge.domain; +package org.haedal.zzansuni.challengereview.domain; import jakarta.persistence.*; import lombok.AccessLevel; @@ -8,6 +8,7 @@ import lombok.NoArgsConstructor; import org.haedal.zzansuni.common.domain.BaseTimeEntity; import org.haedal.zzansuni.challengegroup.domain.ChallengeCommand; +import org.haedal.zzansuni.userchallenge.domain.UserChallenge; @Entity @AllArgsConstructor diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/ChallengeReviewModel.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/domain/ChallengeReviewModel.java similarity index 96% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/ChallengeReviewModel.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/domain/ChallengeReviewModel.java index 6460a4e4..ebc0cb8f 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/ChallengeReviewModel.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/domain/ChallengeReviewModel.java @@ -1,4 +1,4 @@ -package org.haedal.zzansuni.userchallenge.domain.application; +package org.haedal.zzansuni.challengereview.domain; import java.util.HashMap; import java.util.List; @@ -7,7 +7,6 @@ import org.haedal.zzansuni.challengegroup.domain.ChallengeGroup; import org.haedal.zzansuni.challengegroup.domain.Challenge; import org.haedal.zzansuni.user.domain.UserModel; -import org.haedal.zzansuni.userchallenge.domain.ChallengeReview; import org.haedal.zzansuni.userchallenge.domain.UserChallenge; public class ChallengeReviewModel { diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeReviewReader.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/domain/ChallengeReviewReader.java similarity index 85% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeReviewReader.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/domain/ChallengeReviewReader.java index de90e0e1..c1a13550 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeReviewReader.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/domain/ChallengeReviewReader.java @@ -1,10 +1,10 @@ -package org.haedal.zzansuni.userchallenge.domain.port; +package org.haedal.zzansuni.challengereview.domain; import java.util.List; import java.util.Map; import java.util.Optional; -import org.haedal.zzansuni.userchallenge.domain.ChallengeReview; + import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/ChallengeReviewService.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/domain/ChallengeReviewService.java similarity index 91% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/ChallengeReviewService.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/domain/ChallengeReviewService.java index 5c37270e..2f56398e 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/ChallengeReviewService.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/domain/ChallengeReviewService.java @@ -1,12 +1,9 @@ -package org.haedal.zzansuni.userchallenge.domain.application; +package org.haedal.zzansuni.challengereview.domain; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.haedal.zzansuni.challengegroup.domain.ChallengeCommand; -import org.haedal.zzansuni.userchallenge.domain.port.ChallengeReviewReader; -import org.haedal.zzansuni.userchallenge.domain.port.ChallengeReviewStore; import org.haedal.zzansuni.userchallenge.domain.port.UserChallengeReader; -import org.haedal.zzansuni.userchallenge.domain.ChallengeReview; import org.haedal.zzansuni.userchallenge.domain.UserChallenge; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/domain/ChallengeReviewStore.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/domain/ChallengeReviewStore.java new file mode 100644 index 00000000..1c9800b4 --- /dev/null +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/domain/ChallengeReviewStore.java @@ -0,0 +1,8 @@ +package org.haedal.zzansuni.challengereview.domain; + + +public interface ChallengeReviewStore { + + ChallengeReview store(ChallengeReview challengeReview); + +} diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/adapter/ChallengeReviewReaderImpl.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/infrastructure/ChallengeReviewReaderImpl.java similarity index 91% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/adapter/ChallengeReviewReaderImpl.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/infrastructure/ChallengeReviewReaderImpl.java index 26c5b6bd..96db0e5d 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/adapter/ChallengeReviewReaderImpl.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/infrastructure/ChallengeReviewReaderImpl.java @@ -1,10 +1,9 @@ -package org.haedal.zzansuni.userchallenge.infrastructure.adapter; +package org.haedal.zzansuni.challengereview.infrastructure; import com.querydsl.jpa.impl.JPAQueryFactory; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.userchallenge.domain.port.ChallengeReviewReader; -import org.haedal.zzansuni.userchallenge.domain.ChallengeReview; -import org.haedal.zzansuni.userchallenge.infrastructure.ChallengeReviewRepository; +import org.haedal.zzansuni.challengereview.domain.ChallengeReview; +import org.haedal.zzansuni.challengereview.domain.ChallengeReviewReader; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; @@ -12,7 +11,7 @@ import java.util.*; -import static org.haedal.zzansuni.userchallenge.domain.QChallengeReview.challengeReview; +import static org.haedal.zzansuni.challengereview.domain.QChallengeReview.challengeReview; @Component diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/ChallengeReviewRepository.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/infrastructure/ChallengeReviewRepository.java similarity index 74% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/ChallengeReviewRepository.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/infrastructure/ChallengeReviewRepository.java index ba4d63d6..fe88eb63 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/ChallengeReviewRepository.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/infrastructure/ChallengeReviewRepository.java @@ -1,6 +1,6 @@ -package org.haedal.zzansuni.userchallenge.infrastructure; +package org.haedal.zzansuni.challengereview.infrastructure; -import org.haedal.zzansuni.userchallenge.domain.ChallengeReview; +import org.haedal.zzansuni.challengereview.domain.ChallengeReview; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/adapter/ChallengeReviewStoreImpl.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/infrastructure/ChallengeReviewStoreImpl.java similarity index 59% rename from zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/adapter/ChallengeReviewStoreImpl.java rename to zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/infrastructure/ChallengeReviewStoreImpl.java index bbbe4fbf..ce8eb4f1 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/infrastructure/adapter/ChallengeReviewStoreImpl.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/challengereview/infrastructure/ChallengeReviewStoreImpl.java @@ -1,9 +1,8 @@ -package org.haedal.zzansuni.userchallenge.infrastructure.adapter; +package org.haedal.zzansuni.challengereview.infrastructure; import lombok.RequiredArgsConstructor; -import org.haedal.zzansuni.userchallenge.domain.ChallengeReview; -import org.haedal.zzansuni.userchallenge.domain.port.ChallengeReviewStore; -import org.haedal.zzansuni.userchallenge.infrastructure.ChallengeReviewRepository; +import org.haedal.zzansuni.challengereview.domain.ChallengeReviewStore; +import org.haedal.zzansuni.challengereview.domain.ChallengeReview; import org.springframework.stereotype.Component; @Component diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/UserChallengeService.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/UserChallengeService.java index 26ae219b..385d20bd 100644 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/UserChallengeService.java +++ b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/application/UserChallengeService.java @@ -4,6 +4,7 @@ import java.util.Map; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.haedal.zzansuni.challengereview.domain.ChallengeReviewReader; import org.haedal.zzansuni.userchallenge.domain.port.UserChallengeReader; import org.haedal.zzansuni.userchallenge.domain.port.UserChallengeStore; import org.haedal.zzansuni.userchallenge.domain.port.ChallengeGroupUserExpStore; @@ -11,7 +12,6 @@ import org.haedal.zzansuni.challengegroup.domain.ChallengeCommand; import org.haedal.zzansuni.challengegroup.domain.application.ChallengeModel; import org.haedal.zzansuni.challengegroup.domain.port.ChallengeReader; -import org.haedal.zzansuni.userchallenge.domain.port.ChallengeReviewReader; import org.haedal.zzansuni.user.domain.User; import org.haedal.zzansuni.user.domain.UserReader; import org.haedal.zzansuni.userchallenge.domain.ChallengeGroupUserExp; diff --git a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeReviewStore.java b/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeReviewStore.java deleted file mode 100644 index c766ddcf..00000000 --- a/zzansuni-api-server/app/src/main/java/org/haedal/zzansuni/userchallenge/domain/port/ChallengeReviewStore.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.haedal.zzansuni.userchallenge.domain.port; - -import org.haedal.zzansuni.userchallenge.domain.ChallengeReview; - -public interface ChallengeReviewStore { - - ChallengeReview store(ChallengeReview challengeReview); - -} diff --git a/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/userchallenge/domain/application/RecordServiceTest.java b/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/userchallenge/domain/application/RecordServiceTest.java index 33c24ba4..8d0c6d8f 100644 --- a/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/userchallenge/domain/application/RecordServiceTest.java +++ b/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/userchallenge/domain/application/RecordServiceTest.java @@ -4,9 +4,12 @@ import org.haedal.zzansuni.challengegroup.domain.*; import org.haedal.zzansuni.challengegroup.domain.port.ChallengeReader; +import org.haedal.zzansuni.challengereview.domain.ChallengeReview; +import org.haedal.zzansuni.challengereview.domain.ChallengeReviewModel; +import org.haedal.zzansuni.challengereview.domain.ChallengeReviewService; import org.haedal.zzansuni.userchallenge.domain.*; -import org.haedal.zzansuni.userchallenge.domain.port.ChallengeReviewReader; -import org.haedal.zzansuni.userchallenge.domain.port.ChallengeReviewStore; +import org.haedal.zzansuni.challengereview.domain.ChallengeReviewReader; +import org.haedal.zzansuni.challengereview.domain.ChallengeReviewStore; import org.haedal.zzansuni.userchallenge.domain.port.ChallengeVerificationReader; import org.haedal.zzansuni.userchallenge.domain.port.UserChallengeReader; import org.haedal.zzansuni.user.domain.User; diff --git a/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/userchallenge/domain/application/UserRecordServiceTest.java b/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/userchallenge/domain/application/UserRecordServiceTest.java index b711d252..ec8aaa6c 100644 --- a/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/userchallenge/domain/application/UserRecordServiceTest.java +++ b/zzansuni-api-server/app/src/test/java/org/haedal/zzansuni/userchallenge/domain/application/UserRecordServiceTest.java @@ -11,7 +11,7 @@ import org.haedal.zzansuni.userchallenge.domain.ChallengeStatus; import org.haedal.zzansuni.userchallenge.domain.UserChallenge; import org.haedal.zzansuni.userchallenge.domain.port.ChallengeGroupUserExpStore; -import org.haedal.zzansuni.userchallenge.domain.port.ChallengeReviewReader; +import org.haedal.zzansuni.challengereview.domain.ChallengeReviewReader; import org.haedal.zzansuni.userchallenge.domain.port.UserChallengeReader; import org.haedal.zzansuni.userchallenge.domain.port.UserChallengeStore; import org.junit.jupiter.api.BeforeEach;