From 5cbe7f0f361940ce498bd205fd8f45dde8caacca Mon Sep 17 00:00:00 2001 From: hectick Date: Thu, 23 Nov 2023 15:50:10 +0900 Subject: [PATCH 1/3] =?UTF-8?q?chore:=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/application/dto/LogoutRequest.java | 4 -- .../application/event/JoinMemberEvent.java | 6 --- .../auth/application/event/LoginEvent.java | 6 --- .../auth/application/event/LogoutEvent.java | 4 -- .../application/dto/response/WriterDto.java | 5 --- .../application/event/SavedCommentEvent.java | 6 --- .../application/ConsumptionService.java | 2 +- .../MemberConsumptionServiceImpl.java | 10 ++--- .../PostConsumptionServiceImpl.java | 6 +-- .../consumption/domain/Consumption.java | 4 +- .../consumption/ui/ConsumptionController.java | 4 +- .../cache/application/PostCachingService.java | 14 +++---- .../application/dto/CachedPostResponse.java | 2 +- .../cache/domain/CachedHotPost.java | 2 +- .../cache/repository/HotPostsRepository.java | 4 +- .../cache/util/CacheKeyStrategy.java | 2 +- .../cache/util/HotPostCachePolicy.java | 4 +- .../cache/util/ProductCacheKeyStrategy.java | 2 +- .../comment/application/CommentService.java | 30 +++++++-------- .../application/PostCommentServiceImpl.java | 10 ++--- .../dto/request/CommentRequest.java | 2 +- .../application/dto/response/CommentDto.java | 4 +- .../dto/response/CommentsResponse.java | 2 +- .../application/dto/response/WriterDto.java | 5 +++ .../application/event/SavedCommentEvent.java | 6 +++ .../commentimage/domain/CommentImageInfo.java | 3 +- .../CommentImageInfoRepository.java | 4 +- .../{ => content}/comment/domain/Comment.java | 8 ++-- .../comment/repository/CommentRepository.java | 4 +- .../comment/ui/CommentController.java | 12 +++--- .../application/GeneralFindingCondition.java | 8 ++-- .../post/application/HotFindingCondition.java | 2 +- .../post/application/MyPostService.java | 12 +++--- .../post/application/PostCommentService.java | 2 +- .../application/PostConsumptionService.java | 4 +- .../post/application/PostReadService.java | 28 ++++++++------ .../post/application/PostService.java | 24 ++++++------ .../post/application/PostSlice.java | 2 +- .../post/application/PostThumbsService.java | 14 +++++++ .../post/application/dto/SortBy.java | 2 +- .../post/application/dto/SortDirection.java | 2 +- .../post/application/dto/WriterResponse.java | 5 +++ .../dto/request/PostModificationRequest.java | 2 +- .../application/dto/request/PostRequest.java | 2 +- .../dto/response/AllThumbsInPostResponse.java | 2 +- .../dto/response/GeneralPostInfoResponse.java | 4 +- .../response/GeneralPostsInfoResponse.java | 4 +- .../dto/response/MyPostResponse.java | 4 +- .../dto/response/PostConsumptionResponse.java | 2 +- .../dto/response/PostIdResponse.java | 5 +++ .../dto/response/ReactionCountResponse.java | 2 +- .../response/SpecificPostInfoResponse.java | 6 +-- .../response/ThumbsStatusInPostResponse.java | 2 +- .../dto/response/WriterDetailResponse.java | 2 +- .../dto/response/WriterResponse.java | 5 +++ .../application/event/PostDeletionEvent.java | 5 +++ .../post/domain/HotPostPolicy.java | 2 +- .../{ => content}/post/domain/Post.java | 8 ++-- .../post}/postimage/domain/PostImageInfo.java | 4 +- .../postimage/domain/PostImageInfos.java | 4 +- .../PostImageInfoCustomRepository.java | 4 +- .../PostImageInfoCustomRepositoryImpl.java | 4 +- .../repository/PostImageInfoRepository.java | 4 +- .../post/repository/PostRepository.java | 4 +- .../post/repository/PostSpecification.java | 4 +- .../post/ui/MyPostController.java | 18 ++++----- .../{ => content}/post/ui/PostController.java | 14 +++---- .../post/ui/PostReadController.java | 22 +++++------ .../post/ui/annotation/HotPostSizing.java | 2 +- .../post/ui/annotation/PostPaging.java | 2 +- .../HotPostSizingArgumentResolver.java | 6 +-- .../PostPagingArgumentResolver.java | 6 +-- .../application/PostThumbsServiceImpl.java | 20 +++++----- .../thumbs/application/ThumbsService.java | 22 +++++------ .../application/event/ThumbsDownEvent.java | 6 +++ .../application/event/ThumbsUpEvent.java | 6 +++ .../thumbs/domain/AllThumbsInPost.java | 2 +- .../{ => content}/thumbs/domain/Thumbs.java | 6 +-- .../thumbs/domain/ThumbsType.java | 2 +- .../thumbs/repository/ThumbsRepository.java | 4 +- .../thumbs/ui/ThumbsController.java | 8 ++-- .../global/config/WebMvcConfiguration.java | 6 +-- .../auth/annotation/AuthPrincipal.java | 2 +- .../auth/application/AuthService.java | 36 +++++++++--------- .../KakaoAuthResponseProvider.java | 6 +-- .../auth/application/dto/JoinRequest.java | 2 +- .../application/dto/KakaoLoginRequest.java | 2 +- .../application/dto/KakaoLoginResponse.java | 2 +- .../auth/application/dto/LoginRequest.java | 2 +- .../auth/application/dto/LogoutRequest.java | 4 ++ .../auth/application/dto/MemberResponse.java | 2 +- .../application/event/JoinMemberEvent.java | 6 +++ .../auth/application/event/LoginEvent.java | 6 +++ .../auth/application/event/LogoutEvent.java | 4 ++ .../auth/domain/BasicTokenGenerator.java | 2 +- .../auth/domain/PasswordEncoder.java | 2 +- .../auth/domain/SimplePasswordEncoder.java | 2 +- .../auth/domain/TokenGenerator.java | 2 +- .../auth/domain/ValidateType.java | 2 +- .../{ => membber}/auth/ui/AuthController.java | 24 ++++++------ .../{ => membber}/auth/ui/SessionConst.java | 2 +- .../AuthArgumentResolver.java | 12 +++--- .../member/application/DeviceRepository.java | 4 +- .../application/MemberConsumptionService.java | 6 +-- .../application/MemberEventListener.java | 8 ++-- .../member/application/MemberService.java | 38 +++++++++---------- .../application/dto/ActiveMemberId.java | 2 +- .../application/dto/AnonymousMemberId.java | 2 +- .../member/application/dto/MemberId.java | 2 +- .../member/application/dto/YearMonthDto.java | 2 +- .../dto/request/MemberUpdateRequest.java | 2 +- .../dto/request/PurchaseConfirmRequest.java | 2 +- .../dto/request/SavingConfirmRequest.java | 2 +- .../dto/response/DuplicateCheckResponse.java | 5 +++ .../dto/response/MemberUpdateResponse.java | 5 +++ .../dto/response/MyPageResponseV1_0.java | 2 +- .../dto/response/MyPageResponseV1_1.java | 2 +- .../event/ProfileImageDeletionEvent.java | 2 +- .../event/ProfileImageUploadEvent.java | 2 +- .../{ => membber}/member/domain/Device.java | 2 +- .../{ => membber}/member/domain/Email.java | 4 +- .../{ => membber}/member/domain/Member.java | 6 +-- .../{ => membber}/member/domain/Nickname.java | 4 +- .../{ => membber}/member/domain/Password.java | 6 +-- .../member/domain/PasswordValidator.java | 2 +- .../member/domain/SocialInfo.java | 2 +- .../ProfileImageEventListener.java | 6 +-- .../profileimage/domain/ProfileImageInfo.java | 2 +- .../ProfileImageInfoRepository.java | 4 +- .../repository/MemberCustomRepository.java | 4 +- .../MemberCustomRepositoryImpl.java | 4 +- .../member/repository/MemberRepository.java | 10 ++--- .../member/ui/MemberController.java | 22 +++++------ .../application/SettingEventListener.java | 4 +- .../setting/application/SettingService.java | 20 +++++----- .../ActivatingPrimaryManager.java | 4 +- .../activationmanager/ActivationManager.java | 4 +- .../DeactivatingSameWeightsManager.java | 4 +- .../DeactivatingLowerWeightManager.java | 4 +- .../DeactivatingPrimaryManager.java | 4 +- .../DeactivationManager.java | 4 +- .../application/dto/SettingRequest.java | 5 +++ .../application/dto/SettingResponse.java | 4 +- .../application/dto/SettingsResponse.java | 4 +- .../setting/domain/Category.java | 2 +- .../{ => membber}/setting/domain/Setting.java | 4 +- .../setting/domain/SettingType.java | 2 +- .../setting/domain/SettingTypeCategory.java | 2 +- .../{ => membber}/setting/domain/Weight.java | 2 +- .../repository/SettingCustomRepository.java | 4 +- .../setting/repository/SettingRepository.java | 6 +-- .../repository/SettingRepositoryImpl.java | 4 +- .../setting/ui/SettingController.java | 12 +++--- .../dto/response/DuplicateCheckResponse.java | 5 --- .../dto/response/MemberUpdateResponse.java | 5 --- .../NotificationEventListener.java | 8 ++-- .../application/NotificationService.java | 22 +++++------ .../application/dto/Receiver.java | 2 +- .../notification/domain/Notification.java | 2 +- .../ui/NotificationController.java | 10 ++--- .../post/application/PostThumbsService.java | 14 ------- .../post/application/dto/WriterResponse.java | 5 --- .../dto/response/PostIdResponse.java | 5 --- .../dto/response/WriterResponse.java | 5 --- .../application/event/PostDeletionEvent.java | 5 --- .../report/application/ReportService.java | 14 +++---- .../backend/report/domain/Report.java | 2 +- .../backend/report/ui/ReportController.java | 4 +- .../application/dto/SettingRequest.java | 5 --- .../application/event/ThumbsDownEvent.java | 6 --- .../application/event/ThumbsUpEvent.java | 6 --- .../java/edonymyeon/backend/CacheConfig.java | 2 +- .../backend/auth/AuthIntegrationTest.java | 24 ++++++------ .../application/AuthDeleteServiceTest.java | 5 ++- .../auth/application/AuthServiceTest.java | 32 ++++++++-------- .../auth/docs/AuthControllerDocsTest.java | 16 ++++---- .../domain/SimplePasswordEncoderTest.java | 1 + .../application/CommentServiceTest.java | 14 +++---- .../docs/CommentControllerDocsTest.java | 12 +++--- .../integration/CommentIntegrationTest.java | 4 +- .../MemberConsumptionServiceImplTest.java | 8 ++-- .../docs/ConsumptionControllerDocsTest.java | 8 ++-- .../domain/ConsumptionsPerMonthTest.java | 4 +- .../ConsumptionIntegrationTest.java | 4 +- .../repository/ConsumptionRepositoryTest.java | 4 +- .../image/ImageFileSizeIntegrationTest.java | 3 +- .../member/application/MemberServiceTest.java | 22 ++++++----- .../member/docs/MemberControllerDocsTest.java | 24 ++++++------ .../backend/member/domain/EmailTest.java | 2 + .../backend/member/domain/MemberTest.java | 1 + .../backend/member/domain/NicknameTest.java | 3 +- .../backend/member/domain/PasswordTest.java | 4 +- .../MemberConsumptionIntegrationTest.java | 8 ++-- .../integration/MemberIntegrationTest.java | 12 +++--- .../repository/MemberRepositoryTest.java | 11 +++--- .../NotificationEventListenerTest.java | 24 ++++++------ .../application/NotificationServiceTest.java | 28 +++++++------- .../NotificationIntegrationTest.java | 16 ++++---- .../post/application/MyPostServiceTest.java | 15 +++++--- .../PostFindingSpecificPostTest.java | 19 +++++----- .../PostServiceFindingAllPostsTest.java | 17 +++++---- .../application/PostServiceHotPostsTest.java | 15 +++++--- .../PostServiceSearchPostsTest.java | 4 +- .../post/application/PostServiceTest.java | 32 ++++++++-------- .../post/application/PostViewTest.java | 11 +++--- .../application/TestCacheKeyStrategy.java | 2 +- .../post/docs/MyPostControllerDocsTest.java | 22 +++++------ .../post/docs/PostControllerDocsTest.java | 28 +++++++------- .../post/docs/PostCreationDocsTest.java | 4 +- .../integration/HotPostIntegrationTest.java | 20 +++++----- .../integration/MyPostIntegrationTest.java | 6 +-- .../PostCommentCountIntegrationTest.java | 13 +++---- .../post/integration/PostIntegrationTest.java | 18 ++++----- .../PostSearchIntegrationTest.java | 3 +- .../integration/PostViewIntegrationTest.java | 4 +- .../post/repository/PostRepositoryTest.java | 13 ++++--- .../repository/PostSpecificationTest.java | 4 +- .../backend/post/ui/PostControllerTest.java | 6 +-- .../report/application/ReportServiceTest.java | 6 +-- .../backend/report/docs/ReportDocsTest.java | 14 +++---- .../report/ui/ReportIntegrationTest.java | 5 +-- .../application/SettingServiceTest.java | 15 ++++---- .../docs/SettingControllerDocsTest.java | 16 ++++---- .../backend/setting/domain/SettingTest.java | 2 + .../setting/ui/SettingIntegrationTest.java | 8 ++-- .../backend/support/CommentTestSupport.java | 12 +++--- .../support/ConsumptionTestSupport.java | 2 +- .../backend/support/IntegrationFixture.java | 8 ++-- .../support/PostImageInfoTestSupport.java | 6 +-- .../support/PostIntegrationTestSupport.java | 5 +-- .../backend/support/PostTestSupport.java | 6 +-- .../support/ProfileImageInfoTestSupport.java | 4 +- .../backend/support/TestMemberBuilder.java | 12 +++--- .../support/ThumbsUpPostTestSupport.java | 10 ++--- .../application/DeleteThumbsServiceTest.java | 19 +++++----- .../application/ThumbsDownServiceTest.java | 21 +++++----- .../application/ThumbsInPostServiceTest.java | 23 +++++------ .../application/ThumbsUpServiceTest.java | 21 +++++----- .../thumbs/docs/ThumbsControllerDocsTest.java | 18 ++++----- .../thumbs/domain/AllThumbsInPostTest.java | 10 +++-- .../integration/ThumbsIntegrationTest.java | 12 +++--- 241 files changed, 935 insertions(+), 903 deletions(-) delete mode 100644 backend/src/main/java/edonymyeon/backend/auth/application/dto/LogoutRequest.java delete mode 100644 backend/src/main/java/edonymyeon/backend/auth/application/event/JoinMemberEvent.java delete mode 100644 backend/src/main/java/edonymyeon/backend/auth/application/event/LoginEvent.java delete mode 100644 backend/src/main/java/edonymyeon/backend/auth/application/event/LogoutEvent.java delete mode 100644 backend/src/main/java/edonymyeon/backend/comment/application/dto/response/WriterDto.java delete mode 100644 backend/src/main/java/edonymyeon/backend/comment/application/event/SavedCommentEvent.java rename backend/src/main/java/edonymyeon/backend/{ => content}/cache/application/PostCachingService.java (84%) rename backend/src/main/java/edonymyeon/backend/{ => content}/cache/application/dto/CachedPostResponse.java (73%) rename backend/src/main/java/edonymyeon/backend/{ => content}/cache/domain/CachedHotPost.java (95%) rename backend/src/main/java/edonymyeon/backend/{ => content}/cache/repository/HotPostsRepository.java (87%) rename backend/src/main/java/edonymyeon/backend/{ => content}/cache/util/CacheKeyStrategy.java (73%) rename backend/src/main/java/edonymyeon/backend/{ => content}/cache/util/HotPostCachePolicy.java (80%) rename backend/src/main/java/edonymyeon/backend/{ => content}/cache/util/ProductCacheKeyStrategy.java (92%) rename backend/src/main/java/edonymyeon/backend/{ => content}/comment/application/CommentService.java (77%) rename backend/src/main/java/edonymyeon/backend/{ => content}/comment/application/PostCommentServiceImpl.java (73%) rename backend/src/main/java/edonymyeon/backend/{ => content}/comment/application/dto/request/CommentRequest.java (65%) rename backend/src/main/java/edonymyeon/backend/{ => content}/comment/application/dto/response/CommentDto.java (82%) rename backend/src/main/java/edonymyeon/backend/{ => content}/comment/application/dto/response/CommentsResponse.java (60%) create mode 100644 backend/src/main/java/edonymyeon/backend/content/comment/application/dto/response/WriterDto.java create mode 100644 backend/src/main/java/edonymyeon/backend/content/comment/application/event/SavedCommentEvent.java rename backend/src/main/java/edonymyeon/backend/{image => content/comment}/commentimage/domain/CommentImageInfo.java (88%) rename backend/src/main/java/edonymyeon/backend/{image => content/comment}/commentimage/repository/CommentImageInfoRepository.java (78%) rename backend/src/main/java/edonymyeon/backend/{ => content}/comment/domain/Comment.java (92%) rename backend/src/main/java/edonymyeon/backend/{ => content}/comment/repository/CommentRepository.java (88%) rename backend/src/main/java/edonymyeon/backend/{ => content}/comment/ui/CommentController.java (83%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/application/GeneralFindingCondition.java (91%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/application/HotFindingCondition.java (97%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/application/MyPostService.java (76%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/application/PostCommentService.java (64%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/application/PostConsumptionService.java (55%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/application/PostReadService.java (84%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/application/PostService.java (85%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/application/PostSlice.java (92%) create mode 100644 backend/src/main/java/edonymyeon/backend/content/post/application/PostThumbsService.java rename backend/src/main/java/edonymyeon/backend/{ => content}/post/application/dto/SortBy.java (92%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/application/dto/SortDirection.java (92%) create mode 100644 backend/src/main/java/edonymyeon/backend/content/post/application/dto/WriterResponse.java rename backend/src/main/java/edonymyeon/backend/{ => content}/post/application/dto/request/PostModificationRequest.java (80%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/application/dto/request/PostRequest.java (77%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/application/dto/response/AllThumbsInPostResponse.java (56%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/application/dto/response/GeneralPostInfoResponse.java (86%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/application/dto/response/GeneralPostsInfoResponse.java (82%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/application/dto/response/MyPostResponse.java (87%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/application/dto/response/PostConsumptionResponse.java (86%) create mode 100644 backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/PostIdResponse.java rename backend/src/main/java/edonymyeon/backend/{ => content}/post/application/dto/response/ReactionCountResponse.java (53%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/application/dto/response/SpecificPostInfoResponse.java (93%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/application/dto/response/ThumbsStatusInPostResponse.java (53%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/application/dto/response/WriterDetailResponse.java (57%) create mode 100644 backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/WriterResponse.java create mode 100644 backend/src/main/java/edonymyeon/backend/content/post/application/event/PostDeletionEvent.java rename backend/src/main/java/edonymyeon/backend/{ => content}/post/domain/HotPostPolicy.java (94%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/domain/Post.java (96%) rename backend/src/main/java/edonymyeon/backend/{image => content/post}/postimage/domain/PostImageInfo.java (89%) rename backend/src/main/java/edonymyeon/backend/{image => content/post}/postimage/domain/PostImageInfos.java (96%) rename backend/src/main/java/edonymyeon/backend/{image => content/post}/postimage/repository/PostImageInfoCustomRepository.java (53%) rename backend/src/main/java/edonymyeon/backend/{image => content/post}/postimage/repository/PostImageInfoCustomRepositoryImpl.java (90%) rename backend/src/main/java/edonymyeon/backend/{image => content/post}/postimage/repository/PostImageInfoRepository.java (85%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/repository/PostRepository.java (95%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/repository/PostSpecification.java (95%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/ui/MyPostController.java (55%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/ui/PostController.java (80%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/ui/PostReadController.java (73%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/ui/annotation/HotPostSizing.java (86%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/ui/annotation/PostPaging.java (87%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/ui/argumentresolver/HotPostSizingArgumentResolver.java (89%) rename backend/src/main/java/edonymyeon/backend/{ => content}/post/ui/argumentresolver/PostPagingArgumentResolver.java (90%) rename backend/src/main/java/edonymyeon/backend/{ => content}/thumbs/application/PostThumbsServiceImpl.java (70%) rename backend/src/main/java/edonymyeon/backend/{ => content}/thumbs/application/ThumbsService.java (86%) create mode 100644 backend/src/main/java/edonymyeon/backend/content/thumbs/application/event/ThumbsDownEvent.java create mode 100644 backend/src/main/java/edonymyeon/backend/content/thumbs/application/event/ThumbsUpEvent.java rename backend/src/main/java/edonymyeon/backend/{ => content}/thumbs/domain/AllThumbsInPost.java (92%) rename backend/src/main/java/edonymyeon/backend/{ => content}/thumbs/domain/Thumbs.java (92%) rename backend/src/main/java/edonymyeon/backend/{ => content}/thumbs/domain/ThumbsType.java (80%) rename backend/src/main/java/edonymyeon/backend/{ => content}/thumbs/repository/ThumbsRepository.java (79%) rename backend/src/main/java/edonymyeon/backend/{ => content}/thumbs/ui/ThumbsController.java (88%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/auth/annotation/AuthPrincipal.java (85%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/auth/application/AuthService.java (83%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/auth/application/KakaoAuthResponseProvider.java (82%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/auth/application/dto/JoinRequest.java (63%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/auth/application/dto/KakaoLoginRequest.java (57%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/auth/application/dto/KakaoLoginResponse.java (73%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/auth/application/dto/LoginRequest.java (59%) create mode 100644 backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/LogoutRequest.java rename backend/src/main/java/edonymyeon/backend/{ => membber}/auth/application/dto/MemberResponse.java (53%) create mode 100644 backend/src/main/java/edonymyeon/backend/membber/auth/application/event/JoinMemberEvent.java create mode 100644 backend/src/main/java/edonymyeon/backend/membber/auth/application/event/LoginEvent.java create mode 100644 backend/src/main/java/edonymyeon/backend/membber/auth/application/event/LogoutEvent.java rename backend/src/main/java/edonymyeon/backend/{ => membber}/auth/domain/BasicTokenGenerator.java (88%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/auth/domain/PasswordEncoder.java (75%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/auth/domain/SimplePasswordEncoder.java (98%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/auth/domain/TokenGenerator.java (62%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/auth/domain/ValidateType.java (91%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/auth/ui/AuthController.java (79%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/auth/ui/SessionConst.java (92%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/auth/ui/argumentresolver/AuthArgumentResolver.java (85%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/application/DeviceRepository.java (83%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/application/MemberConsumptionService.java (69%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/application/MemberEventListener.java (78%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/application/MemberService.java (83%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/application/dto/ActiveMemberId.java (67%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/application/dto/AnonymousMemberId.java (76%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/application/dto/MemberId.java (80%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/application/dto/YearMonthDto.java (51%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/application/dto/request/MemberUpdateRequest.java (71%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/application/dto/request/PurchaseConfirmRequest.java (57%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/application/dto/request/SavingConfirmRequest.java (51%) create mode 100644 backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/DuplicateCheckResponse.java create mode 100644 backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/MemberUpdateResponse.java rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/application/dto/response/MyPageResponseV1_0.java (51%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/application/dto/response/MyPageResponseV1_1.java (55%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/application/event/ProfileImageDeletionEvent.java (75%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/application/event/ProfileImageUploadEvent.java (75%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/domain/Device.java (97%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/domain/Email.java (91%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/domain/Member.java (96%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/domain/Nickname.java (92%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/domain/Password.java (90%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/domain/PasswordValidator.java (95%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/domain/SocialInfo.java (93%) rename backend/src/main/java/edonymyeon/backend/{image => membber/member}/profileimage/application/ProfileImageEventListener.java (68%) rename backend/src/main/java/edonymyeon/backend/{image => membber/member}/profileimage/domain/ProfileImageInfo.java (88%) rename backend/src/main/java/edonymyeon/backend/{image => membber/member}/profileimage/repository/ProfileImageInfoRepository.java (52%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/repository/MemberCustomRepository.java (55%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/repository/MemberCustomRepositoryImpl.java (88%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/repository/MemberRepository.java (58%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/member/ui/MemberController.java (81%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/setting/application/SettingEventListener.java (76%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/setting/application/SettingService.java (81%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/setting/application/activationmanager/ActivatingPrimaryManager.java (84%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/setting/application/activationmanager/ActivationManager.java (80%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/setting/application/activationmanager/DeactivatingSameWeightsManager.java (84%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/setting/application/deactivationmanager/DeactivatingLowerWeightManager.java (84%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/setting/application/deactivationmanager/DeactivatingPrimaryManager.java (82%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/setting/application/deactivationmanager/DeactivationManager.java (80%) create mode 100644 backend/src/main/java/edonymyeon/backend/membber/setting/application/dto/SettingRequest.java rename backend/src/main/java/edonymyeon/backend/{ => membber}/setting/application/dto/SettingResponse.java (65%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/setting/application/dto/SettingsResponse.java (71%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/setting/domain/Category.java (54%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/setting/domain/Setting.java (95%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/setting/domain/SettingType.java (97%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/setting/domain/SettingTypeCategory.java (58%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/setting/domain/Weight.java (85%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/setting/repository/SettingCustomRepository.java (50%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/setting/repository/SettingRepository.java (68%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/setting/repository/SettingRepositoryImpl.java (92%) rename backend/src/main/java/edonymyeon/backend/{ => membber}/setting/ui/SettingController.java (76%) delete mode 100644 backend/src/main/java/edonymyeon/backend/member/application/dto/response/DuplicateCheckResponse.java delete mode 100644 backend/src/main/java/edonymyeon/backend/member/application/dto/response/MemberUpdateResponse.java delete mode 100644 backend/src/main/java/edonymyeon/backend/post/application/PostThumbsService.java delete mode 100644 backend/src/main/java/edonymyeon/backend/post/application/dto/WriterResponse.java delete mode 100644 backend/src/main/java/edonymyeon/backend/post/application/dto/response/PostIdResponse.java delete mode 100644 backend/src/main/java/edonymyeon/backend/post/application/dto/response/WriterResponse.java delete mode 100644 backend/src/main/java/edonymyeon/backend/post/application/event/PostDeletionEvent.java delete mode 100644 backend/src/main/java/edonymyeon/backend/setting/application/dto/SettingRequest.java delete mode 100644 backend/src/main/java/edonymyeon/backend/thumbs/application/event/ThumbsDownEvent.java delete mode 100644 backend/src/main/java/edonymyeon/backend/thumbs/application/event/ThumbsUpEvent.java diff --git a/backend/src/main/java/edonymyeon/backend/auth/application/dto/LogoutRequest.java b/backend/src/main/java/edonymyeon/backend/auth/application/dto/LogoutRequest.java deleted file mode 100644 index 2f584f485..000000000 --- a/backend/src/main/java/edonymyeon/backend/auth/application/dto/LogoutRequest.java +++ /dev/null @@ -1,4 +0,0 @@ -package edonymyeon.backend.auth.application.dto; - -public record LogoutRequest(String deviceToken) { -} diff --git a/backend/src/main/java/edonymyeon/backend/auth/application/event/JoinMemberEvent.java b/backend/src/main/java/edonymyeon/backend/auth/application/event/JoinMemberEvent.java deleted file mode 100644 index 6e5396b2b..000000000 --- a/backend/src/main/java/edonymyeon/backend/auth/application/event/JoinMemberEvent.java +++ /dev/null @@ -1,6 +0,0 @@ -package edonymyeon.backend.auth.application.event; - -import edonymyeon.backend.member.domain.Member; - -public record JoinMemberEvent(Member member, String deviceToken) { -} diff --git a/backend/src/main/java/edonymyeon/backend/auth/application/event/LoginEvent.java b/backend/src/main/java/edonymyeon/backend/auth/application/event/LoginEvent.java deleted file mode 100644 index 1a2d90e84..000000000 --- a/backend/src/main/java/edonymyeon/backend/auth/application/event/LoginEvent.java +++ /dev/null @@ -1,6 +0,0 @@ -package edonymyeon.backend.auth.application.event; - -import edonymyeon.backend.member.domain.Member; - -public record LoginEvent(Member member, String deviceToken) { -} diff --git a/backend/src/main/java/edonymyeon/backend/auth/application/event/LogoutEvent.java b/backend/src/main/java/edonymyeon/backend/auth/application/event/LogoutEvent.java deleted file mode 100644 index 3b3ada8a2..000000000 --- a/backend/src/main/java/edonymyeon/backend/auth/application/event/LogoutEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package edonymyeon.backend.auth.application.event; - -public record LogoutEvent(String deviceToken) { -} diff --git a/backend/src/main/java/edonymyeon/backend/comment/application/dto/response/WriterDto.java b/backend/src/main/java/edonymyeon/backend/comment/application/dto/response/WriterDto.java deleted file mode 100644 index 65e2a210b..000000000 --- a/backend/src/main/java/edonymyeon/backend/comment/application/dto/response/WriterDto.java +++ /dev/null @@ -1,5 +0,0 @@ -package edonymyeon.backend.comment.application.dto.response; - -public record WriterDto(String nickname) { - -} diff --git a/backend/src/main/java/edonymyeon/backend/comment/application/event/SavedCommentEvent.java b/backend/src/main/java/edonymyeon/backend/comment/application/event/SavedCommentEvent.java deleted file mode 100644 index 6e018563d..000000000 --- a/backend/src/main/java/edonymyeon/backend/comment/application/event/SavedCommentEvent.java +++ /dev/null @@ -1,6 +0,0 @@ -package edonymyeon.backend.comment.application.event; - -import edonymyeon.backend.comment.domain.Comment; - -public record SavedCommentEvent(Comment comment) { -} diff --git a/backend/src/main/java/edonymyeon/backend/consumption/application/ConsumptionService.java b/backend/src/main/java/edonymyeon/backend/consumption/application/ConsumptionService.java index f9deefc79..6aedcea2b 100644 --- a/backend/src/main/java/edonymyeon/backend/consumption/application/ConsumptionService.java +++ b/backend/src/main/java/edonymyeon/backend/consumption/application/ConsumptionService.java @@ -5,7 +5,7 @@ import edonymyeon.backend.consumption.domain.Consumption; import edonymyeon.backend.consumption.domain.ConsumptionsPerMonth; import edonymyeon.backend.consumption.repository.ConsumptionRepository; -import edonymyeon.backend.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.application.dto.MemberId; import java.time.LocalDate; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/edonymyeon/backend/consumption/application/MemberConsumptionServiceImpl.java b/backend/src/main/java/edonymyeon/backend/consumption/application/MemberConsumptionServiceImpl.java index 8fc37a399..11d90ddd7 100644 --- a/backend/src/main/java/edonymyeon/backend/consumption/application/MemberConsumptionServiceImpl.java +++ b/backend/src/main/java/edonymyeon/backend/consumption/application/MemberConsumptionServiceImpl.java @@ -9,11 +9,11 @@ import edonymyeon.backend.consumption.domain.Consumption; import edonymyeon.backend.consumption.repository.ConsumptionRepository; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.member.application.MemberConsumptionService; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.member.application.dto.YearMonthDto; -import edonymyeon.backend.post.domain.Post; -import edonymyeon.backend.post.repository.PostRepository; +import edonymyeon.backend.membber.member.application.MemberConsumptionService; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.application.dto.YearMonthDto; +import edonymyeon.backend.content.post.domain.Post; +import edonymyeon.backend.content.post.repository.PostRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/edonymyeon/backend/consumption/application/PostConsumptionServiceImpl.java b/backend/src/main/java/edonymyeon/backend/consumption/application/PostConsumptionServiceImpl.java index 7fcc5abfa..96ac7bc4d 100644 --- a/backend/src/main/java/edonymyeon/backend/consumption/application/PostConsumptionServiceImpl.java +++ b/backend/src/main/java/edonymyeon/backend/consumption/application/PostConsumptionServiceImpl.java @@ -5,9 +5,9 @@ import edonymyeon.backend.consumption.domain.Consumption; import edonymyeon.backend.consumption.repository.ConsumptionRepository; -import edonymyeon.backend.post.application.PostConsumptionService; -import edonymyeon.backend.post.application.dto.response.PostConsumptionResponse; -import edonymyeon.backend.post.application.event.PostDeletionEvent; +import edonymyeon.backend.content.post.application.PostConsumptionService; +import edonymyeon.backend.content.post.application.dto.response.PostConsumptionResponse; +import edonymyeon.backend.content.post.application.event.PostDeletionEvent; import java.util.List; import java.util.Map; import java.util.function.Function; diff --git a/backend/src/main/java/edonymyeon/backend/consumption/domain/Consumption.java b/backend/src/main/java/edonymyeon/backend/consumption/domain/Consumption.java index ad27bf53e..e1cf228c4 100644 --- a/backend/src/main/java/edonymyeon/backend/consumption/domain/Consumption.java +++ b/backend/src/main/java/edonymyeon/backend/consumption/domain/Consumption.java @@ -8,7 +8,7 @@ import edonymyeon.backend.global.domain.TemporalRecord; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.content.post.domain.Post; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; @@ -25,8 +25,6 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; -import org.hibernate.annotations.OnDelete; -import org.hibernate.annotations.OnDeleteAction; @EqualsAndHashCode(of = {"id"}, callSuper = false) @Getter diff --git a/backend/src/main/java/edonymyeon/backend/consumption/ui/ConsumptionController.java b/backend/src/main/java/edonymyeon/backend/consumption/ui/ConsumptionController.java index 41e9f210d..6186b0e36 100644 --- a/backend/src/main/java/edonymyeon/backend/consumption/ui/ConsumptionController.java +++ b/backend/src/main/java/edonymyeon/backend/consumption/ui/ConsumptionController.java @@ -1,10 +1,10 @@ package edonymyeon.backend.consumption.ui; -import edonymyeon.backend.auth.annotation.AuthPrincipal; +import edonymyeon.backend.membber.auth.annotation.AuthPrincipal; import edonymyeon.backend.consumption.application.ConsumptionService; import edonymyeon.backend.consumption.application.dto.RecentConsumptionsResponse; import edonymyeon.backend.global.version.ApiVersion; -import edonymyeon.backend.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.application.dto.MemberId; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/backend/src/main/java/edonymyeon/backend/cache/application/PostCachingService.java b/backend/src/main/java/edonymyeon/backend/content/cache/application/PostCachingService.java similarity index 84% rename from backend/src/main/java/edonymyeon/backend/cache/application/PostCachingService.java rename to backend/src/main/java/edonymyeon/backend/content/cache/application/PostCachingService.java index 75e1c19d2..e5ad81358 100644 --- a/backend/src/main/java/edonymyeon/backend/cache/application/PostCachingService.java +++ b/backend/src/main/java/edonymyeon/backend/content/cache/application/PostCachingService.java @@ -1,12 +1,12 @@ -package edonymyeon.backend.cache.application; +package edonymyeon.backend.content.cache.application; -import edonymyeon.backend.cache.application.dto.CachedPostResponse; -import edonymyeon.backend.cache.domain.CachedHotPost; -import edonymyeon.backend.cache.repository.HotPostsRepository; -import edonymyeon.backend.cache.util.HotPostCachePolicy; +import edonymyeon.backend.content.cache.application.dto.CachedPostResponse; +import edonymyeon.backend.content.cache.domain.CachedHotPost; +import edonymyeon.backend.content.cache.repository.HotPostsRepository; +import edonymyeon.backend.content.cache.util.HotPostCachePolicy; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.post.application.HotFindingCondition; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.content.post.application.HotFindingCondition; +import edonymyeon.backend.content.post.domain.Post; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Slice; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/edonymyeon/backend/cache/application/dto/CachedPostResponse.java b/backend/src/main/java/edonymyeon/backend/content/cache/application/dto/CachedPostResponse.java similarity index 73% rename from backend/src/main/java/edonymyeon/backend/cache/application/dto/CachedPostResponse.java rename to backend/src/main/java/edonymyeon/backend/content/cache/application/dto/CachedPostResponse.java index 4ce4b305c..e7c0c5458 100644 --- a/backend/src/main/java/edonymyeon/backend/cache/application/dto/CachedPostResponse.java +++ b/backend/src/main/java/edonymyeon/backend/content/cache/application/dto/CachedPostResponse.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.cache.application.dto; +package edonymyeon.backend.content.cache.application.dto; import java.util.List; diff --git a/backend/src/main/java/edonymyeon/backend/cache/domain/CachedHotPost.java b/backend/src/main/java/edonymyeon/backend/content/cache/domain/CachedHotPost.java similarity index 95% rename from backend/src/main/java/edonymyeon/backend/cache/domain/CachedHotPost.java rename to backend/src/main/java/edonymyeon/backend/content/cache/domain/CachedHotPost.java index 1b35096e0..e65dad0fa 100644 --- a/backend/src/main/java/edonymyeon/backend/cache/domain/CachedHotPost.java +++ b/backend/src/main/java/edonymyeon/backend/content/cache/domain/CachedHotPost.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.cache.domain; +package edonymyeon.backend.content.cache.domain; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/backend/src/main/java/edonymyeon/backend/cache/repository/HotPostsRepository.java b/backend/src/main/java/edonymyeon/backend/content/cache/repository/HotPostsRepository.java similarity index 87% rename from backend/src/main/java/edonymyeon/backend/cache/repository/HotPostsRepository.java rename to backend/src/main/java/edonymyeon/backend/content/cache/repository/HotPostsRepository.java index 78d0680bf..ebbb09625 100644 --- a/backend/src/main/java/edonymyeon/backend/cache/repository/HotPostsRepository.java +++ b/backend/src/main/java/edonymyeon/backend/content/cache/repository/HotPostsRepository.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.cache.repository; +package edonymyeon.backend.content.cache.repository; -import edonymyeon.backend.cache.domain.CachedHotPost; +import edonymyeon.backend.content.cache.domain.CachedHotPost; import java.util.Map; import java.util.Optional; diff --git a/backend/src/main/java/edonymyeon/backend/cache/util/CacheKeyStrategy.java b/backend/src/main/java/edonymyeon/backend/content/cache/util/CacheKeyStrategy.java similarity index 73% rename from backend/src/main/java/edonymyeon/backend/cache/util/CacheKeyStrategy.java rename to backend/src/main/java/edonymyeon/backend/content/cache/util/CacheKeyStrategy.java index 5707a11f2..db41e6fa9 100644 --- a/backend/src/main/java/edonymyeon/backend/cache/util/CacheKeyStrategy.java +++ b/backend/src/main/java/edonymyeon/backend/content/cache/util/CacheKeyStrategy.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.cache.util; +package edonymyeon.backend.content.cache.util; public interface CacheKeyStrategy { diff --git a/backend/src/main/java/edonymyeon/backend/cache/util/HotPostCachePolicy.java b/backend/src/main/java/edonymyeon/backend/content/cache/util/HotPostCachePolicy.java similarity index 80% rename from backend/src/main/java/edonymyeon/backend/cache/util/HotPostCachePolicy.java rename to backend/src/main/java/edonymyeon/backend/content/cache/util/HotPostCachePolicy.java index 771e738fe..5c6b60843 100644 --- a/backend/src/main/java/edonymyeon/backend/cache/util/HotPostCachePolicy.java +++ b/backend/src/main/java/edonymyeon/backend/content/cache/util/HotPostCachePolicy.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.cache.util; +package edonymyeon.backend.content.cache.util; -import edonymyeon.backend.post.application.HotFindingCondition; +import edonymyeon.backend.content.post.application.HotFindingCondition; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/backend/src/main/java/edonymyeon/backend/cache/util/ProductCacheKeyStrategy.java b/backend/src/main/java/edonymyeon/backend/content/cache/util/ProductCacheKeyStrategy.java similarity index 92% rename from backend/src/main/java/edonymyeon/backend/cache/util/ProductCacheKeyStrategy.java rename to backend/src/main/java/edonymyeon/backend/content/cache/util/ProductCacheKeyStrategy.java index 86a68c632..78bc4f4e3 100644 --- a/backend/src/main/java/edonymyeon/backend/cache/util/ProductCacheKeyStrategy.java +++ b/backend/src/main/java/edonymyeon/backend/content/cache/util/ProductCacheKeyStrategy.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.cache.util; +package edonymyeon.backend.content.cache.util; import org.springframework.stereotype.Component; diff --git a/backend/src/main/java/edonymyeon/backend/comment/application/CommentService.java b/backend/src/main/java/edonymyeon/backend/content/comment/application/CommentService.java similarity index 77% rename from backend/src/main/java/edonymyeon/backend/comment/application/CommentService.java rename to backend/src/main/java/edonymyeon/backend/content/comment/application/CommentService.java index f4c3b646f..018d5e941 100644 --- a/backend/src/main/java/edonymyeon/backend/comment/application/CommentService.java +++ b/backend/src/main/java/edonymyeon/backend/content/comment/application/CommentService.java @@ -1,22 +1,22 @@ -package edonymyeon.backend.comment.application; - -import edonymyeon.backend.comment.application.dto.request.CommentRequest; -import edonymyeon.backend.comment.application.dto.response.CommentDto; -import edonymyeon.backend.comment.application.dto.response.CommentsResponse; -import edonymyeon.backend.comment.application.event.SavedCommentEvent; -import edonymyeon.backend.comment.domain.Comment; -import edonymyeon.backend.comment.repository.CommentRepository; +package edonymyeon.backend.content.comment.application; + +import edonymyeon.backend.content.comment.application.dto.request.CommentRequest; +import edonymyeon.backend.content.comment.application.dto.response.CommentDto; +import edonymyeon.backend.content.comment.application.dto.response.CommentsResponse; +import edonymyeon.backend.content.comment.application.event.SavedCommentEvent; +import edonymyeon.backend.content.comment.domain.Comment; +import edonymyeon.backend.content.comment.repository.CommentRepository; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.global.exception.ExceptionInformation; import edonymyeon.backend.image.application.ImageService; import edonymyeon.backend.image.domain.ImageType; -import edonymyeon.backend.image.commentimage.domain.CommentImageInfo; -import edonymyeon.backend.image.commentimage.repository.CommentImageInfoRepository; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.repository.MemberRepository; -import edonymyeon.backend.post.domain.Post; -import edonymyeon.backend.post.repository.PostRepository; +import edonymyeon.backend.content.comment.commentimage.domain.CommentImageInfo; +import edonymyeon.backend.content.comment.commentimage.repository.CommentImageInfoRepository; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.content.post.domain.Post; +import edonymyeon.backend.content.post.repository.PostRepository; import java.util.ArrayList; import java.util.List; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/edonymyeon/backend/comment/application/PostCommentServiceImpl.java b/backend/src/main/java/edonymyeon/backend/content/comment/application/PostCommentServiceImpl.java similarity index 73% rename from backend/src/main/java/edonymyeon/backend/comment/application/PostCommentServiceImpl.java rename to backend/src/main/java/edonymyeon/backend/content/comment/application/PostCommentServiceImpl.java index 7467e15e2..aff7c9633 100644 --- a/backend/src/main/java/edonymyeon/backend/comment/application/PostCommentServiceImpl.java +++ b/backend/src/main/java/edonymyeon/backend/content/comment/application/PostCommentServiceImpl.java @@ -1,9 +1,9 @@ -package edonymyeon.backend.comment.application; +package edonymyeon.backend.content.comment.application; -import edonymyeon.backend.comment.domain.Comment; -import edonymyeon.backend.comment.repository.CommentRepository; -import edonymyeon.backend.image.commentimage.repository.CommentImageInfoRepository; -import edonymyeon.backend.post.application.PostCommentService; +import edonymyeon.backend.content.comment.domain.Comment; +import edonymyeon.backend.content.comment.repository.CommentRepository; +import edonymyeon.backend.content.comment.commentimage.repository.CommentImageInfoRepository; +import edonymyeon.backend.content.post.application.PostCommentService; import java.util.ArrayList; import java.util.List; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/edonymyeon/backend/comment/application/dto/request/CommentRequest.java b/backend/src/main/java/edonymyeon/backend/content/comment/application/dto/request/CommentRequest.java similarity index 65% rename from backend/src/main/java/edonymyeon/backend/comment/application/dto/request/CommentRequest.java rename to backend/src/main/java/edonymyeon/backend/content/comment/application/dto/request/CommentRequest.java index 65bffe21f..46e93de39 100644 --- a/backend/src/main/java/edonymyeon/backend/comment/application/dto/request/CommentRequest.java +++ b/backend/src/main/java/edonymyeon/backend/content/comment/application/dto/request/CommentRequest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.comment.application.dto.request; +package edonymyeon.backend.content.comment.application.dto.request; import org.springframework.web.multipart.MultipartFile; diff --git a/backend/src/main/java/edonymyeon/backend/comment/application/dto/response/CommentDto.java b/backend/src/main/java/edonymyeon/backend/content/comment/application/dto/response/CommentDto.java similarity index 82% rename from backend/src/main/java/edonymyeon/backend/comment/application/dto/response/CommentDto.java rename to backend/src/main/java/edonymyeon/backend/content/comment/application/dto/response/CommentDto.java index 7027a41c4..be5abd17b 100644 --- a/backend/src/main/java/edonymyeon/backend/comment/application/dto/response/CommentDto.java +++ b/backend/src/main/java/edonymyeon/backend/content/comment/application/dto/response/CommentDto.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.comment.application.dto.response; +package edonymyeon.backend.content.comment.application.dto.response; -import edonymyeon.backend.comment.domain.Comment; +import edonymyeon.backend.content.comment.domain.Comment; import java.time.LocalDateTime; public record CommentDto( diff --git a/backend/src/main/java/edonymyeon/backend/comment/application/dto/response/CommentsResponse.java b/backend/src/main/java/edonymyeon/backend/content/comment/application/dto/response/CommentsResponse.java similarity index 60% rename from backend/src/main/java/edonymyeon/backend/comment/application/dto/response/CommentsResponse.java rename to backend/src/main/java/edonymyeon/backend/content/comment/application/dto/response/CommentsResponse.java index bf5bf150c..96e0d6539 100644 --- a/backend/src/main/java/edonymyeon/backend/comment/application/dto/response/CommentsResponse.java +++ b/backend/src/main/java/edonymyeon/backend/content/comment/application/dto/response/CommentsResponse.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.comment.application.dto.response; +package edonymyeon.backend.content.comment.application.dto.response; import java.util.List; diff --git a/backend/src/main/java/edonymyeon/backend/content/comment/application/dto/response/WriterDto.java b/backend/src/main/java/edonymyeon/backend/content/comment/application/dto/response/WriterDto.java new file mode 100644 index 000000000..20fd4ce0d --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/content/comment/application/dto/response/WriterDto.java @@ -0,0 +1,5 @@ +package edonymyeon.backend.content.comment.application.dto.response; + +public record WriterDto(String nickname) { + +} diff --git a/backend/src/main/java/edonymyeon/backend/content/comment/application/event/SavedCommentEvent.java b/backend/src/main/java/edonymyeon/backend/content/comment/application/event/SavedCommentEvent.java new file mode 100644 index 000000000..b0bf33f55 --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/content/comment/application/event/SavedCommentEvent.java @@ -0,0 +1,6 @@ +package edonymyeon.backend.content.comment.application.event; + +import edonymyeon.backend.content.comment.domain.Comment; + +public record SavedCommentEvent(Comment comment) { +} diff --git a/backend/src/main/java/edonymyeon/backend/image/commentimage/domain/CommentImageInfo.java b/backend/src/main/java/edonymyeon/backend/content/comment/commentimage/domain/CommentImageInfo.java similarity index 88% rename from backend/src/main/java/edonymyeon/backend/image/commentimage/domain/CommentImageInfo.java rename to backend/src/main/java/edonymyeon/backend/content/comment/commentimage/domain/CommentImageInfo.java index b599de445..d4054f9a0 100644 --- a/backend/src/main/java/edonymyeon/backend/image/commentimage/domain/CommentImageInfo.java +++ b/backend/src/main/java/edonymyeon/backend/content/comment/commentimage/domain/CommentImageInfo.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.image.commentimage.domain; +package edonymyeon.backend.content.comment.commentimage.domain; import edonymyeon.backend.image.domain.ImageInfo; import jakarta.persistence.Entity; @@ -6,7 +6,6 @@ import lombok.Getter; import lombok.NoArgsConstructor; import org.hibernate.annotations.ColumnDefault; -import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; @Getter diff --git a/backend/src/main/java/edonymyeon/backend/image/commentimage/repository/CommentImageInfoRepository.java b/backend/src/main/java/edonymyeon/backend/content/comment/commentimage/repository/CommentImageInfoRepository.java similarity index 78% rename from backend/src/main/java/edonymyeon/backend/image/commentimage/repository/CommentImageInfoRepository.java rename to backend/src/main/java/edonymyeon/backend/content/comment/commentimage/repository/CommentImageInfoRepository.java index 69dd17c1a..38dcbe8a6 100644 --- a/backend/src/main/java/edonymyeon/backend/image/commentimage/repository/CommentImageInfoRepository.java +++ b/backend/src/main/java/edonymyeon/backend/content/comment/commentimage/repository/CommentImageInfoRepository.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.image.commentimage.repository; +package edonymyeon.backend.content.comment.commentimage.repository; -import edonymyeon.backend.image.commentimage.domain.CommentImageInfo; +import edonymyeon.backend.content.comment.commentimage.domain.CommentImageInfo; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/backend/src/main/java/edonymyeon/backend/comment/domain/Comment.java b/backend/src/main/java/edonymyeon/backend/content/comment/domain/Comment.java similarity index 92% rename from backend/src/main/java/edonymyeon/backend/comment/domain/Comment.java rename to backend/src/main/java/edonymyeon/backend/content/comment/domain/Comment.java index 0dabe1552..0551057a1 100644 --- a/backend/src/main/java/edonymyeon/backend/comment/domain/Comment.java +++ b/backend/src/main/java/edonymyeon/backend/content/comment/domain/Comment.java @@ -1,12 +1,12 @@ -package edonymyeon.backend.comment.domain; +package edonymyeon.backend.content.comment.domain; import static edonymyeon.backend.global.exception.ExceptionInformation.COMMENT_MEMBER_NOT_SAME; import edonymyeon.backend.global.domain.TemporalRecord; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.image.commentimage.domain.CommentImageInfo; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.content.comment.commentimage.domain.CommentImageInfo; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.content.post.domain.Post; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/backend/src/main/java/edonymyeon/backend/comment/repository/CommentRepository.java b/backend/src/main/java/edonymyeon/backend/content/comment/repository/CommentRepository.java similarity index 88% rename from backend/src/main/java/edonymyeon/backend/comment/repository/CommentRepository.java rename to backend/src/main/java/edonymyeon/backend/content/comment/repository/CommentRepository.java index 937a13fb5..1cc9cd17a 100644 --- a/backend/src/main/java/edonymyeon/backend/comment/repository/CommentRepository.java +++ b/backend/src/main/java/edonymyeon/backend/content/comment/repository/CommentRepository.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.comment.repository; +package edonymyeon.backend.content.comment.repository; -import edonymyeon.backend.comment.domain.Comment; +import edonymyeon.backend.content.comment.domain.Comment; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.EntityGraph; diff --git a/backend/src/main/java/edonymyeon/backend/comment/ui/CommentController.java b/backend/src/main/java/edonymyeon/backend/content/comment/ui/CommentController.java similarity index 83% rename from backend/src/main/java/edonymyeon/backend/comment/ui/CommentController.java rename to backend/src/main/java/edonymyeon/backend/content/comment/ui/CommentController.java index 4ecea2c55..d286a721a 100644 --- a/backend/src/main/java/edonymyeon/backend/comment/ui/CommentController.java +++ b/backend/src/main/java/edonymyeon/backend/content/comment/ui/CommentController.java @@ -1,11 +1,11 @@ -package edonymyeon.backend.comment.ui; +package edonymyeon.backend.content.comment.ui; -import edonymyeon.backend.auth.annotation.AuthPrincipal; -import edonymyeon.backend.comment.application.CommentService; -import edonymyeon.backend.comment.application.dto.request.CommentRequest; -import edonymyeon.backend.comment.application.dto.response.CommentsResponse; +import edonymyeon.backend.membber.auth.annotation.AuthPrincipal; +import edonymyeon.backend.content.comment.application.CommentService; +import edonymyeon.backend.content.comment.application.dto.request.CommentRequest; +import edonymyeon.backend.content.comment.application.dto.response.CommentsResponse; import edonymyeon.backend.global.version.ApiVersion; -import edonymyeon.backend.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.application.dto.MemberId; import java.net.URI; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; diff --git a/backend/src/main/java/edonymyeon/backend/post/application/GeneralFindingCondition.java b/backend/src/main/java/edonymyeon/backend/content/post/application/GeneralFindingCondition.java similarity index 91% rename from backend/src/main/java/edonymyeon/backend/post/application/GeneralFindingCondition.java rename to backend/src/main/java/edonymyeon/backend/content/post/application/GeneralFindingCondition.java index 49f9bc8bb..d2930ecd5 100644 --- a/backend/src/main/java/edonymyeon/backend/post/application/GeneralFindingCondition.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/GeneralFindingCondition.java @@ -1,9 +1,9 @@ -package edonymyeon.backend.post.application; +package edonymyeon.backend.content.post.application; +import edonymyeon.backend.content.post.application.dto.SortBy; +import edonymyeon.backend.content.post.application.dto.SortDirection; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.post.application.dto.SortBy; -import edonymyeon.backend.post.application.dto.SortDirection; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.content.post.domain.Post; import lombok.Builder; import lombok.Getter; import org.springframework.data.domain.PageRequest; diff --git a/backend/src/main/java/edonymyeon/backend/post/application/HotFindingCondition.java b/backend/src/main/java/edonymyeon/backend/content/post/application/HotFindingCondition.java similarity index 97% rename from backend/src/main/java/edonymyeon/backend/post/application/HotFindingCondition.java rename to backend/src/main/java/edonymyeon/backend/content/post/application/HotFindingCondition.java index b32b72aa7..1256ac94f 100644 --- a/backend/src/main/java/edonymyeon/backend/post/application/HotFindingCondition.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/HotFindingCondition.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.post.application; +package edonymyeon.backend.content.post.application; import edonymyeon.backend.global.exception.EdonymyeonException; import lombok.Builder; diff --git a/backend/src/main/java/edonymyeon/backend/post/application/MyPostService.java b/backend/src/main/java/edonymyeon/backend/content/post/application/MyPostService.java similarity index 76% rename from backend/src/main/java/edonymyeon/backend/post/application/MyPostService.java rename to backend/src/main/java/edonymyeon/backend/content/post/application/MyPostService.java index 89969bdd3..6872a3102 100644 --- a/backend/src/main/java/edonymyeon/backend/post/application/MyPostService.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/MyPostService.java @@ -1,12 +1,12 @@ -package edonymyeon.backend.post.application; +package edonymyeon.backend.content.post.application; +import edonymyeon.backend.content.post.application.dto.response.MyPostResponse; +import edonymyeon.backend.content.post.application.dto.response.PostConsumptionResponse; +import edonymyeon.backend.content.post.repository.PostRepository; import edonymyeon.backend.image.application.ImageService; import edonymyeon.backend.image.domain.ImageType; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.post.application.dto.response.MyPostResponse; -import edonymyeon.backend.post.application.dto.response.PostConsumptionResponse; -import edonymyeon.backend.post.domain.Post; -import edonymyeon.backend.post.repository.PostRepository; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.content.post.domain.Post; import java.util.List; import java.util.Map; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/edonymyeon/backend/post/application/PostCommentService.java b/backend/src/main/java/edonymyeon/backend/content/post/application/PostCommentService.java similarity index 64% rename from backend/src/main/java/edonymyeon/backend/post/application/PostCommentService.java rename to backend/src/main/java/edonymyeon/backend/content/post/application/PostCommentService.java index 0613fd65f..ad1e33f61 100644 --- a/backend/src/main/java/edonymyeon/backend/post/application/PostCommentService.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/PostCommentService.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.post.application; +package edonymyeon.backend.content.post.application; public interface PostCommentService { diff --git a/backend/src/main/java/edonymyeon/backend/post/application/PostConsumptionService.java b/backend/src/main/java/edonymyeon/backend/content/post/application/PostConsumptionService.java similarity index 55% rename from backend/src/main/java/edonymyeon/backend/post/application/PostConsumptionService.java rename to backend/src/main/java/edonymyeon/backend/content/post/application/PostConsumptionService.java index 6b6bbbc14..cb2ef9225 100644 --- a/backend/src/main/java/edonymyeon/backend/post/application/PostConsumptionService.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/PostConsumptionService.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.post.application; +package edonymyeon.backend.content.post.application; -import edonymyeon.backend.post.application.dto.response.PostConsumptionResponse; +import edonymyeon.backend.content.post.application.dto.response.PostConsumptionResponse; import java.util.List; import java.util.Map; diff --git a/backend/src/main/java/edonymyeon/backend/post/application/PostReadService.java b/backend/src/main/java/edonymyeon/backend/content/post/application/PostReadService.java similarity index 84% rename from backend/src/main/java/edonymyeon/backend/post/application/PostReadService.java rename to backend/src/main/java/edonymyeon/backend/content/post/application/PostReadService.java index bb3173fe3..20bc73064 100644 --- a/backend/src/main/java/edonymyeon/backend/post/application/PostReadService.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/PostReadService.java @@ -1,22 +1,28 @@ -package edonymyeon.backend.post.application; +package edonymyeon.backend.content.post.application; import static edonymyeon.backend.global.exception.ExceptionInformation.POST_ID_NOT_FOUND; import static org.springframework.data.domain.Sort.Direction; -import edonymyeon.backend.cache.application.PostCachingService; -import edonymyeon.backend.cache.application.dto.CachedPostResponse; +import edonymyeon.backend.content.cache.application.PostCachingService; +import edonymyeon.backend.content.cache.application.dto.CachedPostResponse; +import edonymyeon.backend.content.post.application.dto.response.AllThumbsInPostResponse; +import edonymyeon.backend.content.post.application.dto.response.GeneralPostInfoResponse; +import edonymyeon.backend.content.post.application.dto.response.GeneralPostsInfoResponse; +import edonymyeon.backend.content.post.application.dto.response.ReactionCountResponse; +import edonymyeon.backend.content.post.application.dto.response.SpecificPostInfoResponse; +import edonymyeon.backend.content.post.application.dto.response.ThumbsStatusInPostResponse; +import edonymyeon.backend.content.post.application.dto.response.WriterDetailResponse; +import edonymyeon.backend.content.post.repository.PostRepository; +import edonymyeon.backend.content.post.repository.PostSpecification; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.global.exception.ExceptionInformation; import edonymyeon.backend.image.application.ImageService; import edonymyeon.backend.image.domain.ImageType; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.repository.MemberRepository; -import edonymyeon.backend.post.application.dto.response.*; -import edonymyeon.backend.post.domain.HotPostPolicy; -import edonymyeon.backend.post.domain.Post; -import edonymyeon.backend.post.repository.PostRepository; -import edonymyeon.backend.post.repository.PostSpecification; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.content.post.domain.HotPostPolicy; +import edonymyeon.backend.content.post.domain.Post; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Slice; diff --git a/backend/src/main/java/edonymyeon/backend/post/application/PostService.java b/backend/src/main/java/edonymyeon/backend/content/post/application/PostService.java similarity index 85% rename from backend/src/main/java/edonymyeon/backend/post/application/PostService.java rename to backend/src/main/java/edonymyeon/backend/content/post/application/PostService.java index dd49380a3..f40927f6f 100644 --- a/backend/src/main/java/edonymyeon/backend/post/application/PostService.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/PostService.java @@ -1,19 +1,19 @@ -package edonymyeon.backend.post.application; +package edonymyeon.backend.content.post.application; +import edonymyeon.backend.content.post.application.dto.request.PostModificationRequest; +import edonymyeon.backend.content.post.application.dto.request.PostRequest; +import edonymyeon.backend.content.post.application.dto.response.PostIdResponse; +import edonymyeon.backend.content.post.application.event.PostDeletionEvent; +import edonymyeon.backend.content.post.repository.PostRepository; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.image.application.ImageService; import edonymyeon.backend.image.domain.ImageType; -import edonymyeon.backend.image.postimage.domain.PostImageInfos; -import edonymyeon.backend.image.postimage.repository.PostImageInfoRepository; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.repository.MemberRepository; -import edonymyeon.backend.post.application.dto.request.PostModificationRequest; -import edonymyeon.backend.post.application.dto.request.PostRequest; -import edonymyeon.backend.post.application.dto.response.PostIdResponse; -import edonymyeon.backend.post.application.event.PostDeletionEvent; -import edonymyeon.backend.post.domain.Post; -import edonymyeon.backend.post.repository.PostRepository; +import edonymyeon.backend.content.post.postimage.domain.PostImageInfos; +import edonymyeon.backend.content.post.postimage.repository.PostImageInfoRepository; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.content.post.domain.Post; import lombok.RequiredArgsConstructor; import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/edonymyeon/backend/post/application/PostSlice.java b/backend/src/main/java/edonymyeon/backend/content/post/application/PostSlice.java similarity index 92% rename from backend/src/main/java/edonymyeon/backend/post/application/PostSlice.java rename to backend/src/main/java/edonymyeon/backend/content/post/application/PostSlice.java index 0fc6cb61a..a28e68c46 100644 --- a/backend/src/main/java/edonymyeon/backend/post/application/PostSlice.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/PostSlice.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.post.application; +package edonymyeon.backend.content.post.application; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/edonymyeon/backend/content/post/application/PostThumbsService.java b/backend/src/main/java/edonymyeon/backend/content/post/application/PostThumbsService.java new file mode 100644 index 000000000..0435c1bd0 --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/PostThumbsService.java @@ -0,0 +1,14 @@ +package edonymyeon.backend.content.post.application; + +import edonymyeon.backend.content.post.application.dto.response.AllThumbsInPostResponse; +import edonymyeon.backend.content.post.application.dto.response.ThumbsStatusInPostResponse; +import edonymyeon.backend.membber.member.application.dto.MemberId; + +public interface PostThumbsService { + + AllThumbsInPostResponse findAllThumbsInPost(final Long postId); + + ThumbsStatusInPostResponse findThumbsStatusInPost(final MemberId memberId, final Long postId); + + void deleteAllThumbsInPost(final Long postId); +} diff --git a/backend/src/main/java/edonymyeon/backend/post/application/dto/SortBy.java b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/SortBy.java similarity index 92% rename from backend/src/main/java/edonymyeon/backend/post/application/dto/SortBy.java rename to backend/src/main/java/edonymyeon/backend/content/post/application/dto/SortBy.java index 5dc599d93..b16885259 100644 --- a/backend/src/main/java/edonymyeon/backend/post/application/dto/SortBy.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/SortBy.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.post.application.dto; +package edonymyeon.backend.content.post.application.dto; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.global.exception.ExceptionInformation; diff --git a/backend/src/main/java/edonymyeon/backend/post/application/dto/SortDirection.java b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/SortDirection.java similarity index 92% rename from backend/src/main/java/edonymyeon/backend/post/application/dto/SortDirection.java rename to backend/src/main/java/edonymyeon/backend/content/post/application/dto/SortDirection.java index 961d0d786..5b5b332d5 100644 --- a/backend/src/main/java/edonymyeon/backend/post/application/dto/SortDirection.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/SortDirection.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.post.application.dto; +package edonymyeon.backend.content.post.application.dto; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.global.exception.ExceptionInformation; diff --git a/backend/src/main/java/edonymyeon/backend/content/post/application/dto/WriterResponse.java b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/WriterResponse.java new file mode 100644 index 000000000..2f1530fd8 --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/WriterResponse.java @@ -0,0 +1,5 @@ +package edonymyeon.backend.content.post.application.dto; + +public record WriterResponse(String nickname) { + +} diff --git a/backend/src/main/java/edonymyeon/backend/post/application/dto/request/PostModificationRequest.java b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/request/PostModificationRequest.java similarity index 80% rename from backend/src/main/java/edonymyeon/backend/post/application/dto/request/PostModificationRequest.java rename to backend/src/main/java/edonymyeon/backend/content/post/application/dto/request/PostModificationRequest.java index ee82faa1c..c4ff3dc87 100644 --- a/backend/src/main/java/edonymyeon/backend/post/application/dto/request/PostModificationRequest.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/request/PostModificationRequest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.post.application.dto.request; +package edonymyeon.backend.content.post.application.dto.request; import java.util.List; import org.springframework.web.multipart.MultipartFile; diff --git a/backend/src/main/java/edonymyeon/backend/post/application/dto/request/PostRequest.java b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/request/PostRequest.java similarity index 77% rename from backend/src/main/java/edonymyeon/backend/post/application/dto/request/PostRequest.java rename to backend/src/main/java/edonymyeon/backend/content/post/application/dto/request/PostRequest.java index 5bd82bbfb..112c91841 100644 --- a/backend/src/main/java/edonymyeon/backend/post/application/dto/request/PostRequest.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/request/PostRequest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.post.application.dto.request; +package edonymyeon.backend.content.post.application.dto.request; import java.util.List; import org.springframework.web.multipart.MultipartFile; diff --git a/backend/src/main/java/edonymyeon/backend/post/application/dto/response/AllThumbsInPostResponse.java b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/AllThumbsInPostResponse.java similarity index 56% rename from backend/src/main/java/edonymyeon/backend/post/application/dto/response/AllThumbsInPostResponse.java rename to backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/AllThumbsInPostResponse.java index bf0f1cb6a..3d033bbfa 100644 --- a/backend/src/main/java/edonymyeon/backend/post/application/dto/response/AllThumbsInPostResponse.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/AllThumbsInPostResponse.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.post.application.dto.response; +package edonymyeon.backend.content.post.application.dto.response; public record AllThumbsInPostResponse(int thumbsUpCount, int thumbsDownCount) { diff --git a/backend/src/main/java/edonymyeon/backend/post/application/dto/response/GeneralPostInfoResponse.java b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/GeneralPostInfoResponse.java similarity index 86% rename from backend/src/main/java/edonymyeon/backend/post/application/dto/response/GeneralPostInfoResponse.java rename to backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/GeneralPostInfoResponse.java index 8b05757b0..e0f62e67e 100644 --- a/backend/src/main/java/edonymyeon/backend/post/application/dto/response/GeneralPostInfoResponse.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/GeneralPostInfoResponse.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.post.application.dto.response; +package edonymyeon.backend.content.post.application.dto.response; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.content.post.domain.Post; import java.time.LocalDateTime; public record GeneralPostInfoResponse( diff --git a/backend/src/main/java/edonymyeon/backend/post/application/dto/response/GeneralPostsInfoResponse.java b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/GeneralPostsInfoResponse.java similarity index 82% rename from backend/src/main/java/edonymyeon/backend/post/application/dto/response/GeneralPostsInfoResponse.java rename to backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/GeneralPostsInfoResponse.java index d0c8a6031..26f78a2c1 100644 --- a/backend/src/main/java/edonymyeon/backend/post/application/dto/response/GeneralPostsInfoResponse.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/GeneralPostsInfoResponse.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.post.application.dto.response; +package edonymyeon.backend.content.post.application.dto.response; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.content.post.domain.Post; import org.springframework.data.domain.Slice; import java.util.List; diff --git a/backend/src/main/java/edonymyeon/backend/post/application/dto/response/MyPostResponse.java b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/MyPostResponse.java similarity index 87% rename from backend/src/main/java/edonymyeon/backend/post/application/dto/response/MyPostResponse.java rename to backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/MyPostResponse.java index dc9982892..4ceacd4d1 100644 --- a/backend/src/main/java/edonymyeon/backend/post/application/dto/response/MyPostResponse.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/MyPostResponse.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.post.application.dto.response; +package edonymyeon.backend.content.post.application.dto.response; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.content.post.domain.Post; import java.time.LocalDateTime; public record MyPostResponse( diff --git a/backend/src/main/java/edonymyeon/backend/post/application/dto/response/PostConsumptionResponse.java b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/PostConsumptionResponse.java similarity index 86% rename from backend/src/main/java/edonymyeon/backend/post/application/dto/response/PostConsumptionResponse.java rename to backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/PostConsumptionResponse.java index 27c4888dc..12a9990bb 100644 --- a/backend/src/main/java/edonymyeon/backend/post/application/dto/response/PostConsumptionResponse.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/PostConsumptionResponse.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.post.application.dto.response; +package edonymyeon.backend.content.post.application.dto.response; public record PostConsumptionResponse( String type, diff --git a/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/PostIdResponse.java b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/PostIdResponse.java new file mode 100644 index 000000000..e374d6e45 --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/PostIdResponse.java @@ -0,0 +1,5 @@ +package edonymyeon.backend.content.post.application.dto.response; + +public record PostIdResponse(Long id) { + +} diff --git a/backend/src/main/java/edonymyeon/backend/post/application/dto/response/ReactionCountResponse.java b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/ReactionCountResponse.java similarity index 53% rename from backend/src/main/java/edonymyeon/backend/post/application/dto/response/ReactionCountResponse.java rename to backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/ReactionCountResponse.java index 110c0e8e4..324d7868e 100644 --- a/backend/src/main/java/edonymyeon/backend/post/application/dto/response/ReactionCountResponse.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/ReactionCountResponse.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.post.application.dto.response; +package edonymyeon.backend.content.post.application.dto.response; public record ReactionCountResponse(int viewCount, int commentCount) { diff --git a/backend/src/main/java/edonymyeon/backend/post/application/dto/response/SpecificPostInfoResponse.java b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/SpecificPostInfoResponse.java similarity index 93% rename from backend/src/main/java/edonymyeon/backend/post/application/dto/response/SpecificPostInfoResponse.java rename to backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/SpecificPostInfoResponse.java index d29e5bb78..6843bd2d7 100644 --- a/backend/src/main/java/edonymyeon/backend/post/application/dto/response/SpecificPostInfoResponse.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/SpecificPostInfoResponse.java @@ -1,7 +1,7 @@ -package edonymyeon.backend.post.application.dto.response; +package edonymyeon.backend.content.post.application.dto.response; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.content.post.domain.Post; import java.time.LocalDateTime; import java.util.List; diff --git a/backend/src/main/java/edonymyeon/backend/post/application/dto/response/ThumbsStatusInPostResponse.java b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/ThumbsStatusInPostResponse.java similarity index 53% rename from backend/src/main/java/edonymyeon/backend/post/application/dto/response/ThumbsStatusInPostResponse.java rename to backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/ThumbsStatusInPostResponse.java index 13b218afb..73688f530 100644 --- a/backend/src/main/java/edonymyeon/backend/post/application/dto/response/ThumbsStatusInPostResponse.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/ThumbsStatusInPostResponse.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.post.application.dto.response; +package edonymyeon.backend.content.post.application.dto.response; public record ThumbsStatusInPostResponse(boolean isUp, boolean isDown) { diff --git a/backend/src/main/java/edonymyeon/backend/post/application/dto/response/WriterDetailResponse.java b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/WriterDetailResponse.java similarity index 57% rename from backend/src/main/java/edonymyeon/backend/post/application/dto/response/WriterDetailResponse.java rename to backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/WriterDetailResponse.java index 337804469..8b80d40dc 100644 --- a/backend/src/main/java/edonymyeon/backend/post/application/dto/response/WriterDetailResponse.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/WriterDetailResponse.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.post.application.dto.response; +package edonymyeon.backend.content.post.application.dto.response; public record WriterDetailResponse(long id, String nickname, String profileImage) { diff --git a/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/WriterResponse.java b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/WriterResponse.java new file mode 100644 index 000000000..48333313d --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/WriterResponse.java @@ -0,0 +1,5 @@ +package edonymyeon.backend.content.post.application.dto.response; + +public record WriterResponse(String nickname) { + +} diff --git a/backend/src/main/java/edonymyeon/backend/content/post/application/event/PostDeletionEvent.java b/backend/src/main/java/edonymyeon/backend/content/post/application/event/PostDeletionEvent.java new file mode 100644 index 000000000..ce30ebb62 --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/event/PostDeletionEvent.java @@ -0,0 +1,5 @@ +package edonymyeon.backend.content.post.application.event; + +public record PostDeletionEvent(Long postId) { + +} diff --git a/backend/src/main/java/edonymyeon/backend/post/domain/HotPostPolicy.java b/backend/src/main/java/edonymyeon/backend/content/post/domain/HotPostPolicy.java similarity index 94% rename from backend/src/main/java/edonymyeon/backend/post/domain/HotPostPolicy.java rename to backend/src/main/java/edonymyeon/backend/content/post/domain/HotPostPolicy.java index 48df900cf..b1f74e493 100644 --- a/backend/src/main/java/edonymyeon/backend/post/domain/HotPostPolicy.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/domain/HotPostPolicy.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.post.domain; +package edonymyeon.backend.content.post.domain; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; diff --git a/backend/src/main/java/edonymyeon/backend/post/domain/Post.java b/backend/src/main/java/edonymyeon/backend/content/post/domain/Post.java similarity index 96% rename from backend/src/main/java/edonymyeon/backend/post/domain/Post.java rename to backend/src/main/java/edonymyeon/backend/content/post/domain/Post.java index 1fe4f5ea3..7cbefc824 100644 --- a/backend/src/main/java/edonymyeon/backend/post/domain/Post.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/domain/Post.java @@ -1,10 +1,10 @@ -package edonymyeon.backend.post.domain; +package edonymyeon.backend.content.post.domain; import edonymyeon.backend.global.domain.TemporalRecord; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.image.postimage.domain.PostImageInfo; -import edonymyeon.backend.image.postimage.domain.PostImageInfos; -import edonymyeon.backend.member.domain.Member; +import edonymyeon.backend.content.post.postimage.domain.PostImageInfo; +import edonymyeon.backend.content.post.postimage.domain.PostImageInfos; +import edonymyeon.backend.membber.member.domain.Member; import jakarta.persistence.*; import lombok.*; import org.hibernate.annotations.ColumnDefault; diff --git a/backend/src/main/java/edonymyeon/backend/image/postimage/domain/PostImageInfo.java b/backend/src/main/java/edonymyeon/backend/content/post/postimage/domain/PostImageInfo.java similarity index 89% rename from backend/src/main/java/edonymyeon/backend/image/postimage/domain/PostImageInfo.java rename to backend/src/main/java/edonymyeon/backend/content/post/postimage/domain/PostImageInfo.java index 4a511c07a..8d3717482 100644 --- a/backend/src/main/java/edonymyeon/backend/image/postimage/domain/PostImageInfo.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/postimage/domain/PostImageInfo.java @@ -1,7 +1,7 @@ -package edonymyeon.backend.image.postimage.domain; +package edonymyeon.backend.content.post.postimage.domain; import edonymyeon.backend.image.domain.ImageInfo; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.content.post.domain.Post; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; import jakarta.persistence.JoinColumn; diff --git a/backend/src/main/java/edonymyeon/backend/image/postimage/domain/PostImageInfos.java b/backend/src/main/java/edonymyeon/backend/content/post/postimage/domain/PostImageInfos.java similarity index 96% rename from backend/src/main/java/edonymyeon/backend/image/postimage/domain/PostImageInfos.java rename to backend/src/main/java/edonymyeon/backend/content/post/postimage/domain/PostImageInfos.java index db1044603..6d3f9510b 100644 --- a/backend/src/main/java/edonymyeon/backend/image/postimage/domain/PostImageInfos.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/postimage/domain/PostImageInfos.java @@ -1,8 +1,8 @@ -package edonymyeon.backend.image.postimage.domain; +package edonymyeon.backend.content.post.postimage.domain; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.image.domain.ImageInfo; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.content.post.domain.Post; import jakarta.persistence.Embeddable; import jakarta.persistence.OneToMany; import lombok.AccessLevel; diff --git a/backend/src/main/java/edonymyeon/backend/image/postimage/repository/PostImageInfoCustomRepository.java b/backend/src/main/java/edonymyeon/backend/content/post/postimage/repository/PostImageInfoCustomRepository.java similarity index 53% rename from backend/src/main/java/edonymyeon/backend/image/postimage/repository/PostImageInfoCustomRepository.java rename to backend/src/main/java/edonymyeon/backend/content/post/postimage/repository/PostImageInfoCustomRepository.java index 9b098633a..52c8e18b1 100644 --- a/backend/src/main/java/edonymyeon/backend/image/postimage/repository/PostImageInfoCustomRepository.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/postimage/repository/PostImageInfoCustomRepository.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.image.postimage.repository; +package edonymyeon.backend.content.post.postimage.repository; -import edonymyeon.backend.image.postimage.domain.PostImageInfo; +import edonymyeon.backend.content.post.postimage.domain.PostImageInfo; import java.util.List; diff --git a/backend/src/main/java/edonymyeon/backend/image/postimage/repository/PostImageInfoCustomRepositoryImpl.java b/backend/src/main/java/edonymyeon/backend/content/post/postimage/repository/PostImageInfoCustomRepositoryImpl.java similarity index 90% rename from backend/src/main/java/edonymyeon/backend/image/postimage/repository/PostImageInfoCustomRepositoryImpl.java rename to backend/src/main/java/edonymyeon/backend/content/post/postimage/repository/PostImageInfoCustomRepositoryImpl.java index d25948c0f..48ccd04bb 100644 --- a/backend/src/main/java/edonymyeon/backend/image/postimage/repository/PostImageInfoCustomRepositoryImpl.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/postimage/repository/PostImageInfoCustomRepositoryImpl.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.image.postimage.repository; +package edonymyeon.backend.content.post.postimage.repository; -import edonymyeon.backend.image.postimage.domain.PostImageInfo; +import edonymyeon.backend.content.post.postimage.domain.PostImageInfo; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.BatchPreparedStatementSetter; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/backend/src/main/java/edonymyeon/backend/image/postimage/repository/PostImageInfoRepository.java b/backend/src/main/java/edonymyeon/backend/content/post/postimage/repository/PostImageInfoRepository.java similarity index 85% rename from backend/src/main/java/edonymyeon/backend/image/postimage/repository/PostImageInfoRepository.java rename to backend/src/main/java/edonymyeon/backend/content/post/postimage/repository/PostImageInfoRepository.java index a3857f498..8a24ec066 100644 --- a/backend/src/main/java/edonymyeon/backend/image/postimage/repository/PostImageInfoRepository.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/postimage/repository/PostImageInfoRepository.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.image.postimage.repository; +package edonymyeon.backend.content.post.postimage.repository; -import edonymyeon.backend.image.postimage.domain.PostImageInfo; +import edonymyeon.backend.content.post.postimage.domain.PostImageInfo; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/backend/src/main/java/edonymyeon/backend/post/repository/PostRepository.java b/backend/src/main/java/edonymyeon/backend/content/post/repository/PostRepository.java similarity index 95% rename from backend/src/main/java/edonymyeon/backend/post/repository/PostRepository.java rename to backend/src/main/java/edonymyeon/backend/content/post/repository/PostRepository.java index 16470ed41..b49333e62 100644 --- a/backend/src/main/java/edonymyeon/backend/post/repository/PostRepository.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/repository/PostRepository.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.post.repository; +package edonymyeon.backend.content.post.repository; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.content.post.domain.Post; import java.time.LocalDateTime; import java.util.List; import java.util.Optional; diff --git a/backend/src/main/java/edonymyeon/backend/post/repository/PostSpecification.java b/backend/src/main/java/edonymyeon/backend/content/post/repository/PostSpecification.java similarity index 95% rename from backend/src/main/java/edonymyeon/backend/post/repository/PostSpecification.java rename to backend/src/main/java/edonymyeon/backend/content/post/repository/PostSpecification.java index f1857d337..668621844 100644 --- a/backend/src/main/java/edonymyeon/backend/post/repository/PostSpecification.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/repository/PostSpecification.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.post.repository; +package edonymyeon.backend.content.post.repository; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.content.post.domain.Post; import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; diff --git a/backend/src/main/java/edonymyeon/backend/post/ui/MyPostController.java b/backend/src/main/java/edonymyeon/backend/content/post/ui/MyPostController.java similarity index 55% rename from backend/src/main/java/edonymyeon/backend/post/ui/MyPostController.java rename to backend/src/main/java/edonymyeon/backend/content/post/ui/MyPostController.java index e30aa9863..3933d12bc 100644 --- a/backend/src/main/java/edonymyeon/backend/post/ui/MyPostController.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/ui/MyPostController.java @@ -1,13 +1,13 @@ -package edonymyeon.backend.post.ui; +package edonymyeon.backend.content.post.ui; -import edonymyeon.backend.auth.annotation.AuthPrincipal; +import edonymyeon.backend.content.post.application.GeneralFindingCondition; +import edonymyeon.backend.content.post.application.MyPostService; +import edonymyeon.backend.content.post.application.PostSlice; +import edonymyeon.backend.content.post.application.dto.response.MyPostResponse; +import edonymyeon.backend.membber.auth.annotation.AuthPrincipal; import edonymyeon.backend.global.version.ApiVersion; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.post.application.GeneralFindingCondition; -import edonymyeon.backend.post.application.MyPostService; -import edonymyeon.backend.post.application.PostSlice; -import edonymyeon.backend.post.application.dto.response.MyPostResponse; -import edonymyeon.backend.post.ui.annotation.PostPaging; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.content.post.ui.annotation.PostPaging; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; @@ -24,7 +24,7 @@ public class MyPostController { @ApiVersion(from = "1.0") @GetMapping("/my-posts") public ResponseEntity> findMyPosts(@AuthPrincipal final MemberId memberId, - @PostPaging GeneralFindingCondition generalFindingCondition) { + @PostPaging GeneralFindingCondition generalFindingCondition) { PostSlice response = myPostService.findMyPosts(memberId, generalFindingCondition); return ResponseEntity.ok(response); } diff --git a/backend/src/main/java/edonymyeon/backend/post/ui/PostController.java b/backend/src/main/java/edonymyeon/backend/content/post/ui/PostController.java similarity index 80% rename from backend/src/main/java/edonymyeon/backend/post/ui/PostController.java rename to backend/src/main/java/edonymyeon/backend/content/post/ui/PostController.java index c2b1dcb19..18bca0e17 100644 --- a/backend/src/main/java/edonymyeon/backend/post/ui/PostController.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/ui/PostController.java @@ -1,12 +1,12 @@ -package edonymyeon.backend.post.ui; +package edonymyeon.backend.content.post.ui; -import edonymyeon.backend.auth.annotation.AuthPrincipal; +import edonymyeon.backend.membber.auth.annotation.AuthPrincipal; import edonymyeon.backend.global.version.ApiVersion; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.post.application.PostService; -import edonymyeon.backend.post.application.dto.request.PostModificationRequest; -import edonymyeon.backend.post.application.dto.request.PostRequest; -import edonymyeon.backend.post.application.dto.response.PostIdResponse; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.content.post.application.PostService; +import edonymyeon.backend.content.post.application.dto.request.PostModificationRequest; +import edonymyeon.backend.content.post.application.dto.request.PostRequest; +import edonymyeon.backend.content.post.application.dto.response.PostIdResponse; import java.net.URI; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; diff --git a/backend/src/main/java/edonymyeon/backend/post/ui/PostReadController.java b/backend/src/main/java/edonymyeon/backend/content/post/ui/PostReadController.java similarity index 73% rename from backend/src/main/java/edonymyeon/backend/post/ui/PostReadController.java rename to backend/src/main/java/edonymyeon/backend/content/post/ui/PostReadController.java index de0ba2592..7038aaf10 100644 --- a/backend/src/main/java/edonymyeon/backend/post/ui/PostReadController.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/ui/PostReadController.java @@ -1,16 +1,16 @@ -package edonymyeon.backend.post.ui; +package edonymyeon.backend.content.post.ui; -import edonymyeon.backend.auth.annotation.AuthPrincipal; +import edonymyeon.backend.content.post.application.GeneralFindingCondition; +import edonymyeon.backend.content.post.application.HotFindingCondition; +import edonymyeon.backend.content.post.application.PostReadService; +import edonymyeon.backend.content.post.application.PostSlice; +import edonymyeon.backend.content.post.application.dto.response.GeneralPostInfoResponse; +import edonymyeon.backend.content.post.application.dto.response.SpecificPostInfoResponse; +import edonymyeon.backend.membber.auth.annotation.AuthPrincipal; import edonymyeon.backend.global.version.ApiVersion; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.post.application.GeneralFindingCondition; -import edonymyeon.backend.post.application.HotFindingCondition; -import edonymyeon.backend.post.application.PostReadService; -import edonymyeon.backend.post.application.PostSlice; -import edonymyeon.backend.post.application.dto.response.GeneralPostInfoResponse; -import edonymyeon.backend.post.application.dto.response.SpecificPostInfoResponse; -import edonymyeon.backend.post.ui.annotation.HotPostSizing; -import edonymyeon.backend.post.ui.annotation.PostPaging; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.content.post.ui.annotation.HotPostSizing; +import edonymyeon.backend.content.post.ui.annotation.PostPaging; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/backend/src/main/java/edonymyeon/backend/post/ui/annotation/HotPostSizing.java b/backend/src/main/java/edonymyeon/backend/content/post/ui/annotation/HotPostSizing.java similarity index 86% rename from backend/src/main/java/edonymyeon/backend/post/ui/annotation/HotPostSizing.java rename to backend/src/main/java/edonymyeon/backend/content/post/ui/annotation/HotPostSizing.java index 03dd7ac52..089380ed7 100644 --- a/backend/src/main/java/edonymyeon/backend/post/ui/annotation/HotPostSizing.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/ui/annotation/HotPostSizing.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.post.ui.annotation; +package edonymyeon.backend.content.post.ui.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/backend/src/main/java/edonymyeon/backend/post/ui/annotation/PostPaging.java b/backend/src/main/java/edonymyeon/backend/content/post/ui/annotation/PostPaging.java similarity index 87% rename from backend/src/main/java/edonymyeon/backend/post/ui/annotation/PostPaging.java rename to backend/src/main/java/edonymyeon/backend/content/post/ui/annotation/PostPaging.java index 8160b7d2c..c0a598cdb 100644 --- a/backend/src/main/java/edonymyeon/backend/post/ui/annotation/PostPaging.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/ui/annotation/PostPaging.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.post.ui.annotation; +package edonymyeon.backend.content.post.ui.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/backend/src/main/java/edonymyeon/backend/post/ui/argumentresolver/HotPostSizingArgumentResolver.java b/backend/src/main/java/edonymyeon/backend/content/post/ui/argumentresolver/HotPostSizingArgumentResolver.java similarity index 89% rename from backend/src/main/java/edonymyeon/backend/post/ui/argumentresolver/HotPostSizingArgumentResolver.java rename to backend/src/main/java/edonymyeon/backend/content/post/ui/argumentresolver/HotPostSizingArgumentResolver.java index 30b4b8fc2..4af27c672 100644 --- a/backend/src/main/java/edonymyeon/backend/post/ui/argumentresolver/HotPostSizingArgumentResolver.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/ui/argumentresolver/HotPostSizingArgumentResolver.java @@ -1,9 +1,9 @@ -package edonymyeon.backend.post.ui.argumentresolver; +package edonymyeon.backend.content.post.ui.argumentresolver; +import edonymyeon.backend.content.post.application.HotFindingCondition; +import edonymyeon.backend.content.post.ui.annotation.HotPostSizing; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.post.application.HotFindingCondition; -import edonymyeon.backend.post.ui.annotation.HotPostSizing; import org.springframework.core.MethodParameter; import org.springframework.stereotype.Component; import org.springframework.web.bind.support.WebDataBinderFactory; diff --git a/backend/src/main/java/edonymyeon/backend/post/ui/argumentresolver/PostPagingArgumentResolver.java b/backend/src/main/java/edonymyeon/backend/content/post/ui/argumentresolver/PostPagingArgumentResolver.java similarity index 90% rename from backend/src/main/java/edonymyeon/backend/post/ui/argumentresolver/PostPagingArgumentResolver.java rename to backend/src/main/java/edonymyeon/backend/content/post/ui/argumentresolver/PostPagingArgumentResolver.java index c4245b33f..161863642 100644 --- a/backend/src/main/java/edonymyeon/backend/post/ui/argumentresolver/PostPagingArgumentResolver.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/ui/argumentresolver/PostPagingArgumentResolver.java @@ -1,9 +1,9 @@ -package edonymyeon.backend.post.ui.argumentresolver; +package edonymyeon.backend.content.post.ui.argumentresolver; +import edonymyeon.backend.content.post.application.GeneralFindingCondition; +import edonymyeon.backend.content.post.ui.annotation.PostPaging; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.post.application.GeneralFindingCondition; -import edonymyeon.backend.post.ui.annotation.PostPaging; import java.util.Objects; import org.springframework.core.MethodParameter; import org.springframework.stereotype.Component; diff --git a/backend/src/main/java/edonymyeon/backend/thumbs/application/PostThumbsServiceImpl.java b/backend/src/main/java/edonymyeon/backend/content/thumbs/application/PostThumbsServiceImpl.java similarity index 70% rename from backend/src/main/java/edonymyeon/backend/thumbs/application/PostThumbsServiceImpl.java rename to backend/src/main/java/edonymyeon/backend/content/thumbs/application/PostThumbsServiceImpl.java index 5a9e468b0..7de37434e 100644 --- a/backend/src/main/java/edonymyeon/backend/thumbs/application/PostThumbsServiceImpl.java +++ b/backend/src/main/java/edonymyeon/backend/content/thumbs/application/PostThumbsServiceImpl.java @@ -1,13 +1,13 @@ -package edonymyeon.backend.thumbs.application; - -import edonymyeon.backend.member.application.dto.AnonymousMemberId; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.post.application.PostThumbsService; -import edonymyeon.backend.post.application.dto.response.AllThumbsInPostResponse; -import edonymyeon.backend.post.application.dto.response.ThumbsStatusInPostResponse; -import edonymyeon.backend.thumbs.domain.AllThumbsInPost; -import edonymyeon.backend.thumbs.domain.Thumbs; -import edonymyeon.backend.thumbs.repository.ThumbsRepository; +package edonymyeon.backend.content.thumbs.application; + +import edonymyeon.backend.content.thumbs.domain.AllThumbsInPost; +import edonymyeon.backend.content.thumbs.domain.Thumbs; +import edonymyeon.backend.content.thumbs.repository.ThumbsRepository; +import edonymyeon.backend.membber.member.application.dto.AnonymousMemberId; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.content.post.application.PostThumbsService; +import edonymyeon.backend.content.post.application.dto.response.AllThumbsInPostResponse; +import edonymyeon.backend.content.post.application.dto.response.ThumbsStatusInPostResponse; import java.util.Objects; import java.util.Optional; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/edonymyeon/backend/thumbs/application/ThumbsService.java b/backend/src/main/java/edonymyeon/backend/content/thumbs/application/ThumbsService.java similarity index 86% rename from backend/src/main/java/edonymyeon/backend/thumbs/application/ThumbsService.java rename to backend/src/main/java/edonymyeon/backend/content/thumbs/application/ThumbsService.java index 89948c9c8..9bfa5f4a4 100644 --- a/backend/src/main/java/edonymyeon/backend/thumbs/application/ThumbsService.java +++ b/backend/src/main/java/edonymyeon/backend/content/thumbs/application/ThumbsService.java @@ -1,17 +1,17 @@ -package edonymyeon.backend.thumbs.application; +package edonymyeon.backend.content.thumbs.application; +import edonymyeon.backend.content.thumbs.domain.Thumbs; +import edonymyeon.backend.content.thumbs.domain.ThumbsType; +import edonymyeon.backend.content.thumbs.repository.ThumbsRepository; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.repository.MemberRepository; -import edonymyeon.backend.post.domain.Post; -import edonymyeon.backend.post.repository.PostRepository; -import edonymyeon.backend.thumbs.application.event.ThumbsDownEvent; -import edonymyeon.backend.thumbs.application.event.ThumbsUpEvent; -import edonymyeon.backend.thumbs.domain.Thumbs; -import edonymyeon.backend.thumbs.domain.ThumbsType; -import edonymyeon.backend.thumbs.repository.ThumbsRepository; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.content.post.domain.Post; +import edonymyeon.backend.content.post.repository.PostRepository; +import edonymyeon.backend.content.thumbs.application.event.ThumbsDownEvent; +import edonymyeon.backend.content.thumbs.application.event.ThumbsUpEvent; import lombok.RequiredArgsConstructor; import org.springframework.context.ApplicationEventPublisher; import org.springframework.dao.DataIntegrityViolationException; diff --git a/backend/src/main/java/edonymyeon/backend/content/thumbs/application/event/ThumbsDownEvent.java b/backend/src/main/java/edonymyeon/backend/content/thumbs/application/event/ThumbsDownEvent.java new file mode 100644 index 000000000..3dd020747 --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/content/thumbs/application/event/ThumbsDownEvent.java @@ -0,0 +1,6 @@ +package edonymyeon.backend.content.thumbs.application.event; + +import edonymyeon.backend.content.post.domain.Post; + +public record ThumbsDownEvent(Post post) { +} diff --git a/backend/src/main/java/edonymyeon/backend/content/thumbs/application/event/ThumbsUpEvent.java b/backend/src/main/java/edonymyeon/backend/content/thumbs/application/event/ThumbsUpEvent.java new file mode 100644 index 000000000..94753402b --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/content/thumbs/application/event/ThumbsUpEvent.java @@ -0,0 +1,6 @@ +package edonymyeon.backend.content.thumbs.application.event; + +import edonymyeon.backend.content.post.domain.Post; + +public record ThumbsUpEvent(Post post) { +} diff --git a/backend/src/main/java/edonymyeon/backend/thumbs/domain/AllThumbsInPost.java b/backend/src/main/java/edonymyeon/backend/content/thumbs/domain/AllThumbsInPost.java similarity index 92% rename from backend/src/main/java/edonymyeon/backend/thumbs/domain/AllThumbsInPost.java rename to backend/src/main/java/edonymyeon/backend/content/thumbs/domain/AllThumbsInPost.java index fa8a600ef..f7f8d8b20 100644 --- a/backend/src/main/java/edonymyeon/backend/thumbs/domain/AllThumbsInPost.java +++ b/backend/src/main/java/edonymyeon/backend/content/thumbs/domain/AllThumbsInPost.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.thumbs.domain; +package edonymyeon.backend.content.thumbs.domain; import java.util.List; diff --git a/backend/src/main/java/edonymyeon/backend/thumbs/domain/Thumbs.java b/backend/src/main/java/edonymyeon/backend/content/thumbs/domain/Thumbs.java similarity index 92% rename from backend/src/main/java/edonymyeon/backend/thumbs/domain/Thumbs.java rename to backend/src/main/java/edonymyeon/backend/content/thumbs/domain/Thumbs.java index 8dc155db5..a61f06ebf 100644 --- a/backend/src/main/java/edonymyeon/backend/thumbs/domain/Thumbs.java +++ b/backend/src/main/java/edonymyeon/backend/content/thumbs/domain/Thumbs.java @@ -1,9 +1,9 @@ -package edonymyeon.backend.thumbs.domain; +package edonymyeon.backend.content.thumbs.domain; import edonymyeon.backend.global.domain.TemporalRecord; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.content.post.domain.Post; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.EqualsAndHashCode; diff --git a/backend/src/main/java/edonymyeon/backend/thumbs/domain/ThumbsType.java b/backend/src/main/java/edonymyeon/backend/content/thumbs/domain/ThumbsType.java similarity index 80% rename from backend/src/main/java/edonymyeon/backend/thumbs/domain/ThumbsType.java rename to backend/src/main/java/edonymyeon/backend/content/thumbs/domain/ThumbsType.java index 1fecc9a64..1a10dce71 100644 --- a/backend/src/main/java/edonymyeon/backend/thumbs/domain/ThumbsType.java +++ b/backend/src/main/java/edonymyeon/backend/content/thumbs/domain/ThumbsType.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.thumbs.domain; +package edonymyeon.backend.content.thumbs.domain; public enum ThumbsType { diff --git a/backend/src/main/java/edonymyeon/backend/thumbs/repository/ThumbsRepository.java b/backend/src/main/java/edonymyeon/backend/content/thumbs/repository/ThumbsRepository.java similarity index 79% rename from backend/src/main/java/edonymyeon/backend/thumbs/repository/ThumbsRepository.java rename to backend/src/main/java/edonymyeon/backend/content/thumbs/repository/ThumbsRepository.java index 97f715c88..7a2f40921 100644 --- a/backend/src/main/java/edonymyeon/backend/thumbs/repository/ThumbsRepository.java +++ b/backend/src/main/java/edonymyeon/backend/content/thumbs/repository/ThumbsRepository.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.thumbs.repository; +package edonymyeon.backend.content.thumbs.repository; -import edonymyeon.backend.thumbs.domain.Thumbs; +import edonymyeon.backend.content.thumbs.domain.Thumbs; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/backend/src/main/java/edonymyeon/backend/thumbs/ui/ThumbsController.java b/backend/src/main/java/edonymyeon/backend/content/thumbs/ui/ThumbsController.java similarity index 88% rename from backend/src/main/java/edonymyeon/backend/thumbs/ui/ThumbsController.java rename to backend/src/main/java/edonymyeon/backend/content/thumbs/ui/ThumbsController.java index 7fd2854bc..19ed58101 100644 --- a/backend/src/main/java/edonymyeon/backend/thumbs/ui/ThumbsController.java +++ b/backend/src/main/java/edonymyeon/backend/content/thumbs/ui/ThumbsController.java @@ -1,9 +1,9 @@ -package edonymyeon.backend.thumbs.ui; +package edonymyeon.backend.content.thumbs.ui; -import edonymyeon.backend.auth.annotation.AuthPrincipal; +import edonymyeon.backend.membber.auth.annotation.AuthPrincipal; import edonymyeon.backend.global.version.ApiVersion; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.thumbs.application.ThumbsService; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.content.thumbs.application.ThumbsService; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/backend/src/main/java/edonymyeon/backend/global/config/WebMvcConfiguration.java b/backend/src/main/java/edonymyeon/backend/global/config/WebMvcConfiguration.java index 980b585ba..d220f83a1 100644 --- a/backend/src/main/java/edonymyeon/backend/global/config/WebMvcConfiguration.java +++ b/backend/src/main/java/edonymyeon/backend/global/config/WebMvcConfiguration.java @@ -1,10 +1,10 @@ package edonymyeon.backend.global.config; -import edonymyeon.backend.auth.ui.argumentresolver.AuthArgumentResolver; +import edonymyeon.backend.membber.auth.ui.argumentresolver.AuthArgumentResolver; import edonymyeon.backend.logging.LoggingInterceptor; import edonymyeon.backend.notification.ui.NotificationInterceptor; -import edonymyeon.backend.post.ui.argumentresolver.HotPostSizingArgumentResolver; -import edonymyeon.backend.post.ui.argumentresolver.PostPagingArgumentResolver; +import edonymyeon.backend.content.post.ui.argumentresolver.HotPostSizingArgumentResolver; +import edonymyeon.backend.content.post.ui.argumentresolver.PostPagingArgumentResolver; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Configuration; diff --git a/backend/src/main/java/edonymyeon/backend/auth/annotation/AuthPrincipal.java b/backend/src/main/java/edonymyeon/backend/membber/auth/annotation/AuthPrincipal.java similarity index 85% rename from backend/src/main/java/edonymyeon/backend/auth/annotation/AuthPrincipal.java rename to backend/src/main/java/edonymyeon/backend/membber/auth/annotation/AuthPrincipal.java index f6f373d10..600c851db 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/annotation/AuthPrincipal.java +++ b/backend/src/main/java/edonymyeon/backend/membber/auth/annotation/AuthPrincipal.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.auth.annotation; +package edonymyeon.backend.membber.auth.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/backend/src/main/java/edonymyeon/backend/auth/application/AuthService.java b/backend/src/main/java/edonymyeon/backend/membber/auth/application/AuthService.java similarity index 83% rename from backend/src/main/java/edonymyeon/backend/auth/application/AuthService.java rename to backend/src/main/java/edonymyeon/backend/membber/auth/application/AuthService.java index bb618b610..74cad46cd 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/application/AuthService.java +++ b/backend/src/main/java/edonymyeon/backend/membber/auth/application/AuthService.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.auth.application; +package edonymyeon.backend.membber.auth.application; import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_EMAIL_DUPLICATE; import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_EMAIL_NOT_FOUND; @@ -7,24 +7,24 @@ import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_NICKNAME_INVALID; import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_PASSWORD_NOT_MATCH; -import edonymyeon.backend.member.application.dto.response.DuplicateCheckResponse; -import edonymyeon.backend.auth.application.dto.JoinRequest; -import edonymyeon.backend.auth.application.dto.KakaoLoginResponse; -import edonymyeon.backend.auth.application.dto.LoginRequest; -import edonymyeon.backend.auth.application.event.JoinMemberEvent; -import edonymyeon.backend.auth.application.event.LoginEvent; -import edonymyeon.backend.auth.application.event.LogoutEvent; -import edonymyeon.backend.auth.domain.PasswordEncoder; +import edonymyeon.backend.membber.member.application.dto.response.DuplicateCheckResponse; +import edonymyeon.backend.membber.auth.application.dto.JoinRequest; +import edonymyeon.backend.membber.auth.application.dto.KakaoLoginResponse; +import edonymyeon.backend.membber.auth.application.dto.LoginRequest; +import edonymyeon.backend.membber.auth.application.event.JoinMemberEvent; +import edonymyeon.backend.membber.auth.application.event.LoginEvent; +import edonymyeon.backend.membber.auth.application.event.LogoutEvent; +import edonymyeon.backend.membber.auth.domain.PasswordEncoder; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.member.application.MemberService; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.member.domain.Email; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.domain.Nickname; -import edonymyeon.backend.member.domain.SocialInfo; -import edonymyeon.backend.member.domain.SocialInfo.SocialType; -import edonymyeon.backend.member.repository.MemberRepository; +import edonymyeon.backend.membber.member.application.MemberService; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.domain.Email; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.domain.Nickname; +import edonymyeon.backend.membber.member.domain.SocialInfo; +import edonymyeon.backend.membber.member.domain.SocialInfo.SocialType; +import edonymyeon.backend.membber.member.repository.MemberRepository; import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/edonymyeon/backend/auth/application/KakaoAuthResponseProvider.java b/backend/src/main/java/edonymyeon/backend/membber/auth/application/KakaoAuthResponseProvider.java similarity index 82% rename from backend/src/main/java/edonymyeon/backend/auth/application/KakaoAuthResponseProvider.java rename to backend/src/main/java/edonymyeon/backend/membber/auth/application/KakaoAuthResponseProvider.java index d3f18febe..271471bf3 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/application/KakaoAuthResponseProvider.java +++ b/backend/src/main/java/edonymyeon/backend/membber/auth/application/KakaoAuthResponseProvider.java @@ -1,7 +1,7 @@ -package edonymyeon.backend.auth.application; +package edonymyeon.backend.membber.auth.application; -import edonymyeon.backend.auth.application.dto.KakaoLoginRequest; -import edonymyeon.backend.auth.application.dto.KakaoLoginResponse; +import edonymyeon.backend.membber.auth.application.dto.KakaoLoginRequest; +import edonymyeon.backend.membber.auth.application.dto.KakaoLoginResponse; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; diff --git a/backend/src/main/java/edonymyeon/backend/auth/application/dto/JoinRequest.java b/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/JoinRequest.java similarity index 63% rename from backend/src/main/java/edonymyeon/backend/auth/application/dto/JoinRequest.java rename to backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/JoinRequest.java index 7ef81cab8..7fa5616dd 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/application/dto/JoinRequest.java +++ b/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/JoinRequest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.auth.application.dto; +package edonymyeon.backend.membber.auth.application.dto; public record JoinRequest(String email, String password, String nickname, String deviceToken) { diff --git a/backend/src/main/java/edonymyeon/backend/auth/application/dto/KakaoLoginRequest.java b/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/KakaoLoginRequest.java similarity index 57% rename from backend/src/main/java/edonymyeon/backend/auth/application/dto/KakaoLoginRequest.java rename to backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/KakaoLoginRequest.java index 433b72216..fca36208d 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/application/dto/KakaoLoginRequest.java +++ b/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/KakaoLoginRequest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.auth.application.dto; +package edonymyeon.backend.membber.auth.application.dto; public record KakaoLoginRequest(String accessToken, String deviceToken) { diff --git a/backend/src/main/java/edonymyeon/backend/auth/application/dto/KakaoLoginResponse.java b/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/KakaoLoginResponse.java similarity index 73% rename from backend/src/main/java/edonymyeon/backend/auth/application/dto/KakaoLoginResponse.java rename to backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/KakaoLoginResponse.java index afd764ee4..b9d735929 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/application/dto/KakaoLoginResponse.java +++ b/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/KakaoLoginResponse.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.auth.application.dto; +package edonymyeon.backend.membber.auth.application.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/backend/src/main/java/edonymyeon/backend/auth/application/dto/LoginRequest.java b/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/LoginRequest.java similarity index 59% rename from backend/src/main/java/edonymyeon/backend/auth/application/dto/LoginRequest.java rename to backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/LoginRequest.java index 54bc4e7a3..3d495197b 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/application/dto/LoginRequest.java +++ b/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/LoginRequest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.auth.application.dto; +package edonymyeon.backend.membber.auth.application.dto; public record LoginRequest(String email, String password, String deviceToken) { diff --git a/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/LogoutRequest.java b/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/LogoutRequest.java new file mode 100644 index 000000000..07bc64fdf --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/LogoutRequest.java @@ -0,0 +1,4 @@ +package edonymyeon.backend.membber.auth.application.dto; + +public record LogoutRequest(String deviceToken) { +} diff --git a/backend/src/main/java/edonymyeon/backend/auth/application/dto/MemberResponse.java b/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/MemberResponse.java similarity index 53% rename from backend/src/main/java/edonymyeon/backend/auth/application/dto/MemberResponse.java rename to backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/MemberResponse.java index 6915ccb2e..7ac2e8fc7 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/application/dto/MemberResponse.java +++ b/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/MemberResponse.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.auth.application.dto; +package edonymyeon.backend.membber.auth.application.dto; public record MemberResponse(String email, String password) { diff --git a/backend/src/main/java/edonymyeon/backend/membber/auth/application/event/JoinMemberEvent.java b/backend/src/main/java/edonymyeon/backend/membber/auth/application/event/JoinMemberEvent.java new file mode 100644 index 000000000..71b7f2edf --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/membber/auth/application/event/JoinMemberEvent.java @@ -0,0 +1,6 @@ +package edonymyeon.backend.membber.auth.application.event; + +import edonymyeon.backend.membber.member.domain.Member; + +public record JoinMemberEvent(Member member, String deviceToken) { +} diff --git a/backend/src/main/java/edonymyeon/backend/membber/auth/application/event/LoginEvent.java b/backend/src/main/java/edonymyeon/backend/membber/auth/application/event/LoginEvent.java new file mode 100644 index 000000000..350e746b0 --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/membber/auth/application/event/LoginEvent.java @@ -0,0 +1,6 @@ +package edonymyeon.backend.membber.auth.application.event; + +import edonymyeon.backend.membber.member.domain.Member; + +public record LoginEvent(Member member, String deviceToken) { +} diff --git a/backend/src/main/java/edonymyeon/backend/membber/auth/application/event/LogoutEvent.java b/backend/src/main/java/edonymyeon/backend/membber/auth/application/event/LogoutEvent.java new file mode 100644 index 000000000..e85430c2c --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/membber/auth/application/event/LogoutEvent.java @@ -0,0 +1,4 @@ +package edonymyeon.backend.membber.auth.application.event; + +public record LogoutEvent(String deviceToken) { +} diff --git a/backend/src/main/java/edonymyeon/backend/auth/domain/BasicTokenGenerator.java b/backend/src/main/java/edonymyeon/backend/membber/auth/domain/BasicTokenGenerator.java similarity index 88% rename from backend/src/main/java/edonymyeon/backend/auth/domain/BasicTokenGenerator.java rename to backend/src/main/java/edonymyeon/backend/membber/auth/domain/BasicTokenGenerator.java index 7690ab6d2..8c9a8e1fd 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/domain/BasicTokenGenerator.java +++ b/backend/src/main/java/edonymyeon/backend/membber/auth/domain/BasicTokenGenerator.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.auth.domain; +package edonymyeon.backend.membber.auth.domain; import java.util.Base64; import org.springframework.stereotype.Component; diff --git a/backend/src/main/java/edonymyeon/backend/auth/domain/PasswordEncoder.java b/backend/src/main/java/edonymyeon/backend/membber/auth/domain/PasswordEncoder.java similarity index 75% rename from backend/src/main/java/edonymyeon/backend/auth/domain/PasswordEncoder.java rename to backend/src/main/java/edonymyeon/backend/membber/auth/domain/PasswordEncoder.java index de7ed6db8..4390e48fe 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/domain/PasswordEncoder.java +++ b/backend/src/main/java/edonymyeon/backend/membber/auth/domain/PasswordEncoder.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.auth.domain; +package edonymyeon.backend.membber.auth.domain; public interface PasswordEncoder { diff --git a/backend/src/main/java/edonymyeon/backend/auth/domain/SimplePasswordEncoder.java b/backend/src/main/java/edonymyeon/backend/membber/auth/domain/SimplePasswordEncoder.java similarity index 98% rename from backend/src/main/java/edonymyeon/backend/auth/domain/SimplePasswordEncoder.java rename to backend/src/main/java/edonymyeon/backend/membber/auth/domain/SimplePasswordEncoder.java index 88557fc86..859294874 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/domain/SimplePasswordEncoder.java +++ b/backend/src/main/java/edonymyeon/backend/membber/auth/domain/SimplePasswordEncoder.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.auth.domain; +package edonymyeon.backend.membber.auth.domain; import static edonymyeon.backend.global.exception.ExceptionInformation.NOT_SUPPORTED_ALGORITHM; import static edonymyeon.backend.global.exception.ExceptionInformation.NOT_SUPPORTED_VERSION; diff --git a/backend/src/main/java/edonymyeon/backend/auth/domain/TokenGenerator.java b/backend/src/main/java/edonymyeon/backend/membber/auth/domain/TokenGenerator.java similarity index 62% rename from backend/src/main/java/edonymyeon/backend/auth/domain/TokenGenerator.java rename to backend/src/main/java/edonymyeon/backend/membber/auth/domain/TokenGenerator.java index fbc69783b..c98534aa0 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/domain/TokenGenerator.java +++ b/backend/src/main/java/edonymyeon/backend/membber/auth/domain/TokenGenerator.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.auth.domain; +package edonymyeon.backend.membber.auth.domain; public interface TokenGenerator { diff --git a/backend/src/main/java/edonymyeon/backend/auth/domain/ValidateType.java b/backend/src/main/java/edonymyeon/backend/membber/auth/domain/ValidateType.java similarity index 91% rename from backend/src/main/java/edonymyeon/backend/auth/domain/ValidateType.java rename to backend/src/main/java/edonymyeon/backend/membber/auth/domain/ValidateType.java index a360fbde0..ae845a261 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/domain/ValidateType.java +++ b/backend/src/main/java/edonymyeon/backend/membber/auth/domain/ValidateType.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.auth.domain; +package edonymyeon.backend.membber.auth.domain; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.global.exception.ExceptionInformation; diff --git a/backend/src/main/java/edonymyeon/backend/auth/ui/AuthController.java b/backend/src/main/java/edonymyeon/backend/membber/auth/ui/AuthController.java similarity index 79% rename from backend/src/main/java/edonymyeon/backend/auth/ui/AuthController.java rename to backend/src/main/java/edonymyeon/backend/membber/auth/ui/AuthController.java index f97307d10..0905c5023 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/ui/AuthController.java +++ b/backend/src/main/java/edonymyeon/backend/membber/auth/ui/AuthController.java @@ -1,18 +1,18 @@ -package edonymyeon.backend.auth.ui; +package edonymyeon.backend.membber.auth.ui; -import static edonymyeon.backend.auth.ui.SessionConst.USER; +import static edonymyeon.backend.membber.auth.ui.SessionConst.USER; -import edonymyeon.backend.auth.annotation.AuthPrincipal; -import edonymyeon.backend.auth.application.AuthService; -import edonymyeon.backend.auth.application.KakaoAuthResponseProvider; -import edonymyeon.backend.member.application.dto.response.DuplicateCheckResponse; -import edonymyeon.backend.auth.application.dto.JoinRequest; -import edonymyeon.backend.auth.application.dto.KakaoLoginRequest; -import edonymyeon.backend.auth.application.dto.KakaoLoginResponse; -import edonymyeon.backend.auth.application.dto.LoginRequest; -import edonymyeon.backend.auth.application.dto.LogoutRequest; +import edonymyeon.backend.membber.auth.annotation.AuthPrincipal; +import edonymyeon.backend.membber.auth.application.AuthService; +import edonymyeon.backend.membber.auth.application.KakaoAuthResponseProvider; +import edonymyeon.backend.membber.auth.application.dto.JoinRequest; +import edonymyeon.backend.membber.auth.application.dto.KakaoLoginRequest; +import edonymyeon.backend.membber.auth.application.dto.KakaoLoginResponse; +import edonymyeon.backend.membber.auth.application.dto.LoginRequest; +import edonymyeon.backend.membber.member.application.dto.response.DuplicateCheckResponse; +import edonymyeon.backend.membber.auth.application.dto.LogoutRequest; import edonymyeon.backend.global.version.ApiVersion; -import edonymyeon.backend.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.application.dto.MemberId; import jakarta.servlet.http.HttpSession; import java.net.URI; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/edonymyeon/backend/auth/ui/SessionConst.java b/backend/src/main/java/edonymyeon/backend/membber/auth/ui/SessionConst.java similarity index 92% rename from backend/src/main/java/edonymyeon/backend/auth/ui/SessionConst.java rename to backend/src/main/java/edonymyeon/backend/membber/auth/ui/SessionConst.java index 841bccf37..993a91845 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/ui/SessionConst.java +++ b/backend/src/main/java/edonymyeon/backend/membber/auth/ui/SessionConst.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.auth.ui; +package edonymyeon.backend.membber.auth.ui; public enum SessionConst { diff --git a/backend/src/main/java/edonymyeon/backend/auth/ui/argumentresolver/AuthArgumentResolver.java b/backend/src/main/java/edonymyeon/backend/membber/auth/ui/argumentresolver/AuthArgumentResolver.java similarity index 85% rename from backend/src/main/java/edonymyeon/backend/auth/ui/argumentresolver/AuthArgumentResolver.java rename to backend/src/main/java/edonymyeon/backend/membber/auth/ui/argumentresolver/AuthArgumentResolver.java index 5955661ed..2d443bf7c 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/ui/argumentresolver/AuthArgumentResolver.java +++ b/backend/src/main/java/edonymyeon/backend/membber/auth/ui/argumentresolver/AuthArgumentResolver.java @@ -1,13 +1,13 @@ -package edonymyeon.backend.auth.ui.argumentresolver; +package edonymyeon.backend.membber.auth.ui.argumentresolver; -import static edonymyeon.backend.auth.ui.SessionConst.USER; +import static edonymyeon.backend.membber.auth.ui.SessionConst.USER; import static edonymyeon.backend.global.exception.ExceptionInformation.AUTHORIZATION_EMPTY; -import edonymyeon.backend.auth.annotation.AuthPrincipal; +import edonymyeon.backend.membber.auth.annotation.AuthPrincipal; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.application.dto.AnonymousMemberId; -import edonymyeon.backend.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.application.dto.AnonymousMemberId; +import edonymyeon.backend.membber.member.application.dto.MemberId; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpSession; import java.util.Objects; diff --git a/backend/src/main/java/edonymyeon/backend/member/application/DeviceRepository.java b/backend/src/main/java/edonymyeon/backend/membber/member/application/DeviceRepository.java similarity index 83% rename from backend/src/main/java/edonymyeon/backend/member/application/DeviceRepository.java rename to backend/src/main/java/edonymyeon/backend/membber/member/application/DeviceRepository.java index 134cc81c3..d7fe31539 100644 --- a/backend/src/main/java/edonymyeon/backend/member/application/DeviceRepository.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/application/DeviceRepository.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.member.application; +package edonymyeon.backend.membber.member.application; -import edonymyeon.backend.member.domain.Device; +import edonymyeon.backend.membber.member.domain.Device; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.EntityGraph; diff --git a/backend/src/main/java/edonymyeon/backend/member/application/MemberConsumptionService.java b/backend/src/main/java/edonymyeon/backend/membber/member/application/MemberConsumptionService.java similarity index 69% rename from backend/src/main/java/edonymyeon/backend/member/application/MemberConsumptionService.java rename to backend/src/main/java/edonymyeon/backend/membber/member/application/MemberConsumptionService.java index c61563772..05cd645a9 100644 --- a/backend/src/main/java/edonymyeon/backend/member/application/MemberConsumptionService.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/application/MemberConsumptionService.java @@ -1,7 +1,7 @@ -package edonymyeon.backend.member.application; +package edonymyeon.backend.membber.member.application; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.member.application.dto.YearMonthDto; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.application.dto.YearMonthDto; public interface MemberConsumptionService { diff --git a/backend/src/main/java/edonymyeon/backend/member/application/MemberEventListener.java b/backend/src/main/java/edonymyeon/backend/membber/member/application/MemberEventListener.java similarity index 78% rename from backend/src/main/java/edonymyeon/backend/member/application/MemberEventListener.java rename to backend/src/main/java/edonymyeon/backend/membber/member/application/MemberEventListener.java index 63d0bb7d0..4606d2fe1 100644 --- a/backend/src/main/java/edonymyeon/backend/member/application/MemberEventListener.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/application/MemberEventListener.java @@ -1,8 +1,8 @@ -package edonymyeon.backend.member.application; +package edonymyeon.backend.membber.member.application; -import edonymyeon.backend.auth.application.event.JoinMemberEvent; -import edonymyeon.backend.auth.application.event.LoginEvent; -import edonymyeon.backend.auth.application.event.LogoutEvent; +import edonymyeon.backend.membber.auth.application.event.JoinMemberEvent; +import edonymyeon.backend.membber.auth.application.event.LoginEvent; +import edonymyeon.backend.membber.auth.application.event.LogoutEvent; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.transaction.event.TransactionPhase; diff --git a/backend/src/main/java/edonymyeon/backend/member/application/MemberService.java b/backend/src/main/java/edonymyeon/backend/membber/member/application/MemberService.java similarity index 83% rename from backend/src/main/java/edonymyeon/backend/member/application/MemberService.java rename to backend/src/main/java/edonymyeon/backend/membber/member/application/MemberService.java index d650955ed..959882b29 100644 --- a/backend/src/main/java/edonymyeon/backend/member/application/MemberService.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/application/MemberService.java @@ -1,30 +1,30 @@ -package edonymyeon.backend.member.application; +package edonymyeon.backend.membber.member.application; import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_ID_NOT_FOUND; import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_NICKNAME_DUPLICATE; -import edonymyeon.backend.auth.domain.ValidateType; +import edonymyeon.backend.membber.auth.domain.ValidateType; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.image.application.ImageService; import edonymyeon.backend.image.domain.ImageType; import edonymyeon.backend.image.domain.ImageInfo; -import edonymyeon.backend.image.profileimage.domain.ProfileImageInfo; -import edonymyeon.backend.image.profileimage.repository.ProfileImageInfoRepository; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.member.application.dto.YearMonthDto; -import edonymyeon.backend.member.application.dto.request.MemberUpdateRequest; -import edonymyeon.backend.member.application.dto.request.PurchaseConfirmRequest; -import edonymyeon.backend.member.application.dto.request.SavingConfirmRequest; -import edonymyeon.backend.member.application.dto.response.DuplicateCheckResponse; -import edonymyeon.backend.member.application.dto.response.MemberUpdateResponse; -import edonymyeon.backend.member.application.dto.response.MyPageResponseV1_0; -import edonymyeon.backend.member.application.dto.response.MyPageResponseV1_1; -import edonymyeon.backend.member.application.event.ProfileImageDeletionEvent; -import edonymyeon.backend.member.domain.Device; -import edonymyeon.backend.member.domain.Email; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.domain.Nickname; -import edonymyeon.backend.member.repository.MemberRepository; +import edonymyeon.backend.membber.member.profileimage.domain.ProfileImageInfo; +import edonymyeon.backend.membber.member.profileimage.repository.ProfileImageInfoRepository; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.application.dto.request.MemberUpdateRequest; +import edonymyeon.backend.membber.member.application.dto.request.PurchaseConfirmRequest; +import edonymyeon.backend.membber.member.application.dto.request.SavingConfirmRequest; +import edonymyeon.backend.membber.member.application.dto.response.DuplicateCheckResponse; +import edonymyeon.backend.membber.member.application.dto.response.MemberUpdateResponse; +import edonymyeon.backend.membber.member.application.dto.response.MyPageResponseV1_0; +import edonymyeon.backend.membber.member.application.dto.response.MyPageResponseV1_1; +import edonymyeon.backend.membber.member.application.event.ProfileImageDeletionEvent; +import edonymyeon.backend.membber.member.application.dto.YearMonthDto; +import edonymyeon.backend.membber.member.domain.Device; +import edonymyeon.backend.membber.member.domain.Email; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.domain.Nickname; +import edonymyeon.backend.membber.member.repository.MemberRepository; import java.util.Objects; import java.util.Optional; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/edonymyeon/backend/member/application/dto/ActiveMemberId.java b/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/ActiveMemberId.java similarity index 67% rename from backend/src/main/java/edonymyeon/backend/member/application/dto/ActiveMemberId.java rename to backend/src/main/java/edonymyeon/backend/membber/member/application/dto/ActiveMemberId.java index 3d6ccccc7..18ae79c66 100644 --- a/backend/src/main/java/edonymyeon/backend/member/application/dto/ActiveMemberId.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/ActiveMemberId.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.member.application.dto; +package edonymyeon.backend.membber.member.application.dto; public final class ActiveMemberId extends MemberId { diff --git a/backend/src/main/java/edonymyeon/backend/member/application/dto/AnonymousMemberId.java b/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/AnonymousMemberId.java similarity index 76% rename from backend/src/main/java/edonymyeon/backend/member/application/dto/AnonymousMemberId.java rename to backend/src/main/java/edonymyeon/backend/membber/member/application/dto/AnonymousMemberId.java index 8051cc287..9f3d90124 100644 --- a/backend/src/main/java/edonymyeon/backend/member/application/dto/AnonymousMemberId.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/AnonymousMemberId.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.member.application.dto; +package edonymyeon.backend.membber.member.application.dto; public final class AnonymousMemberId extends MemberId { diff --git a/backend/src/main/java/edonymyeon/backend/member/application/dto/MemberId.java b/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/MemberId.java similarity index 80% rename from backend/src/main/java/edonymyeon/backend/member/application/dto/MemberId.java rename to backend/src/main/java/edonymyeon/backend/membber/member/application/dto/MemberId.java index eb29b3377..a5d26f4ad 100644 --- a/backend/src/main/java/edonymyeon/backend/member/application/dto/MemberId.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/MemberId.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.member.application.dto; +package edonymyeon.backend.membber.member.application.dto; import lombok.EqualsAndHashCode; diff --git a/backend/src/main/java/edonymyeon/backend/member/application/dto/YearMonthDto.java b/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/YearMonthDto.java similarity index 51% rename from backend/src/main/java/edonymyeon/backend/member/application/dto/YearMonthDto.java rename to backend/src/main/java/edonymyeon/backend/membber/member/application/dto/YearMonthDto.java index cedd2ec31..ee701a663 100644 --- a/backend/src/main/java/edonymyeon/backend/member/application/dto/YearMonthDto.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/YearMonthDto.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.member.application.dto; +package edonymyeon.backend.membber.member.application.dto; public record YearMonthDto(Integer year, Integer month) { diff --git a/backend/src/main/java/edonymyeon/backend/member/application/dto/request/MemberUpdateRequest.java b/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/request/MemberUpdateRequest.java similarity index 71% rename from backend/src/main/java/edonymyeon/backend/member/application/dto/request/MemberUpdateRequest.java rename to backend/src/main/java/edonymyeon/backend/membber/member/application/dto/request/MemberUpdateRequest.java index 09e010e97..29ff07ee0 100644 --- a/backend/src/main/java/edonymyeon/backend/member/application/dto/request/MemberUpdateRequest.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/request/MemberUpdateRequest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.member.application.dto.request; +package edonymyeon.backend.membber.member.application.dto.request; import org.springframework.web.multipart.MultipartFile; diff --git a/backend/src/main/java/edonymyeon/backend/member/application/dto/request/PurchaseConfirmRequest.java b/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/request/PurchaseConfirmRequest.java similarity index 57% rename from backend/src/main/java/edonymyeon/backend/member/application/dto/request/PurchaseConfirmRequest.java rename to backend/src/main/java/edonymyeon/backend/membber/member/application/dto/request/PurchaseConfirmRequest.java index 52566eb11..8371653d9 100644 --- a/backend/src/main/java/edonymyeon/backend/member/application/dto/request/PurchaseConfirmRequest.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/request/PurchaseConfirmRequest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.member.application.dto.request; +package edonymyeon.backend.membber.member.application.dto.request; public record PurchaseConfirmRequest(Long purchasePrice, Integer year, Integer month) { diff --git a/backend/src/main/java/edonymyeon/backend/member/application/dto/request/SavingConfirmRequest.java b/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/request/SavingConfirmRequest.java similarity index 51% rename from backend/src/main/java/edonymyeon/backend/member/application/dto/request/SavingConfirmRequest.java rename to backend/src/main/java/edonymyeon/backend/membber/member/application/dto/request/SavingConfirmRequest.java index 0c76331fd..3b2aeedc8 100644 --- a/backend/src/main/java/edonymyeon/backend/member/application/dto/request/SavingConfirmRequest.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/request/SavingConfirmRequest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.member.application.dto.request; +package edonymyeon.backend.membber.member.application.dto.request; public record SavingConfirmRequest(Integer year, Integer month) { diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/DuplicateCheckResponse.java b/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/DuplicateCheckResponse.java new file mode 100644 index 000000000..ea51dc9af --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/DuplicateCheckResponse.java @@ -0,0 +1,5 @@ +package edonymyeon.backend.membber.member.application.dto.response; + +public record DuplicateCheckResponse(Boolean isUnique) { + +} diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/MemberUpdateResponse.java b/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/MemberUpdateResponse.java new file mode 100644 index 000000000..d73accc4e --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/MemberUpdateResponse.java @@ -0,0 +1,5 @@ +package edonymyeon.backend.membber.member.application.dto.response; + +public record MemberUpdateResponse(Long id) { + +} diff --git a/backend/src/main/java/edonymyeon/backend/member/application/dto/response/MyPageResponseV1_0.java b/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/MyPageResponseV1_0.java similarity index 51% rename from backend/src/main/java/edonymyeon/backend/member/application/dto/response/MyPageResponseV1_0.java rename to backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/MyPageResponseV1_0.java index 7df7dfc2a..c649d0673 100644 --- a/backend/src/main/java/edonymyeon/backend/member/application/dto/response/MyPageResponseV1_0.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/MyPageResponseV1_0.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.member.application.dto.response; +package edonymyeon.backend.membber.member.application.dto.response; public record MyPageResponseV1_0(Long memberId, String nickname) { diff --git a/backend/src/main/java/edonymyeon/backend/member/application/dto/response/MyPageResponseV1_1.java b/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/MyPageResponseV1_1.java similarity index 55% rename from backend/src/main/java/edonymyeon/backend/member/application/dto/response/MyPageResponseV1_1.java rename to backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/MyPageResponseV1_1.java index 1bd7e978f..33dee63a3 100644 --- a/backend/src/main/java/edonymyeon/backend/member/application/dto/response/MyPageResponseV1_1.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/MyPageResponseV1_1.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.member.application.dto.response; +package edonymyeon.backend.membber.member.application.dto.response; public record MyPageResponseV1_1(Long id, String nickname, String profileImage) { diff --git a/backend/src/main/java/edonymyeon/backend/member/application/event/ProfileImageDeletionEvent.java b/backend/src/main/java/edonymyeon/backend/membber/member/application/event/ProfileImageDeletionEvent.java similarity index 75% rename from backend/src/main/java/edonymyeon/backend/member/application/event/ProfileImageDeletionEvent.java rename to backend/src/main/java/edonymyeon/backend/membber/member/application/event/ProfileImageDeletionEvent.java index 49be972d8..69dfceb07 100644 --- a/backend/src/main/java/edonymyeon/backend/member/application/event/ProfileImageDeletionEvent.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/application/event/ProfileImageDeletionEvent.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.member.application.event; +package edonymyeon.backend.membber.member.application.event; import edonymyeon.backend.image.domain.ImageType; import edonymyeon.backend.image.domain.ImageInfo; diff --git a/backend/src/main/java/edonymyeon/backend/member/application/event/ProfileImageUploadEvent.java b/backend/src/main/java/edonymyeon/backend/membber/member/application/event/ProfileImageUploadEvent.java similarity index 75% rename from backend/src/main/java/edonymyeon/backend/member/application/event/ProfileImageUploadEvent.java rename to backend/src/main/java/edonymyeon/backend/membber/member/application/event/ProfileImageUploadEvent.java index 813026ba8..2e7394ce4 100644 --- a/backend/src/main/java/edonymyeon/backend/member/application/event/ProfileImageUploadEvent.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/application/event/ProfileImageUploadEvent.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.member.application.event; +package edonymyeon.backend.membber.member.application.event; import edonymyeon.backend.image.domain.ImageInfo; import org.springframework.web.multipart.MultipartFile; diff --git a/backend/src/main/java/edonymyeon/backend/member/domain/Device.java b/backend/src/main/java/edonymyeon/backend/membber/member/domain/Device.java similarity index 97% rename from backend/src/main/java/edonymyeon/backend/member/domain/Device.java rename to backend/src/main/java/edonymyeon/backend/membber/member/domain/Device.java index e1315d5ab..b5bc961b0 100644 --- a/backend/src/main/java/edonymyeon/backend/member/domain/Device.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/domain/Device.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.member.domain; +package edonymyeon.backend.membber.member.domain; import edonymyeon.backend.global.domain.TemporalRecord; import jakarta.persistence.Entity; diff --git a/backend/src/main/java/edonymyeon/backend/member/domain/Email.java b/backend/src/main/java/edonymyeon/backend/membber/member/domain/Email.java similarity index 91% rename from backend/src/main/java/edonymyeon/backend/member/domain/Email.java rename to backend/src/main/java/edonymyeon/backend/membber/member/domain/Email.java index d7028d341..5efd955f6 100644 --- a/backend/src/main/java/edonymyeon/backend/member/domain/Email.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/domain/Email.java @@ -1,9 +1,9 @@ -package edonymyeon.backend.member.domain; +package edonymyeon.backend.membber.member.domain; import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_EMAIL_INVALID; -import static edonymyeon.backend.member.domain.SocialInfo.*; import edonymyeon.backend.global.exception.EdonymyeonException; +import edonymyeon.backend.membber.member.domain.SocialInfo.SocialType; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; import java.util.UUID; diff --git a/backend/src/main/java/edonymyeon/backend/member/domain/Member.java b/backend/src/main/java/edonymyeon/backend/membber/member/domain/Member.java similarity index 96% rename from backend/src/main/java/edonymyeon/backend/member/domain/Member.java rename to backend/src/main/java/edonymyeon/backend/membber/member/domain/Member.java index c002a48b4..d6e64c478 100644 --- a/backend/src/main/java/edonymyeon/backend/member/domain/Member.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/domain/Member.java @@ -1,8 +1,8 @@ -package edonymyeon.backend.member.domain; +package edonymyeon.backend.membber.member.domain; -import edonymyeon.backend.auth.domain.PasswordEncoder; +import edonymyeon.backend.membber.auth.domain.PasswordEncoder; import edonymyeon.backend.global.domain.TemporalRecord; -import edonymyeon.backend.image.profileimage.domain.ProfileImageInfo; +import edonymyeon.backend.membber.member.profileimage.domain.ProfileImageInfo; import jakarta.persistence.CascadeType; import jakarta.persistence.Embedded; import jakarta.persistence.Entity; diff --git a/backend/src/main/java/edonymyeon/backend/member/domain/Nickname.java b/backend/src/main/java/edonymyeon/backend/membber/member/domain/Nickname.java similarity index 92% rename from backend/src/main/java/edonymyeon/backend/member/domain/Nickname.java rename to backend/src/main/java/edonymyeon/backend/membber/member/domain/Nickname.java index 87a9dabb3..116434e75 100644 --- a/backend/src/main/java/edonymyeon/backend/member/domain/Nickname.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/domain/Nickname.java @@ -1,9 +1,9 @@ -package edonymyeon.backend.member.domain; +package edonymyeon.backend.membber.member.domain; import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_NICKNAME_INVALID; -import static edonymyeon.backend.member.domain.SocialInfo.*; import edonymyeon.backend.global.exception.EdonymyeonException; +import edonymyeon.backend.membber.member.domain.SocialInfo.SocialType; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; import java.util.UUID; diff --git a/backend/src/main/java/edonymyeon/backend/member/domain/Password.java b/backend/src/main/java/edonymyeon/backend/membber/member/domain/Password.java similarity index 90% rename from backend/src/main/java/edonymyeon/backend/member/domain/Password.java rename to backend/src/main/java/edonymyeon/backend/membber/member/domain/Password.java index 53afa07f6..5e95ead7b 100644 --- a/backend/src/main/java/edonymyeon/backend/member/domain/Password.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/domain/Password.java @@ -1,9 +1,9 @@ -package edonymyeon.backend.member.domain; +package edonymyeon.backend.membber.member.domain; import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_PASSWORD_INVALID; -import static edonymyeon.backend.member.domain.SocialInfo.SocialType; +import static edonymyeon.backend.membber.member.domain.SocialInfo.SocialType; -import edonymyeon.backend.auth.domain.PasswordEncoder; +import edonymyeon.backend.membber.auth.domain.PasswordEncoder; import edonymyeon.backend.global.exception.BusinessLogicException; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.global.exception.ExceptionInformation; diff --git a/backend/src/main/java/edonymyeon/backend/member/domain/PasswordValidator.java b/backend/src/main/java/edonymyeon/backend/membber/member/domain/PasswordValidator.java similarity index 95% rename from backend/src/main/java/edonymyeon/backend/member/domain/PasswordValidator.java rename to backend/src/main/java/edonymyeon/backend/membber/member/domain/PasswordValidator.java index 2aaa2385d..8bf322ca7 100644 --- a/backend/src/main/java/edonymyeon/backend/member/domain/PasswordValidator.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/domain/PasswordValidator.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.member.domain; +package edonymyeon.backend.membber.member.domain; import java.util.Objects; import java.util.regex.Pattern; diff --git a/backend/src/main/java/edonymyeon/backend/member/domain/SocialInfo.java b/backend/src/main/java/edonymyeon/backend/membber/member/domain/SocialInfo.java similarity index 93% rename from backend/src/main/java/edonymyeon/backend/member/domain/SocialInfo.java rename to backend/src/main/java/edonymyeon/backend/membber/member/domain/SocialInfo.java index ce8e92190..895565453 100644 --- a/backend/src/main/java/edonymyeon/backend/member/domain/SocialInfo.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/domain/SocialInfo.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.member.domain; +package edonymyeon.backend.membber.member.domain; import jakarta.persistence.Embeddable; import jakarta.persistence.EnumType; diff --git a/backend/src/main/java/edonymyeon/backend/image/profileimage/application/ProfileImageEventListener.java b/backend/src/main/java/edonymyeon/backend/membber/member/profileimage/application/ProfileImageEventListener.java similarity index 68% rename from backend/src/main/java/edonymyeon/backend/image/profileimage/application/ProfileImageEventListener.java rename to backend/src/main/java/edonymyeon/backend/membber/member/profileimage/application/ProfileImageEventListener.java index c7ce69237..07a98b0d3 100644 --- a/backend/src/main/java/edonymyeon/backend/image/profileimage/application/ProfileImageEventListener.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/profileimage/application/ProfileImageEventListener.java @@ -1,10 +1,8 @@ -package edonymyeon.backend.image.profileimage.application; +package edonymyeon.backend.membber.member.profileimage.application; import edonymyeon.backend.image.application.ImageService; -import edonymyeon.backend.member.application.event.ProfileImageDeletionEvent; -import edonymyeon.backend.member.application.event.ProfileImageUploadEvent; +import edonymyeon.backend.membber.member.application.event.ProfileImageDeletionEvent; import lombok.RequiredArgsConstructor; -import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; import org.springframework.transaction.event.TransactionalEventListener; diff --git a/backend/src/main/java/edonymyeon/backend/image/profileimage/domain/ProfileImageInfo.java b/backend/src/main/java/edonymyeon/backend/membber/member/profileimage/domain/ProfileImageInfo.java similarity index 88% rename from backend/src/main/java/edonymyeon/backend/image/profileimage/domain/ProfileImageInfo.java rename to backend/src/main/java/edonymyeon/backend/membber/member/profileimage/domain/ProfileImageInfo.java index 38f3d6168..ae99fcabb 100644 --- a/backend/src/main/java/edonymyeon/backend/image/profileimage/domain/ProfileImageInfo.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/profileimage/domain/ProfileImageInfo.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.image.profileimage.domain; +package edonymyeon.backend.membber.member.profileimage.domain; import edonymyeon.backend.image.domain.ImageInfo; import jakarta.persistence.Entity; diff --git a/backend/src/main/java/edonymyeon/backend/image/profileimage/repository/ProfileImageInfoRepository.java b/backend/src/main/java/edonymyeon/backend/membber/member/profileimage/repository/ProfileImageInfoRepository.java similarity index 52% rename from backend/src/main/java/edonymyeon/backend/image/profileimage/repository/ProfileImageInfoRepository.java rename to backend/src/main/java/edonymyeon/backend/membber/member/profileimage/repository/ProfileImageInfoRepository.java index 9637e6328..ea0d50589 100644 --- a/backend/src/main/java/edonymyeon/backend/image/profileimage/repository/ProfileImageInfoRepository.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/profileimage/repository/ProfileImageInfoRepository.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.image.profileimage.repository; +package edonymyeon.backend.membber.member.profileimage.repository; -import edonymyeon.backend.image.profileimage.domain.ProfileImageInfo; +import edonymyeon.backend.membber.member.profileimage.domain.ProfileImageInfo; import org.springframework.data.jpa.repository.JpaRepository; public interface ProfileImageInfoRepository extends JpaRepository { diff --git a/backend/src/main/java/edonymyeon/backend/member/repository/MemberCustomRepository.java b/backend/src/main/java/edonymyeon/backend/membber/member/repository/MemberCustomRepository.java similarity index 55% rename from backend/src/main/java/edonymyeon/backend/member/repository/MemberCustomRepository.java rename to backend/src/main/java/edonymyeon/backend/membber/member/repository/MemberCustomRepository.java index 0d6feaecf..eeeade16c 100644 --- a/backend/src/main/java/edonymyeon/backend/member/repository/MemberCustomRepository.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/repository/MemberCustomRepository.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.member.repository; +package edonymyeon.backend.membber.member.repository; -import edonymyeon.backend.member.domain.Member; +import edonymyeon.backend.membber.member.domain.Member; import java.util.List; public interface MemberCustomRepository { diff --git a/backend/src/main/java/edonymyeon/backend/member/repository/MemberCustomRepositoryImpl.java b/backend/src/main/java/edonymyeon/backend/membber/member/repository/MemberCustomRepositoryImpl.java similarity index 88% rename from backend/src/main/java/edonymyeon/backend/member/repository/MemberCustomRepositoryImpl.java rename to backend/src/main/java/edonymyeon/backend/membber/member/repository/MemberCustomRepositoryImpl.java index 1fd023922..b6f4e3fc5 100644 --- a/backend/src/main/java/edonymyeon/backend/member/repository/MemberCustomRepositoryImpl.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/repository/MemberCustomRepositoryImpl.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.member.repository; +package edonymyeon.backend.membber.member.repository; -import edonymyeon.backend.member.domain.Member; +import edonymyeon.backend.membber.member.domain.Member; import jakarta.persistence.EntityManager; import java.time.LocalDateTime; import java.util.List; diff --git a/backend/src/main/java/edonymyeon/backend/member/repository/MemberRepository.java b/backend/src/main/java/edonymyeon/backend/membber/member/repository/MemberRepository.java similarity index 58% rename from backend/src/main/java/edonymyeon/backend/member/repository/MemberRepository.java rename to backend/src/main/java/edonymyeon/backend/membber/member/repository/MemberRepository.java index b413399ac..3ad05fd5a 100644 --- a/backend/src/main/java/edonymyeon/backend/member/repository/MemberRepository.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/repository/MemberRepository.java @@ -1,9 +1,9 @@ -package edonymyeon.backend.member.repository; +package edonymyeon.backend.membber.member.repository; -import edonymyeon.backend.member.domain.Email; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.domain.Nickname; -import edonymyeon.backend.member.domain.SocialInfo; +import edonymyeon.backend.membber.member.domain.Nickname; +import edonymyeon.backend.membber.member.domain.SocialInfo; +import edonymyeon.backend.membber.member.domain.Email; +import edonymyeon.backend.membber.member.domain.Member; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/backend/src/main/java/edonymyeon/backend/member/ui/MemberController.java b/backend/src/main/java/edonymyeon/backend/membber/member/ui/MemberController.java similarity index 81% rename from backend/src/main/java/edonymyeon/backend/member/ui/MemberController.java rename to backend/src/main/java/edonymyeon/backend/membber/member/ui/MemberController.java index 09e496d32..1875b9eaa 100644 --- a/backend/src/main/java/edonymyeon/backend/member/ui/MemberController.java +++ b/backend/src/main/java/edonymyeon/backend/membber/member/ui/MemberController.java @@ -1,16 +1,16 @@ -package edonymyeon.backend.member.ui; +package edonymyeon.backend.membber.member.ui; -import edonymyeon.backend.auth.annotation.AuthPrincipal; +import edonymyeon.backend.membber.auth.annotation.AuthPrincipal; import edonymyeon.backend.global.version.ApiVersion; -import edonymyeon.backend.member.application.MemberService; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.member.application.dto.request.MemberUpdateRequest; -import edonymyeon.backend.member.application.dto.request.PurchaseConfirmRequest; -import edonymyeon.backend.member.application.dto.request.SavingConfirmRequest; -import edonymyeon.backend.member.application.dto.response.DuplicateCheckResponse; -import edonymyeon.backend.member.application.dto.response.MemberUpdateResponse; -import edonymyeon.backend.member.application.dto.response.MyPageResponseV1_0; -import edonymyeon.backend.member.application.dto.response.MyPageResponseV1_1; +import edonymyeon.backend.membber.member.application.MemberService; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.application.dto.request.MemberUpdateRequest; +import edonymyeon.backend.membber.member.application.dto.request.PurchaseConfirmRequest; +import edonymyeon.backend.membber.member.application.dto.request.SavingConfirmRequest; +import edonymyeon.backend.membber.member.application.dto.response.DuplicateCheckResponse; +import edonymyeon.backend.membber.member.application.dto.response.MemberUpdateResponse; +import edonymyeon.backend.membber.member.application.dto.response.MyPageResponseV1_0; +import edonymyeon.backend.membber.member.application.dto.response.MyPageResponseV1_1; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/backend/src/main/java/edonymyeon/backend/setting/application/SettingEventListener.java b/backend/src/main/java/edonymyeon/backend/membber/setting/application/SettingEventListener.java similarity index 76% rename from backend/src/main/java/edonymyeon/backend/setting/application/SettingEventListener.java rename to backend/src/main/java/edonymyeon/backend/membber/setting/application/SettingEventListener.java index 95f096d6b..fc3e700fa 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/application/SettingEventListener.java +++ b/backend/src/main/java/edonymyeon/backend/membber/setting/application/SettingEventListener.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.setting.application; +package edonymyeon.backend.membber.setting.application; -import edonymyeon.backend.auth.application.event.JoinMemberEvent; +import edonymyeon.backend.membber.auth.application.event.JoinMemberEvent; import lombok.RequiredArgsConstructor; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; diff --git a/backend/src/main/java/edonymyeon/backend/setting/application/SettingService.java b/backend/src/main/java/edonymyeon/backend/membber/setting/application/SettingService.java similarity index 81% rename from backend/src/main/java/edonymyeon/backend/setting/application/SettingService.java rename to backend/src/main/java/edonymyeon/backend/membber/setting/application/SettingService.java index 764fe52ec..4a3457524 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/application/SettingService.java +++ b/backend/src/main/java/edonymyeon/backend/membber/setting/application/SettingService.java @@ -1,16 +1,16 @@ -package edonymyeon.backend.setting.application; +package edonymyeon.backend.membber.setting.application; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.repository.MemberRepository; -import edonymyeon.backend.setting.application.activationmanager.ActivationManager; -import edonymyeon.backend.setting.application.deactivationmanager.DeactivationManager; -import edonymyeon.backend.setting.application.dto.SettingsResponse; -import edonymyeon.backend.setting.domain.Setting; -import edonymyeon.backend.setting.domain.SettingType; -import edonymyeon.backend.setting.repository.SettingRepository; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.membber.setting.application.activationmanager.ActivationManager; +import edonymyeon.backend.membber.setting.application.deactivationmanager.DeactivationManager; +import edonymyeon.backend.membber.setting.application.dto.SettingsResponse; +import edonymyeon.backend.membber.setting.repository.SettingRepository; +import edonymyeon.backend.membber.setting.domain.Setting; +import edonymyeon.backend.membber.setting.domain.SettingType; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/edonymyeon/backend/setting/application/activationmanager/ActivatingPrimaryManager.java b/backend/src/main/java/edonymyeon/backend/membber/setting/application/activationmanager/ActivatingPrimaryManager.java similarity index 84% rename from backend/src/main/java/edonymyeon/backend/setting/application/activationmanager/ActivatingPrimaryManager.java rename to backend/src/main/java/edonymyeon/backend/membber/setting/application/activationmanager/ActivatingPrimaryManager.java index 78e0f7beb..a092e5f22 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/application/activationmanager/ActivatingPrimaryManager.java +++ b/backend/src/main/java/edonymyeon/backend/membber/setting/application/activationmanager/ActivatingPrimaryManager.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.setting.application.activationmanager; +package edonymyeon.backend.membber.setting.application.activationmanager; -import edonymyeon.backend.setting.domain.Setting; +import edonymyeon.backend.membber.setting.domain.Setting; import java.util.List; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/edonymyeon/backend/setting/application/activationmanager/ActivationManager.java b/backend/src/main/java/edonymyeon/backend/membber/setting/application/activationmanager/ActivationManager.java similarity index 80% rename from backend/src/main/java/edonymyeon/backend/setting/application/activationmanager/ActivationManager.java rename to backend/src/main/java/edonymyeon/backend/membber/setting/application/activationmanager/ActivationManager.java index 9730dc1fc..7838410cd 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/application/activationmanager/ActivationManager.java +++ b/backend/src/main/java/edonymyeon/backend/membber/setting/application/activationmanager/ActivationManager.java @@ -1,8 +1,8 @@ -package edonymyeon.backend.setting.application.activationmanager; +package edonymyeon.backend.membber.setting.application.activationmanager; import edonymyeon.backend.global.exception.BusinessLogicException; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.setting.domain.Setting; +import edonymyeon.backend.membber.setting.domain.Setting; import java.util.List; public abstract class ActivationManager { diff --git a/backend/src/main/java/edonymyeon/backend/setting/application/activationmanager/DeactivatingSameWeightsManager.java b/backend/src/main/java/edonymyeon/backend/membber/setting/application/activationmanager/DeactivatingSameWeightsManager.java similarity index 84% rename from backend/src/main/java/edonymyeon/backend/setting/application/activationmanager/DeactivatingSameWeightsManager.java rename to backend/src/main/java/edonymyeon/backend/membber/setting/application/activationmanager/DeactivatingSameWeightsManager.java index a09f2240c..a21683c4e 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/application/activationmanager/DeactivatingSameWeightsManager.java +++ b/backend/src/main/java/edonymyeon/backend/membber/setting/application/activationmanager/DeactivatingSameWeightsManager.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.setting.application.activationmanager; +package edonymyeon.backend.membber.setting.application.activationmanager; -import edonymyeon.backend.setting.domain.Setting; +import edonymyeon.backend.membber.setting.domain.Setting; import java.util.List; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/edonymyeon/backend/setting/application/deactivationmanager/DeactivatingLowerWeightManager.java b/backend/src/main/java/edonymyeon/backend/membber/setting/application/deactivationmanager/DeactivatingLowerWeightManager.java similarity index 84% rename from backend/src/main/java/edonymyeon/backend/setting/application/deactivationmanager/DeactivatingLowerWeightManager.java rename to backend/src/main/java/edonymyeon/backend/membber/setting/application/deactivationmanager/DeactivatingLowerWeightManager.java index b4b9878fc..9add2dc31 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/application/deactivationmanager/DeactivatingLowerWeightManager.java +++ b/backend/src/main/java/edonymyeon/backend/membber/setting/application/deactivationmanager/DeactivatingLowerWeightManager.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.setting.application.deactivationmanager; +package edonymyeon.backend.membber.setting.application.deactivationmanager; -import edonymyeon.backend.setting.domain.Setting; +import edonymyeon.backend.membber.setting.domain.Setting; import java.util.List; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/edonymyeon/backend/setting/application/deactivationmanager/DeactivatingPrimaryManager.java b/backend/src/main/java/edonymyeon/backend/membber/setting/application/deactivationmanager/DeactivatingPrimaryManager.java similarity index 82% rename from backend/src/main/java/edonymyeon/backend/setting/application/deactivationmanager/DeactivatingPrimaryManager.java rename to backend/src/main/java/edonymyeon/backend/membber/setting/application/deactivationmanager/DeactivatingPrimaryManager.java index 28c2d3833..e9b6b7e4b 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/application/deactivationmanager/DeactivatingPrimaryManager.java +++ b/backend/src/main/java/edonymyeon/backend/membber/setting/application/deactivationmanager/DeactivatingPrimaryManager.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.setting.application.deactivationmanager; +package edonymyeon.backend.membber.setting.application.deactivationmanager; -import edonymyeon.backend.setting.domain.Setting; +import edonymyeon.backend.membber.setting.domain.Setting; import java.util.List; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/edonymyeon/backend/setting/application/deactivationmanager/DeactivationManager.java b/backend/src/main/java/edonymyeon/backend/membber/setting/application/deactivationmanager/DeactivationManager.java similarity index 80% rename from backend/src/main/java/edonymyeon/backend/setting/application/deactivationmanager/DeactivationManager.java rename to backend/src/main/java/edonymyeon/backend/membber/setting/application/deactivationmanager/DeactivationManager.java index dfad865da..138d1277d 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/application/deactivationmanager/DeactivationManager.java +++ b/backend/src/main/java/edonymyeon/backend/membber/setting/application/deactivationmanager/DeactivationManager.java @@ -1,8 +1,8 @@ -package edonymyeon.backend.setting.application.deactivationmanager; +package edonymyeon.backend.membber.setting.application.deactivationmanager; import edonymyeon.backend.global.exception.BusinessLogicException; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.setting.domain.Setting; +import edonymyeon.backend.membber.setting.domain.Setting; import java.util.List; public abstract class DeactivationManager { diff --git a/backend/src/main/java/edonymyeon/backend/membber/setting/application/dto/SettingRequest.java b/backend/src/main/java/edonymyeon/backend/membber/setting/application/dto/SettingRequest.java new file mode 100644 index 000000000..9eec68e3c --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/membber/setting/application/dto/SettingRequest.java @@ -0,0 +1,5 @@ +package edonymyeon.backend.membber.setting.application.dto; + +public record SettingRequest(String preferenceType) { + +} diff --git a/backend/src/main/java/edonymyeon/backend/setting/application/dto/SettingResponse.java b/backend/src/main/java/edonymyeon/backend/membber/setting/application/dto/SettingResponse.java similarity index 65% rename from backend/src/main/java/edonymyeon/backend/setting/application/dto/SettingResponse.java rename to backend/src/main/java/edonymyeon/backend/membber/setting/application/dto/SettingResponse.java index c908bb437..9b378214f 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/application/dto/SettingResponse.java +++ b/backend/src/main/java/edonymyeon/backend/membber/setting/application/dto/SettingResponse.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.setting.application.dto; +package edonymyeon.backend.membber.setting.application.dto; -import edonymyeon.backend.setting.domain.Setting; +import edonymyeon.backend.membber.setting.domain.Setting; public record SettingResponse(String preferenceType, boolean enabled) { public static SettingResponse from(final Setting setting) { diff --git a/backend/src/main/java/edonymyeon/backend/setting/application/dto/SettingsResponse.java b/backend/src/main/java/edonymyeon/backend/membber/setting/application/dto/SettingsResponse.java similarity index 71% rename from backend/src/main/java/edonymyeon/backend/setting/application/dto/SettingsResponse.java rename to backend/src/main/java/edonymyeon/backend/membber/setting/application/dto/SettingsResponse.java index bd5ba38ed..d7becb0f8 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/application/dto/SettingsResponse.java +++ b/backend/src/main/java/edonymyeon/backend/membber/setting/application/dto/SettingsResponse.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.setting.application.dto; +package edonymyeon.backend.membber.setting.application.dto; -import edonymyeon.backend.setting.domain.Setting; +import edonymyeon.backend.membber.setting.domain.Setting; import java.util.List; public record SettingsResponse(List notifications) { diff --git a/backend/src/main/java/edonymyeon/backend/setting/domain/Category.java b/backend/src/main/java/edonymyeon/backend/membber/setting/domain/Category.java similarity index 54% rename from backend/src/main/java/edonymyeon/backend/setting/domain/Category.java rename to backend/src/main/java/edonymyeon/backend/membber/setting/domain/Category.java index 812d963ad..c34da5531 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/domain/Category.java +++ b/backend/src/main/java/edonymyeon/backend/membber/setting/domain/Category.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.setting.domain; +package edonymyeon.backend.membber.setting.domain; public enum Category { ALL, THUMB, COMMENT, REMINDING diff --git a/backend/src/main/java/edonymyeon/backend/setting/domain/Setting.java b/backend/src/main/java/edonymyeon/backend/membber/setting/domain/Setting.java similarity index 95% rename from backend/src/main/java/edonymyeon/backend/setting/domain/Setting.java rename to backend/src/main/java/edonymyeon/backend/membber/setting/domain/Setting.java index 0270fb3da..00253ea5b 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/domain/Setting.java +++ b/backend/src/main/java/edonymyeon/backend/membber/setting/domain/Setting.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.setting.domain; +package edonymyeon.backend.membber.setting.domain; -import edonymyeon.backend.member.domain.Member; +import edonymyeon.backend.membber.member.domain.Member; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; diff --git a/backend/src/main/java/edonymyeon/backend/setting/domain/SettingType.java b/backend/src/main/java/edonymyeon/backend/membber/setting/domain/SettingType.java similarity index 97% rename from backend/src/main/java/edonymyeon/backend/setting/domain/SettingType.java rename to backend/src/main/java/edonymyeon/backend/membber/setting/domain/SettingType.java index fc6f155f8..49ca59c91 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/domain/SettingType.java +++ b/backend/src/main/java/edonymyeon/backend/membber/setting/domain/SettingType.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.setting.domain; +package edonymyeon.backend.membber.setting.domain; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.global.exception.ExceptionInformation; diff --git a/backend/src/main/java/edonymyeon/backend/setting/domain/SettingTypeCategory.java b/backend/src/main/java/edonymyeon/backend/membber/setting/domain/SettingTypeCategory.java similarity index 58% rename from backend/src/main/java/edonymyeon/backend/setting/domain/SettingTypeCategory.java rename to backend/src/main/java/edonymyeon/backend/membber/setting/domain/SettingTypeCategory.java index 4ac8abcff..132ec1094 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/domain/SettingTypeCategory.java +++ b/backend/src/main/java/edonymyeon/backend/membber/setting/domain/SettingTypeCategory.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.setting.domain; +package edonymyeon.backend.membber.setting.domain; public enum SettingTypeCategory { ALL, THUMB, COMMENT, REMINDING diff --git a/backend/src/main/java/edonymyeon/backend/setting/domain/Weight.java b/backend/src/main/java/edonymyeon/backend/membber/setting/domain/Weight.java similarity index 85% rename from backend/src/main/java/edonymyeon/backend/setting/domain/Weight.java rename to backend/src/main/java/edonymyeon/backend/membber/setting/domain/Weight.java index 1756e841d..2f70de01d 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/domain/Weight.java +++ b/backend/src/main/java/edonymyeon/backend/membber/setting/domain/Weight.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.setting.domain; +package edonymyeon.backend.membber.setting.domain; public enum Weight { diff --git a/backend/src/main/java/edonymyeon/backend/setting/repository/SettingCustomRepository.java b/backend/src/main/java/edonymyeon/backend/membber/setting/repository/SettingCustomRepository.java similarity index 50% rename from backend/src/main/java/edonymyeon/backend/setting/repository/SettingCustomRepository.java rename to backend/src/main/java/edonymyeon/backend/membber/setting/repository/SettingCustomRepository.java index 90aa9074f..90a0729c6 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/repository/SettingCustomRepository.java +++ b/backend/src/main/java/edonymyeon/backend/membber/setting/repository/SettingCustomRepository.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.setting.repository; +package edonymyeon.backend.membber.setting.repository; -import edonymyeon.backend.setting.domain.Setting; +import edonymyeon.backend.membber.setting.domain.Setting; import java.util.List; public interface SettingCustomRepository { diff --git a/backend/src/main/java/edonymyeon/backend/setting/repository/SettingRepository.java b/backend/src/main/java/edonymyeon/backend/membber/setting/repository/SettingRepository.java similarity index 68% rename from backend/src/main/java/edonymyeon/backend/setting/repository/SettingRepository.java rename to backend/src/main/java/edonymyeon/backend/membber/setting/repository/SettingRepository.java index 13a978372..194f4b2b1 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/repository/SettingRepository.java +++ b/backend/src/main/java/edonymyeon/backend/membber/setting/repository/SettingRepository.java @@ -1,7 +1,7 @@ -package edonymyeon.backend.setting.repository; +package edonymyeon.backend.membber.setting.repository; -import edonymyeon.backend.setting.domain.Setting; -import edonymyeon.backend.setting.domain.SettingType; +import edonymyeon.backend.membber.setting.domain.Setting; +import edonymyeon.backend.membber.setting.domain.SettingType; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/backend/src/main/java/edonymyeon/backend/setting/repository/SettingRepositoryImpl.java b/backend/src/main/java/edonymyeon/backend/membber/setting/repository/SettingRepositoryImpl.java similarity index 92% rename from backend/src/main/java/edonymyeon/backend/setting/repository/SettingRepositoryImpl.java rename to backend/src/main/java/edonymyeon/backend/membber/setting/repository/SettingRepositoryImpl.java index 893ee022f..d3c7d20aa 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/repository/SettingRepositoryImpl.java +++ b/backend/src/main/java/edonymyeon/backend/membber/setting/repository/SettingRepositoryImpl.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.setting.repository; +package edonymyeon.backend.membber.setting.repository; -import edonymyeon.backend.setting.domain.Setting; +import edonymyeon.backend.membber.setting.domain.Setting; import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.List; diff --git a/backend/src/main/java/edonymyeon/backend/setting/ui/SettingController.java b/backend/src/main/java/edonymyeon/backend/membber/setting/ui/SettingController.java similarity index 76% rename from backend/src/main/java/edonymyeon/backend/setting/ui/SettingController.java rename to backend/src/main/java/edonymyeon/backend/membber/setting/ui/SettingController.java index e0ec949b6..b51372d3a 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/ui/SettingController.java +++ b/backend/src/main/java/edonymyeon/backend/membber/setting/ui/SettingController.java @@ -1,11 +1,11 @@ -package edonymyeon.backend.setting.ui; +package edonymyeon.backend.membber.setting.ui; -import edonymyeon.backend.auth.annotation.AuthPrincipal; +import edonymyeon.backend.membber.auth.annotation.AuthPrincipal; import edonymyeon.backend.global.version.ApiVersion; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.setting.application.SettingService; -import edonymyeon.backend.setting.application.dto.SettingRequest; -import edonymyeon.backend.setting.application.dto.SettingsResponse; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.membber.setting.application.SettingService; +import edonymyeon.backend.membber.setting.application.dto.SettingRequest; +import edonymyeon.backend.membber.setting.application.dto.SettingsResponse; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/backend/src/main/java/edonymyeon/backend/member/application/dto/response/DuplicateCheckResponse.java b/backend/src/main/java/edonymyeon/backend/member/application/dto/response/DuplicateCheckResponse.java deleted file mode 100644 index c1400a782..000000000 --- a/backend/src/main/java/edonymyeon/backend/member/application/dto/response/DuplicateCheckResponse.java +++ /dev/null @@ -1,5 +0,0 @@ -package edonymyeon.backend.member.application.dto.response; - -public record DuplicateCheckResponse(Boolean isUnique) { - -} diff --git a/backend/src/main/java/edonymyeon/backend/member/application/dto/response/MemberUpdateResponse.java b/backend/src/main/java/edonymyeon/backend/member/application/dto/response/MemberUpdateResponse.java deleted file mode 100644 index 5bcc672a8..000000000 --- a/backend/src/main/java/edonymyeon/backend/member/application/dto/response/MemberUpdateResponse.java +++ /dev/null @@ -1,5 +0,0 @@ -package edonymyeon.backend.member.application.dto.response; - -public record MemberUpdateResponse(Long id) { - -} diff --git a/backend/src/main/java/edonymyeon/backend/notification/application/NotificationEventListener.java b/backend/src/main/java/edonymyeon/backend/notification/application/NotificationEventListener.java index 8d3149751..403b99531 100644 --- a/backend/src/main/java/edonymyeon/backend/notification/application/NotificationEventListener.java +++ b/backend/src/main/java/edonymyeon/backend/notification/application/NotificationEventListener.java @@ -1,10 +1,10 @@ package edonymyeon.backend.notification.application; -import edonymyeon.backend.comment.application.event.SavedCommentEvent; +import edonymyeon.backend.content.comment.application.event.SavedCommentEvent; import edonymyeon.backend.global.exception.BusinessLogicException; -import edonymyeon.backend.post.application.event.PostDeletionEvent; -import edonymyeon.backend.thumbs.application.event.ThumbsDownEvent; -import edonymyeon.backend.thumbs.application.event.ThumbsUpEvent; +import edonymyeon.backend.content.post.application.event.PostDeletionEvent; +import edonymyeon.backend.content.thumbs.application.event.ThumbsDownEvent; +import edonymyeon.backend.content.thumbs.application.event.ThumbsUpEvent; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/backend/src/main/java/edonymyeon/backend/notification/application/NotificationService.java b/backend/src/main/java/edonymyeon/backend/notification/application/NotificationService.java index 786c8ef4c..1ea8dd921 100644 --- a/backend/src/main/java/edonymyeon/backend/notification/application/NotificationService.java +++ b/backend/src/main/java/edonymyeon/backend/notification/application/NotificationService.java @@ -1,12 +1,12 @@ package edonymyeon.backend.notification.application; -import edonymyeon.backend.comment.domain.Comment; +import edonymyeon.backend.content.comment.domain.Comment; import edonymyeon.backend.consumption.application.ConsumptionService; import edonymyeon.backend.global.exception.BusinessLogicException; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.repository.MemberRepository; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.repository.MemberRepository; import edonymyeon.backend.notification.application.dto.Data; import edonymyeon.backend.notification.application.dto.NotificationResponse; import edonymyeon.backend.notification.application.dto.Receiver; @@ -14,12 +14,12 @@ import edonymyeon.backend.notification.domain.NotificationMessage; import edonymyeon.backend.notification.domain.ScreenType; import edonymyeon.backend.notification.repository.NotificationRepository; -import edonymyeon.backend.post.application.GeneralFindingCondition; -import edonymyeon.backend.post.application.PostSlice; -import edonymyeon.backend.post.domain.Post; -import edonymyeon.backend.setting.application.SettingService; -import edonymyeon.backend.setting.domain.SettingType; -import edonymyeon.backend.thumbs.application.ThumbsService; +import edonymyeon.backend.content.post.application.GeneralFindingCondition; +import edonymyeon.backend.content.post.application.PostSlice; +import edonymyeon.backend.content.post.domain.Post; +import edonymyeon.backend.membber.setting.application.SettingService; +import edonymyeon.backend.membber.setting.domain.SettingType; +import edonymyeon.backend.content.thumbs.application.ThumbsService; import jakarta.persistence.EntityManager; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/edonymyeon/backend/notification/application/dto/Receiver.java b/backend/src/main/java/edonymyeon/backend/notification/application/dto/Receiver.java index d32773fff..e8941fe59 100644 --- a/backend/src/main/java/edonymyeon/backend/notification/application/dto/Receiver.java +++ b/backend/src/main/java/edonymyeon/backend/notification/application/dto/Receiver.java @@ -1,6 +1,6 @@ package edonymyeon.backend.notification.application.dto; -import edonymyeon.backend.member.domain.Member; +import edonymyeon.backend.membber.member.domain.Member; import lombok.Getter; @Getter diff --git a/backend/src/main/java/edonymyeon/backend/notification/domain/Notification.java b/backend/src/main/java/edonymyeon/backend/notification/domain/Notification.java index f68c1491f..7874d69a5 100644 --- a/backend/src/main/java/edonymyeon/backend/notification/domain/Notification.java +++ b/backend/src/main/java/edonymyeon/backend/notification/domain/Notification.java @@ -1,7 +1,7 @@ package edonymyeon.backend.notification.domain; import edonymyeon.backend.global.domain.TemporalRecord; -import edonymyeon.backend.member.domain.Member; +import edonymyeon.backend.membber.member.domain.Member; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; diff --git a/backend/src/main/java/edonymyeon/backend/notification/ui/NotificationController.java b/backend/src/main/java/edonymyeon/backend/notification/ui/NotificationController.java index 2b2276f7a..6c97337ee 100644 --- a/backend/src/main/java/edonymyeon/backend/notification/ui/NotificationController.java +++ b/backend/src/main/java/edonymyeon/backend/notification/ui/NotificationController.java @@ -1,13 +1,13 @@ package edonymyeon.backend.notification.ui; -import edonymyeon.backend.auth.annotation.AuthPrincipal; +import edonymyeon.backend.membber.auth.annotation.AuthPrincipal; import edonymyeon.backend.global.version.ApiVersion; -import edonymyeon.backend.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.application.dto.MemberId; import edonymyeon.backend.notification.application.NotificationService; import edonymyeon.backend.notification.application.dto.NotificationResponse; -import edonymyeon.backend.post.application.GeneralFindingCondition; -import edonymyeon.backend.post.application.PostSlice; -import edonymyeon.backend.post.ui.annotation.PostPaging; +import edonymyeon.backend.content.post.application.GeneralFindingCondition; +import edonymyeon.backend.content.post.application.PostSlice; +import edonymyeon.backend.content.post.ui.annotation.PostPaging; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/backend/src/main/java/edonymyeon/backend/post/application/PostThumbsService.java b/backend/src/main/java/edonymyeon/backend/post/application/PostThumbsService.java deleted file mode 100644 index a90a8bb48..000000000 --- a/backend/src/main/java/edonymyeon/backend/post/application/PostThumbsService.java +++ /dev/null @@ -1,14 +0,0 @@ -package edonymyeon.backend.post.application; - -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.post.application.dto.response.AllThumbsInPostResponse; -import edonymyeon.backend.post.application.dto.response.ThumbsStatusInPostResponse; - -public interface PostThumbsService { - - AllThumbsInPostResponse findAllThumbsInPost(final Long postId); - - ThumbsStatusInPostResponse findThumbsStatusInPost(final MemberId memberId, final Long postId); - - void deleteAllThumbsInPost(final Long postId); -} diff --git a/backend/src/main/java/edonymyeon/backend/post/application/dto/WriterResponse.java b/backend/src/main/java/edonymyeon/backend/post/application/dto/WriterResponse.java deleted file mode 100644 index cecc5d2ed..000000000 --- a/backend/src/main/java/edonymyeon/backend/post/application/dto/WriterResponse.java +++ /dev/null @@ -1,5 +0,0 @@ -package edonymyeon.backend.post.application.dto; - -public record WriterResponse(String nickname) { - -} diff --git a/backend/src/main/java/edonymyeon/backend/post/application/dto/response/PostIdResponse.java b/backend/src/main/java/edonymyeon/backend/post/application/dto/response/PostIdResponse.java deleted file mode 100644 index 9b8078123..000000000 --- a/backend/src/main/java/edonymyeon/backend/post/application/dto/response/PostIdResponse.java +++ /dev/null @@ -1,5 +0,0 @@ -package edonymyeon.backend.post.application.dto.response; - -public record PostIdResponse(Long id) { - -} diff --git a/backend/src/main/java/edonymyeon/backend/post/application/dto/response/WriterResponse.java b/backend/src/main/java/edonymyeon/backend/post/application/dto/response/WriterResponse.java deleted file mode 100644 index 726f9f0fd..000000000 --- a/backend/src/main/java/edonymyeon/backend/post/application/dto/response/WriterResponse.java +++ /dev/null @@ -1,5 +0,0 @@ -package edonymyeon.backend.post.application.dto.response; - -public record WriterResponse(String nickname) { - -} diff --git a/backend/src/main/java/edonymyeon/backend/post/application/event/PostDeletionEvent.java b/backend/src/main/java/edonymyeon/backend/post/application/event/PostDeletionEvent.java deleted file mode 100644 index ff790b02b..000000000 --- a/backend/src/main/java/edonymyeon/backend/post/application/event/PostDeletionEvent.java +++ /dev/null @@ -1,5 +0,0 @@ -package edonymyeon.backend.post.application.event; - -public record PostDeletionEvent(Long postId) { - -} diff --git a/backend/src/main/java/edonymyeon/backend/report/application/ReportService.java b/backend/src/main/java/edonymyeon/backend/report/application/ReportService.java index b48b3eda4..924e5f24f 100644 --- a/backend/src/main/java/edonymyeon/backend/report/application/ReportService.java +++ b/backend/src/main/java/edonymyeon/backend/report/application/ReportService.java @@ -1,14 +1,14 @@ package edonymyeon.backend.report.application; -import edonymyeon.backend.comment.domain.Comment; -import edonymyeon.backend.comment.repository.CommentRepository; +import edonymyeon.backend.content.comment.domain.Comment; +import edonymyeon.backend.content.comment.repository.CommentRepository; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.repository.MemberRepository; -import edonymyeon.backend.post.domain.Post; -import edonymyeon.backend.post.repository.PostRepository; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.content.post.domain.Post; +import edonymyeon.backend.content.post.repository.PostRepository; import edonymyeon.backend.report.domain.AbusingType; import edonymyeon.backend.report.domain.Report; import edonymyeon.backend.report.domain.ReportType; diff --git a/backend/src/main/java/edonymyeon/backend/report/domain/Report.java b/backend/src/main/java/edonymyeon/backend/report/domain/Report.java index 1434e77b5..0b9573ed6 100644 --- a/backend/src/main/java/edonymyeon/backend/report/domain/Report.java +++ b/backend/src/main/java/edonymyeon/backend/report/domain/Report.java @@ -1,7 +1,7 @@ package edonymyeon.backend.report.domain; import edonymyeon.backend.global.domain.TemporalRecord; -import edonymyeon.backend.member.domain.Member; +import edonymyeon.backend.membber.member.domain.Member; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.EqualsAndHashCode; diff --git a/backend/src/main/java/edonymyeon/backend/report/ui/ReportController.java b/backend/src/main/java/edonymyeon/backend/report/ui/ReportController.java index 6f60e7844..b97bec2df 100644 --- a/backend/src/main/java/edonymyeon/backend/report/ui/ReportController.java +++ b/backend/src/main/java/edonymyeon/backend/report/ui/ReportController.java @@ -1,8 +1,8 @@ package edonymyeon.backend.report.ui; -import edonymyeon.backend.auth.annotation.AuthPrincipal; +import edonymyeon.backend.membber.auth.annotation.AuthPrincipal; import edonymyeon.backend.global.version.ApiVersion; -import edonymyeon.backend.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.application.dto.MemberId; import edonymyeon.backend.report.application.ReportRequest; import edonymyeon.backend.report.application.ReportService; import java.net.URI; diff --git a/backend/src/main/java/edonymyeon/backend/setting/application/dto/SettingRequest.java b/backend/src/main/java/edonymyeon/backend/setting/application/dto/SettingRequest.java deleted file mode 100644 index 14644e2f1..000000000 --- a/backend/src/main/java/edonymyeon/backend/setting/application/dto/SettingRequest.java +++ /dev/null @@ -1,5 +0,0 @@ -package edonymyeon.backend.setting.application.dto; - -public record SettingRequest(String preferenceType) { - -} diff --git a/backend/src/main/java/edonymyeon/backend/thumbs/application/event/ThumbsDownEvent.java b/backend/src/main/java/edonymyeon/backend/thumbs/application/event/ThumbsDownEvent.java deleted file mode 100644 index be4557a7b..000000000 --- a/backend/src/main/java/edonymyeon/backend/thumbs/application/event/ThumbsDownEvent.java +++ /dev/null @@ -1,6 +0,0 @@ -package edonymyeon.backend.thumbs.application.event; - -import edonymyeon.backend.post.domain.Post; - -public record ThumbsDownEvent(Post post) { -} diff --git a/backend/src/main/java/edonymyeon/backend/thumbs/application/event/ThumbsUpEvent.java b/backend/src/main/java/edonymyeon/backend/thumbs/application/event/ThumbsUpEvent.java deleted file mode 100644 index e32b372bf..000000000 --- a/backend/src/main/java/edonymyeon/backend/thumbs/application/event/ThumbsUpEvent.java +++ /dev/null @@ -1,6 +0,0 @@ -package edonymyeon.backend.thumbs.application.event; - -import edonymyeon.backend.post.domain.Post; - -public record ThumbsUpEvent(Post post) { -} diff --git a/backend/src/test/java/edonymyeon/backend/CacheConfig.java b/backend/src/test/java/edonymyeon/backend/CacheConfig.java index 8ed51a154..5e685b351 100644 --- a/backend/src/test/java/edonymyeon/backend/CacheConfig.java +++ b/backend/src/test/java/edonymyeon/backend/CacheConfig.java @@ -1,6 +1,6 @@ package edonymyeon.backend; -import edonymyeon.backend.cache.util.HotPostCachePolicy; +import edonymyeon.backend.content.cache.util.HotPostCachePolicy; import edonymyeon.backend.post.application.TestCacheKeyStrategy; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.context.annotation.Bean; diff --git a/backend/src/test/java/edonymyeon/backend/auth/AuthIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/auth/AuthIntegrationTest.java index 0d863effc..76a4b10e6 100644 --- a/backend/src/test/java/edonymyeon/backend/auth/AuthIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/auth/AuthIntegrationTest.java @@ -6,18 +6,18 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; -import edonymyeon.backend.auth.application.AuthService; -import edonymyeon.backend.auth.application.KakaoAuthResponseProvider; -import edonymyeon.backend.member.application.dto.response.DuplicateCheckResponse; -import edonymyeon.backend.auth.application.dto.JoinRequest; -import edonymyeon.backend.auth.application.dto.KakaoLoginRequest; -import edonymyeon.backend.auth.application.dto.KakaoLoginResponse; -import edonymyeon.backend.auth.application.dto.LoginRequest; -import edonymyeon.backend.auth.application.dto.LogoutRequest; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.domain.SocialInfo; -import edonymyeon.backend.member.domain.SocialInfo.SocialType; -import edonymyeon.backend.member.repository.MemberRepository; +import edonymyeon.backend.membber.auth.application.AuthService; +import edonymyeon.backend.membber.auth.application.KakaoAuthResponseProvider; +import edonymyeon.backend.membber.member.application.dto.response.DuplicateCheckResponse; +import edonymyeon.backend.membber.auth.application.dto.JoinRequest; +import edonymyeon.backend.membber.auth.application.dto.KakaoLoginRequest; +import edonymyeon.backend.membber.auth.application.dto.KakaoLoginResponse; +import edonymyeon.backend.membber.auth.application.dto.LoginRequest; +import edonymyeon.backend.membber.auth.application.dto.LogoutRequest; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.domain.SocialInfo; +import edonymyeon.backend.membber.member.domain.SocialInfo.SocialType; +import edonymyeon.backend.membber.member.repository.MemberRepository; import edonymyeon.backend.support.EdonymyeonRestAssured; import edonymyeon.backend.support.IntegrationFixture; import edonymyeon.backend.support.TestMemberBuilder; diff --git a/backend/src/test/java/edonymyeon/backend/auth/application/AuthDeleteServiceTest.java b/backend/src/test/java/edonymyeon/backend/auth/application/AuthDeleteServiceTest.java index 111518c45..4b0820a96 100644 --- a/backend/src/test/java/edonymyeon/backend/auth/application/AuthDeleteServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/auth/application/AuthDeleteServiceTest.java @@ -3,9 +3,10 @@ import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_IS_DELETED; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import edonymyeon.backend.auth.application.dto.LoginRequest; +import edonymyeon.backend.membber.auth.application.AuthService; +import edonymyeon.backend.membber.auth.application.dto.LoginRequest; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.member.domain.Member; +import edonymyeon.backend.membber.member.domain.Member; import edonymyeon.backend.support.IntegrationTest; import edonymyeon.backend.support.TestMemberBuilder; import lombok.RequiredArgsConstructor; diff --git a/backend/src/test/java/edonymyeon/backend/auth/application/AuthServiceTest.java b/backend/src/test/java/edonymyeon/backend/auth/application/AuthServiceTest.java index f83286be6..ce07987d7 100644 --- a/backend/src/test/java/edonymyeon/backend/auth/application/AuthServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/auth/application/AuthServiceTest.java @@ -13,23 +13,24 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import edonymyeon.backend.auth.application.dto.JoinRequest; -import edonymyeon.backend.auth.application.dto.KakaoLoginResponse; -import edonymyeon.backend.auth.application.dto.LoginRequest; -import edonymyeon.backend.auth.domain.PasswordEncoder; +import edonymyeon.backend.membber.auth.application.AuthService; +import edonymyeon.backend.membber.auth.application.dto.JoinRequest; +import edonymyeon.backend.membber.auth.application.dto.KakaoLoginResponse; +import edonymyeon.backend.membber.auth.application.dto.LoginRequest; +import edonymyeon.backend.membber.auth.domain.PasswordEncoder; import edonymyeon.backend.image.application.ImageService; import edonymyeon.backend.image.domain.ImageInfo; -import edonymyeon.backend.image.profileimage.domain.ProfileImageInfo; -import edonymyeon.backend.member.application.DeviceRepository; -import edonymyeon.backend.member.application.MemberService; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.domain.Device; -import edonymyeon.backend.member.domain.Email; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.domain.SocialInfo; -import edonymyeon.backend.member.domain.SocialInfo.SocialType; -import edonymyeon.backend.member.repository.MemberRepository; -import edonymyeon.backend.setting.application.SettingService; +import edonymyeon.backend.membber.member.profileimage.domain.ProfileImageInfo; +import edonymyeon.backend.membber.member.application.DeviceRepository; +import edonymyeon.backend.membber.member.application.MemberService; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.domain.Device; +import edonymyeon.backend.membber.member.domain.Email; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.domain.SocialInfo; +import edonymyeon.backend.membber.member.domain.SocialInfo.SocialType; +import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.membber.setting.application.SettingService; import edonymyeon.backend.support.IntegrationTest; import jakarta.persistence.EntityManager; import java.util.Optional; @@ -43,7 +44,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.mock.mockito.SpyBean; -import org.springframework.test.context.jdbc.Sql; @DisplayNameGeneration(ReplaceUnderscores.class) @SuppressWarnings("NonAsciiCharacters") diff --git a/backend/src/test/java/edonymyeon/backend/auth/docs/AuthControllerDocsTest.java b/backend/src/test/java/edonymyeon/backend/auth/docs/AuthControllerDocsTest.java index 54b2a72d4..b7e0313b8 100644 --- a/backend/src/test/java/edonymyeon/backend/auth/docs/AuthControllerDocsTest.java +++ b/backend/src/test/java/edonymyeon/backend/auth/docs/AuthControllerDocsTest.java @@ -15,14 +15,14 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.fasterxml.jackson.databind.ObjectMapper; -import edonymyeon.backend.auth.application.AuthService; -import edonymyeon.backend.auth.application.KakaoAuthResponseProvider; -import edonymyeon.backend.member.application.dto.response.DuplicateCheckResponse; -import edonymyeon.backend.auth.application.dto.JoinRequest; -import edonymyeon.backend.auth.application.dto.KakaoLoginRequest; -import edonymyeon.backend.auth.application.dto.KakaoLoginResponse; -import edonymyeon.backend.auth.application.dto.LoginRequest; -import edonymyeon.backend.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.auth.application.AuthService; +import edonymyeon.backend.membber.auth.application.KakaoAuthResponseProvider; +import edonymyeon.backend.membber.member.application.dto.response.DuplicateCheckResponse; +import edonymyeon.backend.membber.auth.application.dto.JoinRequest; +import edonymyeon.backend.membber.auth.application.dto.KakaoLoginRequest; +import edonymyeon.backend.membber.auth.application.dto.KakaoLoginResponse; +import edonymyeon.backend.membber.auth.application.dto.LoginRequest; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; import edonymyeon.backend.support.DocsTest; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; diff --git a/backend/src/test/java/edonymyeon/backend/auth/domain/SimplePasswordEncoderTest.java b/backend/src/test/java/edonymyeon/backend/auth/domain/SimplePasswordEncoderTest.java index 0a9707343..d80aa7e7b 100644 --- a/backend/src/test/java/edonymyeon/backend/auth/domain/SimplePasswordEncoderTest.java +++ b/backend/src/test/java/edonymyeon/backend/auth/domain/SimplePasswordEncoderTest.java @@ -2,6 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; +import edonymyeon.backend.membber.auth.domain.SimplePasswordEncoder; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator; diff --git a/backend/src/test/java/edonymyeon/backend/comment/application/CommentServiceTest.java b/backend/src/test/java/edonymyeon/backend/comment/application/CommentServiceTest.java index 92b711e1d..12f0a642c 100644 --- a/backend/src/test/java/edonymyeon/backend/comment/application/CommentServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/comment/application/CommentServiceTest.java @@ -2,15 +2,13 @@ import static org.assertj.core.api.Assertions.assertThat; -import edonymyeon.backend.comment.domain.Comment; -import edonymyeon.backend.comment.repository.CommentRepository; -import edonymyeon.backend.image.commentimage.domain.CommentImageInfo; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.post.application.PostService; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.content.comment.application.CommentService; +import edonymyeon.backend.content.comment.domain.Comment; +import edonymyeon.backend.content.comment.repository.CommentRepository; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.IntegrationFixture; -import jakarta.persistence.EntityManager; import java.util.Optional; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/edonymyeon/backend/comment/docs/CommentControllerDocsTest.java b/backend/src/test/java/edonymyeon/backend/comment/docs/CommentControllerDocsTest.java index 38f500bbc..938ba404a 100644 --- a/backend/src/test/java/edonymyeon/backend/comment/docs/CommentControllerDocsTest.java +++ b/backend/src/test/java/edonymyeon/backend/comment/docs/CommentControllerDocsTest.java @@ -1,6 +1,6 @@ package edonymyeon.backend.comment.docs; -import static edonymyeon.backend.auth.ui.SessionConst.USER; +import static edonymyeon.backend.membber.auth.ui.SessionConst.USER; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.doNothing; @@ -21,11 +21,11 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import edonymyeon.backend.comment.application.CommentService; -import edonymyeon.backend.comment.application.dto.response.CommentDto; -import edonymyeon.backend.comment.application.dto.response.CommentsResponse; -import edonymyeon.backend.comment.application.dto.response.WriterDto; -import edonymyeon.backend.member.domain.Member; +import edonymyeon.backend.content.comment.application.CommentService; +import edonymyeon.backend.content.comment.application.dto.response.CommentDto; +import edonymyeon.backend.content.comment.application.dto.response.CommentsResponse; +import edonymyeon.backend.content.comment.application.dto.response.WriterDto; +import edonymyeon.backend.membber.member.domain.Member; import edonymyeon.backend.support.IntegrationTest; import edonymyeon.backend.support.TestMemberBuilder; import jakarta.servlet.http.Part; diff --git a/backend/src/test/java/edonymyeon/backend/comment/integration/CommentIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/comment/integration/CommentIntegrationTest.java index c46f92ae1..a3a039982 100644 --- a/backend/src/test/java/edonymyeon/backend/comment/integration/CommentIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/comment/integration/CommentIntegrationTest.java @@ -8,9 +8,9 @@ import edonymyeon.backend.TestConfig; import edonymyeon.backend.image.domain.ImageType; -import edonymyeon.backend.member.domain.Member; +import edonymyeon.backend.membber.member.domain.Member; import edonymyeon.backend.post.ImageFileCleaner; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.IntegrationFixture; import io.restassured.response.ExtractableResponse; import io.restassured.response.Response; diff --git a/backend/src/test/java/edonymyeon/backend/consumption/application/MemberConsumptionServiceImplTest.java b/backend/src/test/java/edonymyeon/backend/consumption/application/MemberConsumptionServiceImplTest.java index 47b8a0caf..f8667923c 100644 --- a/backend/src/test/java/edonymyeon/backend/consumption/application/MemberConsumptionServiceImplTest.java +++ b/backend/src/test/java/edonymyeon/backend/consumption/application/MemberConsumptionServiceImplTest.java @@ -3,10 +3,10 @@ import edonymyeon.backend.consumption.domain.Consumption; import edonymyeon.backend.consumption.domain.ConsumptionType; import edonymyeon.backend.consumption.repository.ConsumptionRepository; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.application.dto.YearMonthDto; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.application.dto.YearMonthDto; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.IntegrationTest; import edonymyeon.backend.support.PostTestSupport; import edonymyeon.backend.support.TestMemberBuilder; diff --git a/backend/src/test/java/edonymyeon/backend/consumption/docs/ConsumptionControllerDocsTest.java b/backend/src/test/java/edonymyeon/backend/consumption/docs/ConsumptionControllerDocsTest.java index 35392dda9..8af7e552d 100644 --- a/backend/src/test/java/edonymyeon/backend/consumption/docs/ConsumptionControllerDocsTest.java +++ b/backend/src/test/java/edonymyeon/backend/consumption/docs/ConsumptionControllerDocsTest.java @@ -1,6 +1,6 @@ package edonymyeon.backend.consumption.docs; -import static edonymyeon.backend.auth.ui.SessionConst.USER; +import static edonymyeon.backend.membber.auth.ui.SessionConst.USER; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document; @@ -17,9 +17,9 @@ import edonymyeon.backend.consumption.application.ConsumptionService; import edonymyeon.backend.consumption.application.dto.ConsumptionPriceResponse; import edonymyeon.backend.consumption.application.dto.RecentConsumptionsResponse; -import edonymyeon.backend.member.domain.Email; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.repository.MemberRepository; +import edonymyeon.backend.membber.member.domain.Email; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.repository.MemberRepository; import edonymyeon.backend.support.DocsTest; import edonymyeon.backend.support.TestMemberBuilder; import java.util.List; diff --git a/backend/src/test/java/edonymyeon/backend/consumption/domain/ConsumptionsPerMonthTest.java b/backend/src/test/java/edonymyeon/backend/consumption/domain/ConsumptionsPerMonthTest.java index b5ef1a04a..b9f2c7bef 100644 --- a/backend/src/test/java/edonymyeon/backend/consumption/domain/ConsumptionsPerMonthTest.java +++ b/backend/src/test/java/edonymyeon/backend/consumption/domain/ConsumptionsPerMonthTest.java @@ -1,7 +1,7 @@ package edonymyeon.backend.consumption.domain; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.TestMemberBuilder; import org.assertj.core.api.SoftAssertions; import org.junit.jupiter.api.DisplayNameGeneration; diff --git a/backend/src/test/java/edonymyeon/backend/consumption/integration/ConsumptionIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/consumption/integration/ConsumptionIntegrationTest.java index bbe157416..841b65e0b 100644 --- a/backend/src/test/java/edonymyeon/backend/consumption/integration/ConsumptionIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/consumption/integration/ConsumptionIntegrationTest.java @@ -6,8 +6,8 @@ import edonymyeon.backend.consumption.domain.ConsumptionType; import edonymyeon.backend.global.controlleradvice.dto.ExceptionResponse; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.ConsumptionTestSupport; import edonymyeon.backend.support.IntegrationFixture; import io.restassured.response.ExtractableResponse; diff --git a/backend/src/test/java/edonymyeon/backend/consumption/repository/ConsumptionRepositoryTest.java b/backend/src/test/java/edonymyeon/backend/consumption/repository/ConsumptionRepositoryTest.java index 90ac2ff27..8d5207e84 100644 --- a/backend/src/test/java/edonymyeon/backend/consumption/repository/ConsumptionRepositoryTest.java +++ b/backend/src/test/java/edonymyeon/backend/consumption/repository/ConsumptionRepositoryTest.java @@ -6,8 +6,8 @@ import edonymyeon.backend.support.IntegrationTest; import edonymyeon.backend.consumption.domain.Consumption; import edonymyeon.backend.consumption.domain.ConsumptionType; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.ConsumptionTestSupport; import edonymyeon.backend.support.PostTestSupport; import java.time.LocalDate; diff --git a/backend/src/test/java/edonymyeon/backend/image/ImageFileSizeIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/image/ImageFileSizeIntegrationTest.java index ab87a05f2..29af5636e 100644 --- a/backend/src/test/java/edonymyeon/backend/image/ImageFileSizeIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/image/ImageFileSizeIntegrationTest.java @@ -4,11 +4,10 @@ import static org.assertj.core.api.Assertions.assertThat; import edonymyeon.backend.global.controlleradvice.dto.ExceptionResponse; -import edonymyeon.backend.member.domain.Member; +import edonymyeon.backend.membber.member.domain.Member; import edonymyeon.backend.post.ImageFileCleaner; import edonymyeon.backend.support.EdonymyeonRestAssured; import edonymyeon.backend.support.IntegrationFixture; -import io.restassured.RestAssured; import java.io.File; import org.assertj.core.api.SoftAssertions; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/edonymyeon/backend/member/application/MemberServiceTest.java b/backend/src/test/java/edonymyeon/backend/member/application/MemberServiceTest.java index 0e73c9b25..0771df46e 100644 --- a/backend/src/test/java/edonymyeon/backend/member/application/MemberServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/application/MemberServiceTest.java @@ -9,17 +9,19 @@ import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.verify; -import edonymyeon.backend.auth.application.AuthService; -import edonymyeon.backend.auth.application.dto.JoinRequest; -import edonymyeon.backend.auth.application.dto.KakaoLoginResponse; -import edonymyeon.backend.auth.application.dto.LoginRequest; +import edonymyeon.backend.membber.auth.application.AuthService; +import edonymyeon.backend.membber.auth.application.dto.JoinRequest; +import edonymyeon.backend.membber.auth.application.dto.KakaoLoginResponse; +import edonymyeon.backend.membber.auth.application.dto.LoginRequest; import edonymyeon.backend.image.application.ImageService; -import edonymyeon.backend.image.profileimage.domain.ProfileImageInfo; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.application.dto.request.MemberUpdateRequest; -import edonymyeon.backend.member.application.dto.response.MemberUpdateResponse; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.repository.MemberRepository; +import edonymyeon.backend.membber.member.profileimage.domain.ProfileImageInfo; +import edonymyeon.backend.membber.member.application.DeviceRepository; +import edonymyeon.backend.membber.member.application.MemberService; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.application.dto.request.MemberUpdateRequest; +import edonymyeon.backend.membber.member.application.dto.response.MemberUpdateResponse; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.repository.MemberRepository; import edonymyeon.backend.post.ImageFileCleaner; import edonymyeon.backend.support.IntegrationFixture; import java.io.IOException; diff --git a/backend/src/test/java/edonymyeon/backend/member/docs/MemberControllerDocsTest.java b/backend/src/test/java/edonymyeon/backend/member/docs/MemberControllerDocsTest.java index 779e530ca..f290c77b9 100644 --- a/backend/src/test/java/edonymyeon/backend/member/docs/MemberControllerDocsTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/docs/MemberControllerDocsTest.java @@ -1,6 +1,6 @@ package edonymyeon.backend.member.docs; -import static edonymyeon.backend.auth.ui.SessionConst.USER; +import static edonymyeon.backend.membber.auth.ui.SessionConst.USER; import static edonymyeon.backend.consumption.domain.ConsumptionType.SAVING; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; @@ -27,17 +27,17 @@ import edonymyeon.backend.consumption.repository.ConsumptionRepository; import edonymyeon.backend.image.domain.ImageType; import edonymyeon.backend.image.domain.UrlManager; -import edonymyeon.backend.member.application.MemberService; -import edonymyeon.backend.member.application.dto.request.PurchaseConfirmRequest; -import edonymyeon.backend.member.application.dto.request.SavingConfirmRequest; -import edonymyeon.backend.member.application.dto.response.DuplicateCheckResponse; -import edonymyeon.backend.member.application.dto.response.MyPageResponseV1_0; -import edonymyeon.backend.member.application.dto.response.MyPageResponseV1_1; -import edonymyeon.backend.member.domain.Email; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.repository.MemberRepository; -import edonymyeon.backend.post.domain.Post; -import edonymyeon.backend.post.repository.PostRepository; +import edonymyeon.backend.membber.member.application.MemberService; +import edonymyeon.backend.membber.member.application.dto.request.PurchaseConfirmRequest; +import edonymyeon.backend.membber.member.application.dto.request.SavingConfirmRequest; +import edonymyeon.backend.membber.member.application.dto.response.DuplicateCheckResponse; +import edonymyeon.backend.membber.member.application.dto.response.MyPageResponseV1_0; +import edonymyeon.backend.membber.member.application.dto.response.MyPageResponseV1_1; +import edonymyeon.backend.membber.member.domain.Email; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.content.post.domain.Post; +import edonymyeon.backend.content.post.repository.PostRepository; import edonymyeon.backend.support.DocsTest; import edonymyeon.backend.support.TestMemberBuilder; import jakarta.servlet.http.Part; diff --git a/backend/src/test/java/edonymyeon/backend/member/domain/EmailTest.java b/backend/src/test/java/edonymyeon/backend/member/domain/EmailTest.java index 78d67d771..42751711e 100644 --- a/backend/src/test/java/edonymyeon/backend/member/domain/EmailTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/domain/EmailTest.java @@ -4,6 +4,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import edonymyeon.backend.global.exception.EdonymyeonException; +import edonymyeon.backend.membber.member.domain.Email; +import edonymyeon.backend.membber.member.domain.SocialInfo; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator; diff --git a/backend/src/test/java/edonymyeon/backend/member/domain/MemberTest.java b/backend/src/test/java/edonymyeon/backend/member/domain/MemberTest.java index a81b23121..63feb874d 100644 --- a/backend/src/test/java/edonymyeon/backend/member/domain/MemberTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/domain/MemberTest.java @@ -6,6 +6,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import edonymyeon.backend.global.exception.EdonymyeonException; +import edonymyeon.backend.membber.member.domain.Member; import java.util.Collections; import java.util.List; import org.assertj.core.api.Assertions; diff --git a/backend/src/test/java/edonymyeon/backend/member/domain/NicknameTest.java b/backend/src/test/java/edonymyeon/backend/member/domain/NicknameTest.java index d46b26aff..932e5f1a5 100644 --- a/backend/src/test/java/edonymyeon/backend/member/domain/NicknameTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/domain/NicknameTest.java @@ -1,11 +1,12 @@ package edonymyeon.backend.member.domain; import static edonymyeon.backend.global.exception.ExceptionInformation.*; -import static edonymyeon.backend.member.domain.SocialInfo.SocialType; +import static edonymyeon.backend.membber.member.domain.SocialInfo.SocialType; import static org.assertj.core.api.Assertions.*; import static org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import edonymyeon.backend.global.exception.EdonymyeonException; +import edonymyeon.backend.membber.member.domain.Nickname; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/edonymyeon/backend/member/domain/PasswordTest.java b/backend/src/test/java/edonymyeon/backend/member/domain/PasswordTest.java index 7081f7318..190bc57cf 100644 --- a/backend/src/test/java/edonymyeon/backend/member/domain/PasswordTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/domain/PasswordTest.java @@ -4,9 +4,11 @@ import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_PASSWORD_INVALID; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import edonymyeon.backend.auth.domain.SimplePasswordEncoder; +import edonymyeon.backend.membber.auth.domain.SimplePasswordEncoder; import edonymyeon.backend.global.exception.BusinessLogicException; import edonymyeon.backend.global.exception.EdonymyeonException; +import edonymyeon.backend.membber.member.domain.Password; +import edonymyeon.backend.membber.member.domain.SocialInfo; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator; diff --git a/backend/src/test/java/edonymyeon/backend/member/integration/MemberConsumptionIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/member/integration/MemberConsumptionIntegrationTest.java index cacac34ad..fd890909d 100644 --- a/backend/src/test/java/edonymyeon/backend/member/integration/MemberConsumptionIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/integration/MemberConsumptionIntegrationTest.java @@ -4,10 +4,10 @@ import edonymyeon.backend.global.controlleradvice.dto.ExceptionResponse; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.member.application.dto.request.PurchaseConfirmRequest; -import edonymyeon.backend.member.application.dto.request.SavingConfirmRequest; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.membber.member.application.dto.request.PurchaseConfirmRequest; +import edonymyeon.backend.membber.member.application.dto.request.SavingConfirmRequest; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.IntegrationFixture; import io.restassured.response.ExtractableResponse; import io.restassured.response.Response; diff --git a/backend/src/test/java/edonymyeon/backend/member/integration/MemberIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/member/integration/MemberIntegrationTest.java index 412f22eba..1543181db 100644 --- a/backend/src/test/java/edonymyeon/backend/member/integration/MemberIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/integration/MemberIntegrationTest.java @@ -5,13 +5,13 @@ import static org.assertj.core.api.SoftAssertions.assertSoftly; import static org.junit.jupiter.api.Assertions.assertAll; -import edonymyeon.backend.auth.application.dto.LoginRequest; +import edonymyeon.backend.membber.auth.application.dto.LoginRequest; import edonymyeon.backend.global.controlleradvice.dto.ExceptionResponse; -import edonymyeon.backend.member.application.dto.response.MyPageResponseV1_0; -import edonymyeon.backend.member.application.dto.response.MyPageResponseV1_1; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.post.application.dto.response.MyPostResponse; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.membber.member.application.dto.response.MyPageResponseV1_0; +import edonymyeon.backend.membber.member.application.dto.response.MyPageResponseV1_1; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.content.post.application.dto.response.MyPostResponse; +import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.EdonymyeonRestAssured; import edonymyeon.backend.support.IntegrationFixture; import io.restassured.http.ContentType; diff --git a/backend/src/test/java/edonymyeon/backend/member/repository/MemberRepositoryTest.java b/backend/src/test/java/edonymyeon/backend/member/repository/MemberRepositoryTest.java index 906323fbd..b34e4a2ef 100644 --- a/backend/src/test/java/edonymyeon/backend/member/repository/MemberRepositoryTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/repository/MemberRepositoryTest.java @@ -2,11 +2,12 @@ import static org.assertj.core.api.Assertions.assertThat; -import edonymyeon.backend.member.application.MemberConsumptionService; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.application.dto.YearMonthDto; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.membber.member.application.MemberConsumptionService; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.application.dto.YearMonthDto; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.IntegrationFixture; import jakarta.persistence.EntityManager; import java.time.LocalDateTime; diff --git a/backend/src/test/java/edonymyeon/backend/notification/application/NotificationEventListenerTest.java b/backend/src/test/java/edonymyeon/backend/notification/application/NotificationEventListenerTest.java index e56ffd7ba..844662d16 100644 --- a/backend/src/test/java/edonymyeon/backend/notification/application/NotificationEventListenerTest.java +++ b/backend/src/test/java/edonymyeon/backend/notification/application/NotificationEventListenerTest.java @@ -7,23 +7,23 @@ import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.verify; -import edonymyeon.backend.auth.application.AuthService; -import edonymyeon.backend.auth.application.dto.JoinRequest; -import edonymyeon.backend.comment.application.CommentService; -import edonymyeon.backend.comment.application.dto.request.CommentRequest; +import edonymyeon.backend.membber.auth.application.AuthService; +import edonymyeon.backend.membber.auth.application.dto.JoinRequest; +import edonymyeon.backend.content.comment.application.CommentService; +import edonymyeon.backend.content.comment.application.dto.request.CommentRequest; import edonymyeon.backend.global.exception.BusinessLogicException; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.domain.Member; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.domain.Member; import edonymyeon.backend.notification.domain.Notification; import edonymyeon.backend.notification.repository.NotificationRepository; -import edonymyeon.backend.post.domain.Post; -import edonymyeon.backend.setting.application.SettingService; -import edonymyeon.backend.setting.domain.SettingType; +import edonymyeon.backend.content.post.domain.Post; +import edonymyeon.backend.membber.setting.application.SettingService; +import edonymyeon.backend.membber.setting.domain.SettingType; import edonymyeon.backend.support.IntegrationFixture; -import edonymyeon.backend.thumbs.application.ThumbsService; -import edonymyeon.backend.thumbs.domain.Thumbs; -import edonymyeon.backend.thumbs.repository.ThumbsRepository; +import edonymyeon.backend.content.thumbs.application.ThumbsService; +import edonymyeon.backend.content.thumbs.domain.Thumbs; +import edonymyeon.backend.content.thumbs.repository.ThumbsRepository; import java.time.Duration; import java.util.List; import lombok.RequiredArgsConstructor; diff --git a/backend/src/test/java/edonymyeon/backend/notification/application/NotificationServiceTest.java b/backend/src/test/java/edonymyeon/backend/notification/application/NotificationServiceTest.java index 12e8fd0ad..316648cf4 100644 --- a/backend/src/test/java/edonymyeon/backend/notification/application/NotificationServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/notification/application/NotificationServiceTest.java @@ -1,25 +1,25 @@ package edonymyeon.backend.notification.application; -import edonymyeon.backend.auth.application.AuthService; -import edonymyeon.backend.auth.application.dto.JoinRequest; -import edonymyeon.backend.auth.application.dto.LoginRequest; -import edonymyeon.backend.comment.application.CommentService; -import edonymyeon.backend.comment.application.dto.request.CommentRequest; +import edonymyeon.backend.membber.auth.application.AuthService; +import edonymyeon.backend.membber.auth.application.dto.JoinRequest; +import edonymyeon.backend.membber.auth.application.dto.LoginRequest; +import edonymyeon.backend.content.comment.application.CommentService; +import edonymyeon.backend.content.comment.application.dto.request.CommentRequest; import edonymyeon.backend.global.exception.BusinessLogicException; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.member.application.MemberService; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.application.dto.request.PurchaseConfirmRequest; -import edonymyeon.backend.member.domain.Member; +import edonymyeon.backend.membber.member.application.MemberService; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.application.dto.request.PurchaseConfirmRequest; +import edonymyeon.backend.membber.member.domain.Member; import edonymyeon.backend.notification.domain.Notification; import edonymyeon.backend.notification.domain.ScreenType; import edonymyeon.backend.notification.repository.NotificationRepository; -import edonymyeon.backend.post.application.PostService; -import edonymyeon.backend.post.domain.Post; -import edonymyeon.backend.setting.application.SettingService; -import edonymyeon.backend.setting.domain.SettingType; +import edonymyeon.backend.content.post.application.PostService; +import edonymyeon.backend.content.post.domain.Post; +import edonymyeon.backend.membber.setting.application.SettingService; +import edonymyeon.backend.membber.setting.domain.SettingType; import edonymyeon.backend.support.IntegrationFixture; -import edonymyeon.backend.thumbs.application.ThumbsService; +import edonymyeon.backend.content.thumbs.application.ThumbsService; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; diff --git a/backend/src/test/java/edonymyeon/backend/notification/integration/NotificationIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/notification/integration/NotificationIntegrationTest.java index 99fa66526..19b3ec2f3 100644 --- a/backend/src/test/java/edonymyeon/backend/notification/integration/NotificationIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/notification/integration/NotificationIntegrationTest.java @@ -1,19 +1,19 @@ package edonymyeon.backend.notification.integration; -import edonymyeon.backend.auth.application.AuthService; -import edonymyeon.backend.auth.application.dto.JoinRequest; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.domain.Member; +import edonymyeon.backend.membber.auth.application.AuthService; +import edonymyeon.backend.membber.auth.application.dto.JoinRequest; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.domain.Member; import edonymyeon.backend.notification.domain.Notification; import edonymyeon.backend.notification.domain.ScreenType; import edonymyeon.backend.notification.repository.NotificationRepository; import edonymyeon.backend.post.ImageFileCleaner; -import edonymyeon.backend.post.application.PostSlice; -import edonymyeon.backend.setting.application.SettingService; -import edonymyeon.backend.setting.domain.SettingType; +import edonymyeon.backend.content.post.application.PostSlice; +import edonymyeon.backend.membber.setting.application.SettingService; +import edonymyeon.backend.membber.setting.domain.SettingType; import edonymyeon.backend.support.EdonymyeonRestAssured; import edonymyeon.backend.support.IntegrationFixture; -import edonymyeon.backend.thumbs.application.ThumbsService; +import edonymyeon.backend.content.thumbs.application.ThumbsService; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; diff --git a/backend/src/test/java/edonymyeon/backend/post/application/MyPostServiceTest.java b/backend/src/test/java/edonymyeon/backend/post/application/MyPostServiceTest.java index 3fc8b25aa..66adfc322 100644 --- a/backend/src/test/java/edonymyeon/backend/post/application/MyPostServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/post/application/MyPostServiceTest.java @@ -1,14 +1,17 @@ package edonymyeon.backend.post.application; import edonymyeon.backend.consumption.domain.Consumption; +import edonymyeon.backend.content.post.application.GeneralFindingCondition; +import edonymyeon.backend.content.post.application.MyPostService; +import edonymyeon.backend.content.post.application.PostConsumptionService; import edonymyeon.backend.image.application.ImageService; import edonymyeon.backend.image.domain.ImageType; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.post.application.dto.response.MyPostResponse; -import edonymyeon.backend.post.application.dto.response.PostConsumptionResponse; -import edonymyeon.backend.post.domain.Post; -import edonymyeon.backend.post.repository.PostRepository; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.content.post.application.dto.response.MyPostResponse; +import edonymyeon.backend.content.post.application.dto.response.PostConsumptionResponse; +import edonymyeon.backend.content.post.domain.Post; +import edonymyeon.backend.content.post.repository.PostRepository; import edonymyeon.backend.support.TestMemberBuilder; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; diff --git a/backend/src/test/java/edonymyeon/backend/post/application/PostFindingSpecificPostTest.java b/backend/src/test/java/edonymyeon/backend/post/application/PostFindingSpecificPostTest.java index 6857a8d2a..31d620b67 100644 --- a/backend/src/test/java/edonymyeon/backend/post/application/PostFindingSpecificPostTest.java +++ b/backend/src/test/java/edonymyeon/backend/post/application/PostFindingSpecificPostTest.java @@ -3,19 +3,20 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; +import edonymyeon.backend.content.post.application.PostReadService; import edonymyeon.backend.image.domain.ImageInfo; import edonymyeon.backend.support.TestMemberBuilder; import edonymyeon.backend.support.IntegrationTest; import edonymyeon.backend.TestConfig; -import edonymyeon.backend.image.profileimage.domain.ProfileImageInfo; -import edonymyeon.backend.image.profileimage.repository.ProfileImageInfoRepository; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.application.dto.AnonymousMemberId; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.repository.MemberRepository; -import edonymyeon.backend.post.domain.Post; -import edonymyeon.backend.post.repository.PostRepository; +import edonymyeon.backend.membber.member.profileimage.domain.ProfileImageInfo; +import edonymyeon.backend.membber.member.profileimage.repository.ProfileImageInfoRepository; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.application.dto.AnonymousMemberId; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.content.post.domain.Post; +import edonymyeon.backend.content.post.repository.PostRepository; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/edonymyeon/backend/post/application/PostServiceFindingAllPostsTest.java b/backend/src/test/java/edonymyeon/backend/post/application/PostServiceFindingAllPostsTest.java index 47b768af0..cc50569f6 100644 --- a/backend/src/test/java/edonymyeon/backend/post/application/PostServiceFindingAllPostsTest.java +++ b/backend/src/test/java/edonymyeon/backend/post/application/PostServiceFindingAllPostsTest.java @@ -1,17 +1,20 @@ package edonymyeon.backend.post.application; +import edonymyeon.backend.content.post.application.GeneralFindingCondition; +import edonymyeon.backend.content.post.application.PostReadService; +import edonymyeon.backend.content.post.application.PostService; import edonymyeon.backend.support.IntegrationFixture; import edonymyeon.backend.TestConfig; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.image.postimage.repository.PostImageInfoRepository; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.application.dto.MemberId; +import edonymyeon.backend.content.post.postimage.repository.PostImageInfoRepository; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.application.dto.MemberId; import edonymyeon.backend.post.ImageFileCleaner; -import edonymyeon.backend.post.application.dto.response.GeneralPostInfoResponse; -import edonymyeon.backend.post.application.dto.request.PostRequest; -import edonymyeon.backend.post.application.dto.response.PostIdResponse; -import edonymyeon.backend.post.repository.PostRepository; +import edonymyeon.backend.content.post.application.dto.response.GeneralPostInfoResponse; +import edonymyeon.backend.content.post.application.dto.request.PostRequest; +import edonymyeon.backend.content.post.application.dto.response.PostIdResponse; +import edonymyeon.backend.content.post.repository.PostRepository; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/backend/src/test/java/edonymyeon/backend/post/application/PostServiceHotPostsTest.java b/backend/src/test/java/edonymyeon/backend/post/application/PostServiceHotPostsTest.java index 689e76ecd..1cb1f7b98 100644 --- a/backend/src/test/java/edonymyeon/backend/post/application/PostServiceHotPostsTest.java +++ b/backend/src/test/java/edonymyeon/backend/post/application/PostServiceHotPostsTest.java @@ -1,12 +1,15 @@ package edonymyeon.backend.post.application; import edonymyeon.backend.CacheConfig; -import edonymyeon.backend.cache.application.PostCachingService; -import edonymyeon.backend.cache.repository.HotPostsRepository; -import edonymyeon.backend.cache.util.HotPostCachePolicy; -import edonymyeon.backend.post.application.dto.response.GeneralPostInfoResponse; -import edonymyeon.backend.post.domain.Post; -import edonymyeon.backend.post.repository.PostRepository; +import edonymyeon.backend.content.cache.application.PostCachingService; +import edonymyeon.backend.content.cache.repository.HotPostsRepository; +import edonymyeon.backend.content.cache.util.HotPostCachePolicy; +import edonymyeon.backend.content.post.application.HotFindingCondition; +import edonymyeon.backend.content.post.application.PostReadService; +import edonymyeon.backend.content.post.application.PostSlice; +import edonymyeon.backend.content.post.application.dto.response.GeneralPostInfoResponse; +import edonymyeon.backend.content.post.domain.Post; +import edonymyeon.backend.content.post.repository.PostRepository; import edonymyeon.backend.support.IntegrationTest; import edonymyeon.backend.support.PostTestSupport; import lombok.RequiredArgsConstructor; diff --git a/backend/src/test/java/edonymyeon/backend/post/application/PostServiceSearchPostsTest.java b/backend/src/test/java/edonymyeon/backend/post/application/PostServiceSearchPostsTest.java index 00e613c2f..d285646df 100644 --- a/backend/src/test/java/edonymyeon/backend/post/application/PostServiceSearchPostsTest.java +++ b/backend/src/test/java/edonymyeon/backend/post/application/PostServiceSearchPostsTest.java @@ -3,7 +3,9 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.assertj.core.api.SoftAssertions.assertSoftly; -import edonymyeon.backend.member.domain.Member; +import edonymyeon.backend.content.post.application.GeneralFindingCondition; +import edonymyeon.backend.content.post.application.PostReadService; +import edonymyeon.backend.membber.member.domain.Member; import edonymyeon.backend.support.TestMemberBuilder; import edonymyeon.backend.support.IntegrationTest; import edonymyeon.backend.support.PostTestSupport; diff --git a/backend/src/test/java/edonymyeon/backend/post/application/PostServiceTest.java b/backend/src/test/java/edonymyeon/backend/post/application/PostServiceTest.java index c99b2b838..f29113d1d 100644 --- a/backend/src/test/java/edonymyeon/backend/post/application/PostServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/post/application/PostServiceTest.java @@ -6,25 +6,27 @@ import static org.assertj.core.api.SoftAssertions.assertSoftly; import edonymyeon.backend.TestConfig; -import edonymyeon.backend.comment.application.CommentService; -import edonymyeon.backend.comment.application.dto.request.CommentRequest; -import edonymyeon.backend.comment.repository.CommentRepository; +import edonymyeon.backend.content.comment.application.CommentService; +import edonymyeon.backend.content.comment.application.dto.request.CommentRequest; +import edonymyeon.backend.content.comment.repository.CommentRepository; import edonymyeon.backend.consumption.repository.ConsumptionRepository; +import edonymyeon.backend.content.post.application.PostReadService; +import edonymyeon.backend.content.post.application.PostService; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.image.postimage.domain.PostImageInfo; -import edonymyeon.backend.image.postimage.repository.PostImageInfoRepository; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.repository.MemberRepository; +import edonymyeon.backend.content.post.postimage.domain.PostImageInfo; +import edonymyeon.backend.content.post.postimage.repository.PostImageInfoRepository; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.repository.MemberRepository; import edonymyeon.backend.post.ImageFileCleaner; -import edonymyeon.backend.post.application.dto.request.PostModificationRequest; -import edonymyeon.backend.post.application.dto.request.PostRequest; -import edonymyeon.backend.post.application.dto.response.PostIdResponse; -import edonymyeon.backend.post.application.dto.response.SpecificPostInfoResponse; -import edonymyeon.backend.post.domain.Post; -import edonymyeon.backend.post.repository.PostRepository; +import edonymyeon.backend.content.post.application.dto.request.PostModificationRequest; +import edonymyeon.backend.content.post.application.dto.request.PostRequest; +import edonymyeon.backend.content.post.application.dto.response.PostIdResponse; +import edonymyeon.backend.content.post.application.dto.response.SpecificPostInfoResponse; +import edonymyeon.backend.content.post.domain.Post; +import edonymyeon.backend.content.post.repository.PostRepository; import edonymyeon.backend.support.ConsumptionTestSupport; import edonymyeon.backend.support.IntegrationTest; import edonymyeon.backend.support.MockMultipartFileTestSupport; diff --git a/backend/src/test/java/edonymyeon/backend/post/application/PostViewTest.java b/backend/src/test/java/edonymyeon/backend/post/application/PostViewTest.java index 77c599570..dbade9231 100644 --- a/backend/src/test/java/edonymyeon/backend/post/application/PostViewTest.java +++ b/backend/src/test/java/edonymyeon/backend/post/application/PostViewTest.java @@ -2,15 +2,16 @@ import static org.assertj.core.api.Assertions.assertThat; +import edonymyeon.backend.content.post.application.PostReadService; import edonymyeon.backend.support.TestMemberBuilder; import edonymyeon.backend.support.IntegrationTest; import edonymyeon.backend.TestConfig; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.application.dto.AnonymousMemberId; -import edonymyeon.backend.member.domain.Member; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.application.dto.AnonymousMemberId; +import edonymyeon.backend.membber.member.domain.Member; import edonymyeon.backend.post.ImageFileCleaner; -import edonymyeon.backend.post.domain.Post; -import edonymyeon.backend.post.repository.PostRepository; +import edonymyeon.backend.content.post.domain.Post; +import edonymyeon.backend.content.post.repository.PostRepository; import edonymyeon.backend.support.PostTestSupport; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.BeforeEach; diff --git a/backend/src/test/java/edonymyeon/backend/post/application/TestCacheKeyStrategy.java b/backend/src/test/java/edonymyeon/backend/post/application/TestCacheKeyStrategy.java index 00617afc0..deba5269f 100644 --- a/backend/src/test/java/edonymyeon/backend/post/application/TestCacheKeyStrategy.java +++ b/backend/src/test/java/edonymyeon/backend/post/application/TestCacheKeyStrategy.java @@ -1,6 +1,6 @@ package edonymyeon.backend.post.application; -import edonymyeon.backend.cache.util.CacheKeyStrategy; +import edonymyeon.backend.content.cache.util.CacheKeyStrategy; public class TestCacheKeyStrategy implements CacheKeyStrategy { diff --git a/backend/src/test/java/edonymyeon/backend/post/docs/MyPostControllerDocsTest.java b/backend/src/test/java/edonymyeon/backend/post/docs/MyPostControllerDocsTest.java index fe49c429b..8cd9ae817 100644 --- a/backend/src/test/java/edonymyeon/backend/post/docs/MyPostControllerDocsTest.java +++ b/backend/src/test/java/edonymyeon/backend/post/docs/MyPostControllerDocsTest.java @@ -1,6 +1,6 @@ package edonymyeon.backend.post.docs; -import static edonymyeon.backend.auth.ui.SessionConst.USER; +import static edonymyeon.backend.membber.auth.ui.SessionConst.USER; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document; @@ -17,16 +17,16 @@ import edonymyeon.backend.image.application.ImageService; import edonymyeon.backend.image.domain.ImageType; import edonymyeon.backend.image.domain.UrlManager; -import edonymyeon.backend.image.postimage.domain.PostImageInfos; -import edonymyeon.backend.member.domain.Email; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.repository.MemberRepository; -import edonymyeon.backend.post.application.GeneralFindingCondition; -import edonymyeon.backend.post.application.MyPostService; -import edonymyeon.backend.post.application.PostSlice; -import edonymyeon.backend.post.application.dto.response.MyPostResponse; -import edonymyeon.backend.post.application.dto.response.PostConsumptionResponse; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.content.post.postimage.domain.PostImageInfos; +import edonymyeon.backend.membber.member.domain.Email; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.content.post.application.GeneralFindingCondition; +import edonymyeon.backend.content.post.application.MyPostService; +import edonymyeon.backend.content.post.application.PostSlice; +import edonymyeon.backend.content.post.application.dto.response.MyPostResponse; +import edonymyeon.backend.content.post.application.dto.response.PostConsumptionResponse; +import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.DocsTest; import edonymyeon.backend.support.TestMemberBuilder; import java.util.List; diff --git a/backend/src/test/java/edonymyeon/backend/post/docs/PostControllerDocsTest.java b/backend/src/test/java/edonymyeon/backend/post/docs/PostControllerDocsTest.java index ac3520e7e..759c6ad98 100644 --- a/backend/src/test/java/edonymyeon/backend/post/docs/PostControllerDocsTest.java +++ b/backend/src/test/java/edonymyeon/backend/post/docs/PostControllerDocsTest.java @@ -2,22 +2,22 @@ import edonymyeon.backend.CacheConfig; import edonymyeon.backend.image.domain.ImageInfo; -import edonymyeon.backend.image.postimage.domain.PostImageInfos; -import edonymyeon.backend.image.postimage.repository.PostImageInfoRepository; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.domain.Email; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.repository.MemberRepository; +import edonymyeon.backend.content.post.postimage.domain.PostImageInfos; +import edonymyeon.backend.content.post.postimage.repository.PostImageInfoRepository; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.domain.Email; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.repository.MemberRepository; import edonymyeon.backend.post.ImageFileCleaner; -import edonymyeon.backend.post.application.GeneralFindingCondition; -import edonymyeon.backend.post.application.HotFindingCondition; -import edonymyeon.backend.post.application.dto.response.AllThumbsInPostResponse; -import edonymyeon.backend.post.application.dto.response.ThumbsStatusInPostResponse; -import edonymyeon.backend.post.domain.Post; -import edonymyeon.backend.post.repository.PostRepository; +import edonymyeon.backend.content.post.application.GeneralFindingCondition; +import edonymyeon.backend.content.post.application.HotFindingCondition; +import edonymyeon.backend.content.post.application.dto.response.AllThumbsInPostResponse; +import edonymyeon.backend.content.post.application.dto.response.ThumbsStatusInPostResponse; +import edonymyeon.backend.content.post.domain.Post; +import edonymyeon.backend.content.post.repository.PostRepository; import edonymyeon.backend.support.IntegrationTest; import edonymyeon.backend.support.TestMemberBuilder; -import edonymyeon.backend.thumbs.application.PostThumbsServiceImpl; +import edonymyeon.backend.content.thumbs.application.PostThumbsServiceImpl; import jakarta.servlet.http.Part; import lombok.RequiredArgsConstructor; import org.apache.http.entity.ContentType; @@ -44,7 +44,7 @@ import java.util.List; import java.util.Optional; -import static edonymyeon.backend.auth.ui.SessionConst.USER; +import static edonymyeon.backend.membber.auth.ui.SessionConst.USER; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.when; diff --git a/backend/src/test/java/edonymyeon/backend/post/docs/PostCreationDocsTest.java b/backend/src/test/java/edonymyeon/backend/post/docs/PostCreationDocsTest.java index c90be779f..c036f93a0 100644 --- a/backend/src/test/java/edonymyeon/backend/post/docs/PostCreationDocsTest.java +++ b/backend/src/test/java/edonymyeon/backend/post/docs/PostCreationDocsTest.java @@ -1,6 +1,6 @@ package edonymyeon.backend.post.docs; -import static edonymyeon.backend.auth.ui.SessionConst.USER; +import static edonymyeon.backend.membber.auth.ui.SessionConst.USER; import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document; import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.multipart; import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessRequest; @@ -13,7 +13,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import edonymyeon.backend.member.domain.Member; +import edonymyeon.backend.membber.member.domain.Member; import edonymyeon.backend.post.ImageFileCleaner; import edonymyeon.backend.support.IntegrationTest; import edonymyeon.backend.support.TestMemberBuilder; diff --git a/backend/src/test/java/edonymyeon/backend/post/integration/HotPostIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/post/integration/HotPostIntegrationTest.java index e3167f786..6e6b51dd8 100644 --- a/backend/src/test/java/edonymyeon/backend/post/integration/HotPostIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/post/integration/HotPostIntegrationTest.java @@ -1,17 +1,17 @@ package edonymyeon.backend.post.integration; import edonymyeon.backend.CacheConfig; -import edonymyeon.backend.cache.repository.HotPostsRepository; -import edonymyeon.backend.cache.util.HotPostCachePolicy; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.post.application.HotFindingCondition; -import edonymyeon.backend.post.application.PostReadService; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.content.cache.repository.HotPostsRepository; +import edonymyeon.backend.content.cache.util.HotPostCachePolicy; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.content.post.application.HotFindingCondition; +import edonymyeon.backend.content.post.application.PostReadService; +import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.IntegrationFixture; -import edonymyeon.backend.thumbs.domain.Thumbs; -import edonymyeon.backend.thumbs.domain.ThumbsType; -import edonymyeon.backend.thumbs.repository.ThumbsRepository; +import edonymyeon.backend.content.thumbs.domain.Thumbs; +import edonymyeon.backend.content.thumbs.domain.ThumbsType; +import edonymyeon.backend.content.thumbs.repository.ThumbsRepository; import io.restassured.path.json.JsonPath; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.BeforeEach; diff --git a/backend/src/test/java/edonymyeon/backend/post/integration/MyPostIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/post/integration/MyPostIntegrationTest.java index 86a1e5f24..d0bdf4f63 100644 --- a/backend/src/test/java/edonymyeon/backend/post/integration/MyPostIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/post/integration/MyPostIntegrationTest.java @@ -2,9 +2,9 @@ import static org.assertj.core.api.SoftAssertions.assertSoftly; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.post.application.dto.response.MyPostResponse; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.content.post.application.dto.response.MyPostResponse; +import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.IntegrationFixture; import io.restassured.response.ExtractableResponse; import io.restassured.response.Response; diff --git a/backend/src/test/java/edonymyeon/backend/post/integration/PostCommentCountIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/post/integration/PostCommentCountIntegrationTest.java index d6bd76157..44348ac0e 100644 --- a/backend/src/test/java/edonymyeon/backend/post/integration/PostCommentCountIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/post/integration/PostCommentCountIntegrationTest.java @@ -1,15 +1,14 @@ package edonymyeon.backend.post.integration; import edonymyeon.backend.CacheConfig; -import edonymyeon.backend.cache.repository.HotPostsRepository; -import edonymyeon.backend.cache.util.HotPostCachePolicy; -import edonymyeon.backend.comment.domain.Comment; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.post.application.HotFindingCondition; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.content.cache.repository.HotPostsRepository; +import edonymyeon.backend.content.cache.util.HotPostCachePolicy; +import edonymyeon.backend.content.comment.domain.Comment; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.content.post.application.HotFindingCondition; +import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.EdonymyeonRestAssured; import edonymyeon.backend.support.IntegrationFixture; -import io.restassured.RestAssured; import io.restassured.path.json.JsonPath; import io.restassured.response.ExtractableResponse; import io.restassured.response.Response; diff --git a/backend/src/test/java/edonymyeon/backend/post/integration/PostIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/post/integration/PostIntegrationTest.java index 9f99f4c21..e97c5d9c7 100644 --- a/backend/src/test/java/edonymyeon/backend/post/integration/PostIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/post/integration/PostIntegrationTest.java @@ -11,19 +11,19 @@ import edonymyeon.backend.consumption.repository.ConsumptionRepository; import edonymyeon.backend.image.domain.ImageType; -import edonymyeon.backend.image.postimage.domain.PostImageInfo; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.application.dto.request.PurchaseConfirmRequest; -import edonymyeon.backend.member.domain.Member; +import edonymyeon.backend.content.post.postimage.domain.PostImageInfo; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.application.dto.request.PurchaseConfirmRequest; +import edonymyeon.backend.membber.member.domain.Member; import edonymyeon.backend.post.ImageFileCleaner; -import edonymyeon.backend.post.application.GeneralFindingCondition; -import edonymyeon.backend.post.application.PostReadService; -import edonymyeon.backend.post.application.dto.response.SpecificPostInfoResponse; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.content.post.application.GeneralFindingCondition; +import edonymyeon.backend.content.post.application.PostReadService; +import edonymyeon.backend.content.post.application.dto.response.SpecificPostInfoResponse; +import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.report.application.ReportRequest; import edonymyeon.backend.support.EdonymyeonRestAssured; import edonymyeon.backend.support.IntegrationFixture; -import edonymyeon.backend.thumbs.repository.ThumbsRepository; +import edonymyeon.backend.content.thumbs.repository.ThumbsRepository; import io.restassured.response.ExtractableResponse; import io.restassured.response.Response; import java.io.IOException; diff --git a/backend/src/test/java/edonymyeon/backend/post/integration/PostSearchIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/post/integration/PostSearchIntegrationTest.java index 1b5a2e4b6..d108b7067 100644 --- a/backend/src/test/java/edonymyeon/backend/post/integration/PostSearchIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/post/integration/PostSearchIntegrationTest.java @@ -1,10 +1,9 @@ package edonymyeon.backend.post.integration; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.member.domain.Member; +import edonymyeon.backend.membber.member.domain.Member; import edonymyeon.backend.support.EdonymyeonRestAssured; import edonymyeon.backend.support.IntegrationFixture; -import io.restassured.RestAssured; import io.restassured.response.ExtractableResponse; import io.restassured.response.Response; import org.junit.jupiter.api.BeforeEach; diff --git a/backend/src/test/java/edonymyeon/backend/post/integration/PostViewIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/post/integration/PostViewIntegrationTest.java index d243abbea..f09e26b00 100644 --- a/backend/src/test/java/edonymyeon/backend/post/integration/PostViewIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/post/integration/PostViewIntegrationTest.java @@ -3,9 +3,9 @@ import static org.assertj.core.api.Assertions.assertThat; import edonymyeon.backend.support.IntegrationFixture; -import edonymyeon.backend.member.domain.Member; +import edonymyeon.backend.membber.member.domain.Member; import edonymyeon.backend.post.ImageFileCleaner; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.content.post.domain.Post; import io.restassured.response.ExtractableResponse; import io.restassured.response.Response; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/edonymyeon/backend/post/repository/PostRepositoryTest.java b/backend/src/test/java/edonymyeon/backend/post/repository/PostRepositoryTest.java index 1a361db54..2f50ebf93 100644 --- a/backend/src/test/java/edonymyeon/backend/post/repository/PostRepositoryTest.java +++ b/backend/src/test/java/edonymyeon/backend/post/repository/PostRepositoryTest.java @@ -1,11 +1,12 @@ package edonymyeon.backend.post.repository; -import edonymyeon.backend.member.application.dto.AnonymousMemberId; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.post.application.HotFindingCondition; -import edonymyeon.backend.post.application.PostReadService; -import edonymyeon.backend.post.domain.HotPostPolicy; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.content.post.repository.PostRepository; +import edonymyeon.backend.membber.member.application.dto.AnonymousMemberId; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.content.post.application.HotFindingCondition; +import edonymyeon.backend.content.post.application.PostReadService; +import edonymyeon.backend.content.post.domain.HotPostPolicy; +import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.*; import lombok.RequiredArgsConstructor; import org.assertj.core.api.Assertions; diff --git a/backend/src/test/java/edonymyeon/backend/post/repository/PostSpecificationTest.java b/backend/src/test/java/edonymyeon/backend/post/repository/PostSpecificationTest.java index 2f5626225..5bdaca279 100644 --- a/backend/src/test/java/edonymyeon/backend/post/repository/PostSpecificationTest.java +++ b/backend/src/test/java/edonymyeon/backend/post/repository/PostSpecificationTest.java @@ -1,6 +1,8 @@ package edonymyeon.backend.post.repository; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.content.post.domain.Post; +import edonymyeon.backend.content.post.repository.PostRepository; +import edonymyeon.backend.content.post.repository.PostSpecification; import edonymyeon.backend.support.IntegrationTest; import edonymyeon.backend.support.PostTestSupport; import lombok.RequiredArgsConstructor; diff --git a/backend/src/test/java/edonymyeon/backend/post/ui/PostControllerTest.java b/backend/src/test/java/edonymyeon/backend/post/ui/PostControllerTest.java index 68ffd8ed5..23ec0c03e 100644 --- a/backend/src/test/java/edonymyeon/backend/post/ui/PostControllerTest.java +++ b/backend/src/test/java/edonymyeon/backend/post/ui/PostControllerTest.java @@ -1,15 +1,15 @@ package edonymyeon.backend.post.ui; -import static edonymyeon.backend.auth.ui.SessionConst.USER; +import static edonymyeon.backend.membber.auth.ui.SessionConst.USER; import static edonymyeon.backend.global.exception.ExceptionInformation.POST_MEMBER_NOT_SAME; import static org.assertj.core.api.SoftAssertions.assertSoftly; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import edonymyeon.backend.global.controlleradvice.dto.ExceptionResponse; -import edonymyeon.backend.member.domain.Member; +import edonymyeon.backend.membber.member.domain.Member; import edonymyeon.backend.post.ImageFileCleaner; -import edonymyeon.backend.post.application.dto.response.PostIdResponse; +import edonymyeon.backend.content.post.application.dto.response.PostIdResponse; import edonymyeon.backend.support.IntegrationTest; import edonymyeon.backend.support.TestMemberBuilder; import java.io.IOException; diff --git a/backend/src/test/java/edonymyeon/backend/report/application/ReportServiceTest.java b/backend/src/test/java/edonymyeon/backend/report/application/ReportServiceTest.java index fe0965b47..222bffb83 100644 --- a/backend/src/test/java/edonymyeon/backend/report/application/ReportServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/report/application/ReportServiceTest.java @@ -1,9 +1,9 @@ package edonymyeon.backend.report.application; -import edonymyeon.backend.comment.domain.Comment; +import edonymyeon.backend.content.comment.domain.Comment; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.report.domain.Report; import edonymyeon.backend.support.CommentTestSupport; import edonymyeon.backend.support.IntegrationTest; diff --git a/backend/src/test/java/edonymyeon/backend/report/docs/ReportDocsTest.java b/backend/src/test/java/edonymyeon/backend/report/docs/ReportDocsTest.java index ca6340298..1ed698f3b 100644 --- a/backend/src/test/java/edonymyeon/backend/report/docs/ReportDocsTest.java +++ b/backend/src/test/java/edonymyeon/backend/report/docs/ReportDocsTest.java @@ -1,6 +1,6 @@ package edonymyeon.backend.report.docs; -import static edonymyeon.backend.auth.ui.SessionConst.USER; +import static edonymyeon.backend.membber.auth.ui.SessionConst.USER; import static edonymyeon.backend.report.domain.ReportType.POST; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; @@ -12,13 +12,13 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.fasterxml.jackson.databind.ObjectMapper; -import edonymyeon.backend.image.postimage.domain.PostImageInfos; -import edonymyeon.backend.member.domain.Email; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.repository.MemberRepository; +import edonymyeon.backend.content.post.postimage.domain.PostImageInfos; +import edonymyeon.backend.membber.member.domain.Email; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.repository.MemberRepository; import edonymyeon.backend.post.ImageFileCleaner; -import edonymyeon.backend.post.domain.Post; -import edonymyeon.backend.post.repository.PostRepository; +import edonymyeon.backend.content.post.domain.Post; +import edonymyeon.backend.content.post.repository.PostRepository; import edonymyeon.backend.report.application.ReportRepository; import edonymyeon.backend.report.application.ReportRequest; import edonymyeon.backend.report.domain.AbusingType; diff --git a/backend/src/test/java/edonymyeon/backend/report/ui/ReportIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/report/ui/ReportIntegrationTest.java index 484d22942..84215f15b 100644 --- a/backend/src/test/java/edonymyeon/backend/report/ui/ReportIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/report/ui/ReportIntegrationTest.java @@ -2,13 +2,12 @@ import static org.assertj.core.api.Assertions.assertThat; -import edonymyeon.backend.comment.domain.Comment; -import edonymyeon.backend.member.domain.Member; +import edonymyeon.backend.content.comment.domain.Comment; +import edonymyeon.backend.membber.member.domain.Member; import edonymyeon.backend.post.ImageFileCleaner; import edonymyeon.backend.report.application.ReportRequest; import edonymyeon.backend.support.EdonymyeonRestAssured; import edonymyeon.backend.support.IntegrationFixture; -import io.restassured.RestAssured; import io.restassured.response.ExtractableResponse; import io.restassured.response.Response; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/edonymyeon/backend/setting/application/SettingServiceTest.java b/backend/src/test/java/edonymyeon/backend/setting/application/SettingServiceTest.java index da5a5d935..92da21a20 100644 --- a/backend/src/test/java/edonymyeon/backend/setting/application/SettingServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/setting/application/SettingServiceTest.java @@ -5,13 +5,14 @@ import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.verify; -import edonymyeon.backend.auth.application.AuthService; -import edonymyeon.backend.auth.application.dto.JoinRequest; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.setting.domain.Setting; -import edonymyeon.backend.setting.domain.SettingType; -import edonymyeon.backend.setting.repository.SettingRepository; +import edonymyeon.backend.membber.auth.application.AuthService; +import edonymyeon.backend.membber.auth.application.dto.JoinRequest; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.setting.application.SettingService; +import edonymyeon.backend.membber.setting.domain.Setting; +import edonymyeon.backend.membber.setting.domain.SettingType; +import edonymyeon.backend.membber.setting.repository.SettingRepository; import edonymyeon.backend.support.IntegrationFixture; import java.util.List; import lombok.RequiredArgsConstructor; diff --git a/backend/src/test/java/edonymyeon/backend/setting/docs/SettingControllerDocsTest.java b/backend/src/test/java/edonymyeon/backend/setting/docs/SettingControllerDocsTest.java index 4b9a6325a..df987fe36 100644 --- a/backend/src/test/java/edonymyeon/backend/setting/docs/SettingControllerDocsTest.java +++ b/backend/src/test/java/edonymyeon/backend/setting/docs/SettingControllerDocsTest.java @@ -1,6 +1,6 @@ package edonymyeon.backend.setting.docs; -import static edonymyeon.backend.auth.ui.SessionConst.USER; +import static edonymyeon.backend.membber.auth.ui.SessionConst.USER; import static org.mockito.Mockito.when; import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document; import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get; @@ -13,13 +13,13 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.fasterxml.jackson.databind.ObjectMapper; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.setting.application.SettingService; -import edonymyeon.backend.setting.application.dto.SettingRequest; -import edonymyeon.backend.setting.application.dto.SettingResponse; -import edonymyeon.backend.setting.application.dto.SettingsResponse; -import edonymyeon.backend.setting.domain.SettingType; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.setting.application.SettingService; +import edonymyeon.backend.membber.setting.application.dto.SettingRequest; +import edonymyeon.backend.membber.setting.application.dto.SettingResponse; +import edonymyeon.backend.membber.setting.application.dto.SettingsResponse; +import edonymyeon.backend.membber.setting.domain.SettingType; import edonymyeon.backend.support.DocsTest; import edonymyeon.backend.support.TestMemberBuilder; import java.util.List; diff --git a/backend/src/test/java/edonymyeon/backend/setting/domain/SettingTest.java b/backend/src/test/java/edonymyeon/backend/setting/domain/SettingTest.java index 35b8e099b..37fe8497a 100644 --- a/backend/src/test/java/edonymyeon/backend/setting/domain/SettingTest.java +++ b/backend/src/test/java/edonymyeon/backend/setting/domain/SettingTest.java @@ -2,6 +2,8 @@ import static org.assertj.core.api.Assertions.assertThat; +import edonymyeon.backend.membber.setting.domain.Setting; +import edonymyeon.backend.membber.setting.domain.SettingType; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/backend/src/test/java/edonymyeon/backend/setting/ui/SettingIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/setting/ui/SettingIntegrationTest.java index 3cc584951..2475bcbf5 100644 --- a/backend/src/test/java/edonymyeon/backend/setting/ui/SettingIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/setting/ui/SettingIntegrationTest.java @@ -5,10 +5,10 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import edonymyeon.backend.auth.application.AuthService; -import edonymyeon.backend.auth.application.dto.JoinRequest; -import edonymyeon.backend.setting.application.dto.SettingRequest; -import edonymyeon.backend.setting.domain.SettingType; +import edonymyeon.backend.membber.auth.application.AuthService; +import edonymyeon.backend.membber.auth.application.dto.JoinRequest; +import edonymyeon.backend.membber.setting.application.dto.SettingRequest; +import edonymyeon.backend.membber.setting.domain.SettingType; import edonymyeon.backend.support.EdonymyeonRestAssured; import edonymyeon.backend.support.IntegrationFixture; import io.restassured.response.ExtractableResponse; diff --git a/backend/src/test/java/edonymyeon/backend/support/CommentTestSupport.java b/backend/src/test/java/edonymyeon/backend/support/CommentTestSupport.java index 18dc705c3..1d9b75010 100644 --- a/backend/src/test/java/edonymyeon/backend/support/CommentTestSupport.java +++ b/backend/src/test/java/edonymyeon/backend/support/CommentTestSupport.java @@ -1,12 +1,12 @@ package edonymyeon.backend.support; -import edonymyeon.backend.comment.domain.Comment; -import edonymyeon.backend.comment.repository.CommentRepository; -import edonymyeon.backend.image.commentimage.domain.CommentImageInfo; -import edonymyeon.backend.image.commentimage.repository.CommentImageInfoRepository; +import edonymyeon.backend.content.comment.domain.Comment; +import edonymyeon.backend.content.comment.repository.CommentRepository; +import edonymyeon.backend.content.comment.commentimage.domain.CommentImageInfo; +import edonymyeon.backend.content.comment.commentimage.repository.CommentImageInfoRepository; import edonymyeon.backend.image.domain.ImageInfo; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.content.post.domain.Post; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/backend/src/test/java/edonymyeon/backend/support/ConsumptionTestSupport.java b/backend/src/test/java/edonymyeon/backend/support/ConsumptionTestSupport.java index b7cbde72f..6e32ca89a 100644 --- a/backend/src/test/java/edonymyeon/backend/support/ConsumptionTestSupport.java +++ b/backend/src/test/java/edonymyeon/backend/support/ConsumptionTestSupport.java @@ -3,7 +3,7 @@ import edonymyeon.backend.consumption.domain.Consumption; import edonymyeon.backend.consumption.domain.ConsumptionType; import edonymyeon.backend.consumption.repository.ConsumptionRepository; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.content.post.domain.Post; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/backend/src/test/java/edonymyeon/backend/support/IntegrationFixture.java b/backend/src/test/java/edonymyeon/backend/support/IntegrationFixture.java index 58b4d25ca..53901b78d 100644 --- a/backend/src/test/java/edonymyeon/backend/support/IntegrationFixture.java +++ b/backend/src/test/java/edonymyeon/backend/support/IntegrationFixture.java @@ -3,10 +3,10 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; -import edonymyeon.backend.auth.application.dto.LoginRequest; -import edonymyeon.backend.member.application.dto.request.PurchaseConfirmRequest; -import edonymyeon.backend.member.application.dto.request.SavingConfirmRequest; -import edonymyeon.backend.member.domain.Member; +import edonymyeon.backend.membber.auth.application.dto.LoginRequest; +import edonymyeon.backend.membber.member.application.dto.request.PurchaseConfirmRequest; +import edonymyeon.backend.membber.member.application.dto.request.SavingConfirmRequest; +import edonymyeon.backend.membber.member.domain.Member; import edonymyeon.backend.notification.application.NotificationSender; import edonymyeon.backend.report.application.ReportRequest; import io.restassured.RestAssured; diff --git a/backend/src/test/java/edonymyeon/backend/support/PostImageInfoTestSupport.java b/backend/src/test/java/edonymyeon/backend/support/PostImageInfoTestSupport.java index b8b42bff3..3ddfcf935 100644 --- a/backend/src/test/java/edonymyeon/backend/support/PostImageInfoTestSupport.java +++ b/backend/src/test/java/edonymyeon/backend/support/PostImageInfoTestSupport.java @@ -1,8 +1,8 @@ package edonymyeon.backend.support; -import edonymyeon.backend.image.postimage.domain.PostImageInfo; -import edonymyeon.backend.image.postimage.repository.PostImageInfoRepository; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.content.post.postimage.domain.PostImageInfo; +import edonymyeon.backend.content.post.postimage.repository.PostImageInfoRepository; +import edonymyeon.backend.content.post.domain.Post; import java.util.UUID; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/backend/src/test/java/edonymyeon/backend/support/PostIntegrationTestSupport.java b/backend/src/test/java/edonymyeon/backend/support/PostIntegrationTestSupport.java index 51813532f..224a36a94 100644 --- a/backend/src/test/java/edonymyeon/backend/support/PostIntegrationTestSupport.java +++ b/backend/src/test/java/edonymyeon/backend/support/PostIntegrationTestSupport.java @@ -1,8 +1,7 @@ package edonymyeon.backend.support; -import edonymyeon.backend.auth.application.dto.LoginRequest; -import edonymyeon.backend.member.domain.Member; -import io.restassured.RestAssured; +import edonymyeon.backend.membber.auth.application.dto.LoginRequest; +import edonymyeon.backend.membber.member.domain.Member; import io.restassured.http.ContentType; import io.restassured.response.ExtractableResponse; import io.restassured.response.Response; diff --git a/backend/src/test/java/edonymyeon/backend/support/PostTestSupport.java b/backend/src/test/java/edonymyeon/backend/support/PostTestSupport.java index 118019642..659153f96 100644 --- a/backend/src/test/java/edonymyeon/backend/support/PostTestSupport.java +++ b/backend/src/test/java/edonymyeon/backend/support/PostTestSupport.java @@ -1,8 +1,8 @@ package edonymyeon.backend.support; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.post.domain.Post; -import edonymyeon.backend.post.repository.PostRepository; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.content.post.domain.Post; +import edonymyeon.backend.content.post.repository.PostRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/backend/src/test/java/edonymyeon/backend/support/ProfileImageInfoTestSupport.java b/backend/src/test/java/edonymyeon/backend/support/ProfileImageInfoTestSupport.java index cd3f39868..2ca801f11 100644 --- a/backend/src/test/java/edonymyeon/backend/support/ProfileImageInfoTestSupport.java +++ b/backend/src/test/java/edonymyeon/backend/support/ProfileImageInfoTestSupport.java @@ -3,8 +3,8 @@ import edonymyeon.backend.image.application.ImageService; import edonymyeon.backend.image.domain.ImageType; import edonymyeon.backend.image.domain.ImageInfo; -import edonymyeon.backend.image.profileimage.domain.ProfileImageInfo; -import edonymyeon.backend.image.profileimage.repository.ProfileImageInfoRepository; +import edonymyeon.backend.membber.member.profileimage.domain.ProfileImageInfo; +import edonymyeon.backend.membber.member.profileimage.repository.ProfileImageInfoRepository; import java.io.IOException; import java.util.UUID; import lombok.RequiredArgsConstructor; diff --git a/backend/src/test/java/edonymyeon/backend/support/TestMemberBuilder.java b/backend/src/test/java/edonymyeon/backend/support/TestMemberBuilder.java index 61cfe924f..529888e3a 100644 --- a/backend/src/test/java/edonymyeon/backend/support/TestMemberBuilder.java +++ b/backend/src/test/java/edonymyeon/backend/support/TestMemberBuilder.java @@ -1,11 +1,11 @@ package edonymyeon.backend.support; -import edonymyeon.backend.auth.domain.SimplePasswordEncoder; -import edonymyeon.backend.image.profileimage.domain.ProfileImageInfo; -import edonymyeon.backend.member.domain.Device; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.domain.SocialInfo; -import edonymyeon.backend.member.repository.MemberRepository; +import edonymyeon.backend.membber.auth.domain.SimplePasswordEncoder; +import edonymyeon.backend.membber.member.profileimage.domain.ProfileImageInfo; +import edonymyeon.backend.membber.member.domain.Device; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.domain.SocialInfo; +import edonymyeon.backend.membber.member.repository.MemberRepository; import java.lang.reflect.Field; import java.util.List; import java.util.Objects; diff --git a/backend/src/test/java/edonymyeon/backend/support/ThumbsUpPostTestSupport.java b/backend/src/test/java/edonymyeon/backend/support/ThumbsUpPostTestSupport.java index 4dccca99e..4665a177a 100644 --- a/backend/src/test/java/edonymyeon/backend/support/ThumbsUpPostTestSupport.java +++ b/backend/src/test/java/edonymyeon/backend/support/ThumbsUpPostTestSupport.java @@ -1,10 +1,10 @@ package edonymyeon.backend.support; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.post.domain.Post; -import edonymyeon.backend.thumbs.domain.Thumbs; -import edonymyeon.backend.thumbs.domain.ThumbsType; -import edonymyeon.backend.thumbs.repository.ThumbsRepository; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.content.post.domain.Post; +import edonymyeon.backend.content.thumbs.domain.Thumbs; +import edonymyeon.backend.content.thumbs.domain.ThumbsType; +import edonymyeon.backend.content.thumbs.repository.ThumbsRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/backend/src/test/java/edonymyeon/backend/thumbs/application/DeleteThumbsServiceTest.java b/backend/src/test/java/edonymyeon/backend/thumbs/application/DeleteThumbsServiceTest.java index 796a84ca5..7559112ad 100644 --- a/backend/src/test/java/edonymyeon/backend/thumbs/application/DeleteThumbsServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/thumbs/application/DeleteThumbsServiceTest.java @@ -6,17 +6,18 @@ import static edonymyeon.backend.global.exception.ExceptionInformation.THUMBS_UP_IS_NOT_EXIST; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; +import edonymyeon.backend.content.thumbs.application.ThumbsService; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.repository.MemberRepository; -import edonymyeon.backend.post.application.PostService; -import edonymyeon.backend.post.application.dto.request.PostRequest; -import edonymyeon.backend.post.application.dto.response.PostIdResponse; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.content.post.application.PostService; +import edonymyeon.backend.content.post.application.dto.request.PostRequest; +import edonymyeon.backend.content.post.application.dto.response.PostIdResponse; import edonymyeon.backend.support.IntegrationFixture; -import edonymyeon.backend.thumbs.domain.Thumbs; -import edonymyeon.backend.thumbs.repository.ThumbsRepository; +import edonymyeon.backend.content.thumbs.domain.Thumbs; +import edonymyeon.backend.content.thumbs.repository.ThumbsRepository; import java.util.Optional; import lombok.RequiredArgsConstructor; import org.assertj.core.api.Assertions; diff --git a/backend/src/test/java/edonymyeon/backend/thumbs/application/ThumbsDownServiceTest.java b/backend/src/test/java/edonymyeon/backend/thumbs/application/ThumbsDownServiceTest.java index 69d38dede..1e42e00c6 100644 --- a/backend/src/test/java/edonymyeon/backend/thumbs/application/ThumbsDownServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/thumbs/application/ThumbsDownServiceTest.java @@ -6,18 +6,19 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; import static org.assertj.core.api.SoftAssertions.assertSoftly; +import edonymyeon.backend.content.thumbs.application.ThumbsService; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.repository.MemberRepository; -import edonymyeon.backend.post.application.PostService; -import edonymyeon.backend.post.application.dto.request.PostRequest; -import edonymyeon.backend.post.application.dto.response.PostIdResponse; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.content.post.application.PostService; +import edonymyeon.backend.content.post.application.dto.request.PostRequest; +import edonymyeon.backend.content.post.application.dto.response.PostIdResponse; import edonymyeon.backend.support.IntegrationFixture; -import edonymyeon.backend.thumbs.domain.Thumbs; -import edonymyeon.backend.thumbs.domain.ThumbsType; -import edonymyeon.backend.thumbs.repository.ThumbsRepository; +import edonymyeon.backend.content.thumbs.domain.Thumbs; +import edonymyeon.backend.content.thumbs.domain.ThumbsType; +import edonymyeon.backend.content.thumbs.repository.ThumbsRepository; import java.util.Optional; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.BeforeEach; diff --git a/backend/src/test/java/edonymyeon/backend/thumbs/application/ThumbsInPostServiceTest.java b/backend/src/test/java/edonymyeon/backend/thumbs/application/ThumbsInPostServiceTest.java index 6bade5675..fadd0099d 100644 --- a/backend/src/test/java/edonymyeon/backend/thumbs/application/ThumbsInPostServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/thumbs/application/ThumbsInPostServiceTest.java @@ -2,17 +2,18 @@ import static org.assertj.core.api.SoftAssertions.assertSoftly; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.application.dto.AnonymousMemberId; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.repository.MemberRepository; -import edonymyeon.backend.post.application.PostService; -import edonymyeon.backend.post.application.PostThumbsService; -import edonymyeon.backend.post.application.dto.response.AllThumbsInPostResponse; -import edonymyeon.backend.post.application.dto.request.PostRequest; -import edonymyeon.backend.post.application.dto.response.PostIdResponse; -import edonymyeon.backend.post.application.dto.response.ThumbsStatusInPostResponse; +import edonymyeon.backend.content.thumbs.application.ThumbsService; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.application.dto.AnonymousMemberId; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.content.post.application.PostService; +import edonymyeon.backend.content.post.application.PostThumbsService; +import edonymyeon.backend.content.post.application.dto.response.AllThumbsInPostResponse; +import edonymyeon.backend.content.post.application.dto.request.PostRequest; +import edonymyeon.backend.content.post.application.dto.response.PostIdResponse; +import edonymyeon.backend.content.post.application.dto.response.ThumbsStatusInPostResponse; import edonymyeon.backend.support.IntegrationFixture; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.BeforeEach; diff --git a/backend/src/test/java/edonymyeon/backend/thumbs/application/ThumbsUpServiceTest.java b/backend/src/test/java/edonymyeon/backend/thumbs/application/ThumbsUpServiceTest.java index 1f0d8c0d6..0afee8843 100644 --- a/backend/src/test/java/edonymyeon/backend/thumbs/application/ThumbsUpServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/thumbs/application/ThumbsUpServiceTest.java @@ -1,17 +1,18 @@ package edonymyeon.backend.thumbs.application; +import edonymyeon.backend.content.thumbs.application.ThumbsService; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.repository.MemberRepository; -import edonymyeon.backend.post.application.PostService; -import edonymyeon.backend.post.application.dto.request.PostRequest; -import edonymyeon.backend.post.application.dto.response.PostIdResponse; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.content.post.application.PostService; +import edonymyeon.backend.content.post.application.dto.request.PostRequest; +import edonymyeon.backend.content.post.application.dto.response.PostIdResponse; import edonymyeon.backend.support.IntegrationFixture; -import edonymyeon.backend.thumbs.domain.Thumbs; -import edonymyeon.backend.thumbs.domain.ThumbsType; -import edonymyeon.backend.thumbs.repository.ThumbsRepository; +import edonymyeon.backend.content.thumbs.domain.Thumbs; +import edonymyeon.backend.content.thumbs.domain.ThumbsType; +import edonymyeon.backend.content.thumbs.repository.ThumbsRepository; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/edonymyeon/backend/thumbs/docs/ThumbsControllerDocsTest.java b/backend/src/test/java/edonymyeon/backend/thumbs/docs/ThumbsControllerDocsTest.java index 3e9e2ef88..6dd1d314f 100644 --- a/backend/src/test/java/edonymyeon/backend/thumbs/docs/ThumbsControllerDocsTest.java +++ b/backend/src/test/java/edonymyeon/backend/thumbs/docs/ThumbsControllerDocsTest.java @@ -1,6 +1,6 @@ package edonymyeon.backend.thumbs.docs; -import static edonymyeon.backend.auth.ui.SessionConst.USER; +import static edonymyeon.backend.membber.auth.ui.SessionConst.USER; import static org.mockito.Mockito.when; import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document; import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.delete; @@ -9,16 +9,16 @@ import static org.springframework.restdocs.request.RequestDocumentation.pathParameters; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import edonymyeon.backend.member.domain.Email; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.repository.MemberRepository; -import edonymyeon.backend.post.domain.Post; -import edonymyeon.backend.post.repository.PostRepository; +import edonymyeon.backend.membber.member.domain.Email; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.content.post.domain.Post; +import edonymyeon.backend.content.post.repository.PostRepository; import edonymyeon.backend.support.IntegrationTest; import edonymyeon.backend.support.TestMemberBuilder; -import edonymyeon.backend.thumbs.domain.Thumbs; -import edonymyeon.backend.thumbs.domain.ThumbsType; -import edonymyeon.backend.thumbs.repository.ThumbsRepository; +import edonymyeon.backend.content.thumbs.domain.Thumbs; +import edonymyeon.backend.content.thumbs.domain.ThumbsType; +import edonymyeon.backend.content.thumbs.repository.ThumbsRepository; import java.util.Optional; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.BeforeEach; diff --git a/backend/src/test/java/edonymyeon/backend/thumbs/domain/AllThumbsInPostTest.java b/backend/src/test/java/edonymyeon/backend/thumbs/domain/AllThumbsInPostTest.java index bf4695d3d..e6ca2e55f 100644 --- a/backend/src/test/java/edonymyeon/backend/thumbs/domain/AllThumbsInPostTest.java +++ b/backend/src/test/java/edonymyeon/backend/thumbs/domain/AllThumbsInPostTest.java @@ -1,15 +1,17 @@ package edonymyeon.backend.thumbs.domain; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.content.thumbs.domain.AllThumbsInPost; +import edonymyeon.backend.content.thumbs.domain.Thumbs; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.TestMemberBuilder; import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.List; -import static edonymyeon.backend.thumbs.domain.ThumbsType.DOWN; -import static edonymyeon.backend.thumbs.domain.ThumbsType.UP; +import static edonymyeon.backend.content.thumbs.domain.ThumbsType.DOWN; +import static edonymyeon.backend.content.thumbs.domain.ThumbsType.UP; import static org.assertj.core.api.SoftAssertions.assertSoftly; @SuppressWarnings("NonAsciiCharacters") diff --git a/backend/src/test/java/edonymyeon/backend/thumbs/integration/ThumbsIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/thumbs/integration/ThumbsIntegrationTest.java index 03d7afd96..d7ecf2aca 100644 --- a/backend/src/test/java/edonymyeon/backend/thumbs/integration/ThumbsIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/thumbs/integration/ThumbsIntegrationTest.java @@ -3,12 +3,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.SoftAssertions.assertSoftly; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.member.repository.MemberRepository; -import edonymyeon.backend.post.application.PostService; -import edonymyeon.backend.post.application.dto.request.PostRequest; -import edonymyeon.backend.post.application.dto.response.PostIdResponse; +import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.content.post.application.PostService; +import edonymyeon.backend.content.post.application.dto.request.PostRequest; +import edonymyeon.backend.content.post.application.dto.response.PostIdResponse; import edonymyeon.backend.support.EdonymyeonRestAssured; import edonymyeon.backend.support.IntegrationFixture; import io.restassured.response.ExtractableResponse; From 569e149096121aaec2a9fd3ed9ce7de02008f275 Mon Sep 17 00:00:00 2001 From: hectick Date: Thu, 23 Nov 2023 15:58:45 +0900 Subject: [PATCH 2/3] =?UTF-8?q?chore:=20config=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/WebMvcContentConfiguration.java | 23 +++++++++++++++++++ .../global/config/WebMvcConfiguration.java | 22 +----------------- .../{ => global}/logging/LoggingFilter.java | 2 +- .../logging/LoggingInterceptor.java | 2 +- .../{ => global}/logging/application/Log.java | 2 +- .../logging/application/LogType.java | 2 +- .../application/LoggingFileReader.java | 2 +- .../logging/application/LoggingService.java | 4 ++-- .../logging/ui/LoggingController.java | 6 ++--- .../logging/ui/dto/LoggingResponse.java | 2 +- .../{global => image}/config/S3Config.java | 2 +- .../config/WebMvcMemberConfiguration.java | 20 ++++++++++++++++ .../WebMvcNotificationConfiguration.java | 20 ++++++++++++++++ .../application/LoggingServiceTest.java | 4 +++- 14 files changed, 79 insertions(+), 34 deletions(-) create mode 100644 backend/src/main/java/edonymyeon/backend/content/config/WebMvcContentConfiguration.java rename backend/src/main/java/edonymyeon/backend/{ => global}/logging/LoggingFilter.java (96%) rename backend/src/main/java/edonymyeon/backend/{ => global}/logging/LoggingInterceptor.java (98%) rename backend/src/main/java/edonymyeon/backend/{ => global}/logging/application/Log.java (58%) rename backend/src/main/java/edonymyeon/backend/{ => global}/logging/application/LogType.java (91%) rename backend/src/main/java/edonymyeon/backend/{ => global}/logging/application/LoggingFileReader.java (97%) rename backend/src/main/java/edonymyeon/backend/{ => global}/logging/application/LoggingService.java (73%) rename backend/src/main/java/edonymyeon/backend/{ => global}/logging/ui/LoggingController.java (81%) rename backend/src/main/java/edonymyeon/backend/{ => global}/logging/ui/dto/LoggingResponse.java (70%) rename backend/src/main/java/edonymyeon/backend/{global => image}/config/S3Config.java (93%) create mode 100644 backend/src/main/java/edonymyeon/backend/membber/config/WebMvcMemberConfiguration.java create mode 100644 backend/src/main/java/edonymyeon/backend/notification/config/WebMvcNotificationConfiguration.java diff --git a/backend/src/main/java/edonymyeon/backend/content/config/WebMvcContentConfiguration.java b/backend/src/main/java/edonymyeon/backend/content/config/WebMvcContentConfiguration.java new file mode 100644 index 000000000..4e2cb0140 --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/content/config/WebMvcContentConfiguration.java @@ -0,0 +1,23 @@ +package edonymyeon.backend.content.config; + +import edonymyeon.backend.content.post.ui.argumentresolver.HotPostSizingArgumentResolver; +import edonymyeon.backend.content.post.ui.argumentresolver.PostPagingArgumentResolver; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@RequiredArgsConstructor +@Configuration +public class WebMvcContentConfiguration implements WebMvcConfigurer { + + private final PostPagingArgumentResolver postPagingArgumentResolver; + private final HotPostSizingArgumentResolver hotPostSizingArgumentResolver; + + @Override + public void addArgumentResolvers(List resolvers) { + resolvers.add(postPagingArgumentResolver); + resolvers.add(hotPostSizingArgumentResolver); + } +} diff --git a/backend/src/main/java/edonymyeon/backend/global/config/WebMvcConfiguration.java b/backend/src/main/java/edonymyeon/backend/global/config/WebMvcConfiguration.java index d220f83a1..cb8afb54f 100644 --- a/backend/src/main/java/edonymyeon/backend/global/config/WebMvcConfiguration.java +++ b/backend/src/main/java/edonymyeon/backend/global/config/WebMvcConfiguration.java @@ -1,14 +1,8 @@ package edonymyeon.backend.global.config; -import edonymyeon.backend.membber.auth.ui.argumentresolver.AuthArgumentResolver; -import edonymyeon.backend.logging.LoggingInterceptor; -import edonymyeon.backend.notification.ui.NotificationInterceptor; -import edonymyeon.backend.content.post.ui.argumentresolver.HotPostSizingArgumentResolver; -import edonymyeon.backend.content.post.ui.argumentresolver.PostPagingArgumentResolver; -import java.util.List; +import edonymyeon.backend.global.logging.LoggingInterceptor; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Configuration; -import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @@ -16,23 +10,9 @@ @Configuration public class WebMvcConfiguration implements WebMvcConfigurer { - private final AuthArgumentResolver authArgumentResolver; - private final PostPagingArgumentResolver postPagingArgumentResolver; - private final HotPostSizingArgumentResolver hotPostSizingArgumentResolver; - private final NotificationInterceptor notificationInterceptor; - - @Override - public void addArgumentResolvers(List resolvers) { - resolvers.add(authArgumentResolver); - resolvers.add(postPagingArgumentResolver); - resolvers.add(hotPostSizingArgumentResolver); - } - @Override public void addInterceptors(final InterceptorRegistry registry) { registry.addInterceptor(new LoggingInterceptor()) .addPathPatterns("/**"); - registry.addInterceptor(notificationInterceptor) - .addPathPatterns("/**"); } } diff --git a/backend/src/main/java/edonymyeon/backend/logging/LoggingFilter.java b/backend/src/main/java/edonymyeon/backend/global/logging/LoggingFilter.java similarity index 96% rename from backend/src/main/java/edonymyeon/backend/logging/LoggingFilter.java rename to backend/src/main/java/edonymyeon/backend/global/logging/LoggingFilter.java index 8f42de285..688514822 100644 --- a/backend/src/main/java/edonymyeon/backend/logging/LoggingFilter.java +++ b/backend/src/main/java/edonymyeon/backend/global/logging/LoggingFilter.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.logging; +package edonymyeon.backend.global.logging; import jakarta.servlet.Filter; import jakarta.servlet.FilterChain; diff --git a/backend/src/main/java/edonymyeon/backend/logging/LoggingInterceptor.java b/backend/src/main/java/edonymyeon/backend/global/logging/LoggingInterceptor.java similarity index 98% rename from backend/src/main/java/edonymyeon/backend/logging/LoggingInterceptor.java rename to backend/src/main/java/edonymyeon/backend/global/logging/LoggingInterceptor.java index 9b3669315..75daa2792 100644 --- a/backend/src/main/java/edonymyeon/backend/logging/LoggingInterceptor.java +++ b/backend/src/main/java/edonymyeon/backend/global/logging/LoggingInterceptor.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.logging; +package edonymyeon.backend.global.logging; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/backend/src/main/java/edonymyeon/backend/logging/application/Log.java b/backend/src/main/java/edonymyeon/backend/global/logging/application/Log.java similarity index 58% rename from backend/src/main/java/edonymyeon/backend/logging/application/Log.java rename to backend/src/main/java/edonymyeon/backend/global/logging/application/Log.java index 67e81aaa3..3aa151b45 100644 --- a/backend/src/main/java/edonymyeon/backend/logging/application/Log.java +++ b/backend/src/main/java/edonymyeon/backend/global/logging/application/Log.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.logging.application; +package edonymyeon.backend.global.logging.application; import java.nio.file.Path; diff --git a/backend/src/main/java/edonymyeon/backend/logging/application/LogType.java b/backend/src/main/java/edonymyeon/backend/global/logging/application/LogType.java similarity index 91% rename from backend/src/main/java/edonymyeon/backend/logging/application/LogType.java rename to backend/src/main/java/edonymyeon/backend/global/logging/application/LogType.java index 5b2bd1c1e..aeb4c24e8 100644 --- a/backend/src/main/java/edonymyeon/backend/logging/application/LogType.java +++ b/backend/src/main/java/edonymyeon/backend/global/logging/application/LogType.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.logging.application; +package edonymyeon.backend.global.logging.application; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/backend/src/main/java/edonymyeon/backend/logging/application/LoggingFileReader.java b/backend/src/main/java/edonymyeon/backend/global/logging/application/LoggingFileReader.java similarity index 97% rename from backend/src/main/java/edonymyeon/backend/logging/application/LoggingFileReader.java rename to backend/src/main/java/edonymyeon/backend/global/logging/application/LoggingFileReader.java index f09410168..25b52eeb4 100644 --- a/backend/src/main/java/edonymyeon/backend/logging/application/LoggingFileReader.java +++ b/backend/src/main/java/edonymyeon/backend/global/logging/application/LoggingFileReader.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.logging.application; +package edonymyeon.backend.global.logging.application; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/backend/src/main/java/edonymyeon/backend/logging/application/LoggingService.java b/backend/src/main/java/edonymyeon/backend/global/logging/application/LoggingService.java similarity index 73% rename from backend/src/main/java/edonymyeon/backend/logging/application/LoggingService.java rename to backend/src/main/java/edonymyeon/backend/global/logging/application/LoggingService.java index a127e2dee..5a2044a4b 100644 --- a/backend/src/main/java/edonymyeon/backend/logging/application/LoggingService.java +++ b/backend/src/main/java/edonymyeon/backend/global/logging/application/LoggingService.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.logging.application; +package edonymyeon.backend.global.logging.application; -import edonymyeon.backend.logging.ui.dto.LoggingResponse; +import edonymyeon.backend.global.logging.ui.dto.LoggingResponse; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/edonymyeon/backend/logging/ui/LoggingController.java b/backend/src/main/java/edonymyeon/backend/global/logging/ui/LoggingController.java similarity index 81% rename from backend/src/main/java/edonymyeon/backend/logging/ui/LoggingController.java rename to backend/src/main/java/edonymyeon/backend/global/logging/ui/LoggingController.java index faa7f524c..8f8ba90d7 100644 --- a/backend/src/main/java/edonymyeon/backend/logging/ui/LoggingController.java +++ b/backend/src/main/java/edonymyeon/backend/global/logging/ui/LoggingController.java @@ -1,7 +1,7 @@ -package edonymyeon.backend.logging.ui; +package edonymyeon.backend.global.logging.ui; -import edonymyeon.backend.logging.application.LogType; -import edonymyeon.backend.logging.application.LoggingService; +import edonymyeon.backend.global.logging.application.LogType; +import edonymyeon.backend.global.logging.application.LoggingService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/backend/src/main/java/edonymyeon/backend/logging/ui/dto/LoggingResponse.java b/backend/src/main/java/edonymyeon/backend/global/logging/ui/dto/LoggingResponse.java similarity index 70% rename from backend/src/main/java/edonymyeon/backend/logging/ui/dto/LoggingResponse.java rename to backend/src/main/java/edonymyeon/backend/global/logging/ui/dto/LoggingResponse.java index 025691de9..b111db135 100644 --- a/backend/src/main/java/edonymyeon/backend/logging/ui/dto/LoggingResponse.java +++ b/backend/src/main/java/edonymyeon/backend/global/logging/ui/dto/LoggingResponse.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.logging.ui.dto; +package edonymyeon.backend.global.logging.ui.dto; import java.util.List; import java.util.Map; diff --git a/backend/src/main/java/edonymyeon/backend/global/config/S3Config.java b/backend/src/main/java/edonymyeon/backend/image/config/S3Config.java similarity index 93% rename from backend/src/main/java/edonymyeon/backend/global/config/S3Config.java rename to backend/src/main/java/edonymyeon/backend/image/config/S3Config.java index deda49c2e..075088e35 100644 --- a/backend/src/main/java/edonymyeon/backend/global/config/S3Config.java +++ b/backend/src/main/java/edonymyeon/backend/image/config/S3Config.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.global.config; +package edonymyeon.backend.image.config; import static software.amazon.awssdk.regions.Region.AP_NORTHEAST_2; diff --git a/backend/src/main/java/edonymyeon/backend/membber/config/WebMvcMemberConfiguration.java b/backend/src/main/java/edonymyeon/backend/membber/config/WebMvcMemberConfiguration.java new file mode 100644 index 000000000..0581f7bd9 --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/membber/config/WebMvcMemberConfiguration.java @@ -0,0 +1,20 @@ +package edonymyeon.backend.membber.config; + +import edonymyeon.backend.membber.auth.ui.argumentresolver.AuthArgumentResolver; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@RequiredArgsConstructor +@Configuration +public class WebMvcMemberConfiguration implements WebMvcConfigurer { + + private final AuthArgumentResolver authArgumentResolver; + + @Override + public void addArgumentResolvers(List resolvers) { + resolvers.add(authArgumentResolver); + } +} diff --git a/backend/src/main/java/edonymyeon/backend/notification/config/WebMvcNotificationConfiguration.java b/backend/src/main/java/edonymyeon/backend/notification/config/WebMvcNotificationConfiguration.java new file mode 100644 index 000000000..6a59a8a71 --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/notification/config/WebMvcNotificationConfiguration.java @@ -0,0 +1,20 @@ +package edonymyeon.backend.notification.config; + +import edonymyeon.backend.notification.ui.NotificationInterceptor; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@RequiredArgsConstructor +@Configuration +public class WebMvcNotificationConfiguration implements WebMvcConfigurer { + + private final NotificationInterceptor notificationInterceptor; + + @Override + public void addInterceptors(final InterceptorRegistry registry) { + registry.addInterceptor(notificationInterceptor) + .addPathPatterns("/**"); + } +} diff --git a/backend/src/test/java/edonymyeon/backend/logging/application/LoggingServiceTest.java b/backend/src/test/java/edonymyeon/backend/logging/application/LoggingServiceTest.java index 6d01dca3b..49fd3704b 100644 --- a/backend/src/test/java/edonymyeon/backend/logging/application/LoggingServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/logging/application/LoggingServiceTest.java @@ -3,7 +3,9 @@ import static org.assertj.core.api.SoftAssertions.*; import com.fasterxml.jackson.databind.ObjectMapper; -import edonymyeon.backend.logging.ui.dto.LoggingResponse; +import edonymyeon.backend.global.logging.application.LoggingFileReader; +import edonymyeon.backend.global.logging.application.LoggingService; +import edonymyeon.backend.global.logging.ui.dto.LoggingResponse; import java.nio.file.Paths; import org.junit.jupiter.api.Test; From 4d83aac0ed303a43b2914abd57128baefff61fcd Mon Sep 17 00:00:00 2001 From: hectick Date: Thu, 23 Nov 2023 16:06:22 +0900 Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=ED=8C=A8=ED=82=A4=EC=A7=80=20=EC=9D=B4=EB=8F=99=20=EB=B0=8F=20?= =?UTF-8?q?=ED=8C=A8=ED=82=A4=EC=A7=80=EB=AA=85=20=EC=A0=9C=EB=8C=80?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/ConsumptionService.java | 2 +- .../MemberConsumptionServiceImpl.java | 6 +-- .../consumption/ui/ConsumptionController.java | 4 +- .../comment/application/CommentService.java | 6 +-- .../content/comment/domain/Comment.java | 2 +- .../content/comment/ui/CommentController.java | 4 +- .../post/application/MyPostService.java | 2 +- .../post/application/PostReadService.java | 6 +-- .../content/post/application/PostService.java | 6 +-- .../post/application/PostThumbsService.java | 2 +- .../response/SpecificPostInfoResponse.java | 2 +- .../backend/content/post/domain/Post.java | 2 +- .../content/post/ui/MyPostController.java | 4 +- .../content/post/ui/PostController.java | 4 +- .../content/post/ui/PostReadController.java | 4 +- .../application/PostThumbsServiceImpl.java | 4 +- .../thumbs/application/ThumbsService.java | 6 +-- .../backend/content/thumbs/domain/Thumbs.java | 2 +- .../content/thumbs/ui/ThumbsController.java | 4 +- .../auth/application/dto/LogoutRequest.java | 4 -- .../application/event/JoinMemberEvent.java | 6 --- .../auth/application/event/LoginEvent.java | 6 --- .../auth/application/event/LogoutEvent.java | 4 -- .../dto/response/MemberUpdateResponse.java | 5 --- .../application/dto/SettingRequest.java | 5 --- .../auth/annotation/AuthPrincipal.java | 2 +- .../auth/application/AuthService.java | 36 +++++++++--------- .../KakaoAuthResponseProvider.java | 6 +-- .../auth/application/dto/JoinRequest.java | 2 +- .../application/dto/KakaoLoginRequest.java | 2 +- .../application/dto/KakaoLoginResponse.java | 2 +- .../auth/application/dto/LoginRequest.java | 2 +- .../auth/application/dto/LogoutRequest.java | 4 ++ .../auth/application/dto/MemberResponse.java | 2 +- .../application/event/JoinMemberEvent.java | 6 +++ .../auth/application/event/LoginEvent.java | 6 +++ .../auth/application/event/LogoutEvent.java | 4 ++ .../auth/domain/BasicTokenGenerator.java | 2 +- .../auth/domain/PasswordEncoder.java | 2 +- .../auth/domain/SimplePasswordEncoder.java | 2 +- .../auth/domain/TokenGenerator.java | 2 +- .../auth/domain/ValidateType.java | 2 +- .../auth/ui/AuthController.java | 24 ++++++------ .../auth/ui/SessionConst.java | 2 +- .../AuthArgumentResolver.java | 12 +++--- .../config/WebMvcMemberConfiguration.java | 4 +- .../application/DeviceRepository.java | 4 +- .../application/MemberConsumptionService.java | 6 +-- .../application/MemberEventListener.java | 8 ++-- .../profile}/application/MemberService.java | 38 +++++++++---------- .../application/dto/ActiveMemberId.java | 2 +- .../application/dto/AnonymousMemberId.java | 2 +- .../profile}/application/dto/MemberId.java | 2 +- .../application/dto/YearMonthDto.java | 2 +- .../dto/request/MemberUpdateRequest.java | 2 +- .../dto/request/PurchaseConfirmRequest.java | 2 +- .../dto/request/SavingConfirmRequest.java | 2 +- .../dto/response/DuplicateCheckResponse.java | 2 +- .../dto/response/MemberUpdateResponse.java | 5 +++ .../dto/response/MyPageResponseV1_0.java | 2 +- .../dto/response/MyPageResponseV1_1.java | 2 +- .../event/ProfileImageDeletionEvent.java | 2 +- .../event/ProfileImageUploadEvent.java | 2 +- .../profile}/domain/Device.java | 2 +- .../profile}/domain/Email.java | 4 +- .../profile}/domain/Member.java | 6 +-- .../profile}/domain/Nickname.java | 4 +- .../profile}/domain/Password.java | 6 +-- .../profile}/domain/PasswordValidator.java | 2 +- .../profile}/domain/SocialInfo.java | 2 +- .../ProfileImageEventListener.java | 4 +- .../profileimage/domain/ProfileImageInfo.java | 2 +- .../ProfileImageInfoRepository.java | 4 +- .../repository/MemberCustomRepository.java | 4 +- .../MemberCustomRepositoryImpl.java | 4 +- .../profile}/repository/MemberRepository.java | 10 ++--- .../profile}/ui/MemberController.java | 22 +++++------ .../application/SettingEventListener.java | 4 +- .../setting/application/SettingService.java | 20 +++++----- .../ActivatingPrimaryManager.java | 4 +- .../activationmanager/ActivationManager.java | 4 +- .../DeactivatingSameWeightsManager.java | 4 +- .../DeactivatingLowerWeightManager.java | 4 +- .../DeactivatingPrimaryManager.java | 4 +- .../DeactivationManager.java | 4 +- .../application/dto/SettingRequest.java | 5 +++ .../application/dto/SettingResponse.java | 4 +- .../application/dto/SettingsResponse.java | 4 +- .../setting/domain/Category.java | 2 +- .../setting/domain/Setting.java | 4 +- .../setting/domain/SettingType.java | 2 +- .../setting/domain/SettingTypeCategory.java | 2 +- .../setting/domain/Weight.java | 2 +- .../repository/SettingCustomRepository.java | 4 +- .../setting/repository/SettingRepository.java | 6 +-- .../repository/SettingRepositoryImpl.java | 4 +- .../setting/ui/SettingController.java | 12 +++--- .../application/NotificationService.java | 12 +++--- .../application/dto/Receiver.java | 2 +- .../notification/domain/Notification.java | 2 +- .../ui/NotificationController.java | 4 +- .../report/application/ReportService.java | 6 +-- .../backend/report/domain/Report.java | 2 +- .../backend/report/ui/ReportController.java | 4 +- .../java/edonymyeon/backend/CacheConfig.java | 2 +- .../java/edonymyeon/backend/TestConfig.java | 2 +- .../MemberConsumptionServiceImplTest.java | 6 +-- .../docs/ConsumptionControllerDocsTest.java | 8 ++-- .../domain/ConsumptionsPerMonthTest.java | 2 +- .../ConsumptionIntegrationTest.java | 2 +- .../repository/ConsumptionRepositoryTest.java | 2 +- .../application/CommentServiceTest.java | 7 ++-- .../docs/CommentControllerDocsTest.java | 6 +-- .../integration/CommentIntegrationTest.java | 6 +-- .../{ => content}/post/ImageFileCleaner.java | 2 +- .../ImageFileNameMockStrategy.java | 2 +- .../post/application/MyPostServiceTest.java | 9 ++--- .../PostFindingSpecificPostTest.java | 17 ++++----- .../PostServiceFindingAllPostsTest.java | 11 ++---- .../application/PostServiceHotPostsTest.java | 2 +- .../PostServiceSearchPostsTest.java | 6 +-- .../post/application/PostServiceTest.java | 14 +++---- .../post/application/PostViewTest.java | 11 +++--- .../application/TestCacheKeyStrategy.java | 2 +- .../post/docs/MyPostControllerDocsTest.java | 10 ++--- .../post/docs/PostControllerDocsTest.java | 14 +++---- .../post/docs/PostCreationDocsTest.java | 8 ++-- .../integration/HotPostIntegrationTest.java | 6 +-- .../integration/MyPostIntegrationTest.java | 4 +- .../PostCommentCountIntegrationTest.java | 4 +- .../post/integration/PostIntegrationTest.java | 10 ++--- .../PostSearchIntegrationTest.java | 4 +- .../integration/PostViewIntegrationTest.java | 6 +-- .../post/repository/PostRepositoryTest.java | 7 ++-- .../repository/PostSpecificationTest.java | 2 +- .../post/ui/PostControllerTest.java | 8 ++-- .../application/DeleteThumbsServiceTest.java | 11 +++--- .../application/ThumbsDownServiceTest.java | 11 +++--- .../application/ThumbsInPostServiceTest.java | 13 +++---- .../application/ThumbsUpServiceTest.java | 11 +++--- .../thumbs/docs/ThumbsControllerDocsTest.java | 10 ++--- .../thumbs/domain/AllThumbsInPostTest.java | 6 +-- .../integration/ThumbsIntegrationTest.java | 8 ++-- .../application/LoggingServiceTest.java | 4 +- .../{ => global}/logging/application/info.log | 0 .../image/ImageFileSizeIntegrationTest.java | 4 +- .../image/application/ImageServiceTest.java | 2 +- .../auth/AuthIntegrationTest.java | 26 ++++++------- .../application/AuthDeleteServiceTest.java | 7 ++-- .../auth/application/AuthServiceTest.java | 33 ++++++++-------- .../auth/docs/AuthControllerDocsTest.java | 18 ++++----- .../domain/SimplePasswordEncoderTest.java | 3 +- .../application/MemberServiceTest.java | 26 ++++++------- .../docs/MemberControllerDocsTest.java | 22 +++++------ .../{ => profile}/domain/EmailTest.java | 4 +- .../{ => profile}/domain/MemberTest.java | 3 +- .../{ => profile}/domain/NicknameTest.java | 5 +-- .../{ => profile}/domain/PasswordTest.java | 6 +-- .../MemberConsumptionIntegrationTest.java | 8 ++-- .../integration/MemberIntegrationTest.java | 10 ++--- .../repository/MemberRepositoryTest.java | 11 +++--- .../application/SettingServiceTest.java | 17 ++++----- .../docs/SettingControllerDocsTest.java | 18 ++++----- .../setting/domain/SettingTest.java | 4 +- .../setting/ui/SettingIntegrationTest.java | 10 ++--- .../NotificationEventListenerTest.java | 12 +++--- .../application/NotificationServiceTest.java | 18 ++++----- .../NotificationIntegrationTest.java | 14 +++---- .../report/application/ReportServiceTest.java | 2 +- .../backend/report/docs/ReportDocsTest.java | 10 ++--- .../report/ui/ReportIntegrationTest.java | 4 +- .../backend/support/CommentTestSupport.java | 2 +- .../backend/support/IntegrationFixture.java | 8 ++-- .../support/PostIntegrationTestSupport.java | 4 +- .../backend/support/PostTestSupport.java | 2 +- .../support/ProfileImageInfoTestSupport.java | 4 +- .../backend/support/TestMemberBuilder.java | 12 +++--- .../support/ThumbsUpPostTestSupport.java | 2 +- 178 files changed, 546 insertions(+), 581 deletions(-) delete mode 100644 backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/LogoutRequest.java delete mode 100644 backend/src/main/java/edonymyeon/backend/membber/auth/application/event/JoinMemberEvent.java delete mode 100644 backend/src/main/java/edonymyeon/backend/membber/auth/application/event/LoginEvent.java delete mode 100644 backend/src/main/java/edonymyeon/backend/membber/auth/application/event/LogoutEvent.java delete mode 100644 backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/MemberUpdateResponse.java delete mode 100644 backend/src/main/java/edonymyeon/backend/membber/setting/application/dto/SettingRequest.java rename backend/src/main/java/edonymyeon/backend/{membber => member}/auth/annotation/AuthPrincipal.java (85%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/auth/application/AuthService.java (84%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/auth/application/KakaoAuthResponseProvider.java (82%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/auth/application/dto/JoinRequest.java (63%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/auth/application/dto/KakaoLoginRequest.java (57%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/auth/application/dto/KakaoLoginResponse.java (73%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/auth/application/dto/LoginRequest.java (59%) create mode 100644 backend/src/main/java/edonymyeon/backend/member/auth/application/dto/LogoutRequest.java rename backend/src/main/java/edonymyeon/backend/{membber => member}/auth/application/dto/MemberResponse.java (53%) create mode 100644 backend/src/main/java/edonymyeon/backend/member/auth/application/event/JoinMemberEvent.java create mode 100644 backend/src/main/java/edonymyeon/backend/member/auth/application/event/LoginEvent.java create mode 100644 backend/src/main/java/edonymyeon/backend/member/auth/application/event/LogoutEvent.java rename backend/src/main/java/edonymyeon/backend/{membber => member}/auth/domain/BasicTokenGenerator.java (88%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/auth/domain/PasswordEncoder.java (75%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/auth/domain/SimplePasswordEncoder.java (98%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/auth/domain/TokenGenerator.java (62%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/auth/domain/ValidateType.java (91%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/auth/ui/AuthController.java (80%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/auth/ui/SessionConst.java (92%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/auth/ui/argumentresolver/AuthArgumentResolver.java (86%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/config/WebMvcMemberConfiguration.java (82%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/application/DeviceRepository.java (83%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/application/MemberConsumptionService.java (71%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/application/MemberEventListener.java (78%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/application/MemberService.java (85%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/application/dto/ActiveMemberId.java (67%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/application/dto/AnonymousMemberId.java (76%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/application/dto/MemberId.java (80%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/application/dto/YearMonthDto.java (51%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/application/dto/request/MemberUpdateRequest.java (72%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/application/dto/request/PurchaseConfirmRequest.java (59%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/application/dto/request/SavingConfirmRequest.java (53%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/application/dto/response/DuplicateCheckResponse.java (50%) create mode 100644 backend/src/main/java/edonymyeon/backend/member/profile/application/dto/response/MemberUpdateResponse.java rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/application/dto/response/MyPageResponseV1_0.java (53%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/application/dto/response/MyPageResponseV1_1.java (58%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/application/event/ProfileImageDeletionEvent.java (75%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/application/event/ProfileImageUploadEvent.java (75%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/domain/Device.java (97%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/domain/Email.java (91%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/domain/Member.java (96%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/domain/Nickname.java (92%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/domain/Password.java (90%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/domain/PasswordValidator.java (95%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/domain/SocialInfo.java (93%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/profileimage/application/ProfileImageEventListener.java (82%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/profileimage/domain/ProfileImageInfo.java (88%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/profileimage/repository/ProfileImageInfoRepository.java (58%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/repository/MemberCustomRepository.java (55%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/repository/MemberCustomRepositoryImpl.java (88%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/repository/MemberRepository.java (58%) rename backend/src/main/java/edonymyeon/backend/{membber/member => member/profile}/ui/MemberController.java (84%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/setting/application/SettingEventListener.java (76%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/setting/application/SettingService.java (82%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/setting/application/activationmanager/ActivatingPrimaryManager.java (84%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/setting/application/activationmanager/ActivationManager.java (80%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/setting/application/activationmanager/DeactivatingSameWeightsManager.java (84%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/setting/application/deactivationmanager/DeactivatingLowerWeightManager.java (84%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/setting/application/deactivationmanager/DeactivatingPrimaryManager.java (82%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/setting/application/deactivationmanager/DeactivationManager.java (80%) create mode 100644 backend/src/main/java/edonymyeon/backend/member/setting/application/dto/SettingRequest.java rename backend/src/main/java/edonymyeon/backend/{membber => member}/setting/application/dto/SettingResponse.java (65%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/setting/application/dto/SettingsResponse.java (71%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/setting/domain/Category.java (54%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/setting/domain/Setting.java (95%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/setting/domain/SettingType.java (97%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/setting/domain/SettingTypeCategory.java (58%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/setting/domain/Weight.java (85%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/setting/repository/SettingCustomRepository.java (50%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/setting/repository/SettingRepository.java (68%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/setting/repository/SettingRepositoryImpl.java (92%) rename backend/src/main/java/edonymyeon/backend/{membber => member}/setting/ui/SettingController.java (76%) rename backend/src/test/java/edonymyeon/backend/{ => content}/comment/application/CommentServiceTest.java (84%) rename backend/src/test/java/edonymyeon/backend/{ => content}/comment/docs/CommentControllerDocsTest.java (98%) rename backend/src/test/java/edonymyeon/backend/{ => content}/comment/integration/CommentIntegrationTest.java (99%) rename backend/src/test/java/edonymyeon/backend/{ => content}/post/ImageFileCleaner.java (96%) rename backend/src/test/java/edonymyeon/backend/{ => content}/post/application/ImageFileNameMockStrategy.java (92%) rename backend/src/test/java/edonymyeon/backend/{ => content}/post/application/MyPostServiceTest.java (93%) rename backend/src/test/java/edonymyeon/backend/{ => content}/post/application/PostFindingSpecificPostTest.java (89%) rename backend/src/test/java/edonymyeon/backend/{ => content}/post/application/PostServiceFindingAllPostsTest.java (96%) rename backend/src/test/java/edonymyeon/backend/{ => content}/post/application/PostServiceHotPostsTest.java (99%) rename backend/src/test/java/edonymyeon/backend/{ => content}/post/application/PostServiceSearchPostsTest.java (94%) rename backend/src/test/java/edonymyeon/backend/{ => content}/post/application/PostServiceTest.java (97%) rename backend/src/test/java/edonymyeon/backend/{ => content}/post/application/PostViewTest.java (88%) rename backend/src/test/java/edonymyeon/backend/{ => content}/post/application/TestCacheKeyStrategy.java (90%) rename backend/src/test/java/edonymyeon/backend/{ => content}/post/docs/MyPostControllerDocsTest.java (96%) rename backend/src/test/java/edonymyeon/backend/{ => content}/post/docs/PostControllerDocsTest.java (97%) rename backend/src/test/java/edonymyeon/backend/{ => content}/post/docs/PostCreationDocsTest.java (94%) rename backend/src/test/java/edonymyeon/backend/{ => content}/post/integration/HotPostIntegrationTest.java (96%) rename backend/src/test/java/edonymyeon/backend/{ => content}/post/integration/MyPostIntegrationTest.java (96%) rename backend/src/test/java/edonymyeon/backend/{ => content}/post/integration/PostCommentCountIntegrationTest.java (98%) rename backend/src/test/java/edonymyeon/backend/{ => content}/post/integration/PostIntegrationTest.java (99%) rename backend/src/test/java/edonymyeon/backend/{ => content}/post/integration/PostSearchIntegrationTest.java (97%) rename backend/src/test/java/edonymyeon/backend/{ => content}/post/integration/PostViewIntegrationTest.java (91%) rename backend/src/test/java/edonymyeon/backend/{ => content}/post/repository/PostRepositoryTest.java (97%) rename backend/src/test/java/edonymyeon/backend/{ => content}/post/repository/PostSpecificationTest.java (98%) rename backend/src/test/java/edonymyeon/backend/{ => content}/post/ui/PostControllerTest.java (97%) rename backend/src/test/java/edonymyeon/backend/{ => content}/thumbs/application/DeleteThumbsServiceTest.java (93%) rename backend/src/test/java/edonymyeon/backend/{ => content}/thumbs/application/ThumbsDownServiceTest.java (94%) rename backend/src/test/java/edonymyeon/backend/{ => content}/thumbs/application/ThumbsInPostServiceTest.java (94%) rename backend/src/test/java/edonymyeon/backend/{ => content}/thumbs/application/ThumbsUpServiceTest.java (95%) rename backend/src/test/java/edonymyeon/backend/{ => content}/thumbs/docs/ThumbsControllerDocsTest.java (95%) rename backend/src/test/java/edonymyeon/backend/{ => content}/thumbs/domain/AllThumbsInPostTest.java (89%) rename backend/src/test/java/edonymyeon/backend/{ => content}/thumbs/integration/ThumbsIntegrationTest.java (97%) rename backend/src/test/java/edonymyeon/backend/{ => global}/logging/application/LoggingServiceTest.java (95%) rename backend/src/test/java/edonymyeon/backend/{ => global}/logging/application/info.log (100%) rename backend/src/test/java/edonymyeon/backend/{ => member}/auth/AuthIntegrationTest.java (93%) rename backend/src/test/java/edonymyeon/backend/{ => member}/auth/application/AuthDeleteServiceTest.java (87%) rename backend/src/test/java/edonymyeon/backend/{ => member}/auth/application/AuthServiceTest.java (90%) rename backend/src/test/java/edonymyeon/backend/{ => member}/auth/docs/AuthControllerDocsTest.java (92%) rename backend/src/test/java/edonymyeon/backend/{ => member}/auth/domain/SimplePasswordEncoderTest.java (92%) rename backend/src/test/java/edonymyeon/backend/member/{ => profile}/application/MemberServiceTest.java (92%) rename backend/src/test/java/edonymyeon/backend/member/{ => profile}/docs/MemberControllerDocsTest.java (95%) rename backend/src/test/java/edonymyeon/backend/member/{ => profile}/domain/EmailTest.java (90%) rename backend/src/test/java/edonymyeon/backend/member/{ => profile}/domain/MemberTest.java (97%) rename backend/src/test/java/edonymyeon/backend/member/{ => profile}/domain/NicknameTest.java (90%) rename backend/src/test/java/edonymyeon/backend/member/{ => profile}/domain/PasswordTest.java (93%) rename backend/src/test/java/edonymyeon/backend/member/{ => profile}/integration/MemberConsumptionIntegrationTest.java (97%) rename backend/src/test/java/edonymyeon/backend/member/{ => profile}/integration/MemberIntegrationTest.java (95%) rename backend/src/test/java/edonymyeon/backend/member/{ => profile}/repository/MemberRepositoryTest.java (93%) rename backend/src/test/java/edonymyeon/backend/{ => member}/setting/application/SettingServiceTest.java (93%) rename backend/src/test/java/edonymyeon/backend/{ => member}/setting/docs/SettingControllerDocsTest.java (91%) rename backend/src/test/java/edonymyeon/backend/{ => member}/setting/domain/SettingTest.java (79%) rename backend/src/test/java/edonymyeon/backend/{ => member}/setting/ui/SettingIntegrationTest.java (92%) diff --git a/backend/src/main/java/edonymyeon/backend/consumption/application/ConsumptionService.java b/backend/src/main/java/edonymyeon/backend/consumption/application/ConsumptionService.java index 6aedcea2b..2bed42b11 100644 --- a/backend/src/main/java/edonymyeon/backend/consumption/application/ConsumptionService.java +++ b/backend/src/main/java/edonymyeon/backend/consumption/application/ConsumptionService.java @@ -5,7 +5,7 @@ import edonymyeon.backend.consumption.domain.Consumption; import edonymyeon.backend.consumption.domain.ConsumptionsPerMonth; import edonymyeon.backend.consumption.repository.ConsumptionRepository; -import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.member.profile.application.dto.MemberId; import java.time.LocalDate; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/edonymyeon/backend/consumption/application/MemberConsumptionServiceImpl.java b/backend/src/main/java/edonymyeon/backend/consumption/application/MemberConsumptionServiceImpl.java index 11d90ddd7..2f05fce4f 100644 --- a/backend/src/main/java/edonymyeon/backend/consumption/application/MemberConsumptionServiceImpl.java +++ b/backend/src/main/java/edonymyeon/backend/consumption/application/MemberConsumptionServiceImpl.java @@ -9,9 +9,9 @@ import edonymyeon.backend.consumption.domain.Consumption; import edonymyeon.backend.consumption.repository.ConsumptionRepository; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.membber.member.application.MemberConsumptionService; -import edonymyeon.backend.membber.member.application.dto.MemberId; -import edonymyeon.backend.membber.member.application.dto.YearMonthDto; +import edonymyeon.backend.member.profile.application.MemberConsumptionService; +import edonymyeon.backend.member.profile.application.dto.MemberId; +import edonymyeon.backend.member.profile.application.dto.YearMonthDto; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.content.post.repository.PostRepository; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/edonymyeon/backend/consumption/ui/ConsumptionController.java b/backend/src/main/java/edonymyeon/backend/consumption/ui/ConsumptionController.java index 6186b0e36..7e6dae005 100644 --- a/backend/src/main/java/edonymyeon/backend/consumption/ui/ConsumptionController.java +++ b/backend/src/main/java/edonymyeon/backend/consumption/ui/ConsumptionController.java @@ -1,10 +1,10 @@ package edonymyeon.backend.consumption.ui; -import edonymyeon.backend.membber.auth.annotation.AuthPrincipal; +import edonymyeon.backend.member.auth.annotation.AuthPrincipal; import edonymyeon.backend.consumption.application.ConsumptionService; import edonymyeon.backend.consumption.application.dto.RecentConsumptionsResponse; import edonymyeon.backend.global.version.ApiVersion; -import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.member.profile.application.dto.MemberId; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/backend/src/main/java/edonymyeon/backend/content/comment/application/CommentService.java b/backend/src/main/java/edonymyeon/backend/content/comment/application/CommentService.java index 018d5e941..cb8428a16 100644 --- a/backend/src/main/java/edonymyeon/backend/content/comment/application/CommentService.java +++ b/backend/src/main/java/edonymyeon/backend/content/comment/application/CommentService.java @@ -12,9 +12,9 @@ import edonymyeon.backend.image.domain.ImageType; import edonymyeon.backend.content.comment.commentimage.domain.CommentImageInfo; import edonymyeon.backend.content.comment.commentimage.repository.CommentImageInfoRepository; -import edonymyeon.backend.membber.member.application.dto.MemberId; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.member.profile.application.dto.MemberId; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.repository.MemberRepository; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.content.post.repository.PostRepository; import java.util.ArrayList; diff --git a/backend/src/main/java/edonymyeon/backend/content/comment/domain/Comment.java b/backend/src/main/java/edonymyeon/backend/content/comment/domain/Comment.java index 0551057a1..51e5f09f0 100644 --- a/backend/src/main/java/edonymyeon/backend/content/comment/domain/Comment.java +++ b/backend/src/main/java/edonymyeon/backend/content/comment/domain/Comment.java @@ -5,7 +5,7 @@ import edonymyeon.backend.global.domain.TemporalRecord; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.content.comment.commentimage.domain.CommentImageInfo; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.content.post.domain.Post; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/backend/src/main/java/edonymyeon/backend/content/comment/ui/CommentController.java b/backend/src/main/java/edonymyeon/backend/content/comment/ui/CommentController.java index d286a721a..5cdfc6fad 100644 --- a/backend/src/main/java/edonymyeon/backend/content/comment/ui/CommentController.java +++ b/backend/src/main/java/edonymyeon/backend/content/comment/ui/CommentController.java @@ -1,11 +1,11 @@ package edonymyeon.backend.content.comment.ui; -import edonymyeon.backend.membber.auth.annotation.AuthPrincipal; +import edonymyeon.backend.member.auth.annotation.AuthPrincipal; import edonymyeon.backend.content.comment.application.CommentService; import edonymyeon.backend.content.comment.application.dto.request.CommentRequest; import edonymyeon.backend.content.comment.application.dto.response.CommentsResponse; import edonymyeon.backend.global.version.ApiVersion; -import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.member.profile.application.dto.MemberId; import java.net.URI; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; diff --git a/backend/src/main/java/edonymyeon/backend/content/post/application/MyPostService.java b/backend/src/main/java/edonymyeon/backend/content/post/application/MyPostService.java index 6872a3102..0cab32ae6 100644 --- a/backend/src/main/java/edonymyeon/backend/content/post/application/MyPostService.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/MyPostService.java @@ -5,7 +5,7 @@ import edonymyeon.backend.content.post.repository.PostRepository; import edonymyeon.backend.image.application.ImageService; import edonymyeon.backend.image.domain.ImageType; -import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.member.profile.application.dto.MemberId; import edonymyeon.backend.content.post.domain.Post; import java.util.List; import java.util.Map; diff --git a/backend/src/main/java/edonymyeon/backend/content/post/application/PostReadService.java b/backend/src/main/java/edonymyeon/backend/content/post/application/PostReadService.java index 20bc73064..ab4b9bc49 100644 --- a/backend/src/main/java/edonymyeon/backend/content/post/application/PostReadService.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/PostReadService.java @@ -18,9 +18,9 @@ import edonymyeon.backend.global.exception.ExceptionInformation; import edonymyeon.backend.image.application.ImageService; import edonymyeon.backend.image.domain.ImageType; -import edonymyeon.backend.membber.member.application.dto.MemberId; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.member.profile.application.dto.MemberId; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.repository.MemberRepository; import edonymyeon.backend.content.post.domain.HotPostPolicy; import edonymyeon.backend.content.post.domain.Post; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/edonymyeon/backend/content/post/application/PostService.java b/backend/src/main/java/edonymyeon/backend/content/post/application/PostService.java index f40927f6f..68d87fb1d 100644 --- a/backend/src/main/java/edonymyeon/backend/content/post/application/PostService.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/PostService.java @@ -10,9 +10,9 @@ import edonymyeon.backend.image.domain.ImageType; import edonymyeon.backend.content.post.postimage.domain.PostImageInfos; import edonymyeon.backend.content.post.postimage.repository.PostImageInfoRepository; -import edonymyeon.backend.membber.member.application.dto.MemberId; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.member.profile.application.dto.MemberId; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.repository.MemberRepository; import edonymyeon.backend.content.post.domain.Post; import lombok.RequiredArgsConstructor; import org.springframework.context.ApplicationEventPublisher; diff --git a/backend/src/main/java/edonymyeon/backend/content/post/application/PostThumbsService.java b/backend/src/main/java/edonymyeon/backend/content/post/application/PostThumbsService.java index 0435c1bd0..e7f6320d5 100644 --- a/backend/src/main/java/edonymyeon/backend/content/post/application/PostThumbsService.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/PostThumbsService.java @@ -2,7 +2,7 @@ import edonymyeon.backend.content.post.application.dto.response.AllThumbsInPostResponse; import edonymyeon.backend.content.post.application.dto.response.ThumbsStatusInPostResponse; -import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.member.profile.application.dto.MemberId; public interface PostThumbsService { diff --git a/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/SpecificPostInfoResponse.java b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/SpecificPostInfoResponse.java index 6843bd2d7..d3c9183e6 100644 --- a/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/SpecificPostInfoResponse.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/application/dto/response/SpecificPostInfoResponse.java @@ -1,6 +1,6 @@ package edonymyeon.backend.content.post.application.dto.response; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.content.post.domain.Post; import java.time.LocalDateTime; import java.util.List; diff --git a/backend/src/main/java/edonymyeon/backend/content/post/domain/Post.java b/backend/src/main/java/edonymyeon/backend/content/post/domain/Post.java index 7cbefc824..058ad3d2c 100644 --- a/backend/src/main/java/edonymyeon/backend/content/post/domain/Post.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/domain/Post.java @@ -4,7 +4,7 @@ import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.content.post.postimage.domain.PostImageInfo; import edonymyeon.backend.content.post.postimage.domain.PostImageInfos; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Member; import jakarta.persistence.*; import lombok.*; import org.hibernate.annotations.ColumnDefault; diff --git a/backend/src/main/java/edonymyeon/backend/content/post/ui/MyPostController.java b/backend/src/main/java/edonymyeon/backend/content/post/ui/MyPostController.java index 3933d12bc..76fe50449 100644 --- a/backend/src/main/java/edonymyeon/backend/content/post/ui/MyPostController.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/ui/MyPostController.java @@ -4,9 +4,9 @@ import edonymyeon.backend.content.post.application.MyPostService; import edonymyeon.backend.content.post.application.PostSlice; import edonymyeon.backend.content.post.application.dto.response.MyPostResponse; -import edonymyeon.backend.membber.auth.annotation.AuthPrincipal; +import edonymyeon.backend.member.auth.annotation.AuthPrincipal; import edonymyeon.backend.global.version.ApiVersion; -import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.member.profile.application.dto.MemberId; import edonymyeon.backend.content.post.ui.annotation.PostPaging; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; diff --git a/backend/src/main/java/edonymyeon/backend/content/post/ui/PostController.java b/backend/src/main/java/edonymyeon/backend/content/post/ui/PostController.java index 18bca0e17..23fed9bc5 100644 --- a/backend/src/main/java/edonymyeon/backend/content/post/ui/PostController.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/ui/PostController.java @@ -1,8 +1,8 @@ package edonymyeon.backend.content.post.ui; -import edonymyeon.backend.membber.auth.annotation.AuthPrincipal; +import edonymyeon.backend.member.auth.annotation.AuthPrincipal; import edonymyeon.backend.global.version.ApiVersion; -import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.member.profile.application.dto.MemberId; import edonymyeon.backend.content.post.application.PostService; import edonymyeon.backend.content.post.application.dto.request.PostModificationRequest; import edonymyeon.backend.content.post.application.dto.request.PostRequest; diff --git a/backend/src/main/java/edonymyeon/backend/content/post/ui/PostReadController.java b/backend/src/main/java/edonymyeon/backend/content/post/ui/PostReadController.java index 7038aaf10..b796ce490 100644 --- a/backend/src/main/java/edonymyeon/backend/content/post/ui/PostReadController.java +++ b/backend/src/main/java/edonymyeon/backend/content/post/ui/PostReadController.java @@ -6,9 +6,9 @@ import edonymyeon.backend.content.post.application.PostSlice; import edonymyeon.backend.content.post.application.dto.response.GeneralPostInfoResponse; import edonymyeon.backend.content.post.application.dto.response.SpecificPostInfoResponse; -import edonymyeon.backend.membber.auth.annotation.AuthPrincipal; +import edonymyeon.backend.member.auth.annotation.AuthPrincipal; import edonymyeon.backend.global.version.ApiVersion; -import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.member.profile.application.dto.MemberId; import edonymyeon.backend.content.post.ui.annotation.HotPostSizing; import edonymyeon.backend.content.post.ui.annotation.PostPaging; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/edonymyeon/backend/content/thumbs/application/PostThumbsServiceImpl.java b/backend/src/main/java/edonymyeon/backend/content/thumbs/application/PostThumbsServiceImpl.java index 7de37434e..7ccc4cd71 100644 --- a/backend/src/main/java/edonymyeon/backend/content/thumbs/application/PostThumbsServiceImpl.java +++ b/backend/src/main/java/edonymyeon/backend/content/thumbs/application/PostThumbsServiceImpl.java @@ -3,8 +3,8 @@ import edonymyeon.backend.content.thumbs.domain.AllThumbsInPost; import edonymyeon.backend.content.thumbs.domain.Thumbs; import edonymyeon.backend.content.thumbs.repository.ThumbsRepository; -import edonymyeon.backend.membber.member.application.dto.AnonymousMemberId; -import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.member.profile.application.dto.AnonymousMemberId; +import edonymyeon.backend.member.profile.application.dto.MemberId; import edonymyeon.backend.content.post.application.PostThumbsService; import edonymyeon.backend.content.post.application.dto.response.AllThumbsInPostResponse; import edonymyeon.backend.content.post.application.dto.response.ThumbsStatusInPostResponse; diff --git a/backend/src/main/java/edonymyeon/backend/content/thumbs/application/ThumbsService.java b/backend/src/main/java/edonymyeon/backend/content/thumbs/application/ThumbsService.java index 9bfa5f4a4..a3ecfd864 100644 --- a/backend/src/main/java/edonymyeon/backend/content/thumbs/application/ThumbsService.java +++ b/backend/src/main/java/edonymyeon/backend/content/thumbs/application/ThumbsService.java @@ -5,9 +5,9 @@ import edonymyeon.backend.content.thumbs.repository.ThumbsRepository; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.membber.member.application.dto.MemberId; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.member.profile.application.dto.MemberId; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.repository.MemberRepository; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.content.post.repository.PostRepository; import edonymyeon.backend.content.thumbs.application.event.ThumbsDownEvent; diff --git a/backend/src/main/java/edonymyeon/backend/content/thumbs/domain/Thumbs.java b/backend/src/main/java/edonymyeon/backend/content/thumbs/domain/Thumbs.java index a61f06ebf..0c735c92c 100644 --- a/backend/src/main/java/edonymyeon/backend/content/thumbs/domain/Thumbs.java +++ b/backend/src/main/java/edonymyeon/backend/content/thumbs/domain/Thumbs.java @@ -2,7 +2,7 @@ import edonymyeon.backend.global.domain.TemporalRecord; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.content.post.domain.Post; import jakarta.persistence.*; import lombok.AccessLevel; diff --git a/backend/src/main/java/edonymyeon/backend/content/thumbs/ui/ThumbsController.java b/backend/src/main/java/edonymyeon/backend/content/thumbs/ui/ThumbsController.java index 19ed58101..47e089ba2 100644 --- a/backend/src/main/java/edonymyeon/backend/content/thumbs/ui/ThumbsController.java +++ b/backend/src/main/java/edonymyeon/backend/content/thumbs/ui/ThumbsController.java @@ -1,8 +1,8 @@ package edonymyeon.backend.content.thumbs.ui; -import edonymyeon.backend.membber.auth.annotation.AuthPrincipal; +import edonymyeon.backend.member.auth.annotation.AuthPrincipal; import edonymyeon.backend.global.version.ApiVersion; -import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.member.profile.application.dto.MemberId; import edonymyeon.backend.content.thumbs.application.ThumbsService; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; diff --git a/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/LogoutRequest.java b/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/LogoutRequest.java deleted file mode 100644 index 07bc64fdf..000000000 --- a/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/LogoutRequest.java +++ /dev/null @@ -1,4 +0,0 @@ -package edonymyeon.backend.membber.auth.application.dto; - -public record LogoutRequest(String deviceToken) { -} diff --git a/backend/src/main/java/edonymyeon/backend/membber/auth/application/event/JoinMemberEvent.java b/backend/src/main/java/edonymyeon/backend/membber/auth/application/event/JoinMemberEvent.java deleted file mode 100644 index 71b7f2edf..000000000 --- a/backend/src/main/java/edonymyeon/backend/membber/auth/application/event/JoinMemberEvent.java +++ /dev/null @@ -1,6 +0,0 @@ -package edonymyeon.backend.membber.auth.application.event; - -import edonymyeon.backend.membber.member.domain.Member; - -public record JoinMemberEvent(Member member, String deviceToken) { -} diff --git a/backend/src/main/java/edonymyeon/backend/membber/auth/application/event/LoginEvent.java b/backend/src/main/java/edonymyeon/backend/membber/auth/application/event/LoginEvent.java deleted file mode 100644 index 350e746b0..000000000 --- a/backend/src/main/java/edonymyeon/backend/membber/auth/application/event/LoginEvent.java +++ /dev/null @@ -1,6 +0,0 @@ -package edonymyeon.backend.membber.auth.application.event; - -import edonymyeon.backend.membber.member.domain.Member; - -public record LoginEvent(Member member, String deviceToken) { -} diff --git a/backend/src/main/java/edonymyeon/backend/membber/auth/application/event/LogoutEvent.java b/backend/src/main/java/edonymyeon/backend/membber/auth/application/event/LogoutEvent.java deleted file mode 100644 index e85430c2c..000000000 --- a/backend/src/main/java/edonymyeon/backend/membber/auth/application/event/LogoutEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package edonymyeon.backend.membber.auth.application.event; - -public record LogoutEvent(String deviceToken) { -} diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/MemberUpdateResponse.java b/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/MemberUpdateResponse.java deleted file mode 100644 index d73accc4e..000000000 --- a/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/MemberUpdateResponse.java +++ /dev/null @@ -1,5 +0,0 @@ -package edonymyeon.backend.membber.member.application.dto.response; - -public record MemberUpdateResponse(Long id) { - -} diff --git a/backend/src/main/java/edonymyeon/backend/membber/setting/application/dto/SettingRequest.java b/backend/src/main/java/edonymyeon/backend/membber/setting/application/dto/SettingRequest.java deleted file mode 100644 index 9eec68e3c..000000000 --- a/backend/src/main/java/edonymyeon/backend/membber/setting/application/dto/SettingRequest.java +++ /dev/null @@ -1,5 +0,0 @@ -package edonymyeon.backend.membber.setting.application.dto; - -public record SettingRequest(String preferenceType) { - -} diff --git a/backend/src/main/java/edonymyeon/backend/membber/auth/annotation/AuthPrincipal.java b/backend/src/main/java/edonymyeon/backend/member/auth/annotation/AuthPrincipal.java similarity index 85% rename from backend/src/main/java/edonymyeon/backend/membber/auth/annotation/AuthPrincipal.java rename to backend/src/main/java/edonymyeon/backend/member/auth/annotation/AuthPrincipal.java index 600c851db..249ec35c4 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/auth/annotation/AuthPrincipal.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/annotation/AuthPrincipal.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.auth.annotation; +package edonymyeon.backend.member.auth.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/backend/src/main/java/edonymyeon/backend/membber/auth/application/AuthService.java b/backend/src/main/java/edonymyeon/backend/member/auth/application/AuthService.java similarity index 84% rename from backend/src/main/java/edonymyeon/backend/membber/auth/application/AuthService.java rename to backend/src/main/java/edonymyeon/backend/member/auth/application/AuthService.java index 74cad46cd..c90801fae 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/auth/application/AuthService.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/application/AuthService.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.auth.application; +package edonymyeon.backend.member.auth.application; import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_EMAIL_DUPLICATE; import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_EMAIL_NOT_FOUND; @@ -7,24 +7,24 @@ import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_NICKNAME_INVALID; import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_PASSWORD_NOT_MATCH; -import edonymyeon.backend.membber.member.application.dto.response.DuplicateCheckResponse; -import edonymyeon.backend.membber.auth.application.dto.JoinRequest; -import edonymyeon.backend.membber.auth.application.dto.KakaoLoginResponse; -import edonymyeon.backend.membber.auth.application.dto.LoginRequest; -import edonymyeon.backend.membber.auth.application.event.JoinMemberEvent; -import edonymyeon.backend.membber.auth.application.event.LoginEvent; -import edonymyeon.backend.membber.auth.application.event.LogoutEvent; -import edonymyeon.backend.membber.auth.domain.PasswordEncoder; +import edonymyeon.backend.member.profile.application.dto.response.DuplicateCheckResponse; +import edonymyeon.backend.member.auth.application.dto.JoinRequest; +import edonymyeon.backend.member.auth.application.dto.KakaoLoginResponse; +import edonymyeon.backend.member.auth.application.dto.LoginRequest; +import edonymyeon.backend.member.auth.application.event.JoinMemberEvent; +import edonymyeon.backend.member.auth.application.event.LoginEvent; +import edonymyeon.backend.member.auth.application.event.LogoutEvent; +import edonymyeon.backend.member.auth.domain.PasswordEncoder; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.membber.member.application.MemberService; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.application.dto.MemberId; -import edonymyeon.backend.membber.member.domain.Email; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.domain.Nickname; -import edonymyeon.backend.membber.member.domain.SocialInfo; -import edonymyeon.backend.membber.member.domain.SocialInfo.SocialType; -import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.member.profile.application.MemberService; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.application.dto.MemberId; +import edonymyeon.backend.member.profile.domain.Email; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.domain.Nickname; +import edonymyeon.backend.member.profile.domain.SocialInfo; +import edonymyeon.backend.member.profile.domain.SocialInfo.SocialType; +import edonymyeon.backend.member.profile.repository.MemberRepository; import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/edonymyeon/backend/membber/auth/application/KakaoAuthResponseProvider.java b/backend/src/main/java/edonymyeon/backend/member/auth/application/KakaoAuthResponseProvider.java similarity index 82% rename from backend/src/main/java/edonymyeon/backend/membber/auth/application/KakaoAuthResponseProvider.java rename to backend/src/main/java/edonymyeon/backend/member/auth/application/KakaoAuthResponseProvider.java index 271471bf3..4f194a425 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/auth/application/KakaoAuthResponseProvider.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/application/KakaoAuthResponseProvider.java @@ -1,7 +1,7 @@ -package edonymyeon.backend.membber.auth.application; +package edonymyeon.backend.member.auth.application; -import edonymyeon.backend.membber.auth.application.dto.KakaoLoginRequest; -import edonymyeon.backend.membber.auth.application.dto.KakaoLoginResponse; +import edonymyeon.backend.member.auth.application.dto.KakaoLoginRequest; +import edonymyeon.backend.member.auth.application.dto.KakaoLoginResponse; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; diff --git a/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/JoinRequest.java b/backend/src/main/java/edonymyeon/backend/member/auth/application/dto/JoinRequest.java similarity index 63% rename from backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/JoinRequest.java rename to backend/src/main/java/edonymyeon/backend/member/auth/application/dto/JoinRequest.java index 7fa5616dd..21ee44615 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/JoinRequest.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/application/dto/JoinRequest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.auth.application.dto; +package edonymyeon.backend.member.auth.application.dto; public record JoinRequest(String email, String password, String nickname, String deviceToken) { diff --git a/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/KakaoLoginRequest.java b/backend/src/main/java/edonymyeon/backend/member/auth/application/dto/KakaoLoginRequest.java similarity index 57% rename from backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/KakaoLoginRequest.java rename to backend/src/main/java/edonymyeon/backend/member/auth/application/dto/KakaoLoginRequest.java index fca36208d..ce0c0a3e6 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/KakaoLoginRequest.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/application/dto/KakaoLoginRequest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.auth.application.dto; +package edonymyeon.backend.member.auth.application.dto; public record KakaoLoginRequest(String accessToken, String deviceToken) { diff --git a/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/KakaoLoginResponse.java b/backend/src/main/java/edonymyeon/backend/member/auth/application/dto/KakaoLoginResponse.java similarity index 73% rename from backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/KakaoLoginResponse.java rename to backend/src/main/java/edonymyeon/backend/member/auth/application/dto/KakaoLoginResponse.java index b9d735929..78a0cc0e5 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/KakaoLoginResponse.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/application/dto/KakaoLoginResponse.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.auth.application.dto; +package edonymyeon.backend.member.auth.application.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/LoginRequest.java b/backend/src/main/java/edonymyeon/backend/member/auth/application/dto/LoginRequest.java similarity index 59% rename from backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/LoginRequest.java rename to backend/src/main/java/edonymyeon/backend/member/auth/application/dto/LoginRequest.java index 3d495197b..2c4e8c189 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/LoginRequest.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/application/dto/LoginRequest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.auth.application.dto; +package edonymyeon.backend.member.auth.application.dto; public record LoginRequest(String email, String password, String deviceToken) { diff --git a/backend/src/main/java/edonymyeon/backend/member/auth/application/dto/LogoutRequest.java b/backend/src/main/java/edonymyeon/backend/member/auth/application/dto/LogoutRequest.java new file mode 100644 index 000000000..8e96ca00b --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/member/auth/application/dto/LogoutRequest.java @@ -0,0 +1,4 @@ +package edonymyeon.backend.member.auth.application.dto; + +public record LogoutRequest(String deviceToken) { +} diff --git a/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/MemberResponse.java b/backend/src/main/java/edonymyeon/backend/member/auth/application/dto/MemberResponse.java similarity index 53% rename from backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/MemberResponse.java rename to backend/src/main/java/edonymyeon/backend/member/auth/application/dto/MemberResponse.java index 7ac2e8fc7..b86258080 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/auth/application/dto/MemberResponse.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/application/dto/MemberResponse.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.auth.application.dto; +package edonymyeon.backend.member.auth.application.dto; public record MemberResponse(String email, String password) { diff --git a/backend/src/main/java/edonymyeon/backend/member/auth/application/event/JoinMemberEvent.java b/backend/src/main/java/edonymyeon/backend/member/auth/application/event/JoinMemberEvent.java new file mode 100644 index 000000000..30fdcedc3 --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/member/auth/application/event/JoinMemberEvent.java @@ -0,0 +1,6 @@ +package edonymyeon.backend.member.auth.application.event; + +import edonymyeon.backend.member.profile.domain.Member; + +public record JoinMemberEvent(Member member, String deviceToken) { +} diff --git a/backend/src/main/java/edonymyeon/backend/member/auth/application/event/LoginEvent.java b/backend/src/main/java/edonymyeon/backend/member/auth/application/event/LoginEvent.java new file mode 100644 index 000000000..968c84750 --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/member/auth/application/event/LoginEvent.java @@ -0,0 +1,6 @@ +package edonymyeon.backend.member.auth.application.event; + +import edonymyeon.backend.member.profile.domain.Member; + +public record LoginEvent(Member member, String deviceToken) { +} diff --git a/backend/src/main/java/edonymyeon/backend/member/auth/application/event/LogoutEvent.java b/backend/src/main/java/edonymyeon/backend/member/auth/application/event/LogoutEvent.java new file mode 100644 index 000000000..e574d421d --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/member/auth/application/event/LogoutEvent.java @@ -0,0 +1,4 @@ +package edonymyeon.backend.member.auth.application.event; + +public record LogoutEvent(String deviceToken) { +} diff --git a/backend/src/main/java/edonymyeon/backend/membber/auth/domain/BasicTokenGenerator.java b/backend/src/main/java/edonymyeon/backend/member/auth/domain/BasicTokenGenerator.java similarity index 88% rename from backend/src/main/java/edonymyeon/backend/membber/auth/domain/BasicTokenGenerator.java rename to backend/src/main/java/edonymyeon/backend/member/auth/domain/BasicTokenGenerator.java index 8c9a8e1fd..e71c77e13 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/auth/domain/BasicTokenGenerator.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/domain/BasicTokenGenerator.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.auth.domain; +package edonymyeon.backend.member.auth.domain; import java.util.Base64; import org.springframework.stereotype.Component; diff --git a/backend/src/main/java/edonymyeon/backend/membber/auth/domain/PasswordEncoder.java b/backend/src/main/java/edonymyeon/backend/member/auth/domain/PasswordEncoder.java similarity index 75% rename from backend/src/main/java/edonymyeon/backend/membber/auth/domain/PasswordEncoder.java rename to backend/src/main/java/edonymyeon/backend/member/auth/domain/PasswordEncoder.java index 4390e48fe..4b0093dea 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/auth/domain/PasswordEncoder.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/domain/PasswordEncoder.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.auth.domain; +package edonymyeon.backend.member.auth.domain; public interface PasswordEncoder { diff --git a/backend/src/main/java/edonymyeon/backend/membber/auth/domain/SimplePasswordEncoder.java b/backend/src/main/java/edonymyeon/backend/member/auth/domain/SimplePasswordEncoder.java similarity index 98% rename from backend/src/main/java/edonymyeon/backend/membber/auth/domain/SimplePasswordEncoder.java rename to backend/src/main/java/edonymyeon/backend/member/auth/domain/SimplePasswordEncoder.java index 859294874..ff586cd9f 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/auth/domain/SimplePasswordEncoder.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/domain/SimplePasswordEncoder.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.auth.domain; +package edonymyeon.backend.member.auth.domain; import static edonymyeon.backend.global.exception.ExceptionInformation.NOT_SUPPORTED_ALGORITHM; import static edonymyeon.backend.global.exception.ExceptionInformation.NOT_SUPPORTED_VERSION; diff --git a/backend/src/main/java/edonymyeon/backend/membber/auth/domain/TokenGenerator.java b/backend/src/main/java/edonymyeon/backend/member/auth/domain/TokenGenerator.java similarity index 62% rename from backend/src/main/java/edonymyeon/backend/membber/auth/domain/TokenGenerator.java rename to backend/src/main/java/edonymyeon/backend/member/auth/domain/TokenGenerator.java index c98534aa0..ca7c03849 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/auth/domain/TokenGenerator.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/domain/TokenGenerator.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.auth.domain; +package edonymyeon.backend.member.auth.domain; public interface TokenGenerator { diff --git a/backend/src/main/java/edonymyeon/backend/membber/auth/domain/ValidateType.java b/backend/src/main/java/edonymyeon/backend/member/auth/domain/ValidateType.java similarity index 91% rename from backend/src/main/java/edonymyeon/backend/membber/auth/domain/ValidateType.java rename to backend/src/main/java/edonymyeon/backend/member/auth/domain/ValidateType.java index ae845a261..20982fafa 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/auth/domain/ValidateType.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/domain/ValidateType.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.auth.domain; +package edonymyeon.backend.member.auth.domain; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.global.exception.ExceptionInformation; diff --git a/backend/src/main/java/edonymyeon/backend/membber/auth/ui/AuthController.java b/backend/src/main/java/edonymyeon/backend/member/auth/ui/AuthController.java similarity index 80% rename from backend/src/main/java/edonymyeon/backend/membber/auth/ui/AuthController.java rename to backend/src/main/java/edonymyeon/backend/member/auth/ui/AuthController.java index 0905c5023..abf22c070 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/auth/ui/AuthController.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/ui/AuthController.java @@ -1,18 +1,18 @@ -package edonymyeon.backend.membber.auth.ui; +package edonymyeon.backend.member.auth.ui; -import static edonymyeon.backend.membber.auth.ui.SessionConst.USER; +import static edonymyeon.backend.member.auth.ui.SessionConst.USER; -import edonymyeon.backend.membber.auth.annotation.AuthPrincipal; -import edonymyeon.backend.membber.auth.application.AuthService; -import edonymyeon.backend.membber.auth.application.KakaoAuthResponseProvider; -import edonymyeon.backend.membber.auth.application.dto.JoinRequest; -import edonymyeon.backend.membber.auth.application.dto.KakaoLoginRequest; -import edonymyeon.backend.membber.auth.application.dto.KakaoLoginResponse; -import edonymyeon.backend.membber.auth.application.dto.LoginRequest; -import edonymyeon.backend.membber.member.application.dto.response.DuplicateCheckResponse; -import edonymyeon.backend.membber.auth.application.dto.LogoutRequest; +import edonymyeon.backend.member.auth.annotation.AuthPrincipal; +import edonymyeon.backend.member.auth.application.AuthService; +import edonymyeon.backend.member.auth.application.KakaoAuthResponseProvider; +import edonymyeon.backend.member.auth.application.dto.JoinRequest; +import edonymyeon.backend.member.auth.application.dto.KakaoLoginRequest; +import edonymyeon.backend.member.auth.application.dto.KakaoLoginResponse; +import edonymyeon.backend.member.auth.application.dto.LoginRequest; +import edonymyeon.backend.member.profile.application.dto.response.DuplicateCheckResponse; +import edonymyeon.backend.member.auth.application.dto.LogoutRequest; import edonymyeon.backend.global.version.ApiVersion; -import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.member.profile.application.dto.MemberId; import jakarta.servlet.http.HttpSession; import java.net.URI; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/edonymyeon/backend/membber/auth/ui/SessionConst.java b/backend/src/main/java/edonymyeon/backend/member/auth/ui/SessionConst.java similarity index 92% rename from backend/src/main/java/edonymyeon/backend/membber/auth/ui/SessionConst.java rename to backend/src/main/java/edonymyeon/backend/member/auth/ui/SessionConst.java index 993a91845..976f7e3c1 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/auth/ui/SessionConst.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/ui/SessionConst.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.auth.ui; +package edonymyeon.backend.member.auth.ui; public enum SessionConst { diff --git a/backend/src/main/java/edonymyeon/backend/membber/auth/ui/argumentresolver/AuthArgumentResolver.java b/backend/src/main/java/edonymyeon/backend/member/auth/ui/argumentresolver/AuthArgumentResolver.java similarity index 86% rename from backend/src/main/java/edonymyeon/backend/membber/auth/ui/argumentresolver/AuthArgumentResolver.java rename to backend/src/main/java/edonymyeon/backend/member/auth/ui/argumentresolver/AuthArgumentResolver.java index 2d443bf7c..326244433 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/auth/ui/argumentresolver/AuthArgumentResolver.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/ui/argumentresolver/AuthArgumentResolver.java @@ -1,13 +1,13 @@ -package edonymyeon.backend.membber.auth.ui.argumentresolver; +package edonymyeon.backend.member.auth.ui.argumentresolver; -import static edonymyeon.backend.membber.auth.ui.SessionConst.USER; +import static edonymyeon.backend.member.auth.ui.SessionConst.USER; import static edonymyeon.backend.global.exception.ExceptionInformation.AUTHORIZATION_EMPTY; -import edonymyeon.backend.membber.auth.annotation.AuthPrincipal; +import edonymyeon.backend.member.auth.annotation.AuthPrincipal; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.application.dto.AnonymousMemberId; -import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.application.dto.AnonymousMemberId; +import edonymyeon.backend.member.profile.application.dto.MemberId; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpSession; import java.util.Objects; diff --git a/backend/src/main/java/edonymyeon/backend/membber/config/WebMvcMemberConfiguration.java b/backend/src/main/java/edonymyeon/backend/member/config/WebMvcMemberConfiguration.java similarity index 82% rename from backend/src/main/java/edonymyeon/backend/membber/config/WebMvcMemberConfiguration.java rename to backend/src/main/java/edonymyeon/backend/member/config/WebMvcMemberConfiguration.java index 0581f7bd9..5303f9e29 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/config/WebMvcMemberConfiguration.java +++ b/backend/src/main/java/edonymyeon/backend/member/config/WebMvcMemberConfiguration.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.membber.config; +package edonymyeon.backend.member.config; -import edonymyeon.backend.membber.auth.ui.argumentresolver.AuthArgumentResolver; +import edonymyeon.backend.member.auth.ui.argumentresolver.AuthArgumentResolver; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Configuration; diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/application/DeviceRepository.java b/backend/src/main/java/edonymyeon/backend/member/profile/application/DeviceRepository.java similarity index 83% rename from backend/src/main/java/edonymyeon/backend/membber/member/application/DeviceRepository.java rename to backend/src/main/java/edonymyeon/backend/member/profile/application/DeviceRepository.java index d7fe31539..03546ca75 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/application/DeviceRepository.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/application/DeviceRepository.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.membber.member.application; +package edonymyeon.backend.member.profile.application; -import edonymyeon.backend.membber.member.domain.Device; +import edonymyeon.backend.member.profile.domain.Device; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.EntityGraph; diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/application/MemberConsumptionService.java b/backend/src/main/java/edonymyeon/backend/member/profile/application/MemberConsumptionService.java similarity index 71% rename from backend/src/main/java/edonymyeon/backend/membber/member/application/MemberConsumptionService.java rename to backend/src/main/java/edonymyeon/backend/member/profile/application/MemberConsumptionService.java index 05cd645a9..2406d0525 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/application/MemberConsumptionService.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/application/MemberConsumptionService.java @@ -1,7 +1,7 @@ -package edonymyeon.backend.membber.member.application; +package edonymyeon.backend.member.profile.application; -import edonymyeon.backend.membber.member.application.dto.MemberId; -import edonymyeon.backend.membber.member.application.dto.YearMonthDto; +import edonymyeon.backend.member.profile.application.dto.MemberId; +import edonymyeon.backend.member.profile.application.dto.YearMonthDto; public interface MemberConsumptionService { diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/application/MemberEventListener.java b/backend/src/main/java/edonymyeon/backend/member/profile/application/MemberEventListener.java similarity index 78% rename from backend/src/main/java/edonymyeon/backend/membber/member/application/MemberEventListener.java rename to backend/src/main/java/edonymyeon/backend/member/profile/application/MemberEventListener.java index 4606d2fe1..028ffe7e1 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/application/MemberEventListener.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/application/MemberEventListener.java @@ -1,8 +1,8 @@ -package edonymyeon.backend.membber.member.application; +package edonymyeon.backend.member.profile.application; -import edonymyeon.backend.membber.auth.application.event.JoinMemberEvent; -import edonymyeon.backend.membber.auth.application.event.LoginEvent; -import edonymyeon.backend.membber.auth.application.event.LogoutEvent; +import edonymyeon.backend.member.auth.application.event.JoinMemberEvent; +import edonymyeon.backend.member.auth.application.event.LoginEvent; +import edonymyeon.backend.member.auth.application.event.LogoutEvent; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.transaction.event.TransactionPhase; diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/application/MemberService.java b/backend/src/main/java/edonymyeon/backend/member/profile/application/MemberService.java similarity index 85% rename from backend/src/main/java/edonymyeon/backend/membber/member/application/MemberService.java rename to backend/src/main/java/edonymyeon/backend/member/profile/application/MemberService.java index 959882b29..b03f94a4b 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/application/MemberService.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/application/MemberService.java @@ -1,30 +1,30 @@ -package edonymyeon.backend.membber.member.application; +package edonymyeon.backend.member.profile.application; import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_ID_NOT_FOUND; import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_NICKNAME_DUPLICATE; -import edonymyeon.backend.membber.auth.domain.ValidateType; +import edonymyeon.backend.member.auth.domain.ValidateType; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.image.application.ImageService; import edonymyeon.backend.image.domain.ImageType; import edonymyeon.backend.image.domain.ImageInfo; -import edonymyeon.backend.membber.member.profileimage.domain.ProfileImageInfo; -import edonymyeon.backend.membber.member.profileimage.repository.ProfileImageInfoRepository; -import edonymyeon.backend.membber.member.application.dto.MemberId; -import edonymyeon.backend.membber.member.application.dto.request.MemberUpdateRequest; -import edonymyeon.backend.membber.member.application.dto.request.PurchaseConfirmRequest; -import edonymyeon.backend.membber.member.application.dto.request.SavingConfirmRequest; -import edonymyeon.backend.membber.member.application.dto.response.DuplicateCheckResponse; -import edonymyeon.backend.membber.member.application.dto.response.MemberUpdateResponse; -import edonymyeon.backend.membber.member.application.dto.response.MyPageResponseV1_0; -import edonymyeon.backend.membber.member.application.dto.response.MyPageResponseV1_1; -import edonymyeon.backend.membber.member.application.event.ProfileImageDeletionEvent; -import edonymyeon.backend.membber.member.application.dto.YearMonthDto; -import edonymyeon.backend.membber.member.domain.Device; -import edonymyeon.backend.membber.member.domain.Email; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.domain.Nickname; -import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.member.profile.profileimage.domain.ProfileImageInfo; +import edonymyeon.backend.member.profile.profileimage.repository.ProfileImageInfoRepository; +import edonymyeon.backend.member.profile.application.dto.MemberId; +import edonymyeon.backend.member.profile.application.dto.request.MemberUpdateRequest; +import edonymyeon.backend.member.profile.application.dto.request.PurchaseConfirmRequest; +import edonymyeon.backend.member.profile.application.dto.request.SavingConfirmRequest; +import edonymyeon.backend.member.profile.application.dto.response.DuplicateCheckResponse; +import edonymyeon.backend.member.profile.application.dto.response.MemberUpdateResponse; +import edonymyeon.backend.member.profile.application.dto.response.MyPageResponseV1_0; +import edonymyeon.backend.member.profile.application.dto.response.MyPageResponseV1_1; +import edonymyeon.backend.member.profile.application.event.ProfileImageDeletionEvent; +import edonymyeon.backend.member.profile.application.dto.YearMonthDto; +import edonymyeon.backend.member.profile.domain.Device; +import edonymyeon.backend.member.profile.domain.Email; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.domain.Nickname; +import edonymyeon.backend.member.profile.repository.MemberRepository; import java.util.Objects; import java.util.Optional; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/ActiveMemberId.java b/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/ActiveMemberId.java similarity index 67% rename from backend/src/main/java/edonymyeon/backend/membber/member/application/dto/ActiveMemberId.java rename to backend/src/main/java/edonymyeon/backend/member/profile/application/dto/ActiveMemberId.java index 18ae79c66..1b59a329f 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/ActiveMemberId.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/ActiveMemberId.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.member.application.dto; +package edonymyeon.backend.member.profile.application.dto; public final class ActiveMemberId extends MemberId { diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/AnonymousMemberId.java b/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/AnonymousMemberId.java similarity index 76% rename from backend/src/main/java/edonymyeon/backend/membber/member/application/dto/AnonymousMemberId.java rename to backend/src/main/java/edonymyeon/backend/member/profile/application/dto/AnonymousMemberId.java index 9f3d90124..6a04e3de6 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/AnonymousMemberId.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/AnonymousMemberId.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.member.application.dto; +package edonymyeon.backend.member.profile.application.dto; public final class AnonymousMemberId extends MemberId { diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/MemberId.java b/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/MemberId.java similarity index 80% rename from backend/src/main/java/edonymyeon/backend/membber/member/application/dto/MemberId.java rename to backend/src/main/java/edonymyeon/backend/member/profile/application/dto/MemberId.java index a5d26f4ad..768514a62 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/MemberId.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/MemberId.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.member.application.dto; +package edonymyeon.backend.member.profile.application.dto; import lombok.EqualsAndHashCode; diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/YearMonthDto.java b/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/YearMonthDto.java similarity index 51% rename from backend/src/main/java/edonymyeon/backend/membber/member/application/dto/YearMonthDto.java rename to backend/src/main/java/edonymyeon/backend/member/profile/application/dto/YearMonthDto.java index ee701a663..d1fad593d 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/YearMonthDto.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/YearMonthDto.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.member.application.dto; +package edonymyeon.backend.member.profile.application.dto; public record YearMonthDto(Integer year, Integer month) { diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/request/MemberUpdateRequest.java b/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/request/MemberUpdateRequest.java similarity index 72% rename from backend/src/main/java/edonymyeon/backend/membber/member/application/dto/request/MemberUpdateRequest.java rename to backend/src/main/java/edonymyeon/backend/member/profile/application/dto/request/MemberUpdateRequest.java index 29ff07ee0..a5ae9a626 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/request/MemberUpdateRequest.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/request/MemberUpdateRequest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.member.application.dto.request; +package edonymyeon.backend.member.profile.application.dto.request; import org.springframework.web.multipart.MultipartFile; diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/request/PurchaseConfirmRequest.java b/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/request/PurchaseConfirmRequest.java similarity index 59% rename from backend/src/main/java/edonymyeon/backend/membber/member/application/dto/request/PurchaseConfirmRequest.java rename to backend/src/main/java/edonymyeon/backend/member/profile/application/dto/request/PurchaseConfirmRequest.java index 8371653d9..813a4bb95 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/request/PurchaseConfirmRequest.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/request/PurchaseConfirmRequest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.member.application.dto.request; +package edonymyeon.backend.member.profile.application.dto.request; public record PurchaseConfirmRequest(Long purchasePrice, Integer year, Integer month) { diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/request/SavingConfirmRequest.java b/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/request/SavingConfirmRequest.java similarity index 53% rename from backend/src/main/java/edonymyeon/backend/membber/member/application/dto/request/SavingConfirmRequest.java rename to backend/src/main/java/edonymyeon/backend/member/profile/application/dto/request/SavingConfirmRequest.java index 3b2aeedc8..469556777 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/request/SavingConfirmRequest.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/request/SavingConfirmRequest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.member.application.dto.request; +package edonymyeon.backend.member.profile.application.dto.request; public record SavingConfirmRequest(Integer year, Integer month) { diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/DuplicateCheckResponse.java b/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/response/DuplicateCheckResponse.java similarity index 50% rename from backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/DuplicateCheckResponse.java rename to backend/src/main/java/edonymyeon/backend/member/profile/application/dto/response/DuplicateCheckResponse.java index ea51dc9af..b37267780 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/DuplicateCheckResponse.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/response/DuplicateCheckResponse.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.member.application.dto.response; +package edonymyeon.backend.member.profile.application.dto.response; public record DuplicateCheckResponse(Boolean isUnique) { diff --git a/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/response/MemberUpdateResponse.java b/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/response/MemberUpdateResponse.java new file mode 100644 index 000000000..0958e4874 --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/response/MemberUpdateResponse.java @@ -0,0 +1,5 @@ +package edonymyeon.backend.member.profile.application.dto.response; + +public record MemberUpdateResponse(Long id) { + +} diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/MyPageResponseV1_0.java b/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/response/MyPageResponseV1_0.java similarity index 53% rename from backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/MyPageResponseV1_0.java rename to backend/src/main/java/edonymyeon/backend/member/profile/application/dto/response/MyPageResponseV1_0.java index c649d0673..f43626d5e 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/MyPageResponseV1_0.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/response/MyPageResponseV1_0.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.member.application.dto.response; +package edonymyeon.backend.member.profile.application.dto.response; public record MyPageResponseV1_0(Long memberId, String nickname) { diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/MyPageResponseV1_1.java b/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/response/MyPageResponseV1_1.java similarity index 58% rename from backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/MyPageResponseV1_1.java rename to backend/src/main/java/edonymyeon/backend/member/profile/application/dto/response/MyPageResponseV1_1.java index 33dee63a3..a57fcc577 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/application/dto/response/MyPageResponseV1_1.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/response/MyPageResponseV1_1.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.member.application.dto.response; +package edonymyeon.backend.member.profile.application.dto.response; public record MyPageResponseV1_1(Long id, String nickname, String profileImage) { diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/application/event/ProfileImageDeletionEvent.java b/backend/src/main/java/edonymyeon/backend/member/profile/application/event/ProfileImageDeletionEvent.java similarity index 75% rename from backend/src/main/java/edonymyeon/backend/membber/member/application/event/ProfileImageDeletionEvent.java rename to backend/src/main/java/edonymyeon/backend/member/profile/application/event/ProfileImageDeletionEvent.java index 69dfceb07..b81bcf43c 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/application/event/ProfileImageDeletionEvent.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/application/event/ProfileImageDeletionEvent.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.member.application.event; +package edonymyeon.backend.member.profile.application.event; import edonymyeon.backend.image.domain.ImageType; import edonymyeon.backend.image.domain.ImageInfo; diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/application/event/ProfileImageUploadEvent.java b/backend/src/main/java/edonymyeon/backend/member/profile/application/event/ProfileImageUploadEvent.java similarity index 75% rename from backend/src/main/java/edonymyeon/backend/membber/member/application/event/ProfileImageUploadEvent.java rename to backend/src/main/java/edonymyeon/backend/member/profile/application/event/ProfileImageUploadEvent.java index 2e7394ce4..82cae6c10 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/application/event/ProfileImageUploadEvent.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/application/event/ProfileImageUploadEvent.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.member.application.event; +package edonymyeon.backend.member.profile.application.event; import edonymyeon.backend.image.domain.ImageInfo; import org.springframework.web.multipart.MultipartFile; diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/domain/Device.java b/backend/src/main/java/edonymyeon/backend/member/profile/domain/Device.java similarity index 97% rename from backend/src/main/java/edonymyeon/backend/membber/member/domain/Device.java rename to backend/src/main/java/edonymyeon/backend/member/profile/domain/Device.java index b5bc961b0..76f851709 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/domain/Device.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/domain/Device.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.member.domain; +package edonymyeon.backend.member.profile.domain; import edonymyeon.backend.global.domain.TemporalRecord; import jakarta.persistence.Entity; diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/domain/Email.java b/backend/src/main/java/edonymyeon/backend/member/profile/domain/Email.java similarity index 91% rename from backend/src/main/java/edonymyeon/backend/membber/member/domain/Email.java rename to backend/src/main/java/edonymyeon/backend/member/profile/domain/Email.java index 5efd955f6..3f3cd3046 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/domain/Email.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/domain/Email.java @@ -1,9 +1,9 @@ -package edonymyeon.backend.membber.member.domain; +package edonymyeon.backend.member.profile.domain; import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_EMAIL_INVALID; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.membber.member.domain.SocialInfo.SocialType; +import edonymyeon.backend.member.profile.domain.SocialInfo.SocialType; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; import java.util.UUID; diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/domain/Member.java b/backend/src/main/java/edonymyeon/backend/member/profile/domain/Member.java similarity index 96% rename from backend/src/main/java/edonymyeon/backend/membber/member/domain/Member.java rename to backend/src/main/java/edonymyeon/backend/member/profile/domain/Member.java index d6e64c478..6bf7209e6 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/domain/Member.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/domain/Member.java @@ -1,8 +1,8 @@ -package edonymyeon.backend.membber.member.domain; +package edonymyeon.backend.member.profile.domain; -import edonymyeon.backend.membber.auth.domain.PasswordEncoder; +import edonymyeon.backend.member.auth.domain.PasswordEncoder; import edonymyeon.backend.global.domain.TemporalRecord; -import edonymyeon.backend.membber.member.profileimage.domain.ProfileImageInfo; +import edonymyeon.backend.member.profile.profileimage.domain.ProfileImageInfo; import jakarta.persistence.CascadeType; import jakarta.persistence.Embedded; import jakarta.persistence.Entity; diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/domain/Nickname.java b/backend/src/main/java/edonymyeon/backend/member/profile/domain/Nickname.java similarity index 92% rename from backend/src/main/java/edonymyeon/backend/membber/member/domain/Nickname.java rename to backend/src/main/java/edonymyeon/backend/member/profile/domain/Nickname.java index 116434e75..9ac641241 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/domain/Nickname.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/domain/Nickname.java @@ -1,9 +1,9 @@ -package edonymyeon.backend.membber.member.domain; +package edonymyeon.backend.member.profile.domain; import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_NICKNAME_INVALID; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.membber.member.domain.SocialInfo.SocialType; +import edonymyeon.backend.member.profile.domain.SocialInfo.SocialType; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; import java.util.UUID; diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/domain/Password.java b/backend/src/main/java/edonymyeon/backend/member/profile/domain/Password.java similarity index 90% rename from backend/src/main/java/edonymyeon/backend/membber/member/domain/Password.java rename to backend/src/main/java/edonymyeon/backend/member/profile/domain/Password.java index 5e95ead7b..ce164ddbd 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/domain/Password.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/domain/Password.java @@ -1,9 +1,9 @@ -package edonymyeon.backend.membber.member.domain; +package edonymyeon.backend.member.profile.domain; import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_PASSWORD_INVALID; -import static edonymyeon.backend.membber.member.domain.SocialInfo.SocialType; +import static edonymyeon.backend.member.profile.domain.SocialInfo.SocialType; -import edonymyeon.backend.membber.auth.domain.PasswordEncoder; +import edonymyeon.backend.member.auth.domain.PasswordEncoder; import edonymyeon.backend.global.exception.BusinessLogicException; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.global.exception.ExceptionInformation; diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/domain/PasswordValidator.java b/backend/src/main/java/edonymyeon/backend/member/profile/domain/PasswordValidator.java similarity index 95% rename from backend/src/main/java/edonymyeon/backend/membber/member/domain/PasswordValidator.java rename to backend/src/main/java/edonymyeon/backend/member/profile/domain/PasswordValidator.java index 8bf322ca7..837484b8a 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/domain/PasswordValidator.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/domain/PasswordValidator.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.member.domain; +package edonymyeon.backend.member.profile.domain; import java.util.Objects; import java.util.regex.Pattern; diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/domain/SocialInfo.java b/backend/src/main/java/edonymyeon/backend/member/profile/domain/SocialInfo.java similarity index 93% rename from backend/src/main/java/edonymyeon/backend/membber/member/domain/SocialInfo.java rename to backend/src/main/java/edonymyeon/backend/member/profile/domain/SocialInfo.java index 895565453..2a7f49c24 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/domain/SocialInfo.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/domain/SocialInfo.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.member.domain; +package edonymyeon.backend.member.profile.domain; import jakarta.persistence.Embeddable; import jakarta.persistence.EnumType; diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/profileimage/application/ProfileImageEventListener.java b/backend/src/main/java/edonymyeon/backend/member/profile/profileimage/application/ProfileImageEventListener.java similarity index 82% rename from backend/src/main/java/edonymyeon/backend/membber/member/profileimage/application/ProfileImageEventListener.java rename to backend/src/main/java/edonymyeon/backend/member/profile/profileimage/application/ProfileImageEventListener.java index 07a98b0d3..e7682c8e6 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/profileimage/application/ProfileImageEventListener.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/profileimage/application/ProfileImageEventListener.java @@ -1,7 +1,7 @@ -package edonymyeon.backend.membber.member.profileimage.application; +package edonymyeon.backend.member.profile.profileimage.application; import edonymyeon.backend.image.application.ImageService; -import edonymyeon.backend.membber.member.application.event.ProfileImageDeletionEvent; +import edonymyeon.backend.member.profile.application.event.ProfileImageDeletionEvent; import lombok.RequiredArgsConstructor; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/profileimage/domain/ProfileImageInfo.java b/backend/src/main/java/edonymyeon/backend/member/profile/profileimage/domain/ProfileImageInfo.java similarity index 88% rename from backend/src/main/java/edonymyeon/backend/membber/member/profileimage/domain/ProfileImageInfo.java rename to backend/src/main/java/edonymyeon/backend/member/profile/profileimage/domain/ProfileImageInfo.java index ae99fcabb..bdc20e6bc 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/profileimage/domain/ProfileImageInfo.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/profileimage/domain/ProfileImageInfo.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.member.profileimage.domain; +package edonymyeon.backend.member.profile.profileimage.domain; import edonymyeon.backend.image.domain.ImageInfo; import jakarta.persistence.Entity; diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/profileimage/repository/ProfileImageInfoRepository.java b/backend/src/main/java/edonymyeon/backend/member/profile/profileimage/repository/ProfileImageInfoRepository.java similarity index 58% rename from backend/src/main/java/edonymyeon/backend/membber/member/profileimage/repository/ProfileImageInfoRepository.java rename to backend/src/main/java/edonymyeon/backend/member/profile/profileimage/repository/ProfileImageInfoRepository.java index ea0d50589..fa4cf624a 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/profileimage/repository/ProfileImageInfoRepository.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/profileimage/repository/ProfileImageInfoRepository.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.membber.member.profileimage.repository; +package edonymyeon.backend.member.profile.profileimage.repository; -import edonymyeon.backend.membber.member.profileimage.domain.ProfileImageInfo; +import edonymyeon.backend.member.profile.profileimage.domain.ProfileImageInfo; import org.springframework.data.jpa.repository.JpaRepository; public interface ProfileImageInfoRepository extends JpaRepository { diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/repository/MemberCustomRepository.java b/backend/src/main/java/edonymyeon/backend/member/profile/repository/MemberCustomRepository.java similarity index 55% rename from backend/src/main/java/edonymyeon/backend/membber/member/repository/MemberCustomRepository.java rename to backend/src/main/java/edonymyeon/backend/member/profile/repository/MemberCustomRepository.java index eeeade16c..2fd9db4de 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/repository/MemberCustomRepository.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/repository/MemberCustomRepository.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.membber.member.repository; +package edonymyeon.backend.member.profile.repository; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Member; import java.util.List; public interface MemberCustomRepository { diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/repository/MemberCustomRepositoryImpl.java b/backend/src/main/java/edonymyeon/backend/member/profile/repository/MemberCustomRepositoryImpl.java similarity index 88% rename from backend/src/main/java/edonymyeon/backend/membber/member/repository/MemberCustomRepositoryImpl.java rename to backend/src/main/java/edonymyeon/backend/member/profile/repository/MemberCustomRepositoryImpl.java index b6f4e3fc5..9382f029a 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/repository/MemberCustomRepositoryImpl.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/repository/MemberCustomRepositoryImpl.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.membber.member.repository; +package edonymyeon.backend.member.profile.repository; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Member; import jakarta.persistence.EntityManager; import java.time.LocalDateTime; import java.util.List; diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/repository/MemberRepository.java b/backend/src/main/java/edonymyeon/backend/member/profile/repository/MemberRepository.java similarity index 58% rename from backend/src/main/java/edonymyeon/backend/membber/member/repository/MemberRepository.java rename to backend/src/main/java/edonymyeon/backend/member/profile/repository/MemberRepository.java index 3ad05fd5a..7819f4f4c 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/repository/MemberRepository.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/repository/MemberRepository.java @@ -1,9 +1,9 @@ -package edonymyeon.backend.membber.member.repository; +package edonymyeon.backend.member.profile.repository; -import edonymyeon.backend.membber.member.domain.Nickname; -import edonymyeon.backend.membber.member.domain.SocialInfo; -import edonymyeon.backend.membber.member.domain.Email; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Nickname; +import edonymyeon.backend.member.profile.domain.SocialInfo; +import edonymyeon.backend.member.profile.domain.Email; +import edonymyeon.backend.member.profile.domain.Member; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/backend/src/main/java/edonymyeon/backend/membber/member/ui/MemberController.java b/backend/src/main/java/edonymyeon/backend/member/profile/ui/MemberController.java similarity index 84% rename from backend/src/main/java/edonymyeon/backend/membber/member/ui/MemberController.java rename to backend/src/main/java/edonymyeon/backend/member/profile/ui/MemberController.java index 1875b9eaa..e5b7d0c78 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/member/ui/MemberController.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/ui/MemberController.java @@ -1,16 +1,16 @@ -package edonymyeon.backend.membber.member.ui; +package edonymyeon.backend.member.profile.ui; -import edonymyeon.backend.membber.auth.annotation.AuthPrincipal; +import edonymyeon.backend.member.auth.annotation.AuthPrincipal; import edonymyeon.backend.global.version.ApiVersion; -import edonymyeon.backend.membber.member.application.MemberService; -import edonymyeon.backend.membber.member.application.dto.MemberId; -import edonymyeon.backend.membber.member.application.dto.request.MemberUpdateRequest; -import edonymyeon.backend.membber.member.application.dto.request.PurchaseConfirmRequest; -import edonymyeon.backend.membber.member.application.dto.request.SavingConfirmRequest; -import edonymyeon.backend.membber.member.application.dto.response.DuplicateCheckResponse; -import edonymyeon.backend.membber.member.application.dto.response.MemberUpdateResponse; -import edonymyeon.backend.membber.member.application.dto.response.MyPageResponseV1_0; -import edonymyeon.backend.membber.member.application.dto.response.MyPageResponseV1_1; +import edonymyeon.backend.member.profile.application.MemberService; +import edonymyeon.backend.member.profile.application.dto.MemberId; +import edonymyeon.backend.member.profile.application.dto.request.MemberUpdateRequest; +import edonymyeon.backend.member.profile.application.dto.request.PurchaseConfirmRequest; +import edonymyeon.backend.member.profile.application.dto.request.SavingConfirmRequest; +import edonymyeon.backend.member.profile.application.dto.response.DuplicateCheckResponse; +import edonymyeon.backend.member.profile.application.dto.response.MemberUpdateResponse; +import edonymyeon.backend.member.profile.application.dto.response.MyPageResponseV1_0; +import edonymyeon.backend.member.profile.application.dto.response.MyPageResponseV1_1; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/backend/src/main/java/edonymyeon/backend/membber/setting/application/SettingEventListener.java b/backend/src/main/java/edonymyeon/backend/member/setting/application/SettingEventListener.java similarity index 76% rename from backend/src/main/java/edonymyeon/backend/membber/setting/application/SettingEventListener.java rename to backend/src/main/java/edonymyeon/backend/member/setting/application/SettingEventListener.java index fc3e700fa..263509619 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/setting/application/SettingEventListener.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/application/SettingEventListener.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.membber.setting.application; +package edonymyeon.backend.member.setting.application; -import edonymyeon.backend.membber.auth.application.event.JoinMemberEvent; +import edonymyeon.backend.member.auth.application.event.JoinMemberEvent; import lombok.RequiredArgsConstructor; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; diff --git a/backend/src/main/java/edonymyeon/backend/membber/setting/application/SettingService.java b/backend/src/main/java/edonymyeon/backend/member/setting/application/SettingService.java similarity index 82% rename from backend/src/main/java/edonymyeon/backend/membber/setting/application/SettingService.java rename to backend/src/main/java/edonymyeon/backend/member/setting/application/SettingService.java index 4a3457524..6207c6cd0 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/setting/application/SettingService.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/application/SettingService.java @@ -1,16 +1,16 @@ -package edonymyeon.backend.membber.setting.application; +package edonymyeon.backend.member.setting.application; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.membber.member.application.dto.MemberId; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.repository.MemberRepository; -import edonymyeon.backend.membber.setting.application.activationmanager.ActivationManager; -import edonymyeon.backend.membber.setting.application.deactivationmanager.DeactivationManager; -import edonymyeon.backend.membber.setting.application.dto.SettingsResponse; -import edonymyeon.backend.membber.setting.repository.SettingRepository; -import edonymyeon.backend.membber.setting.domain.Setting; -import edonymyeon.backend.membber.setting.domain.SettingType; +import edonymyeon.backend.member.profile.application.dto.MemberId; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.repository.MemberRepository; +import edonymyeon.backend.member.setting.application.activationmanager.ActivationManager; +import edonymyeon.backend.member.setting.application.deactivationmanager.DeactivationManager; +import edonymyeon.backend.member.setting.application.dto.SettingsResponse; +import edonymyeon.backend.member.setting.repository.SettingRepository; +import edonymyeon.backend.member.setting.domain.Setting; +import edonymyeon.backend.member.setting.domain.SettingType; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/edonymyeon/backend/membber/setting/application/activationmanager/ActivatingPrimaryManager.java b/backend/src/main/java/edonymyeon/backend/member/setting/application/activationmanager/ActivatingPrimaryManager.java similarity index 84% rename from backend/src/main/java/edonymyeon/backend/membber/setting/application/activationmanager/ActivatingPrimaryManager.java rename to backend/src/main/java/edonymyeon/backend/member/setting/application/activationmanager/ActivatingPrimaryManager.java index a092e5f22..8957af165 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/setting/application/activationmanager/ActivatingPrimaryManager.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/application/activationmanager/ActivatingPrimaryManager.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.membber.setting.application.activationmanager; +package edonymyeon.backend.member.setting.application.activationmanager; -import edonymyeon.backend.membber.setting.domain.Setting; +import edonymyeon.backend.member.setting.domain.Setting; import java.util.List; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/edonymyeon/backend/membber/setting/application/activationmanager/ActivationManager.java b/backend/src/main/java/edonymyeon/backend/member/setting/application/activationmanager/ActivationManager.java similarity index 80% rename from backend/src/main/java/edonymyeon/backend/membber/setting/application/activationmanager/ActivationManager.java rename to backend/src/main/java/edonymyeon/backend/member/setting/application/activationmanager/ActivationManager.java index 7838410cd..b6a780433 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/setting/application/activationmanager/ActivationManager.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/application/activationmanager/ActivationManager.java @@ -1,8 +1,8 @@ -package edonymyeon.backend.membber.setting.application.activationmanager; +package edonymyeon.backend.member.setting.application.activationmanager; import edonymyeon.backend.global.exception.BusinessLogicException; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.membber.setting.domain.Setting; +import edonymyeon.backend.member.setting.domain.Setting; import java.util.List; public abstract class ActivationManager { diff --git a/backend/src/main/java/edonymyeon/backend/membber/setting/application/activationmanager/DeactivatingSameWeightsManager.java b/backend/src/main/java/edonymyeon/backend/member/setting/application/activationmanager/DeactivatingSameWeightsManager.java similarity index 84% rename from backend/src/main/java/edonymyeon/backend/membber/setting/application/activationmanager/DeactivatingSameWeightsManager.java rename to backend/src/main/java/edonymyeon/backend/member/setting/application/activationmanager/DeactivatingSameWeightsManager.java index a21683c4e..377aa2767 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/setting/application/activationmanager/DeactivatingSameWeightsManager.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/application/activationmanager/DeactivatingSameWeightsManager.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.membber.setting.application.activationmanager; +package edonymyeon.backend.member.setting.application.activationmanager; -import edonymyeon.backend.membber.setting.domain.Setting; +import edonymyeon.backend.member.setting.domain.Setting; import java.util.List; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/edonymyeon/backend/membber/setting/application/deactivationmanager/DeactivatingLowerWeightManager.java b/backend/src/main/java/edonymyeon/backend/member/setting/application/deactivationmanager/DeactivatingLowerWeightManager.java similarity index 84% rename from backend/src/main/java/edonymyeon/backend/membber/setting/application/deactivationmanager/DeactivatingLowerWeightManager.java rename to backend/src/main/java/edonymyeon/backend/member/setting/application/deactivationmanager/DeactivatingLowerWeightManager.java index 9add2dc31..1e463c6fe 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/setting/application/deactivationmanager/DeactivatingLowerWeightManager.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/application/deactivationmanager/DeactivatingLowerWeightManager.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.membber.setting.application.deactivationmanager; +package edonymyeon.backend.member.setting.application.deactivationmanager; -import edonymyeon.backend.membber.setting.domain.Setting; +import edonymyeon.backend.member.setting.domain.Setting; import java.util.List; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/edonymyeon/backend/membber/setting/application/deactivationmanager/DeactivatingPrimaryManager.java b/backend/src/main/java/edonymyeon/backend/member/setting/application/deactivationmanager/DeactivatingPrimaryManager.java similarity index 82% rename from backend/src/main/java/edonymyeon/backend/membber/setting/application/deactivationmanager/DeactivatingPrimaryManager.java rename to backend/src/main/java/edonymyeon/backend/member/setting/application/deactivationmanager/DeactivatingPrimaryManager.java index e9b6b7e4b..26b2d72c3 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/setting/application/deactivationmanager/DeactivatingPrimaryManager.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/application/deactivationmanager/DeactivatingPrimaryManager.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.membber.setting.application.deactivationmanager; +package edonymyeon.backend.member.setting.application.deactivationmanager; -import edonymyeon.backend.membber.setting.domain.Setting; +import edonymyeon.backend.member.setting.domain.Setting; import java.util.List; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/edonymyeon/backend/membber/setting/application/deactivationmanager/DeactivationManager.java b/backend/src/main/java/edonymyeon/backend/member/setting/application/deactivationmanager/DeactivationManager.java similarity index 80% rename from backend/src/main/java/edonymyeon/backend/membber/setting/application/deactivationmanager/DeactivationManager.java rename to backend/src/main/java/edonymyeon/backend/member/setting/application/deactivationmanager/DeactivationManager.java index 138d1277d..eaddc2ca1 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/setting/application/deactivationmanager/DeactivationManager.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/application/deactivationmanager/DeactivationManager.java @@ -1,8 +1,8 @@ -package edonymyeon.backend.membber.setting.application.deactivationmanager; +package edonymyeon.backend.member.setting.application.deactivationmanager; import edonymyeon.backend.global.exception.BusinessLogicException; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.membber.setting.domain.Setting; +import edonymyeon.backend.member.setting.domain.Setting; import java.util.List; public abstract class DeactivationManager { diff --git a/backend/src/main/java/edonymyeon/backend/member/setting/application/dto/SettingRequest.java b/backend/src/main/java/edonymyeon/backend/member/setting/application/dto/SettingRequest.java new file mode 100644 index 000000000..56dfa1587 --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/member/setting/application/dto/SettingRequest.java @@ -0,0 +1,5 @@ +package edonymyeon.backend.member.setting.application.dto; + +public record SettingRequest(String preferenceType) { + +} diff --git a/backend/src/main/java/edonymyeon/backend/membber/setting/application/dto/SettingResponse.java b/backend/src/main/java/edonymyeon/backend/member/setting/application/dto/SettingResponse.java similarity index 65% rename from backend/src/main/java/edonymyeon/backend/membber/setting/application/dto/SettingResponse.java rename to backend/src/main/java/edonymyeon/backend/member/setting/application/dto/SettingResponse.java index 9b378214f..6673694af 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/setting/application/dto/SettingResponse.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/application/dto/SettingResponse.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.membber.setting.application.dto; +package edonymyeon.backend.member.setting.application.dto; -import edonymyeon.backend.membber.setting.domain.Setting; +import edonymyeon.backend.member.setting.domain.Setting; public record SettingResponse(String preferenceType, boolean enabled) { public static SettingResponse from(final Setting setting) { diff --git a/backend/src/main/java/edonymyeon/backend/membber/setting/application/dto/SettingsResponse.java b/backend/src/main/java/edonymyeon/backend/member/setting/application/dto/SettingsResponse.java similarity index 71% rename from backend/src/main/java/edonymyeon/backend/membber/setting/application/dto/SettingsResponse.java rename to backend/src/main/java/edonymyeon/backend/member/setting/application/dto/SettingsResponse.java index d7becb0f8..494d74f8e 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/setting/application/dto/SettingsResponse.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/application/dto/SettingsResponse.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.membber.setting.application.dto; +package edonymyeon.backend.member.setting.application.dto; -import edonymyeon.backend.membber.setting.domain.Setting; +import edonymyeon.backend.member.setting.domain.Setting; import java.util.List; public record SettingsResponse(List notifications) { diff --git a/backend/src/main/java/edonymyeon/backend/membber/setting/domain/Category.java b/backend/src/main/java/edonymyeon/backend/member/setting/domain/Category.java similarity index 54% rename from backend/src/main/java/edonymyeon/backend/membber/setting/domain/Category.java rename to backend/src/main/java/edonymyeon/backend/member/setting/domain/Category.java index c34da5531..de6791f1d 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/setting/domain/Category.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/domain/Category.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.setting.domain; +package edonymyeon.backend.member.setting.domain; public enum Category { ALL, THUMB, COMMENT, REMINDING diff --git a/backend/src/main/java/edonymyeon/backend/membber/setting/domain/Setting.java b/backend/src/main/java/edonymyeon/backend/member/setting/domain/Setting.java similarity index 95% rename from backend/src/main/java/edonymyeon/backend/membber/setting/domain/Setting.java rename to backend/src/main/java/edonymyeon/backend/member/setting/domain/Setting.java index 00253ea5b..4d3fd24f6 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/setting/domain/Setting.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/domain/Setting.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.membber.setting.domain; +package edonymyeon.backend.member.setting.domain; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Member; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; diff --git a/backend/src/main/java/edonymyeon/backend/membber/setting/domain/SettingType.java b/backend/src/main/java/edonymyeon/backend/member/setting/domain/SettingType.java similarity index 97% rename from backend/src/main/java/edonymyeon/backend/membber/setting/domain/SettingType.java rename to backend/src/main/java/edonymyeon/backend/member/setting/domain/SettingType.java index 49ca59c91..0c30b9a8d 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/setting/domain/SettingType.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/domain/SettingType.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.setting.domain; +package edonymyeon.backend.member.setting.domain; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.global.exception.ExceptionInformation; diff --git a/backend/src/main/java/edonymyeon/backend/membber/setting/domain/SettingTypeCategory.java b/backend/src/main/java/edonymyeon/backend/member/setting/domain/SettingTypeCategory.java similarity index 58% rename from backend/src/main/java/edonymyeon/backend/membber/setting/domain/SettingTypeCategory.java rename to backend/src/main/java/edonymyeon/backend/member/setting/domain/SettingTypeCategory.java index 132ec1094..06a41012f 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/setting/domain/SettingTypeCategory.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/domain/SettingTypeCategory.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.setting.domain; +package edonymyeon.backend.member.setting.domain; public enum SettingTypeCategory { ALL, THUMB, COMMENT, REMINDING diff --git a/backend/src/main/java/edonymyeon/backend/membber/setting/domain/Weight.java b/backend/src/main/java/edonymyeon/backend/member/setting/domain/Weight.java similarity index 85% rename from backend/src/main/java/edonymyeon/backend/membber/setting/domain/Weight.java rename to backend/src/main/java/edonymyeon/backend/member/setting/domain/Weight.java index 2f70de01d..17571c00d 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/setting/domain/Weight.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/domain/Weight.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.membber.setting.domain; +package edonymyeon.backend.member.setting.domain; public enum Weight { diff --git a/backend/src/main/java/edonymyeon/backend/membber/setting/repository/SettingCustomRepository.java b/backend/src/main/java/edonymyeon/backend/member/setting/repository/SettingCustomRepository.java similarity index 50% rename from backend/src/main/java/edonymyeon/backend/membber/setting/repository/SettingCustomRepository.java rename to backend/src/main/java/edonymyeon/backend/member/setting/repository/SettingCustomRepository.java index 90a0729c6..0c0880852 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/setting/repository/SettingCustomRepository.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/repository/SettingCustomRepository.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.membber.setting.repository; +package edonymyeon.backend.member.setting.repository; -import edonymyeon.backend.membber.setting.domain.Setting; +import edonymyeon.backend.member.setting.domain.Setting; import java.util.List; public interface SettingCustomRepository { diff --git a/backend/src/main/java/edonymyeon/backend/membber/setting/repository/SettingRepository.java b/backend/src/main/java/edonymyeon/backend/member/setting/repository/SettingRepository.java similarity index 68% rename from backend/src/main/java/edonymyeon/backend/membber/setting/repository/SettingRepository.java rename to backend/src/main/java/edonymyeon/backend/member/setting/repository/SettingRepository.java index 194f4b2b1..ee94cc80f 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/setting/repository/SettingRepository.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/repository/SettingRepository.java @@ -1,7 +1,7 @@ -package edonymyeon.backend.membber.setting.repository; +package edonymyeon.backend.member.setting.repository; -import edonymyeon.backend.membber.setting.domain.Setting; -import edonymyeon.backend.membber.setting.domain.SettingType; +import edonymyeon.backend.member.setting.domain.Setting; +import edonymyeon.backend.member.setting.domain.SettingType; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/backend/src/main/java/edonymyeon/backend/membber/setting/repository/SettingRepositoryImpl.java b/backend/src/main/java/edonymyeon/backend/member/setting/repository/SettingRepositoryImpl.java similarity index 92% rename from backend/src/main/java/edonymyeon/backend/membber/setting/repository/SettingRepositoryImpl.java rename to backend/src/main/java/edonymyeon/backend/member/setting/repository/SettingRepositoryImpl.java index d3c7d20aa..aa6beac2e 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/setting/repository/SettingRepositoryImpl.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/repository/SettingRepositoryImpl.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.membber.setting.repository; +package edonymyeon.backend.member.setting.repository; -import edonymyeon.backend.membber.setting.domain.Setting; +import edonymyeon.backend.member.setting.domain.Setting; import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.List; diff --git a/backend/src/main/java/edonymyeon/backend/membber/setting/ui/SettingController.java b/backend/src/main/java/edonymyeon/backend/member/setting/ui/SettingController.java similarity index 76% rename from backend/src/main/java/edonymyeon/backend/membber/setting/ui/SettingController.java rename to backend/src/main/java/edonymyeon/backend/member/setting/ui/SettingController.java index b51372d3a..e12c1c381 100644 --- a/backend/src/main/java/edonymyeon/backend/membber/setting/ui/SettingController.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/ui/SettingController.java @@ -1,11 +1,11 @@ -package edonymyeon.backend.membber.setting.ui; +package edonymyeon.backend.member.setting.ui; -import edonymyeon.backend.membber.auth.annotation.AuthPrincipal; +import edonymyeon.backend.member.auth.annotation.AuthPrincipal; import edonymyeon.backend.global.version.ApiVersion; -import edonymyeon.backend.membber.member.application.dto.MemberId; -import edonymyeon.backend.membber.setting.application.SettingService; -import edonymyeon.backend.membber.setting.application.dto.SettingRequest; -import edonymyeon.backend.membber.setting.application.dto.SettingsResponse; +import edonymyeon.backend.member.profile.application.dto.MemberId; +import edonymyeon.backend.member.setting.application.SettingService; +import edonymyeon.backend.member.setting.application.dto.SettingRequest; +import edonymyeon.backend.member.setting.application.dto.SettingsResponse; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/backend/src/main/java/edonymyeon/backend/notification/application/NotificationService.java b/backend/src/main/java/edonymyeon/backend/notification/application/NotificationService.java index 1ea8dd921..bdca0adaa 100644 --- a/backend/src/main/java/edonymyeon/backend/notification/application/NotificationService.java +++ b/backend/src/main/java/edonymyeon/backend/notification/application/NotificationService.java @@ -3,10 +3,10 @@ import edonymyeon.backend.content.comment.domain.Comment; import edonymyeon.backend.consumption.application.ConsumptionService; import edonymyeon.backend.global.exception.BusinessLogicException; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.application.dto.MemberId; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.application.dto.MemberId; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.repository.MemberRepository; import edonymyeon.backend.notification.application.dto.Data; import edonymyeon.backend.notification.application.dto.NotificationResponse; import edonymyeon.backend.notification.application.dto.Receiver; @@ -17,8 +17,8 @@ import edonymyeon.backend.content.post.application.GeneralFindingCondition; import edonymyeon.backend.content.post.application.PostSlice; import edonymyeon.backend.content.post.domain.Post; -import edonymyeon.backend.membber.setting.application.SettingService; -import edonymyeon.backend.membber.setting.domain.SettingType; +import edonymyeon.backend.member.setting.application.SettingService; +import edonymyeon.backend.member.setting.domain.SettingType; import edonymyeon.backend.content.thumbs.application.ThumbsService; import jakarta.persistence.EntityManager; import lombok.RequiredArgsConstructor; diff --git a/backend/src/main/java/edonymyeon/backend/notification/application/dto/Receiver.java b/backend/src/main/java/edonymyeon/backend/notification/application/dto/Receiver.java index e8941fe59..025387416 100644 --- a/backend/src/main/java/edonymyeon/backend/notification/application/dto/Receiver.java +++ b/backend/src/main/java/edonymyeon/backend/notification/application/dto/Receiver.java @@ -1,6 +1,6 @@ package edonymyeon.backend.notification.application.dto; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Member; import lombok.Getter; @Getter diff --git a/backend/src/main/java/edonymyeon/backend/notification/domain/Notification.java b/backend/src/main/java/edonymyeon/backend/notification/domain/Notification.java index 7874d69a5..4a0624ef7 100644 --- a/backend/src/main/java/edonymyeon/backend/notification/domain/Notification.java +++ b/backend/src/main/java/edonymyeon/backend/notification/domain/Notification.java @@ -1,7 +1,7 @@ package edonymyeon.backend.notification.domain; import edonymyeon.backend.global.domain.TemporalRecord; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Member; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; diff --git a/backend/src/main/java/edonymyeon/backend/notification/ui/NotificationController.java b/backend/src/main/java/edonymyeon/backend/notification/ui/NotificationController.java index 6c97337ee..4e7c87407 100644 --- a/backend/src/main/java/edonymyeon/backend/notification/ui/NotificationController.java +++ b/backend/src/main/java/edonymyeon/backend/notification/ui/NotificationController.java @@ -1,8 +1,8 @@ package edonymyeon.backend.notification.ui; -import edonymyeon.backend.membber.auth.annotation.AuthPrincipal; +import edonymyeon.backend.member.auth.annotation.AuthPrincipal; import edonymyeon.backend.global.version.ApiVersion; -import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.member.profile.application.dto.MemberId; import edonymyeon.backend.notification.application.NotificationService; import edonymyeon.backend.notification.application.dto.NotificationResponse; import edonymyeon.backend.content.post.application.GeneralFindingCondition; diff --git a/backend/src/main/java/edonymyeon/backend/report/application/ReportService.java b/backend/src/main/java/edonymyeon/backend/report/application/ReportService.java index 924e5f24f..7c5ca0ebc 100644 --- a/backend/src/main/java/edonymyeon/backend/report/application/ReportService.java +++ b/backend/src/main/java/edonymyeon/backend/report/application/ReportService.java @@ -4,9 +4,9 @@ import edonymyeon.backend.content.comment.repository.CommentRepository; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.membber.member.application.dto.MemberId; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.member.profile.application.dto.MemberId; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.repository.MemberRepository; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.content.post.repository.PostRepository; import edonymyeon.backend.report.domain.AbusingType; diff --git a/backend/src/main/java/edonymyeon/backend/report/domain/Report.java b/backend/src/main/java/edonymyeon/backend/report/domain/Report.java index 0b9573ed6..665356abe 100644 --- a/backend/src/main/java/edonymyeon/backend/report/domain/Report.java +++ b/backend/src/main/java/edonymyeon/backend/report/domain/Report.java @@ -1,7 +1,7 @@ package edonymyeon.backend.report.domain; import edonymyeon.backend.global.domain.TemporalRecord; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Member; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.EqualsAndHashCode; diff --git a/backend/src/main/java/edonymyeon/backend/report/ui/ReportController.java b/backend/src/main/java/edonymyeon/backend/report/ui/ReportController.java index b97bec2df..eef5d14a2 100644 --- a/backend/src/main/java/edonymyeon/backend/report/ui/ReportController.java +++ b/backend/src/main/java/edonymyeon/backend/report/ui/ReportController.java @@ -1,8 +1,8 @@ package edonymyeon.backend.report.ui; -import edonymyeon.backend.membber.auth.annotation.AuthPrincipal; +import edonymyeon.backend.member.auth.annotation.AuthPrincipal; import edonymyeon.backend.global.version.ApiVersion; -import edonymyeon.backend.membber.member.application.dto.MemberId; +import edonymyeon.backend.member.profile.application.dto.MemberId; import edonymyeon.backend.report.application.ReportRequest; import edonymyeon.backend.report.application.ReportService; import java.net.URI; diff --git a/backend/src/test/java/edonymyeon/backend/CacheConfig.java b/backend/src/test/java/edonymyeon/backend/CacheConfig.java index 5e685b351..a7ab2c262 100644 --- a/backend/src/test/java/edonymyeon/backend/CacheConfig.java +++ b/backend/src/test/java/edonymyeon/backend/CacheConfig.java @@ -1,7 +1,7 @@ package edonymyeon.backend; import edonymyeon.backend.content.cache.util.HotPostCachePolicy; -import edonymyeon.backend.post.application.TestCacheKeyStrategy; +import edonymyeon.backend.content.post.application.TestCacheKeyStrategy; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.context.annotation.Bean; diff --git a/backend/src/test/java/edonymyeon/backend/TestConfig.java b/backend/src/test/java/edonymyeon/backend/TestConfig.java index 1c90c31f7..72eeb6b22 100644 --- a/backend/src/test/java/edonymyeon/backend/TestConfig.java +++ b/backend/src/test/java/edonymyeon/backend/TestConfig.java @@ -1,7 +1,7 @@ package edonymyeon.backend; import edonymyeon.backend.image.domain.ImageFileNameStrategy; -import edonymyeon.backend.post.application.ImageFileNameMockStrategy; +import edonymyeon.backend.content.post.application.ImageFileNameMockStrategy; import lombok.RequiredArgsConstructor; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.context.annotation.Bean; diff --git a/backend/src/test/java/edonymyeon/backend/consumption/application/MemberConsumptionServiceImplTest.java b/backend/src/test/java/edonymyeon/backend/consumption/application/MemberConsumptionServiceImplTest.java index f8667923c..b4a16c202 100644 --- a/backend/src/test/java/edonymyeon/backend/consumption/application/MemberConsumptionServiceImplTest.java +++ b/backend/src/test/java/edonymyeon/backend/consumption/application/MemberConsumptionServiceImplTest.java @@ -3,9 +3,9 @@ import edonymyeon.backend.consumption.domain.Consumption; import edonymyeon.backend.consumption.domain.ConsumptionType; import edonymyeon.backend.consumption.repository.ConsumptionRepository; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.application.dto.YearMonthDto; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.application.dto.YearMonthDto; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.IntegrationTest; import edonymyeon.backend.support.PostTestSupport; diff --git a/backend/src/test/java/edonymyeon/backend/consumption/docs/ConsumptionControllerDocsTest.java b/backend/src/test/java/edonymyeon/backend/consumption/docs/ConsumptionControllerDocsTest.java index 8af7e552d..66994c173 100644 --- a/backend/src/test/java/edonymyeon/backend/consumption/docs/ConsumptionControllerDocsTest.java +++ b/backend/src/test/java/edonymyeon/backend/consumption/docs/ConsumptionControllerDocsTest.java @@ -1,6 +1,6 @@ package edonymyeon.backend.consumption.docs; -import static edonymyeon.backend.membber.auth.ui.SessionConst.USER; +import static edonymyeon.backend.member.auth.ui.SessionConst.USER; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document; @@ -17,9 +17,9 @@ import edonymyeon.backend.consumption.application.ConsumptionService; import edonymyeon.backend.consumption.application.dto.ConsumptionPriceResponse; import edonymyeon.backend.consumption.application.dto.RecentConsumptionsResponse; -import edonymyeon.backend.membber.member.domain.Email; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.member.profile.domain.Email; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.repository.MemberRepository; import edonymyeon.backend.support.DocsTest; import edonymyeon.backend.support.TestMemberBuilder; import java.util.List; diff --git a/backend/src/test/java/edonymyeon/backend/consumption/domain/ConsumptionsPerMonthTest.java b/backend/src/test/java/edonymyeon/backend/consumption/domain/ConsumptionsPerMonthTest.java index b9f2c7bef..e1aee7efc 100644 --- a/backend/src/test/java/edonymyeon/backend/consumption/domain/ConsumptionsPerMonthTest.java +++ b/backend/src/test/java/edonymyeon/backend/consumption/domain/ConsumptionsPerMonthTest.java @@ -1,6 +1,6 @@ package edonymyeon.backend.consumption.domain; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.TestMemberBuilder; import org.assertj.core.api.SoftAssertions; diff --git a/backend/src/test/java/edonymyeon/backend/consumption/integration/ConsumptionIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/consumption/integration/ConsumptionIntegrationTest.java index 841b65e0b..b75a15e7e 100644 --- a/backend/src/test/java/edonymyeon/backend/consumption/integration/ConsumptionIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/consumption/integration/ConsumptionIntegrationTest.java @@ -6,7 +6,7 @@ import edonymyeon.backend.consumption.domain.ConsumptionType; import edonymyeon.backend.global.controlleradvice.dto.ExceptionResponse; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.ConsumptionTestSupport; import edonymyeon.backend.support.IntegrationFixture; diff --git a/backend/src/test/java/edonymyeon/backend/consumption/repository/ConsumptionRepositoryTest.java b/backend/src/test/java/edonymyeon/backend/consumption/repository/ConsumptionRepositoryTest.java index 8d5207e84..7121dea78 100644 --- a/backend/src/test/java/edonymyeon/backend/consumption/repository/ConsumptionRepositoryTest.java +++ b/backend/src/test/java/edonymyeon/backend/consumption/repository/ConsumptionRepositoryTest.java @@ -6,7 +6,7 @@ import edonymyeon.backend.support.IntegrationTest; import edonymyeon.backend.consumption.domain.Consumption; import edonymyeon.backend.consumption.domain.ConsumptionType; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.ConsumptionTestSupport; import edonymyeon.backend.support.PostTestSupport; diff --git a/backend/src/test/java/edonymyeon/backend/comment/application/CommentServiceTest.java b/backend/src/test/java/edonymyeon/backend/content/comment/application/CommentServiceTest.java similarity index 84% rename from backend/src/test/java/edonymyeon/backend/comment/application/CommentServiceTest.java rename to backend/src/test/java/edonymyeon/backend/content/comment/application/CommentServiceTest.java index 12f0a642c..b5b57519a 100644 --- a/backend/src/test/java/edonymyeon/backend/comment/application/CommentServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/comment/application/CommentServiceTest.java @@ -1,12 +1,11 @@ -package edonymyeon.backend.comment.application; +package edonymyeon.backend.content.comment.application; import static org.assertj.core.api.Assertions.assertThat; -import edonymyeon.backend.content.comment.application.CommentService; import edonymyeon.backend.content.comment.domain.Comment; import edonymyeon.backend.content.comment.repository.CommentRepository; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.IntegrationFixture; import java.util.Optional; diff --git a/backend/src/test/java/edonymyeon/backend/comment/docs/CommentControllerDocsTest.java b/backend/src/test/java/edonymyeon/backend/content/comment/docs/CommentControllerDocsTest.java similarity index 98% rename from backend/src/test/java/edonymyeon/backend/comment/docs/CommentControllerDocsTest.java rename to backend/src/test/java/edonymyeon/backend/content/comment/docs/CommentControllerDocsTest.java index 938ba404a..fdf7e09dc 100644 --- a/backend/src/test/java/edonymyeon/backend/comment/docs/CommentControllerDocsTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/comment/docs/CommentControllerDocsTest.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.comment.docs; +package edonymyeon.backend.content.comment.docs; -import static edonymyeon.backend.membber.auth.ui.SessionConst.USER; +import static edonymyeon.backend.member.auth.ui.SessionConst.USER; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.doNothing; @@ -25,7 +25,7 @@ import edonymyeon.backend.content.comment.application.dto.response.CommentDto; import edonymyeon.backend.content.comment.application.dto.response.CommentsResponse; import edonymyeon.backend.content.comment.application.dto.response.WriterDto; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.support.IntegrationTest; import edonymyeon.backend.support.TestMemberBuilder; import jakarta.servlet.http.Part; diff --git a/backend/src/test/java/edonymyeon/backend/comment/integration/CommentIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/content/comment/integration/CommentIntegrationTest.java similarity index 99% rename from backend/src/test/java/edonymyeon/backend/comment/integration/CommentIntegrationTest.java rename to backend/src/test/java/edonymyeon/backend/content/comment/integration/CommentIntegrationTest.java index a3a039982..5a6a9bb03 100644 --- a/backend/src/test/java/edonymyeon/backend/comment/integration/CommentIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/comment/integration/CommentIntegrationTest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.comment.integration; +package edonymyeon.backend.content.comment.integration; import static edonymyeon.backend.global.exception.ExceptionInformation.COMMENT_ID_NOT_FOUND; import static edonymyeon.backend.global.exception.ExceptionInformation.COMMENT_MEMBER_NOT_SAME; @@ -8,8 +8,8 @@ import edonymyeon.backend.TestConfig; import edonymyeon.backend.image.domain.ImageType; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.post.ImageFileCleaner; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.content.post.ImageFileCleaner; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.IntegrationFixture; import io.restassured.response.ExtractableResponse; diff --git a/backend/src/test/java/edonymyeon/backend/post/ImageFileCleaner.java b/backend/src/test/java/edonymyeon/backend/content/post/ImageFileCleaner.java similarity index 96% rename from backend/src/test/java/edonymyeon/backend/post/ImageFileCleaner.java rename to backend/src/test/java/edonymyeon/backend/content/post/ImageFileCleaner.java index 3685dcce2..8a2bd4524 100644 --- a/backend/src/test/java/edonymyeon/backend/post/ImageFileCleaner.java +++ b/backend/src/test/java/edonymyeon/backend/content/post/ImageFileCleaner.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.post; +package edonymyeon.backend.content.post; import java.io.File; import java.io.FilenameFilter; diff --git a/backend/src/test/java/edonymyeon/backend/post/application/ImageFileNameMockStrategy.java b/backend/src/test/java/edonymyeon/backend/content/post/application/ImageFileNameMockStrategy.java similarity index 92% rename from backend/src/test/java/edonymyeon/backend/post/application/ImageFileNameMockStrategy.java rename to backend/src/test/java/edonymyeon/backend/content/post/application/ImageFileNameMockStrategy.java index fdc71ebb4..b8c7d950a 100644 --- a/backend/src/test/java/edonymyeon/backend/post/application/ImageFileNameMockStrategy.java +++ b/backend/src/test/java/edonymyeon/backend/content/post/application/ImageFileNameMockStrategy.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.post.application; +package edonymyeon.backend.content.post.application; import edonymyeon.backend.image.domain.ImageFileNameStrategy; diff --git a/backend/src/test/java/edonymyeon/backend/post/application/MyPostServiceTest.java b/backend/src/test/java/edonymyeon/backend/content/post/application/MyPostServiceTest.java similarity index 93% rename from backend/src/test/java/edonymyeon/backend/post/application/MyPostServiceTest.java rename to backend/src/test/java/edonymyeon/backend/content/post/application/MyPostServiceTest.java index 66adfc322..3812c4529 100644 --- a/backend/src/test/java/edonymyeon/backend/post/application/MyPostServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/post/application/MyPostServiceTest.java @@ -1,13 +1,10 @@ -package edonymyeon.backend.post.application; +package edonymyeon.backend.content.post.application; import edonymyeon.backend.consumption.domain.Consumption; -import edonymyeon.backend.content.post.application.GeneralFindingCondition; -import edonymyeon.backend.content.post.application.MyPostService; -import edonymyeon.backend.content.post.application.PostConsumptionService; import edonymyeon.backend.image.application.ImageService; import edonymyeon.backend.image.domain.ImageType; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.content.post.application.dto.response.MyPostResponse; import edonymyeon.backend.content.post.application.dto.response.PostConsumptionResponse; import edonymyeon.backend.content.post.domain.Post; diff --git a/backend/src/test/java/edonymyeon/backend/post/application/PostFindingSpecificPostTest.java b/backend/src/test/java/edonymyeon/backend/content/post/application/PostFindingSpecificPostTest.java similarity index 89% rename from backend/src/test/java/edonymyeon/backend/post/application/PostFindingSpecificPostTest.java rename to backend/src/test/java/edonymyeon/backend/content/post/application/PostFindingSpecificPostTest.java index 31d620b67..80e910880 100644 --- a/backend/src/test/java/edonymyeon/backend/post/application/PostFindingSpecificPostTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/post/application/PostFindingSpecificPostTest.java @@ -1,20 +1,19 @@ -package edonymyeon.backend.post.application; +package edonymyeon.backend.content.post.application; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; -import edonymyeon.backend.content.post.application.PostReadService; import edonymyeon.backend.image.domain.ImageInfo; import edonymyeon.backend.support.TestMemberBuilder; import edonymyeon.backend.support.IntegrationTest; import edonymyeon.backend.TestConfig; -import edonymyeon.backend.membber.member.profileimage.domain.ProfileImageInfo; -import edonymyeon.backend.membber.member.profileimage.repository.ProfileImageInfoRepository; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.application.dto.AnonymousMemberId; -import edonymyeon.backend.membber.member.application.dto.MemberId; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.member.profile.profileimage.domain.ProfileImageInfo; +import edonymyeon.backend.member.profile.profileimage.repository.ProfileImageInfoRepository; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.application.dto.AnonymousMemberId; +import edonymyeon.backend.member.profile.application.dto.MemberId; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.repository.MemberRepository; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.content.post.repository.PostRepository; import lombok.RequiredArgsConstructor; diff --git a/backend/src/test/java/edonymyeon/backend/post/application/PostServiceFindingAllPostsTest.java b/backend/src/test/java/edonymyeon/backend/content/post/application/PostServiceFindingAllPostsTest.java similarity index 96% rename from backend/src/test/java/edonymyeon/backend/post/application/PostServiceFindingAllPostsTest.java rename to backend/src/test/java/edonymyeon/backend/content/post/application/PostServiceFindingAllPostsTest.java index cc50569f6..b1f136e3f 100644 --- a/backend/src/test/java/edonymyeon/backend/post/application/PostServiceFindingAllPostsTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/post/application/PostServiceFindingAllPostsTest.java @@ -1,16 +1,13 @@ -package edonymyeon.backend.post.application; +package edonymyeon.backend.content.post.application; -import edonymyeon.backend.content.post.application.GeneralFindingCondition; -import edonymyeon.backend.content.post.application.PostReadService; -import edonymyeon.backend.content.post.application.PostService; +import edonymyeon.backend.content.post.ImageFileCleaner; import edonymyeon.backend.support.IntegrationFixture; import edonymyeon.backend.TestConfig; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.global.exception.ExceptionInformation; import edonymyeon.backend.content.post.postimage.repository.PostImageInfoRepository; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.application.dto.MemberId; -import edonymyeon.backend.post.ImageFileCleaner; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.application.dto.MemberId; import edonymyeon.backend.content.post.application.dto.response.GeneralPostInfoResponse; import edonymyeon.backend.content.post.application.dto.request.PostRequest; import edonymyeon.backend.content.post.application.dto.response.PostIdResponse; diff --git a/backend/src/test/java/edonymyeon/backend/post/application/PostServiceHotPostsTest.java b/backend/src/test/java/edonymyeon/backend/content/post/application/PostServiceHotPostsTest.java similarity index 99% rename from backend/src/test/java/edonymyeon/backend/post/application/PostServiceHotPostsTest.java rename to backend/src/test/java/edonymyeon/backend/content/post/application/PostServiceHotPostsTest.java index 1cb1f7b98..afddb308a 100644 --- a/backend/src/test/java/edonymyeon/backend/post/application/PostServiceHotPostsTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/post/application/PostServiceHotPostsTest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.post.application; +package edonymyeon.backend.content.post.application; import edonymyeon.backend.CacheConfig; import edonymyeon.backend.content.cache.application.PostCachingService; diff --git a/backend/src/test/java/edonymyeon/backend/post/application/PostServiceSearchPostsTest.java b/backend/src/test/java/edonymyeon/backend/content/post/application/PostServiceSearchPostsTest.java similarity index 94% rename from backend/src/test/java/edonymyeon/backend/post/application/PostServiceSearchPostsTest.java rename to backend/src/test/java/edonymyeon/backend/content/post/application/PostServiceSearchPostsTest.java index d285646df..5c238c95a 100644 --- a/backend/src/test/java/edonymyeon/backend/post/application/PostServiceSearchPostsTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/post/application/PostServiceSearchPostsTest.java @@ -1,11 +1,9 @@ -package edonymyeon.backend.post.application; +package edonymyeon.backend.content.post.application; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.assertj.core.api.SoftAssertions.assertSoftly; -import edonymyeon.backend.content.post.application.GeneralFindingCondition; -import edonymyeon.backend.content.post.application.PostReadService; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.support.TestMemberBuilder; import edonymyeon.backend.support.IntegrationTest; import edonymyeon.backend.support.PostTestSupport; diff --git a/backend/src/test/java/edonymyeon/backend/post/application/PostServiceTest.java b/backend/src/test/java/edonymyeon/backend/content/post/application/PostServiceTest.java similarity index 97% rename from backend/src/test/java/edonymyeon/backend/post/application/PostServiceTest.java rename to backend/src/test/java/edonymyeon/backend/content/post/application/PostServiceTest.java index f29113d1d..f01566084 100644 --- a/backend/src/test/java/edonymyeon/backend/post/application/PostServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/post/application/PostServiceTest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.post.application; +package edonymyeon.backend.content.post.application; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -10,17 +10,15 @@ import edonymyeon.backend.content.comment.application.dto.request.CommentRequest; import edonymyeon.backend.content.comment.repository.CommentRepository; import edonymyeon.backend.consumption.repository.ConsumptionRepository; -import edonymyeon.backend.content.post.application.PostReadService; -import edonymyeon.backend.content.post.application.PostService; +import edonymyeon.backend.content.post.ImageFileCleaner; import edonymyeon.backend.global.exception.EdonymyeonException; import edonymyeon.backend.global.exception.ExceptionInformation; import edonymyeon.backend.content.post.postimage.domain.PostImageInfo; import edonymyeon.backend.content.post.postimage.repository.PostImageInfoRepository; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.application.dto.MemberId; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.repository.MemberRepository; -import edonymyeon.backend.post.ImageFileCleaner; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.application.dto.MemberId; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.repository.MemberRepository; import edonymyeon.backend.content.post.application.dto.request.PostModificationRequest; import edonymyeon.backend.content.post.application.dto.request.PostRequest; import edonymyeon.backend.content.post.application.dto.response.PostIdResponse; diff --git a/backend/src/test/java/edonymyeon/backend/post/application/PostViewTest.java b/backend/src/test/java/edonymyeon/backend/content/post/application/PostViewTest.java similarity index 88% rename from backend/src/test/java/edonymyeon/backend/post/application/PostViewTest.java rename to backend/src/test/java/edonymyeon/backend/content/post/application/PostViewTest.java index dbade9231..e9c140350 100644 --- a/backend/src/test/java/edonymyeon/backend/post/application/PostViewTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/post/application/PostViewTest.java @@ -1,15 +1,14 @@ -package edonymyeon.backend.post.application; +package edonymyeon.backend.content.post.application; import static org.assertj.core.api.Assertions.assertThat; -import edonymyeon.backend.content.post.application.PostReadService; +import edonymyeon.backend.content.post.ImageFileCleaner; import edonymyeon.backend.support.TestMemberBuilder; import edonymyeon.backend.support.IntegrationTest; import edonymyeon.backend.TestConfig; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.application.dto.AnonymousMemberId; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.post.ImageFileCleaner; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.application.dto.AnonymousMemberId; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.content.post.repository.PostRepository; import edonymyeon.backend.support.PostTestSupport; diff --git a/backend/src/test/java/edonymyeon/backend/post/application/TestCacheKeyStrategy.java b/backend/src/test/java/edonymyeon/backend/content/post/application/TestCacheKeyStrategy.java similarity index 90% rename from backend/src/test/java/edonymyeon/backend/post/application/TestCacheKeyStrategy.java rename to backend/src/test/java/edonymyeon/backend/content/post/application/TestCacheKeyStrategy.java index deba5269f..de6f904ce 100644 --- a/backend/src/test/java/edonymyeon/backend/post/application/TestCacheKeyStrategy.java +++ b/backend/src/test/java/edonymyeon/backend/content/post/application/TestCacheKeyStrategy.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.post.application; +package edonymyeon.backend.content.post.application; import edonymyeon.backend.content.cache.util.CacheKeyStrategy; diff --git a/backend/src/test/java/edonymyeon/backend/post/docs/MyPostControllerDocsTest.java b/backend/src/test/java/edonymyeon/backend/content/post/docs/MyPostControllerDocsTest.java similarity index 96% rename from backend/src/test/java/edonymyeon/backend/post/docs/MyPostControllerDocsTest.java rename to backend/src/test/java/edonymyeon/backend/content/post/docs/MyPostControllerDocsTest.java index 8cd9ae817..253bb2f4d 100644 --- a/backend/src/test/java/edonymyeon/backend/post/docs/MyPostControllerDocsTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/post/docs/MyPostControllerDocsTest.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.post.docs; +package edonymyeon.backend.content.post.docs; -import static edonymyeon.backend.membber.auth.ui.SessionConst.USER; +import static edonymyeon.backend.member.auth.ui.SessionConst.USER; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document; @@ -18,9 +18,9 @@ import edonymyeon.backend.image.domain.ImageType; import edonymyeon.backend.image.domain.UrlManager; import edonymyeon.backend.content.post.postimage.domain.PostImageInfos; -import edonymyeon.backend.membber.member.domain.Email; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.member.profile.domain.Email; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.repository.MemberRepository; import edonymyeon.backend.content.post.application.GeneralFindingCondition; import edonymyeon.backend.content.post.application.MyPostService; import edonymyeon.backend.content.post.application.PostSlice; diff --git a/backend/src/test/java/edonymyeon/backend/post/docs/PostControllerDocsTest.java b/backend/src/test/java/edonymyeon/backend/content/post/docs/PostControllerDocsTest.java similarity index 97% rename from backend/src/test/java/edonymyeon/backend/post/docs/PostControllerDocsTest.java rename to backend/src/test/java/edonymyeon/backend/content/post/docs/PostControllerDocsTest.java index 759c6ad98..91b60573a 100644 --- a/backend/src/test/java/edonymyeon/backend/post/docs/PostControllerDocsTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/post/docs/PostControllerDocsTest.java @@ -1,14 +1,14 @@ -package edonymyeon.backend.post.docs; +package edonymyeon.backend.content.post.docs; import edonymyeon.backend.CacheConfig; +import edonymyeon.backend.content.post.ImageFileCleaner; import edonymyeon.backend.image.domain.ImageInfo; import edonymyeon.backend.content.post.postimage.domain.PostImageInfos; import edonymyeon.backend.content.post.postimage.repository.PostImageInfoRepository; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.domain.Email; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.repository.MemberRepository; -import edonymyeon.backend.post.ImageFileCleaner; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.domain.Email; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.repository.MemberRepository; import edonymyeon.backend.content.post.application.GeneralFindingCondition; import edonymyeon.backend.content.post.application.HotFindingCondition; import edonymyeon.backend.content.post.application.dto.response.AllThumbsInPostResponse; @@ -44,7 +44,7 @@ import java.util.List; import java.util.Optional; -import static edonymyeon.backend.membber.auth.ui.SessionConst.USER; +import static edonymyeon.backend.member.auth.ui.SessionConst.USER; import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.when; diff --git a/backend/src/test/java/edonymyeon/backend/post/docs/PostCreationDocsTest.java b/backend/src/test/java/edonymyeon/backend/content/post/docs/PostCreationDocsTest.java similarity index 94% rename from backend/src/test/java/edonymyeon/backend/post/docs/PostCreationDocsTest.java rename to backend/src/test/java/edonymyeon/backend/content/post/docs/PostCreationDocsTest.java index c036f93a0..1512c5f17 100644 --- a/backend/src/test/java/edonymyeon/backend/post/docs/PostCreationDocsTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/post/docs/PostCreationDocsTest.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.post.docs; +package edonymyeon.backend.content.post.docs; -import static edonymyeon.backend.membber.auth.ui.SessionConst.USER; +import static edonymyeon.backend.member.auth.ui.SessionConst.USER; import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document; import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.multipart; import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessRequest; @@ -13,8 +13,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.post.ImageFileCleaner; +import edonymyeon.backend.content.post.ImageFileCleaner; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.support.IntegrationTest; import edonymyeon.backend.support.TestMemberBuilder; import jakarta.servlet.http.Part; diff --git a/backend/src/test/java/edonymyeon/backend/post/integration/HotPostIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/content/post/integration/HotPostIntegrationTest.java similarity index 96% rename from backend/src/test/java/edonymyeon/backend/post/integration/HotPostIntegrationTest.java rename to backend/src/test/java/edonymyeon/backend/content/post/integration/HotPostIntegrationTest.java index 6e6b51dd8..348ccc502 100644 --- a/backend/src/test/java/edonymyeon/backend/post/integration/HotPostIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/post/integration/HotPostIntegrationTest.java @@ -1,10 +1,10 @@ -package edonymyeon.backend.post.integration; +package edonymyeon.backend.content.post.integration; import edonymyeon.backend.CacheConfig; import edonymyeon.backend.content.cache.repository.HotPostsRepository; import edonymyeon.backend.content.cache.util.HotPostCachePolicy; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.content.post.application.HotFindingCondition; import edonymyeon.backend.content.post.application.PostReadService; import edonymyeon.backend.content.post.domain.Post; diff --git a/backend/src/test/java/edonymyeon/backend/post/integration/MyPostIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/content/post/integration/MyPostIntegrationTest.java similarity index 96% rename from backend/src/test/java/edonymyeon/backend/post/integration/MyPostIntegrationTest.java rename to backend/src/test/java/edonymyeon/backend/content/post/integration/MyPostIntegrationTest.java index d0bdf4f63..b9dea1576 100644 --- a/backend/src/test/java/edonymyeon/backend/post/integration/MyPostIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/post/integration/MyPostIntegrationTest.java @@ -1,8 +1,8 @@ -package edonymyeon.backend.post.integration; +package edonymyeon.backend.content.post.integration; import static org.assertj.core.api.SoftAssertions.assertSoftly; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.content.post.application.dto.response.MyPostResponse; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.IntegrationFixture; diff --git a/backend/src/test/java/edonymyeon/backend/post/integration/PostCommentCountIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/content/post/integration/PostCommentCountIntegrationTest.java similarity index 98% rename from backend/src/test/java/edonymyeon/backend/post/integration/PostCommentCountIntegrationTest.java rename to backend/src/test/java/edonymyeon/backend/content/post/integration/PostCommentCountIntegrationTest.java index 44348ac0e..98b68e314 100644 --- a/backend/src/test/java/edonymyeon/backend/post/integration/PostCommentCountIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/post/integration/PostCommentCountIntegrationTest.java @@ -1,10 +1,10 @@ -package edonymyeon.backend.post.integration; +package edonymyeon.backend.content.post.integration; import edonymyeon.backend.CacheConfig; import edonymyeon.backend.content.cache.repository.HotPostsRepository; import edonymyeon.backend.content.cache.util.HotPostCachePolicy; import edonymyeon.backend.content.comment.domain.Comment; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.content.post.application.HotFindingCondition; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.EdonymyeonRestAssured; diff --git a/backend/src/test/java/edonymyeon/backend/post/integration/PostIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/content/post/integration/PostIntegrationTest.java similarity index 99% rename from backend/src/test/java/edonymyeon/backend/post/integration/PostIntegrationTest.java rename to backend/src/test/java/edonymyeon/backend/content/post/integration/PostIntegrationTest.java index e97c5d9c7..6d1373a15 100644 --- a/backend/src/test/java/edonymyeon/backend/post/integration/PostIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/post/integration/PostIntegrationTest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.post.integration; +package edonymyeon.backend.content.post.integration; import static edonymyeon.backend.global.exception.ExceptionInformation.AUTHORIZATION_EMPTY; import static edonymyeon.backend.global.exception.ExceptionInformation.IMAGE_DOMAIN_INVALID; @@ -10,12 +10,12 @@ import static org.junit.jupiter.api.Assertions.assertAll; import edonymyeon.backend.consumption.repository.ConsumptionRepository; +import edonymyeon.backend.content.post.ImageFileCleaner; import edonymyeon.backend.image.domain.ImageType; import edonymyeon.backend.content.post.postimage.domain.PostImageInfo; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.application.dto.request.PurchaseConfirmRequest; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.post.ImageFileCleaner; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.application.dto.request.PurchaseConfirmRequest; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.content.post.application.GeneralFindingCondition; import edonymyeon.backend.content.post.application.PostReadService; import edonymyeon.backend.content.post.application.dto.response.SpecificPostInfoResponse; diff --git a/backend/src/test/java/edonymyeon/backend/post/integration/PostSearchIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/content/post/integration/PostSearchIntegrationTest.java similarity index 97% rename from backend/src/test/java/edonymyeon/backend/post/integration/PostSearchIntegrationTest.java rename to backend/src/test/java/edonymyeon/backend/content/post/integration/PostSearchIntegrationTest.java index d108b7067..4588ce757 100644 --- a/backend/src/test/java/edonymyeon/backend/post/integration/PostSearchIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/post/integration/PostSearchIntegrationTest.java @@ -1,7 +1,7 @@ -package edonymyeon.backend.post.integration; +package edonymyeon.backend.content.post.integration; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.support.EdonymyeonRestAssured; import edonymyeon.backend.support.IntegrationFixture; import io.restassured.response.ExtractableResponse; diff --git a/backend/src/test/java/edonymyeon/backend/post/integration/PostViewIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/content/post/integration/PostViewIntegrationTest.java similarity index 91% rename from backend/src/test/java/edonymyeon/backend/post/integration/PostViewIntegrationTest.java rename to backend/src/test/java/edonymyeon/backend/content/post/integration/PostViewIntegrationTest.java index f09e26b00..5ccf7e03b 100644 --- a/backend/src/test/java/edonymyeon/backend/post/integration/PostViewIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/post/integration/PostViewIntegrationTest.java @@ -1,10 +1,10 @@ -package edonymyeon.backend.post.integration; +package edonymyeon.backend.content.post.integration; import static org.assertj.core.api.Assertions.assertThat; +import edonymyeon.backend.content.post.ImageFileCleaner; import edonymyeon.backend.support.IntegrationFixture; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.post.ImageFileCleaner; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.content.post.domain.Post; import io.restassured.response.ExtractableResponse; import io.restassured.response.Response; diff --git a/backend/src/test/java/edonymyeon/backend/post/repository/PostRepositoryTest.java b/backend/src/test/java/edonymyeon/backend/content/post/repository/PostRepositoryTest.java similarity index 97% rename from backend/src/test/java/edonymyeon/backend/post/repository/PostRepositoryTest.java rename to backend/src/test/java/edonymyeon/backend/content/post/repository/PostRepositoryTest.java index 2f50ebf93..aea8e187f 100644 --- a/backend/src/test/java/edonymyeon/backend/post/repository/PostRepositoryTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/post/repository/PostRepositoryTest.java @@ -1,8 +1,7 @@ -package edonymyeon.backend.post.repository; +package edonymyeon.backend.content.post.repository; -import edonymyeon.backend.content.post.repository.PostRepository; -import edonymyeon.backend.membber.member.application.dto.AnonymousMemberId; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.application.dto.AnonymousMemberId; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.content.post.application.HotFindingCondition; import edonymyeon.backend.content.post.application.PostReadService; import edonymyeon.backend.content.post.domain.HotPostPolicy; diff --git a/backend/src/test/java/edonymyeon/backend/post/repository/PostSpecificationTest.java b/backend/src/test/java/edonymyeon/backend/content/post/repository/PostSpecificationTest.java similarity index 98% rename from backend/src/test/java/edonymyeon/backend/post/repository/PostSpecificationTest.java rename to backend/src/test/java/edonymyeon/backend/content/post/repository/PostSpecificationTest.java index 5bdaca279..165df0dcc 100644 --- a/backend/src/test/java/edonymyeon/backend/post/repository/PostSpecificationTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/post/repository/PostSpecificationTest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.post.repository; +package edonymyeon.backend.content.post.repository; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.content.post.repository.PostRepository; diff --git a/backend/src/test/java/edonymyeon/backend/post/ui/PostControllerTest.java b/backend/src/test/java/edonymyeon/backend/content/post/ui/PostControllerTest.java similarity index 97% rename from backend/src/test/java/edonymyeon/backend/post/ui/PostControllerTest.java rename to backend/src/test/java/edonymyeon/backend/content/post/ui/PostControllerTest.java index 23ec0c03e..9ef0f54b9 100644 --- a/backend/src/test/java/edonymyeon/backend/post/ui/PostControllerTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/post/ui/PostControllerTest.java @@ -1,14 +1,14 @@ -package edonymyeon.backend.post.ui; +package edonymyeon.backend.content.post.ui; -import static edonymyeon.backend.membber.auth.ui.SessionConst.USER; +import static edonymyeon.backend.member.auth.ui.SessionConst.USER; import static edonymyeon.backend.global.exception.ExceptionInformation.POST_MEMBER_NOT_SAME; import static org.assertj.core.api.SoftAssertions.assertSoftly; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import edonymyeon.backend.content.post.ImageFileCleaner; import edonymyeon.backend.global.controlleradvice.dto.ExceptionResponse; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.post.ImageFileCleaner; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.content.post.application.dto.response.PostIdResponse; import edonymyeon.backend.support.IntegrationTest; import edonymyeon.backend.support.TestMemberBuilder; diff --git a/backend/src/test/java/edonymyeon/backend/thumbs/application/DeleteThumbsServiceTest.java b/backend/src/test/java/edonymyeon/backend/content/thumbs/application/DeleteThumbsServiceTest.java similarity index 93% rename from backend/src/test/java/edonymyeon/backend/thumbs/application/DeleteThumbsServiceTest.java rename to backend/src/test/java/edonymyeon/backend/content/thumbs/application/DeleteThumbsServiceTest.java index 7559112ad..d6ae226a4 100644 --- a/backend/src/test/java/edonymyeon/backend/thumbs/application/DeleteThumbsServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/thumbs/application/DeleteThumbsServiceTest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.thumbs.application; +package edonymyeon.backend.content.thumbs.application; import static edonymyeon.backend.global.exception.ExceptionInformation.THUMBS_DOWN_DELETE_FAIL_WHEN_THUMBS_UP; import static edonymyeon.backend.global.exception.ExceptionInformation.THUMBS_DOWN_IS_NOT_EXIST; @@ -6,12 +6,11 @@ import static edonymyeon.backend.global.exception.ExceptionInformation.THUMBS_UP_IS_NOT_EXIST; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; -import edonymyeon.backend.content.thumbs.application.ThumbsService; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.application.dto.MemberId; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.application.dto.MemberId; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.repository.MemberRepository; import edonymyeon.backend.content.post.application.PostService; import edonymyeon.backend.content.post.application.dto.request.PostRequest; import edonymyeon.backend.content.post.application.dto.response.PostIdResponse; diff --git a/backend/src/test/java/edonymyeon/backend/thumbs/application/ThumbsDownServiceTest.java b/backend/src/test/java/edonymyeon/backend/content/thumbs/application/ThumbsDownServiceTest.java similarity index 94% rename from backend/src/test/java/edonymyeon/backend/thumbs/application/ThumbsDownServiceTest.java rename to backend/src/test/java/edonymyeon/backend/content/thumbs/application/ThumbsDownServiceTest.java index 1e42e00c6..749c16d98 100644 --- a/backend/src/test/java/edonymyeon/backend/thumbs/application/ThumbsDownServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/thumbs/application/ThumbsDownServiceTest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.thumbs.application; +package edonymyeon.backend.content.thumbs.application; import static edonymyeon.backend.global.exception.ExceptionInformation.POST_ID_NOT_FOUND; import static edonymyeon.backend.global.exception.ExceptionInformation.THUMBS_DOWN_ALREADY_EXIST; @@ -6,12 +6,11 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; import static org.assertj.core.api.SoftAssertions.assertSoftly; -import edonymyeon.backend.content.thumbs.application.ThumbsService; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.application.dto.MemberId; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.application.dto.MemberId; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.repository.MemberRepository; import edonymyeon.backend.content.post.application.PostService; import edonymyeon.backend.content.post.application.dto.request.PostRequest; import edonymyeon.backend.content.post.application.dto.response.PostIdResponse; diff --git a/backend/src/test/java/edonymyeon/backend/thumbs/application/ThumbsInPostServiceTest.java b/backend/src/test/java/edonymyeon/backend/content/thumbs/application/ThumbsInPostServiceTest.java similarity index 94% rename from backend/src/test/java/edonymyeon/backend/thumbs/application/ThumbsInPostServiceTest.java rename to backend/src/test/java/edonymyeon/backend/content/thumbs/application/ThumbsInPostServiceTest.java index fadd0099d..389f58443 100644 --- a/backend/src/test/java/edonymyeon/backend/thumbs/application/ThumbsInPostServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/thumbs/application/ThumbsInPostServiceTest.java @@ -1,13 +1,12 @@ -package edonymyeon.backend.thumbs.application; +package edonymyeon.backend.content.thumbs.application; import static org.assertj.core.api.SoftAssertions.assertSoftly; -import edonymyeon.backend.content.thumbs.application.ThumbsService; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.application.dto.AnonymousMemberId; -import edonymyeon.backend.membber.member.application.dto.MemberId; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.application.dto.AnonymousMemberId; +import edonymyeon.backend.member.profile.application.dto.MemberId; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.repository.MemberRepository; import edonymyeon.backend.content.post.application.PostService; import edonymyeon.backend.content.post.application.PostThumbsService; import edonymyeon.backend.content.post.application.dto.response.AllThumbsInPostResponse; diff --git a/backend/src/test/java/edonymyeon/backend/thumbs/application/ThumbsUpServiceTest.java b/backend/src/test/java/edonymyeon/backend/content/thumbs/application/ThumbsUpServiceTest.java similarity index 95% rename from backend/src/test/java/edonymyeon/backend/thumbs/application/ThumbsUpServiceTest.java rename to backend/src/test/java/edonymyeon/backend/content/thumbs/application/ThumbsUpServiceTest.java index 0afee8843..9a7dc356c 100644 --- a/backend/src/test/java/edonymyeon/backend/thumbs/application/ThumbsUpServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/thumbs/application/ThumbsUpServiceTest.java @@ -1,11 +1,10 @@ -package edonymyeon.backend.thumbs.application; +package edonymyeon.backend.content.thumbs.application; -import edonymyeon.backend.content.thumbs.application.ThumbsService; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.application.dto.MemberId; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.application.dto.MemberId; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.repository.MemberRepository; import edonymyeon.backend.content.post.application.PostService; import edonymyeon.backend.content.post.application.dto.request.PostRequest; import edonymyeon.backend.content.post.application.dto.response.PostIdResponse; diff --git a/backend/src/test/java/edonymyeon/backend/thumbs/docs/ThumbsControllerDocsTest.java b/backend/src/test/java/edonymyeon/backend/content/thumbs/docs/ThumbsControllerDocsTest.java similarity index 95% rename from backend/src/test/java/edonymyeon/backend/thumbs/docs/ThumbsControllerDocsTest.java rename to backend/src/test/java/edonymyeon/backend/content/thumbs/docs/ThumbsControllerDocsTest.java index 6dd1d314f..f1cfd4d56 100644 --- a/backend/src/test/java/edonymyeon/backend/thumbs/docs/ThumbsControllerDocsTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/thumbs/docs/ThumbsControllerDocsTest.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.thumbs.docs; +package edonymyeon.backend.content.thumbs.docs; -import static edonymyeon.backend.membber.auth.ui.SessionConst.USER; +import static edonymyeon.backend.member.auth.ui.SessionConst.USER; import static org.mockito.Mockito.when; import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document; import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.delete; @@ -9,9 +9,9 @@ import static org.springframework.restdocs.request.RequestDocumentation.pathParameters; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import edonymyeon.backend.membber.member.domain.Email; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.member.profile.domain.Email; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.repository.MemberRepository; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.content.post.repository.PostRepository; import edonymyeon.backend.support.IntegrationTest; diff --git a/backend/src/test/java/edonymyeon/backend/thumbs/domain/AllThumbsInPostTest.java b/backend/src/test/java/edonymyeon/backend/content/thumbs/domain/AllThumbsInPostTest.java similarity index 89% rename from backend/src/test/java/edonymyeon/backend/thumbs/domain/AllThumbsInPostTest.java rename to backend/src/test/java/edonymyeon/backend/content/thumbs/domain/AllThumbsInPostTest.java index e6ca2e55f..b1416d02c 100644 --- a/backend/src/test/java/edonymyeon/backend/thumbs/domain/AllThumbsInPostTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/thumbs/domain/AllThumbsInPostTest.java @@ -1,8 +1,6 @@ -package edonymyeon.backend.thumbs.domain; +package edonymyeon.backend.content.thumbs.domain; -import edonymyeon.backend.content.thumbs.domain.AllThumbsInPost; -import edonymyeon.backend.content.thumbs.domain.Thumbs; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.TestMemberBuilder; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/edonymyeon/backend/thumbs/integration/ThumbsIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/content/thumbs/integration/ThumbsIntegrationTest.java similarity index 97% rename from backend/src/test/java/edonymyeon/backend/thumbs/integration/ThumbsIntegrationTest.java rename to backend/src/test/java/edonymyeon/backend/content/thumbs/integration/ThumbsIntegrationTest.java index d7ecf2aca..a6c8b6dce 100644 --- a/backend/src/test/java/edonymyeon/backend/thumbs/integration/ThumbsIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/content/thumbs/integration/ThumbsIntegrationTest.java @@ -1,11 +1,11 @@ -package edonymyeon.backend.thumbs.integration; +package edonymyeon.backend.content.thumbs.integration; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.SoftAssertions.assertSoftly; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.repository.MemberRepository; import edonymyeon.backend.content.post.application.PostService; import edonymyeon.backend.content.post.application.dto.request.PostRequest; import edonymyeon.backend.content.post.application.dto.response.PostIdResponse; diff --git a/backend/src/test/java/edonymyeon/backend/logging/application/LoggingServiceTest.java b/backend/src/test/java/edonymyeon/backend/global/logging/application/LoggingServiceTest.java similarity index 95% rename from backend/src/test/java/edonymyeon/backend/logging/application/LoggingServiceTest.java rename to backend/src/test/java/edonymyeon/backend/global/logging/application/LoggingServiceTest.java index 49fd3704b..517211dc4 100644 --- a/backend/src/test/java/edonymyeon/backend/logging/application/LoggingServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/global/logging/application/LoggingServiceTest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.logging.application; +package edonymyeon.backend.global.logging.application; import static org.assertj.core.api.SoftAssertions.*; @@ -16,7 +16,7 @@ class LoggingServiceTest { @Test void info로그가_위치한_파일을_읽어_객체_리스트로_파싱한다() { LoggingResponse loggingResponse = loggingService.findLogs( - () -> Paths.get("src/test/java/edonymyeon/backend/logging/application/info.log").toAbsolutePath()); + () -> Paths.get("src/test/java/edonymyeon/backend/global/logging/application/info.log").toAbsolutePath()); assertSoftly(softAssertions -> { softAssertions.assertThat(loggingResponse.response().size()).isEqualTo(4); diff --git a/backend/src/test/java/edonymyeon/backend/logging/application/info.log b/backend/src/test/java/edonymyeon/backend/global/logging/application/info.log similarity index 100% rename from backend/src/test/java/edonymyeon/backend/logging/application/info.log rename to backend/src/test/java/edonymyeon/backend/global/logging/application/info.log diff --git a/backend/src/test/java/edonymyeon/backend/image/ImageFileSizeIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/image/ImageFileSizeIntegrationTest.java index 29af5636e..e86be8ca5 100644 --- a/backend/src/test/java/edonymyeon/backend/image/ImageFileSizeIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/image/ImageFileSizeIntegrationTest.java @@ -4,8 +4,8 @@ import static org.assertj.core.api.Assertions.assertThat; import edonymyeon.backend.global.controlleradvice.dto.ExceptionResponse; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.post.ImageFileCleaner; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.content.post.ImageFileCleaner; import edonymyeon.backend.support.EdonymyeonRestAssured; import edonymyeon.backend.support.IntegrationFixture; import java.io.File; diff --git a/backend/src/test/java/edonymyeon/backend/image/application/ImageServiceTest.java b/backend/src/test/java/edonymyeon/backend/image/application/ImageServiceTest.java index 87c810a1b..44f265c77 100644 --- a/backend/src/test/java/edonymyeon/backend/image/application/ImageServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/image/application/ImageServiceTest.java @@ -4,7 +4,7 @@ import edonymyeon.backend.image.domain.ImageInfo; import edonymyeon.backend.image.domain.ImageType; -import edonymyeon.backend.post.ImageFileCleaner; +import edonymyeon.backend.content.post.ImageFileCleaner; import edonymyeon.backend.support.IntegrationFixture; import edonymyeon.backend.support.MockMultipartFileTestSupport; import java.io.File; diff --git a/backend/src/test/java/edonymyeon/backend/auth/AuthIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/member/auth/AuthIntegrationTest.java similarity index 93% rename from backend/src/test/java/edonymyeon/backend/auth/AuthIntegrationTest.java rename to backend/src/test/java/edonymyeon/backend/member/auth/AuthIntegrationTest.java index 76a4b10e6..3af562b54 100644 --- a/backend/src/test/java/edonymyeon/backend/auth/AuthIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/auth/AuthIntegrationTest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.auth; +package edonymyeon.backend.member.auth; import static edonymyeon.backend.global.exception.ExceptionInformation.AUTHORIZATION_EMPTY; import static org.assertj.core.api.Assertions.assertThat; @@ -6,18 +6,18 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; -import edonymyeon.backend.membber.auth.application.AuthService; -import edonymyeon.backend.membber.auth.application.KakaoAuthResponseProvider; -import edonymyeon.backend.membber.member.application.dto.response.DuplicateCheckResponse; -import edonymyeon.backend.membber.auth.application.dto.JoinRequest; -import edonymyeon.backend.membber.auth.application.dto.KakaoLoginRequest; -import edonymyeon.backend.membber.auth.application.dto.KakaoLoginResponse; -import edonymyeon.backend.membber.auth.application.dto.LoginRequest; -import edonymyeon.backend.membber.auth.application.dto.LogoutRequest; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.domain.SocialInfo; -import edonymyeon.backend.membber.member.domain.SocialInfo.SocialType; -import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.member.auth.application.AuthService; +import edonymyeon.backend.member.auth.application.KakaoAuthResponseProvider; +import edonymyeon.backend.member.profile.application.dto.response.DuplicateCheckResponse; +import edonymyeon.backend.member.auth.application.dto.JoinRequest; +import edonymyeon.backend.member.auth.application.dto.KakaoLoginRequest; +import edonymyeon.backend.member.auth.application.dto.KakaoLoginResponse; +import edonymyeon.backend.member.auth.application.dto.LoginRequest; +import edonymyeon.backend.member.auth.application.dto.LogoutRequest; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.domain.SocialInfo; +import edonymyeon.backend.member.profile.domain.SocialInfo.SocialType; +import edonymyeon.backend.member.profile.repository.MemberRepository; import edonymyeon.backend.support.EdonymyeonRestAssured; import edonymyeon.backend.support.IntegrationFixture; import edonymyeon.backend.support.TestMemberBuilder; diff --git a/backend/src/test/java/edonymyeon/backend/auth/application/AuthDeleteServiceTest.java b/backend/src/test/java/edonymyeon/backend/member/auth/application/AuthDeleteServiceTest.java similarity index 87% rename from backend/src/test/java/edonymyeon/backend/auth/application/AuthDeleteServiceTest.java rename to backend/src/test/java/edonymyeon/backend/member/auth/application/AuthDeleteServiceTest.java index 4b0820a96..31682e933 100644 --- a/backend/src/test/java/edonymyeon/backend/auth/application/AuthDeleteServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/auth/application/AuthDeleteServiceTest.java @@ -1,12 +1,11 @@ -package edonymyeon.backend.auth.application; +package edonymyeon.backend.member.auth.application; import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_IS_DELETED; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import edonymyeon.backend.membber.auth.application.AuthService; -import edonymyeon.backend.membber.auth.application.dto.LoginRequest; +import edonymyeon.backend.member.auth.application.dto.LoginRequest; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.support.IntegrationTest; import edonymyeon.backend.support.TestMemberBuilder; import lombok.RequiredArgsConstructor; diff --git a/backend/src/test/java/edonymyeon/backend/auth/application/AuthServiceTest.java b/backend/src/test/java/edonymyeon/backend/member/auth/application/AuthServiceTest.java similarity index 90% rename from backend/src/test/java/edonymyeon/backend/auth/application/AuthServiceTest.java rename to backend/src/test/java/edonymyeon/backend/member/auth/application/AuthServiceTest.java index ce07987d7..eb53fc9b8 100644 --- a/backend/src/test/java/edonymyeon/backend/auth/application/AuthServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/auth/application/AuthServiceTest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.auth.application; +package edonymyeon.backend.member.auth.application; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.SoftAssertions.assertSoftly; @@ -13,24 +13,23 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import edonymyeon.backend.membber.auth.application.AuthService; -import edonymyeon.backend.membber.auth.application.dto.JoinRequest; -import edonymyeon.backend.membber.auth.application.dto.KakaoLoginResponse; -import edonymyeon.backend.membber.auth.application.dto.LoginRequest; -import edonymyeon.backend.membber.auth.domain.PasswordEncoder; +import edonymyeon.backend.member.auth.application.dto.JoinRequest; +import edonymyeon.backend.member.auth.application.dto.KakaoLoginResponse; +import edonymyeon.backend.member.auth.application.dto.LoginRequest; +import edonymyeon.backend.member.auth.domain.PasswordEncoder; import edonymyeon.backend.image.application.ImageService; import edonymyeon.backend.image.domain.ImageInfo; -import edonymyeon.backend.membber.member.profileimage.domain.ProfileImageInfo; -import edonymyeon.backend.membber.member.application.DeviceRepository; -import edonymyeon.backend.membber.member.application.MemberService; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.domain.Device; -import edonymyeon.backend.membber.member.domain.Email; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.domain.SocialInfo; -import edonymyeon.backend.membber.member.domain.SocialInfo.SocialType; -import edonymyeon.backend.membber.member.repository.MemberRepository; -import edonymyeon.backend.membber.setting.application.SettingService; +import edonymyeon.backend.member.profile.profileimage.domain.ProfileImageInfo; +import edonymyeon.backend.member.profile.application.DeviceRepository; +import edonymyeon.backend.member.profile.application.MemberService; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.domain.Device; +import edonymyeon.backend.member.profile.domain.Email; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.domain.SocialInfo; +import edonymyeon.backend.member.profile.domain.SocialInfo.SocialType; +import edonymyeon.backend.member.profile.repository.MemberRepository; +import edonymyeon.backend.member.setting.application.SettingService; import edonymyeon.backend.support.IntegrationTest; import jakarta.persistence.EntityManager; import java.util.Optional; diff --git a/backend/src/test/java/edonymyeon/backend/auth/docs/AuthControllerDocsTest.java b/backend/src/test/java/edonymyeon/backend/member/auth/docs/AuthControllerDocsTest.java similarity index 92% rename from backend/src/test/java/edonymyeon/backend/auth/docs/AuthControllerDocsTest.java rename to backend/src/test/java/edonymyeon/backend/member/auth/docs/AuthControllerDocsTest.java index b7e0313b8..703d7e20d 100644 --- a/backend/src/test/java/edonymyeon/backend/auth/docs/AuthControllerDocsTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/auth/docs/AuthControllerDocsTest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.auth.docs; +package edonymyeon.backend.member.auth.docs; import static org.mockito.Mockito.when; import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document; @@ -15,14 +15,14 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.fasterxml.jackson.databind.ObjectMapper; -import edonymyeon.backend.membber.auth.application.AuthService; -import edonymyeon.backend.membber.auth.application.KakaoAuthResponseProvider; -import edonymyeon.backend.membber.member.application.dto.response.DuplicateCheckResponse; -import edonymyeon.backend.membber.auth.application.dto.JoinRequest; -import edonymyeon.backend.membber.auth.application.dto.KakaoLoginRequest; -import edonymyeon.backend.membber.auth.application.dto.KakaoLoginResponse; -import edonymyeon.backend.membber.auth.application.dto.LoginRequest; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.member.auth.application.AuthService; +import edonymyeon.backend.member.auth.application.KakaoAuthResponseProvider; +import edonymyeon.backend.member.profile.application.dto.response.DuplicateCheckResponse; +import edonymyeon.backend.member.auth.application.dto.JoinRequest; +import edonymyeon.backend.member.auth.application.dto.KakaoLoginRequest; +import edonymyeon.backend.member.auth.application.dto.KakaoLoginResponse; +import edonymyeon.backend.member.auth.application.dto.LoginRequest; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; import edonymyeon.backend.support.DocsTest; import org.junit.jupiter.api.Test; import org.springframework.boot.test.mock.mockito.MockBean; diff --git a/backend/src/test/java/edonymyeon/backend/auth/domain/SimplePasswordEncoderTest.java b/backend/src/test/java/edonymyeon/backend/member/auth/domain/SimplePasswordEncoderTest.java similarity index 92% rename from backend/src/test/java/edonymyeon/backend/auth/domain/SimplePasswordEncoderTest.java rename to backend/src/test/java/edonymyeon/backend/member/auth/domain/SimplePasswordEncoderTest.java index d80aa7e7b..c77fc0c14 100644 --- a/backend/src/test/java/edonymyeon/backend/auth/domain/SimplePasswordEncoderTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/auth/domain/SimplePasswordEncoderTest.java @@ -1,8 +1,7 @@ -package edonymyeon.backend.auth.domain; +package edonymyeon.backend.member.auth.domain; import static org.assertj.core.api.Assertions.assertThat; -import edonymyeon.backend.membber.auth.domain.SimplePasswordEncoder; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator; diff --git a/backend/src/test/java/edonymyeon/backend/member/application/MemberServiceTest.java b/backend/src/test/java/edonymyeon/backend/member/profile/application/MemberServiceTest.java similarity index 92% rename from backend/src/test/java/edonymyeon/backend/member/application/MemberServiceTest.java rename to backend/src/test/java/edonymyeon/backend/member/profile/application/MemberServiceTest.java index 0771df46e..5adeacdcf 100644 --- a/backend/src/test/java/edonymyeon/backend/member/application/MemberServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/profile/application/MemberServiceTest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.member.application; +package edonymyeon.backend.member.profile.application; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -9,20 +9,18 @@ import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.verify; -import edonymyeon.backend.membber.auth.application.AuthService; -import edonymyeon.backend.membber.auth.application.dto.JoinRequest; -import edonymyeon.backend.membber.auth.application.dto.KakaoLoginResponse; -import edonymyeon.backend.membber.auth.application.dto.LoginRequest; +import edonymyeon.backend.member.auth.application.AuthService; +import edonymyeon.backend.member.auth.application.dto.JoinRequest; +import edonymyeon.backend.member.auth.application.dto.KakaoLoginResponse; +import edonymyeon.backend.member.auth.application.dto.LoginRequest; import edonymyeon.backend.image.application.ImageService; -import edonymyeon.backend.membber.member.profileimage.domain.ProfileImageInfo; -import edonymyeon.backend.membber.member.application.DeviceRepository; -import edonymyeon.backend.membber.member.application.MemberService; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.application.dto.request.MemberUpdateRequest; -import edonymyeon.backend.membber.member.application.dto.response.MemberUpdateResponse; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.repository.MemberRepository; -import edonymyeon.backend.post.ImageFileCleaner; +import edonymyeon.backend.member.profile.profileimage.domain.ProfileImageInfo; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.application.dto.request.MemberUpdateRequest; +import edonymyeon.backend.member.profile.application.dto.response.MemberUpdateResponse; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.repository.MemberRepository; +import edonymyeon.backend.content.post.ImageFileCleaner; import edonymyeon.backend.support.IntegrationFixture; import java.io.IOException; import lombok.RequiredArgsConstructor; diff --git a/backend/src/test/java/edonymyeon/backend/member/docs/MemberControllerDocsTest.java b/backend/src/test/java/edonymyeon/backend/member/profile/docs/MemberControllerDocsTest.java similarity index 95% rename from backend/src/test/java/edonymyeon/backend/member/docs/MemberControllerDocsTest.java rename to backend/src/test/java/edonymyeon/backend/member/profile/docs/MemberControllerDocsTest.java index f290c77b9..2a850cfbf 100644 --- a/backend/src/test/java/edonymyeon/backend/member/docs/MemberControllerDocsTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/profile/docs/MemberControllerDocsTest.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.member.docs; +package edonymyeon.backend.member.profile.docs; -import static edonymyeon.backend.membber.auth.ui.SessionConst.USER; +import static edonymyeon.backend.member.auth.ui.SessionConst.USER; import static edonymyeon.backend.consumption.domain.ConsumptionType.SAVING; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; @@ -27,15 +27,15 @@ import edonymyeon.backend.consumption.repository.ConsumptionRepository; import edonymyeon.backend.image.domain.ImageType; import edonymyeon.backend.image.domain.UrlManager; -import edonymyeon.backend.membber.member.application.MemberService; -import edonymyeon.backend.membber.member.application.dto.request.PurchaseConfirmRequest; -import edonymyeon.backend.membber.member.application.dto.request.SavingConfirmRequest; -import edonymyeon.backend.membber.member.application.dto.response.DuplicateCheckResponse; -import edonymyeon.backend.membber.member.application.dto.response.MyPageResponseV1_0; -import edonymyeon.backend.membber.member.application.dto.response.MyPageResponseV1_1; -import edonymyeon.backend.membber.member.domain.Email; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.member.profile.application.MemberService; +import edonymyeon.backend.member.profile.application.dto.request.PurchaseConfirmRequest; +import edonymyeon.backend.member.profile.application.dto.request.SavingConfirmRequest; +import edonymyeon.backend.member.profile.application.dto.response.DuplicateCheckResponse; +import edonymyeon.backend.member.profile.application.dto.response.MyPageResponseV1_0; +import edonymyeon.backend.member.profile.application.dto.response.MyPageResponseV1_1; +import edonymyeon.backend.member.profile.domain.Email; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.repository.MemberRepository; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.content.post.repository.PostRepository; import edonymyeon.backend.support.DocsTest; diff --git a/backend/src/test/java/edonymyeon/backend/member/domain/EmailTest.java b/backend/src/test/java/edonymyeon/backend/member/profile/domain/EmailTest.java similarity index 90% rename from backend/src/test/java/edonymyeon/backend/member/domain/EmailTest.java rename to backend/src/test/java/edonymyeon/backend/member/profile/domain/EmailTest.java index 42751711e..1302f30a0 100644 --- a/backend/src/test/java/edonymyeon/backend/member/domain/EmailTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/profile/domain/EmailTest.java @@ -1,11 +1,9 @@ -package edonymyeon.backend.member.domain; +package edonymyeon.backend.member.profile.domain; import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_EMAIL_INVALID; import static org.assertj.core.api.Assertions.assertThatThrownBy; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.membber.member.domain.Email; -import edonymyeon.backend.membber.member.domain.SocialInfo; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator; diff --git a/backend/src/test/java/edonymyeon/backend/member/domain/MemberTest.java b/backend/src/test/java/edonymyeon/backend/member/profile/domain/MemberTest.java similarity index 97% rename from backend/src/test/java/edonymyeon/backend/member/domain/MemberTest.java rename to backend/src/test/java/edonymyeon/backend/member/profile/domain/MemberTest.java index 63feb874d..a0b34b75f 100644 --- a/backend/src/test/java/edonymyeon/backend/member/domain/MemberTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/profile/domain/MemberTest.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.member.domain; +package edonymyeon.backend.member.profile.domain; import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_EMAIL_INVALID; import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_NICKNAME_INVALID; @@ -6,7 +6,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.membber.member.domain.Member; import java.util.Collections; import java.util.List; import org.assertj.core.api.Assertions; diff --git a/backend/src/test/java/edonymyeon/backend/member/domain/NicknameTest.java b/backend/src/test/java/edonymyeon/backend/member/profile/domain/NicknameTest.java similarity index 90% rename from backend/src/test/java/edonymyeon/backend/member/domain/NicknameTest.java rename to backend/src/test/java/edonymyeon/backend/member/profile/domain/NicknameTest.java index 932e5f1a5..35647eafe 100644 --- a/backend/src/test/java/edonymyeon/backend/member/domain/NicknameTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/profile/domain/NicknameTest.java @@ -1,12 +1,11 @@ -package edonymyeon.backend.member.domain; +package edonymyeon.backend.member.profile.domain; import static edonymyeon.backend.global.exception.ExceptionInformation.*; -import static edonymyeon.backend.membber.member.domain.SocialInfo.SocialType; +import static edonymyeon.backend.member.profile.domain.SocialInfo.SocialType; import static org.assertj.core.api.Assertions.*; import static org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.membber.member.domain.Nickname; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/edonymyeon/backend/member/domain/PasswordTest.java b/backend/src/test/java/edonymyeon/backend/member/profile/domain/PasswordTest.java similarity index 93% rename from backend/src/test/java/edonymyeon/backend/member/domain/PasswordTest.java rename to backend/src/test/java/edonymyeon/backend/member/profile/domain/PasswordTest.java index 190bc57cf..afbd714fe 100644 --- a/backend/src/test/java/edonymyeon/backend/member/domain/PasswordTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/profile/domain/PasswordTest.java @@ -1,14 +1,12 @@ -package edonymyeon.backend.member.domain; +package edonymyeon.backend.member.profile.domain; import static edonymyeon.backend.global.exception.ExceptionInformation.ALREADY_ENCODED_PASSWORD; import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_PASSWORD_INVALID; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import edonymyeon.backend.membber.auth.domain.SimplePasswordEncoder; +import edonymyeon.backend.member.auth.domain.SimplePasswordEncoder; import edonymyeon.backend.global.exception.BusinessLogicException; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.membber.member.domain.Password; -import edonymyeon.backend.membber.member.domain.SocialInfo; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator; diff --git a/backend/src/test/java/edonymyeon/backend/member/integration/MemberConsumptionIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/member/profile/integration/MemberConsumptionIntegrationTest.java similarity index 97% rename from backend/src/test/java/edonymyeon/backend/member/integration/MemberConsumptionIntegrationTest.java rename to backend/src/test/java/edonymyeon/backend/member/profile/integration/MemberConsumptionIntegrationTest.java index fd890909d..4b51813ff 100644 --- a/backend/src/test/java/edonymyeon/backend/member/integration/MemberConsumptionIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/profile/integration/MemberConsumptionIntegrationTest.java @@ -1,12 +1,12 @@ -package edonymyeon.backend.member.integration; +package edonymyeon.backend.member.profile.integration; import static org.assertj.core.api.Assertions.assertThat; import edonymyeon.backend.global.controlleradvice.dto.ExceptionResponse; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.membber.member.application.dto.request.PurchaseConfirmRequest; -import edonymyeon.backend.membber.member.application.dto.request.SavingConfirmRequest; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.application.dto.request.PurchaseConfirmRequest; +import edonymyeon.backend.member.profile.application.dto.request.SavingConfirmRequest; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.IntegrationFixture; import io.restassured.response.ExtractableResponse; diff --git a/backend/src/test/java/edonymyeon/backend/member/integration/MemberIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/member/profile/integration/MemberIntegrationTest.java similarity index 95% rename from backend/src/test/java/edonymyeon/backend/member/integration/MemberIntegrationTest.java rename to backend/src/test/java/edonymyeon/backend/member/profile/integration/MemberIntegrationTest.java index 1543181db..b695987e6 100644 --- a/backend/src/test/java/edonymyeon/backend/member/integration/MemberIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/profile/integration/MemberIntegrationTest.java @@ -1,15 +1,15 @@ -package edonymyeon.backend.member.integration; +package edonymyeon.backend.member.profile.integration; import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_IS_DELETED; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.SoftAssertions.assertSoftly; import static org.junit.jupiter.api.Assertions.assertAll; -import edonymyeon.backend.membber.auth.application.dto.LoginRequest; +import edonymyeon.backend.member.auth.application.dto.LoginRequest; import edonymyeon.backend.global.controlleradvice.dto.ExceptionResponse; -import edonymyeon.backend.membber.member.application.dto.response.MyPageResponseV1_0; -import edonymyeon.backend.membber.member.application.dto.response.MyPageResponseV1_1; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.application.dto.response.MyPageResponseV1_0; +import edonymyeon.backend.member.profile.application.dto.response.MyPageResponseV1_1; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.content.post.application.dto.response.MyPostResponse; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.EdonymyeonRestAssured; diff --git a/backend/src/test/java/edonymyeon/backend/member/repository/MemberRepositoryTest.java b/backend/src/test/java/edonymyeon/backend/member/profile/repository/MemberRepositoryTest.java similarity index 93% rename from backend/src/test/java/edonymyeon/backend/member/repository/MemberRepositoryTest.java rename to backend/src/test/java/edonymyeon/backend/member/profile/repository/MemberRepositoryTest.java index b34e4a2ef..02eeba17d 100644 --- a/backend/src/test/java/edonymyeon/backend/member/repository/MemberRepositoryTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/profile/repository/MemberRepositoryTest.java @@ -1,12 +1,11 @@ -package edonymyeon.backend.member.repository; +package edonymyeon.backend.member.profile.repository; import static org.assertj.core.api.Assertions.assertThat; -import edonymyeon.backend.membber.member.application.MemberConsumptionService; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.application.dto.YearMonthDto; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.member.profile.application.MemberConsumptionService; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.application.dto.YearMonthDto; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.support.IntegrationFixture; import jakarta.persistence.EntityManager; diff --git a/backend/src/test/java/edonymyeon/backend/setting/application/SettingServiceTest.java b/backend/src/test/java/edonymyeon/backend/member/setting/application/SettingServiceTest.java similarity index 93% rename from backend/src/test/java/edonymyeon/backend/setting/application/SettingServiceTest.java rename to backend/src/test/java/edonymyeon/backend/member/setting/application/SettingServiceTest.java index 92da21a20..1ec790043 100644 --- a/backend/src/test/java/edonymyeon/backend/setting/application/SettingServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/setting/application/SettingServiceTest.java @@ -1,18 +1,17 @@ -package edonymyeon.backend.setting.application; +package edonymyeon.backend.member.setting.application; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.verify; -import edonymyeon.backend.membber.auth.application.AuthService; -import edonymyeon.backend.membber.auth.application.dto.JoinRequest; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.setting.application.SettingService; -import edonymyeon.backend.membber.setting.domain.Setting; -import edonymyeon.backend.membber.setting.domain.SettingType; -import edonymyeon.backend.membber.setting.repository.SettingRepository; +import edonymyeon.backend.member.auth.application.AuthService; +import edonymyeon.backend.member.auth.application.dto.JoinRequest; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.setting.domain.Setting; +import edonymyeon.backend.member.setting.domain.SettingType; +import edonymyeon.backend.member.setting.repository.SettingRepository; import edonymyeon.backend.support.IntegrationFixture; import java.util.List; import lombok.RequiredArgsConstructor; diff --git a/backend/src/test/java/edonymyeon/backend/setting/docs/SettingControllerDocsTest.java b/backend/src/test/java/edonymyeon/backend/member/setting/docs/SettingControllerDocsTest.java similarity index 91% rename from backend/src/test/java/edonymyeon/backend/setting/docs/SettingControllerDocsTest.java rename to backend/src/test/java/edonymyeon/backend/member/setting/docs/SettingControllerDocsTest.java index df987fe36..5d74e8af8 100644 --- a/backend/src/test/java/edonymyeon/backend/setting/docs/SettingControllerDocsTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/setting/docs/SettingControllerDocsTest.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.setting.docs; +package edonymyeon.backend.member.setting.docs; -import static edonymyeon.backend.membber.auth.ui.SessionConst.USER; +import static edonymyeon.backend.member.auth.ui.SessionConst.USER; import static org.mockito.Mockito.when; import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document; import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get; @@ -13,13 +13,13 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.fasterxml.jackson.databind.ObjectMapper; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.setting.application.SettingService; -import edonymyeon.backend.membber.setting.application.dto.SettingRequest; -import edonymyeon.backend.membber.setting.application.dto.SettingResponse; -import edonymyeon.backend.membber.setting.application.dto.SettingsResponse; -import edonymyeon.backend.membber.setting.domain.SettingType; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.setting.application.SettingService; +import edonymyeon.backend.member.setting.application.dto.SettingRequest; +import edonymyeon.backend.member.setting.application.dto.SettingResponse; +import edonymyeon.backend.member.setting.application.dto.SettingsResponse; +import edonymyeon.backend.member.setting.domain.SettingType; import edonymyeon.backend.support.DocsTest; import edonymyeon.backend.support.TestMemberBuilder; import java.util.List; diff --git a/backend/src/test/java/edonymyeon/backend/setting/domain/SettingTest.java b/backend/src/test/java/edonymyeon/backend/member/setting/domain/SettingTest.java similarity index 79% rename from backend/src/test/java/edonymyeon/backend/setting/domain/SettingTest.java rename to backend/src/test/java/edonymyeon/backend/member/setting/domain/SettingTest.java index 37fe8497a..f38b7cae4 100644 --- a/backend/src/test/java/edonymyeon/backend/setting/domain/SettingTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/setting/domain/SettingTest.java @@ -1,9 +1,7 @@ -package edonymyeon.backend.setting.domain; +package edonymyeon.backend.member.setting.domain; import static org.assertj.core.api.Assertions.assertThat; -import edonymyeon.backend.membber.setting.domain.Setting; -import edonymyeon.backend.membber.setting.domain.SettingType; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/backend/src/test/java/edonymyeon/backend/setting/ui/SettingIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/member/setting/ui/SettingIntegrationTest.java similarity index 92% rename from backend/src/test/java/edonymyeon/backend/setting/ui/SettingIntegrationTest.java rename to backend/src/test/java/edonymyeon/backend/member/setting/ui/SettingIntegrationTest.java index 2475bcbf5..1334a7276 100644 --- a/backend/src/test/java/edonymyeon/backend/setting/ui/SettingIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/member/setting/ui/SettingIntegrationTest.java @@ -1,14 +1,14 @@ -package edonymyeon.backend.setting.ui; +package edonymyeon.backend.member.setting.ui; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import edonymyeon.backend.membber.auth.application.AuthService; -import edonymyeon.backend.membber.auth.application.dto.JoinRequest; -import edonymyeon.backend.membber.setting.application.dto.SettingRequest; -import edonymyeon.backend.membber.setting.domain.SettingType; +import edonymyeon.backend.member.auth.application.AuthService; +import edonymyeon.backend.member.auth.application.dto.JoinRequest; +import edonymyeon.backend.member.setting.application.dto.SettingRequest; +import edonymyeon.backend.member.setting.domain.SettingType; import edonymyeon.backend.support.EdonymyeonRestAssured; import edonymyeon.backend.support.IntegrationFixture; import io.restassured.response.ExtractableResponse; diff --git a/backend/src/test/java/edonymyeon/backend/notification/application/NotificationEventListenerTest.java b/backend/src/test/java/edonymyeon/backend/notification/application/NotificationEventListenerTest.java index 844662d16..f12d22a0c 100644 --- a/backend/src/test/java/edonymyeon/backend/notification/application/NotificationEventListenerTest.java +++ b/backend/src/test/java/edonymyeon/backend/notification/application/NotificationEventListenerTest.java @@ -7,19 +7,19 @@ import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.verify; -import edonymyeon.backend.membber.auth.application.AuthService; -import edonymyeon.backend.membber.auth.application.dto.JoinRequest; +import edonymyeon.backend.member.auth.application.AuthService; +import edonymyeon.backend.member.auth.application.dto.JoinRequest; import edonymyeon.backend.content.comment.application.CommentService; import edonymyeon.backend.content.comment.application.dto.request.CommentRequest; import edonymyeon.backend.global.exception.BusinessLogicException; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.notification.domain.Notification; import edonymyeon.backend.notification.repository.NotificationRepository; import edonymyeon.backend.content.post.domain.Post; -import edonymyeon.backend.membber.setting.application.SettingService; -import edonymyeon.backend.membber.setting.domain.SettingType; +import edonymyeon.backend.member.setting.application.SettingService; +import edonymyeon.backend.member.setting.domain.SettingType; import edonymyeon.backend.support.IntegrationFixture; import edonymyeon.backend.content.thumbs.application.ThumbsService; import edonymyeon.backend.content.thumbs.domain.Thumbs; diff --git a/backend/src/test/java/edonymyeon/backend/notification/application/NotificationServiceTest.java b/backend/src/test/java/edonymyeon/backend/notification/application/NotificationServiceTest.java index 316648cf4..ed87a5ba7 100644 --- a/backend/src/test/java/edonymyeon/backend/notification/application/NotificationServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/notification/application/NotificationServiceTest.java @@ -1,23 +1,23 @@ package edonymyeon.backend.notification.application; -import edonymyeon.backend.membber.auth.application.AuthService; -import edonymyeon.backend.membber.auth.application.dto.JoinRequest; -import edonymyeon.backend.membber.auth.application.dto.LoginRequest; +import edonymyeon.backend.member.auth.application.AuthService; +import edonymyeon.backend.member.auth.application.dto.JoinRequest; +import edonymyeon.backend.member.auth.application.dto.LoginRequest; import edonymyeon.backend.content.comment.application.CommentService; import edonymyeon.backend.content.comment.application.dto.request.CommentRequest; import edonymyeon.backend.global.exception.BusinessLogicException; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.membber.member.application.MemberService; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.application.dto.request.PurchaseConfirmRequest; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.application.MemberService; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.application.dto.request.PurchaseConfirmRequest; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.notification.domain.Notification; import edonymyeon.backend.notification.domain.ScreenType; import edonymyeon.backend.notification.repository.NotificationRepository; import edonymyeon.backend.content.post.application.PostService; import edonymyeon.backend.content.post.domain.Post; -import edonymyeon.backend.membber.setting.application.SettingService; -import edonymyeon.backend.membber.setting.domain.SettingType; +import edonymyeon.backend.member.setting.application.SettingService; +import edonymyeon.backend.member.setting.domain.SettingType; import edonymyeon.backend.support.IntegrationFixture; import edonymyeon.backend.content.thumbs.application.ThumbsService; import lombok.RequiredArgsConstructor; diff --git a/backend/src/test/java/edonymyeon/backend/notification/integration/NotificationIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/notification/integration/NotificationIntegrationTest.java index 19b3ec2f3..39bc0cff5 100644 --- a/backend/src/test/java/edonymyeon/backend/notification/integration/NotificationIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/notification/integration/NotificationIntegrationTest.java @@ -1,16 +1,16 @@ package edonymyeon.backend.notification.integration; -import edonymyeon.backend.membber.auth.application.AuthService; -import edonymyeon.backend.membber.auth.application.dto.JoinRequest; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.auth.application.AuthService; +import edonymyeon.backend.member.auth.application.dto.JoinRequest; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.notification.domain.Notification; import edonymyeon.backend.notification.domain.ScreenType; import edonymyeon.backend.notification.repository.NotificationRepository; -import edonymyeon.backend.post.ImageFileCleaner; +import edonymyeon.backend.content.post.ImageFileCleaner; import edonymyeon.backend.content.post.application.PostSlice; -import edonymyeon.backend.membber.setting.application.SettingService; -import edonymyeon.backend.membber.setting.domain.SettingType; +import edonymyeon.backend.member.setting.application.SettingService; +import edonymyeon.backend.member.setting.domain.SettingType; import edonymyeon.backend.support.EdonymyeonRestAssured; import edonymyeon.backend.support.IntegrationFixture; import edonymyeon.backend.content.thumbs.application.ThumbsService; diff --git a/backend/src/test/java/edonymyeon/backend/report/application/ReportServiceTest.java b/backend/src/test/java/edonymyeon/backend/report/application/ReportServiceTest.java index 222bffb83..342a9a54b 100644 --- a/backend/src/test/java/edonymyeon/backend/report/application/ReportServiceTest.java +++ b/backend/src/test/java/edonymyeon/backend/report/application/ReportServiceTest.java @@ -2,7 +2,7 @@ import edonymyeon.backend.content.comment.domain.Comment; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.membber.member.application.dto.ActiveMemberId; +import edonymyeon.backend.member.profile.application.dto.ActiveMemberId; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.report.domain.Report; import edonymyeon.backend.support.CommentTestSupport; diff --git a/backend/src/test/java/edonymyeon/backend/report/docs/ReportDocsTest.java b/backend/src/test/java/edonymyeon/backend/report/docs/ReportDocsTest.java index 1ed698f3b..765f10f9f 100644 --- a/backend/src/test/java/edonymyeon/backend/report/docs/ReportDocsTest.java +++ b/backend/src/test/java/edonymyeon/backend/report/docs/ReportDocsTest.java @@ -1,6 +1,6 @@ package edonymyeon.backend.report.docs; -import static edonymyeon.backend.membber.auth.ui.SessionConst.USER; +import static edonymyeon.backend.member.auth.ui.SessionConst.USER; import static edonymyeon.backend.report.domain.ReportType.POST; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; @@ -13,10 +13,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import edonymyeon.backend.content.post.postimage.domain.PostImageInfos; -import edonymyeon.backend.membber.member.domain.Email; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.repository.MemberRepository; -import edonymyeon.backend.post.ImageFileCleaner; +import edonymyeon.backend.member.profile.domain.Email; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.repository.MemberRepository; +import edonymyeon.backend.content.post.ImageFileCleaner; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.content.post.repository.PostRepository; import edonymyeon.backend.report.application.ReportRepository; diff --git a/backend/src/test/java/edonymyeon/backend/report/ui/ReportIntegrationTest.java b/backend/src/test/java/edonymyeon/backend/report/ui/ReportIntegrationTest.java index 84215f15b..1ac66669b 100644 --- a/backend/src/test/java/edonymyeon/backend/report/ui/ReportIntegrationTest.java +++ b/backend/src/test/java/edonymyeon/backend/report/ui/ReportIntegrationTest.java @@ -3,8 +3,8 @@ import static org.assertj.core.api.Assertions.assertThat; import edonymyeon.backend.content.comment.domain.Comment; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.post.ImageFileCleaner; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.content.post.ImageFileCleaner; import edonymyeon.backend.report.application.ReportRequest; import edonymyeon.backend.support.EdonymyeonRestAssured; import edonymyeon.backend.support.IntegrationFixture; diff --git a/backend/src/test/java/edonymyeon/backend/support/CommentTestSupport.java b/backend/src/test/java/edonymyeon/backend/support/CommentTestSupport.java index 1d9b75010..dc6f10b06 100644 --- a/backend/src/test/java/edonymyeon/backend/support/CommentTestSupport.java +++ b/backend/src/test/java/edonymyeon/backend/support/CommentTestSupport.java @@ -5,7 +5,7 @@ import edonymyeon.backend.content.comment.commentimage.domain.CommentImageInfo; import edonymyeon.backend.content.comment.commentimage.repository.CommentImageInfoRepository; import edonymyeon.backend.image.domain.ImageInfo; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.content.post.domain.Post; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/backend/src/test/java/edonymyeon/backend/support/IntegrationFixture.java b/backend/src/test/java/edonymyeon/backend/support/IntegrationFixture.java index 53901b78d..98f88241b 100644 --- a/backend/src/test/java/edonymyeon/backend/support/IntegrationFixture.java +++ b/backend/src/test/java/edonymyeon/backend/support/IntegrationFixture.java @@ -3,10 +3,10 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; -import edonymyeon.backend.membber.auth.application.dto.LoginRequest; -import edonymyeon.backend.membber.member.application.dto.request.PurchaseConfirmRequest; -import edonymyeon.backend.membber.member.application.dto.request.SavingConfirmRequest; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.auth.application.dto.LoginRequest; +import edonymyeon.backend.member.profile.application.dto.request.PurchaseConfirmRequest; +import edonymyeon.backend.member.profile.application.dto.request.SavingConfirmRequest; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.notification.application.NotificationSender; import edonymyeon.backend.report.application.ReportRequest; import io.restassured.RestAssured; diff --git a/backend/src/test/java/edonymyeon/backend/support/PostIntegrationTestSupport.java b/backend/src/test/java/edonymyeon/backend/support/PostIntegrationTestSupport.java index 224a36a94..f27d17ad4 100644 --- a/backend/src/test/java/edonymyeon/backend/support/PostIntegrationTestSupport.java +++ b/backend/src/test/java/edonymyeon/backend/support/PostIntegrationTestSupport.java @@ -1,7 +1,7 @@ package edonymyeon.backend.support; -import edonymyeon.backend.membber.auth.application.dto.LoginRequest; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.auth.application.dto.LoginRequest; +import edonymyeon.backend.member.profile.domain.Member; import io.restassured.http.ContentType; import io.restassured.response.ExtractableResponse; import io.restassured.response.Response; diff --git a/backend/src/test/java/edonymyeon/backend/support/PostTestSupport.java b/backend/src/test/java/edonymyeon/backend/support/PostTestSupport.java index 659153f96..77be1ac18 100644 --- a/backend/src/test/java/edonymyeon/backend/support/PostTestSupport.java +++ b/backend/src/test/java/edonymyeon/backend/support/PostTestSupport.java @@ -1,6 +1,6 @@ package edonymyeon.backend.support; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.content.post.repository.PostRepository; import lombok.RequiredArgsConstructor; diff --git a/backend/src/test/java/edonymyeon/backend/support/ProfileImageInfoTestSupport.java b/backend/src/test/java/edonymyeon/backend/support/ProfileImageInfoTestSupport.java index 2ca801f11..296df9d5f 100644 --- a/backend/src/test/java/edonymyeon/backend/support/ProfileImageInfoTestSupport.java +++ b/backend/src/test/java/edonymyeon/backend/support/ProfileImageInfoTestSupport.java @@ -3,8 +3,8 @@ import edonymyeon.backend.image.application.ImageService; import edonymyeon.backend.image.domain.ImageType; import edonymyeon.backend.image.domain.ImageInfo; -import edonymyeon.backend.membber.member.profileimage.domain.ProfileImageInfo; -import edonymyeon.backend.membber.member.profileimage.repository.ProfileImageInfoRepository; +import edonymyeon.backend.member.profile.profileimage.domain.ProfileImageInfo; +import edonymyeon.backend.member.profile.profileimage.repository.ProfileImageInfoRepository; import java.io.IOException; import java.util.UUID; import lombok.RequiredArgsConstructor; diff --git a/backend/src/test/java/edonymyeon/backend/support/TestMemberBuilder.java b/backend/src/test/java/edonymyeon/backend/support/TestMemberBuilder.java index 529888e3a..b1d59113c 100644 --- a/backend/src/test/java/edonymyeon/backend/support/TestMemberBuilder.java +++ b/backend/src/test/java/edonymyeon/backend/support/TestMemberBuilder.java @@ -1,11 +1,11 @@ package edonymyeon.backend.support; -import edonymyeon.backend.membber.auth.domain.SimplePasswordEncoder; -import edonymyeon.backend.membber.member.profileimage.domain.ProfileImageInfo; -import edonymyeon.backend.membber.member.domain.Device; -import edonymyeon.backend.membber.member.domain.Member; -import edonymyeon.backend.membber.member.domain.SocialInfo; -import edonymyeon.backend.membber.member.repository.MemberRepository; +import edonymyeon.backend.member.auth.domain.SimplePasswordEncoder; +import edonymyeon.backend.member.profile.profileimage.domain.ProfileImageInfo; +import edonymyeon.backend.member.profile.domain.Device; +import edonymyeon.backend.member.profile.domain.Member; +import edonymyeon.backend.member.profile.domain.SocialInfo; +import edonymyeon.backend.member.profile.repository.MemberRepository; import java.lang.reflect.Field; import java.util.List; import java.util.Objects; diff --git a/backend/src/test/java/edonymyeon/backend/support/ThumbsUpPostTestSupport.java b/backend/src/test/java/edonymyeon/backend/support/ThumbsUpPostTestSupport.java index 4665a177a..d933c9ce2 100644 --- a/backend/src/test/java/edonymyeon/backend/support/ThumbsUpPostTestSupport.java +++ b/backend/src/test/java/edonymyeon/backend/support/ThumbsUpPostTestSupport.java @@ -1,6 +1,6 @@ package edonymyeon.backend.support; -import edonymyeon.backend.membber.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Member; import edonymyeon.backend.content.post.domain.Post; import edonymyeon.backend.content.thumbs.domain.Thumbs; import edonymyeon.backend.content.thumbs.domain.ThumbsType;