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..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.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 8fc37a399..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,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.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; 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..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.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.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/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..cb8428a16 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.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; 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..51e5f09f0 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.member.profile.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..5cdfc6fad 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.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.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/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/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..0cab32ae6 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.member.profile.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..ab4b9bc49 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.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; 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..68d87fb1d 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.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; 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..e7f6320d5 --- /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.member.profile.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..d3c9183e6 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.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/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..058ad3d2c 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.member.profile.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..76fe50449 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.member.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.member.profile.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..23fed9bc5 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.member.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.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; +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..b796ce490 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.member.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.member.profile.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..7ccc4cd71 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.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; 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..a3ecfd864 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.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; +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..0c735c92c 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.member.profile.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..47e089ba2 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.member.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.member.profile.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..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.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 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/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/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/auth/annotation/AuthPrincipal.java rename to backend/src/main/java/edonymyeon/backend/member/auth/annotation/AuthPrincipal.java index f6f373d10..249ec35c4 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/annotation/AuthPrincipal.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/annotation/AuthPrincipal.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.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/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/auth/application/AuthService.java rename to backend/src/main/java/edonymyeon/backend/member/auth/application/AuthService.java index bb618b610..c90801fae 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/application/AuthService.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/application/AuthService.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.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.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.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.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.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/auth/application/KakaoAuthResponseProvider.java b/backend/src/main/java/edonymyeon/backend/member/auth/application/KakaoAuthResponseProvider.java similarity index 83% rename from backend/src/main/java/edonymyeon/backend/auth/application/KakaoAuthResponseProvider.java rename to backend/src/main/java/edonymyeon/backend/member/auth/application/KakaoAuthResponseProvider.java index d3f18febe..4f194a425 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/application/KakaoAuthResponseProvider.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/application/KakaoAuthResponseProvider.java @@ -1,7 +1,7 @@ -package edonymyeon.backend.auth.application; +package edonymyeon.backend.member.auth.application; -import edonymyeon.backend.auth.application.dto.KakaoLoginRequest; -import edonymyeon.backend.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/auth/application/dto/JoinRequest.java b/backend/src/main/java/edonymyeon/backend/member/auth/application/dto/JoinRequest.java similarity index 64% rename from backend/src/main/java/edonymyeon/backend/auth/application/dto/JoinRequest.java rename to backend/src/main/java/edonymyeon/backend/member/auth/application/dto/JoinRequest.java index 7ef81cab8..21ee44615 100644 --- a/backend/src/main/java/edonymyeon/backend/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.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/auth/application/dto/KakaoLoginRequest.java b/backend/src/main/java/edonymyeon/backend/member/auth/application/dto/KakaoLoginRequest.java similarity index 58% rename from backend/src/main/java/edonymyeon/backend/auth/application/dto/KakaoLoginRequest.java rename to backend/src/main/java/edonymyeon/backend/member/auth/application/dto/KakaoLoginRequest.java index 433b72216..ce0c0a3e6 100644 --- a/backend/src/main/java/edonymyeon/backend/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.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/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/auth/application/dto/KakaoLoginResponse.java rename to backend/src/main/java/edonymyeon/backend/member/auth/application/dto/KakaoLoginResponse.java index afd764ee4..78a0cc0e5 100644 --- a/backend/src/main/java/edonymyeon/backend/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.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/auth/application/dto/LoginRequest.java b/backend/src/main/java/edonymyeon/backend/member/auth/application/dto/LoginRequest.java similarity index 60% rename from backend/src/main/java/edonymyeon/backend/auth/application/dto/LoginRequest.java rename to backend/src/main/java/edonymyeon/backend/member/auth/application/dto/LoginRequest.java index 54bc4e7a3..2c4e8c189 100644 --- a/backend/src/main/java/edonymyeon/backend/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.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/auth/application/dto/MemberResponse.java b/backend/src/main/java/edonymyeon/backend/member/auth/application/dto/MemberResponse.java similarity index 54% rename from backend/src/main/java/edonymyeon/backend/auth/application/dto/MemberResponse.java rename to backend/src/main/java/edonymyeon/backend/member/auth/application/dto/MemberResponse.java index 6915ccb2e..b86258080 100644 --- a/backend/src/main/java/edonymyeon/backend/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.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/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/auth/domain/BasicTokenGenerator.java rename to backend/src/main/java/edonymyeon/backend/member/auth/domain/BasicTokenGenerator.java index 7690ab6d2..e71c77e13 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/domain/BasicTokenGenerator.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/domain/BasicTokenGenerator.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.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/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/auth/domain/PasswordEncoder.java rename to backend/src/main/java/edonymyeon/backend/member/auth/domain/PasswordEncoder.java index de7ed6db8..4b0093dea 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/domain/PasswordEncoder.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/domain/PasswordEncoder.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.auth.domain; +package edonymyeon.backend.member.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/member/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/member/auth/domain/SimplePasswordEncoder.java index 88557fc86..ff586cd9f 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/domain/SimplePasswordEncoder.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/domain/SimplePasswordEncoder.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.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/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/auth/domain/TokenGenerator.java rename to backend/src/main/java/edonymyeon/backend/member/auth/domain/TokenGenerator.java index fbc69783b..ca7c03849 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/domain/TokenGenerator.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/domain/TokenGenerator.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.auth.domain; +package edonymyeon.backend.member.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/member/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/member/auth/domain/ValidateType.java index a360fbde0..20982fafa 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/domain/ValidateType.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/domain/ValidateType.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.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/auth/ui/AuthController.java b/backend/src/main/java/edonymyeon/backend/member/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/member/auth/ui/AuthController.java index f97307d10..abf22c070 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/ui/AuthController.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/ui/AuthController.java @@ -1,18 +1,18 @@ -package edonymyeon.backend.auth.ui; +package edonymyeon.backend.member.auth.ui; -import static edonymyeon.backend.auth.ui.SessionConst.USER; +import static edonymyeon.backend.member.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.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.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/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/auth/ui/SessionConst.java rename to backend/src/main/java/edonymyeon/backend/member/auth/ui/SessionConst.java index 841bccf37..976f7e3c1 100644 --- a/backend/src/main/java/edonymyeon/backend/auth/ui/SessionConst.java +++ b/backend/src/main/java/edonymyeon/backend/member/auth/ui/SessionConst.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.auth.ui; +package edonymyeon.backend.member.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/member/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/member/auth/ui/argumentresolver/AuthArgumentResolver.java index 5955661ed..326244433 100644 --- a/backend/src/main/java/edonymyeon/backend/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.auth.ui.argumentresolver; +package edonymyeon.backend.member.auth.ui.argumentresolver; -import static edonymyeon.backend.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.auth.annotation.AuthPrincipal; +import edonymyeon.backend.member.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.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/member/config/WebMvcMemberConfiguration.java b/backend/src/main/java/edonymyeon/backend/member/config/WebMvcMemberConfiguration.java new file mode 100644 index 000000000..5303f9e29 --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/member/config/WebMvcMemberConfiguration.java @@ -0,0 +1,20 @@ +package edonymyeon.backend.member.config; + +import edonymyeon.backend.member.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/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/member/application/DeviceRepository.java rename to backend/src/main/java/edonymyeon/backend/member/profile/application/DeviceRepository.java index 134cc81c3..03546ca75 100644 --- a/backend/src/main/java/edonymyeon/backend/member/application/DeviceRepository.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/application/DeviceRepository.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.member.application; +package edonymyeon.backend.member.profile.application; -import edonymyeon.backend.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/member/application/MemberConsumptionService.java b/backend/src/main/java/edonymyeon/backend/member/profile/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/member/profile/application/MemberConsumptionService.java index c61563772..2406d0525 100644 --- a/backend/src/main/java/edonymyeon/backend/member/application/MemberConsumptionService.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/application/MemberConsumptionService.java @@ -1,7 +1,7 @@ -package edonymyeon.backend.member.application; +package edonymyeon.backend.member.profile.application; -import edonymyeon.backend.member.application.dto.MemberId; -import edonymyeon.backend.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/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/member/application/MemberEventListener.java rename to backend/src/main/java/edonymyeon/backend/member/profile/application/MemberEventListener.java index 63d0bb7d0..028ffe7e1 100644 --- a/backend/src/main/java/edonymyeon/backend/member/application/MemberEventListener.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/application/MemberEventListener.java @@ -1,8 +1,8 @@ -package edonymyeon.backend.member.application; +package edonymyeon.backend.member.profile.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.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/member/application/MemberService.java b/backend/src/main/java/edonymyeon/backend/member/profile/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/member/profile/application/MemberService.java index d650955ed..b03f94a4b 100644 --- a/backend/src/main/java/edonymyeon/backend/member/application/MemberService.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/application/MemberService.java @@ -1,30 +1,30 @@ -package edonymyeon.backend.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.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.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.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/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/member/application/dto/ActiveMemberId.java rename to backend/src/main/java/edonymyeon/backend/member/profile/application/dto/ActiveMemberId.java index 3d6ccccc7..1b59a329f 100644 --- a/backend/src/main/java/edonymyeon/backend/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.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/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/member/application/dto/AnonymousMemberId.java rename to backend/src/main/java/edonymyeon/backend/member/profile/application/dto/AnonymousMemberId.java index 8051cc287..6a04e3de6 100644 --- a/backend/src/main/java/edonymyeon/backend/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.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/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/member/application/dto/MemberId.java rename to backend/src/main/java/edonymyeon/backend/member/profile/application/dto/MemberId.java index eb29b3377..768514a62 100644 --- a/backend/src/main/java/edonymyeon/backend/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.member.application.dto; +package edonymyeon.backend.member.profile.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/member/profile/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/member/profile/application/dto/YearMonthDto.java index cedd2ec31..d1fad593d 100644 --- a/backend/src/main/java/edonymyeon/backend/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.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/member/application/dto/request/MemberUpdateRequest.java b/backend/src/main/java/edonymyeon/backend/member/profile/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/member/profile/application/dto/request/MemberUpdateRequest.java index 09e010e97..a5ae9a626 100644 --- a/backend/src/main/java/edonymyeon/backend/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.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/member/application/dto/request/PurchaseConfirmRequest.java b/backend/src/main/java/edonymyeon/backend/member/profile/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/member/profile/application/dto/request/PurchaseConfirmRequest.java index 52566eb11..813a4bb95 100644 --- a/backend/src/main/java/edonymyeon/backend/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.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/member/application/dto/request/SavingConfirmRequest.java b/backend/src/main/java/edonymyeon/backend/member/profile/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/member/profile/application/dto/request/SavingConfirmRequest.java index 0c76331fd..469556777 100644 --- a/backend/src/main/java/edonymyeon/backend/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.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/member/profile/application/dto/response/DuplicateCheckResponse.java b/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/response/DuplicateCheckResponse.java new file mode 100644 index 000000000..b37267780 --- /dev/null +++ b/backend/src/main/java/edonymyeon/backend/member/profile/application/dto/response/DuplicateCheckResponse.java @@ -0,0 +1,5 @@ +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/member/application/dto/response/MyPageResponseV1_0.java b/backend/src/main/java/edonymyeon/backend/member/profile/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/member/profile/application/dto/response/MyPageResponseV1_0.java index 7df7dfc2a..f43626d5e 100644 --- a/backend/src/main/java/edonymyeon/backend/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.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/member/application/dto/response/MyPageResponseV1_1.java b/backend/src/main/java/edonymyeon/backend/member/profile/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/member/profile/application/dto/response/MyPageResponseV1_1.java index 1bd7e978f..a57fcc577 100644 --- a/backend/src/main/java/edonymyeon/backend/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.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/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/member/application/event/ProfileImageDeletionEvent.java rename to backend/src/main/java/edonymyeon/backend/member/profile/application/event/ProfileImageDeletionEvent.java index 49be972d8..b81bcf43c 100644 --- a/backend/src/main/java/edonymyeon/backend/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.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/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/member/application/event/ProfileImageUploadEvent.java rename to backend/src/main/java/edonymyeon/backend/member/profile/application/event/ProfileImageUploadEvent.java index 813026ba8..82cae6c10 100644 --- a/backend/src/main/java/edonymyeon/backend/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.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/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/member/domain/Device.java rename to backend/src/main/java/edonymyeon/backend/member/profile/domain/Device.java index e1315d5ab..76f851709 100644 --- a/backend/src/main/java/edonymyeon/backend/member/domain/Device.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/domain/Device.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.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/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/member/domain/Email.java rename to backend/src/main/java/edonymyeon/backend/member/profile/domain/Email.java index d7028d341..3f3cd3046 100644 --- a/backend/src/main/java/edonymyeon/backend/member/domain/Email.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/domain/Email.java @@ -1,9 +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 edonymyeon.backend.member.domain.SocialInfo.*; import edonymyeon.backend.global.exception.EdonymyeonException; +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/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/member/domain/Member.java rename to backend/src/main/java/edonymyeon/backend/member/profile/domain/Member.java index c002a48b4..6bf7209e6 100644 --- a/backend/src/main/java/edonymyeon/backend/member/domain/Member.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/domain/Member.java @@ -1,8 +1,8 @@ -package edonymyeon.backend.member.domain; +package edonymyeon.backend.member.profile.domain; -import edonymyeon.backend.auth.domain.PasswordEncoder; +import edonymyeon.backend.member.auth.domain.PasswordEncoder; import edonymyeon.backend.global.domain.TemporalRecord; -import edonymyeon.backend.image.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/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/member/domain/Nickname.java rename to backend/src/main/java/edonymyeon/backend/member/profile/domain/Nickname.java index 87a9dabb3..9ac641241 100644 --- a/backend/src/main/java/edonymyeon/backend/member/domain/Nickname.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/domain/Nickname.java @@ -1,9 +1,9 @@ -package edonymyeon.backend.member.domain; +package edonymyeon.backend.member.profile.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.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/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/member/domain/Password.java rename to backend/src/main/java/edonymyeon/backend/member/profile/domain/Password.java index 53afa07f6..ce164ddbd 100644 --- a/backend/src/main/java/edonymyeon/backend/member/domain/Password.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/domain/Password.java @@ -1,9 +1,9 @@ -package edonymyeon.backend.member.domain; +package edonymyeon.backend.member.profile.domain; import static edonymyeon.backend.global.exception.ExceptionInformation.MEMBER_PASSWORD_INVALID; -import static edonymyeon.backend.member.domain.SocialInfo.SocialType; +import static edonymyeon.backend.member.profile.domain.SocialInfo.SocialType; -import edonymyeon.backend.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/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/member/domain/PasswordValidator.java rename to backend/src/main/java/edonymyeon/backend/member/profile/domain/PasswordValidator.java index 2aaa2385d..837484b8a 100644 --- a/backend/src/main/java/edonymyeon/backend/member/domain/PasswordValidator.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/domain/PasswordValidator.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.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/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/member/domain/SocialInfo.java rename to backend/src/main/java/edonymyeon/backend/member/profile/domain/SocialInfo.java index ce8e92190..2a7f49c24 100644 --- a/backend/src/main/java/edonymyeon/backend/member/domain/SocialInfo.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/domain/SocialInfo.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.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/image/profileimage/application/ProfileImageEventListener.java b/backend/src/main/java/edonymyeon/backend/member/profile/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/member/profile/profileimage/application/ProfileImageEventListener.java index c7ce69237..e7682c8e6 100644 --- a/backend/src/main/java/edonymyeon/backend/image/profileimage/application/ProfileImageEventListener.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/profileimage/application/ProfileImageEventListener.java @@ -1,10 +1,8 @@ -package edonymyeon.backend.image.profileimage.application; +package edonymyeon.backend.member.profile.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.member.profile.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/member/profile/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/member/profile/profileimage/domain/ProfileImageInfo.java index 38f3d6168..bdc20e6bc 100644 --- a/backend/src/main/java/edonymyeon/backend/image/profileimage/domain/ProfileImageInfo.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/profileimage/domain/ProfileImageInfo.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.image.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/image/profileimage/repository/ProfileImageInfoRepository.java b/backend/src/main/java/edonymyeon/backend/member/profile/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/member/profile/profileimage/repository/ProfileImageInfoRepository.java index 9637e6328..fa4cf624a 100644 --- a/backend/src/main/java/edonymyeon/backend/image/profileimage/repository/ProfileImageInfoRepository.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/profileimage/repository/ProfileImageInfoRepository.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.image.profileimage.repository; +package edonymyeon.backend.member.profile.profileimage.repository; -import edonymyeon.backend.image.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/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/member/repository/MemberCustomRepository.java rename to backend/src/main/java/edonymyeon/backend/member/profile/repository/MemberCustomRepository.java index 0d6feaecf..2fd9db4de 100644 --- a/backend/src/main/java/edonymyeon/backend/member/repository/MemberCustomRepository.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/repository/MemberCustomRepository.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.member.repository; +package edonymyeon.backend.member.profile.repository; -import edonymyeon.backend.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/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/member/repository/MemberCustomRepositoryImpl.java rename to backend/src/main/java/edonymyeon/backend/member/profile/repository/MemberCustomRepositoryImpl.java index 1fd023922..9382f029a 100644 --- a/backend/src/main/java/edonymyeon/backend/member/repository/MemberCustomRepositoryImpl.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/repository/MemberCustomRepositoryImpl.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.member.repository; +package edonymyeon.backend.member.profile.repository; -import edonymyeon.backend.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/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/member/repository/MemberRepository.java rename to backend/src/main/java/edonymyeon/backend/member/profile/repository/MemberRepository.java index b413399ac..7819f4f4c 100644 --- a/backend/src/main/java/edonymyeon/backend/member/repository/MemberRepository.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/repository/MemberRepository.java @@ -1,9 +1,9 @@ -package edonymyeon.backend.member.repository; +package edonymyeon.backend.member.profile.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.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/member/ui/MemberController.java b/backend/src/main/java/edonymyeon/backend/member/profile/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/member/profile/ui/MemberController.java index 09e496d32..e5b7d0c78 100644 --- a/backend/src/main/java/edonymyeon/backend/member/ui/MemberController.java +++ b/backend/src/main/java/edonymyeon/backend/member/profile/ui/MemberController.java @@ -1,16 +1,16 @@ -package edonymyeon.backend.member.ui; +package edonymyeon.backend.member.profile.ui; -import edonymyeon.backend.auth.annotation.AuthPrincipal; +import edonymyeon.backend.member.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.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/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/setting/application/SettingEventListener.java rename to backend/src/main/java/edonymyeon/backend/member/setting/application/SettingEventListener.java index 95f096d6b..263509619 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/application/SettingEventListener.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/application/SettingEventListener.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.setting.application; +package edonymyeon.backend.member.setting.application; -import edonymyeon.backend.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/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/setting/application/SettingService.java rename to backend/src/main/java/edonymyeon/backend/member/setting/application/SettingService.java index 764fe52ec..6207c6cd0 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/application/SettingService.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/application/SettingService.java @@ -1,16 +1,16 @@ -package edonymyeon.backend.setting.application; +package edonymyeon.backend.member.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.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/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/setting/application/activationmanager/ActivatingPrimaryManager.java rename to backend/src/main/java/edonymyeon/backend/member/setting/application/activationmanager/ActivatingPrimaryManager.java index 78e0f7beb..8957af165 100644 --- a/backend/src/main/java/edonymyeon/backend/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.setting.application.activationmanager; +package edonymyeon.backend.member.setting.application.activationmanager; -import edonymyeon.backend.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/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/setting/application/activationmanager/ActivationManager.java rename to backend/src/main/java/edonymyeon/backend/member/setting/application/activationmanager/ActivationManager.java index 9730dc1fc..b6a780433 100644 --- a/backend/src/main/java/edonymyeon/backend/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.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.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/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/setting/application/activationmanager/DeactivatingSameWeightsManager.java rename to backend/src/main/java/edonymyeon/backend/member/setting/application/activationmanager/DeactivatingSameWeightsManager.java index a09f2240c..377aa2767 100644 --- a/backend/src/main/java/edonymyeon/backend/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.setting.application.activationmanager; +package edonymyeon.backend.member.setting.application.activationmanager; -import edonymyeon.backend.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/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/setting/application/deactivationmanager/DeactivatingLowerWeightManager.java rename to backend/src/main/java/edonymyeon/backend/member/setting/application/deactivationmanager/DeactivatingLowerWeightManager.java index b4b9878fc..1e463c6fe 100644 --- a/backend/src/main/java/edonymyeon/backend/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.setting.application.deactivationmanager; +package edonymyeon.backend.member.setting.application.deactivationmanager; -import edonymyeon.backend.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/setting/application/deactivationmanager/DeactivatingPrimaryManager.java b/backend/src/main/java/edonymyeon/backend/member/setting/application/deactivationmanager/DeactivatingPrimaryManager.java similarity index 83% rename from backend/src/main/java/edonymyeon/backend/setting/application/deactivationmanager/DeactivatingPrimaryManager.java rename to backend/src/main/java/edonymyeon/backend/member/setting/application/deactivationmanager/DeactivatingPrimaryManager.java index 28c2d3833..26b2d72c3 100644 --- a/backend/src/main/java/edonymyeon/backend/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.setting.application.deactivationmanager; +package edonymyeon.backend.member.setting.application.deactivationmanager; -import edonymyeon.backend.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/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/setting/application/deactivationmanager/DeactivationManager.java rename to backend/src/main/java/edonymyeon/backend/member/setting/application/deactivationmanager/DeactivationManager.java index dfad865da..eaddc2ca1 100644 --- a/backend/src/main/java/edonymyeon/backend/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.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.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/setting/application/dto/SettingResponse.java b/backend/src/main/java/edonymyeon/backend/member/setting/application/dto/SettingResponse.java similarity index 66% rename from backend/src/main/java/edonymyeon/backend/setting/application/dto/SettingResponse.java rename to backend/src/main/java/edonymyeon/backend/member/setting/application/dto/SettingResponse.java index c908bb437..6673694af 100644 --- a/backend/src/main/java/edonymyeon/backend/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.setting.application.dto; +package edonymyeon.backend.member.setting.application.dto; -import edonymyeon.backend.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/setting/application/dto/SettingsResponse.java b/backend/src/main/java/edonymyeon/backend/member/setting/application/dto/SettingsResponse.java similarity index 72% rename from backend/src/main/java/edonymyeon/backend/setting/application/dto/SettingsResponse.java rename to backend/src/main/java/edonymyeon/backend/member/setting/application/dto/SettingsResponse.java index bd5ba38ed..494d74f8e 100644 --- a/backend/src/main/java/edonymyeon/backend/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.setting.application.dto; +package edonymyeon.backend.member.setting.application.dto; -import edonymyeon.backend.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/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/setting/domain/Category.java rename to backend/src/main/java/edonymyeon/backend/member/setting/domain/Category.java index 812d963ad..de6791f1d 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/domain/Category.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/domain/Category.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.setting.domain; +package edonymyeon.backend.member.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/member/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/member/setting/domain/Setting.java index 0270fb3da..4d3fd24f6 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/domain/Setting.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/domain/Setting.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.setting.domain; +package edonymyeon.backend.member.setting.domain; -import edonymyeon.backend.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/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/setting/domain/SettingType.java rename to backend/src/main/java/edonymyeon/backend/member/setting/domain/SettingType.java index fc6f155f8..0c30b9a8d 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/domain/SettingType.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/domain/SettingType.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.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/setting/domain/SettingTypeCategory.java b/backend/src/main/java/edonymyeon/backend/member/setting/domain/SettingTypeCategory.java similarity index 59% rename from backend/src/main/java/edonymyeon/backend/setting/domain/SettingTypeCategory.java rename to backend/src/main/java/edonymyeon/backend/member/setting/domain/SettingTypeCategory.java index 4ac8abcff..06a41012f 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/domain/SettingTypeCategory.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/domain/SettingTypeCategory.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.setting.domain; +package edonymyeon.backend.member.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/member/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/member/setting/domain/Weight.java index 1756e841d..17571c00d 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/domain/Weight.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/domain/Weight.java @@ -1,4 +1,4 @@ -package edonymyeon.backend.setting.domain; +package edonymyeon.backend.member.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/member/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/member/setting/repository/SettingCustomRepository.java index 90aa9074f..0c0880852 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/repository/SettingCustomRepository.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/repository/SettingCustomRepository.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.setting.repository; +package edonymyeon.backend.member.setting.repository; -import edonymyeon.backend.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/setting/repository/SettingRepository.java b/backend/src/main/java/edonymyeon/backend/member/setting/repository/SettingRepository.java similarity index 69% rename from backend/src/main/java/edonymyeon/backend/setting/repository/SettingRepository.java rename to backend/src/main/java/edonymyeon/backend/member/setting/repository/SettingRepository.java index 13a978372..ee94cc80f 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/repository/SettingRepository.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/repository/SettingRepository.java @@ -1,7 +1,7 @@ -package edonymyeon.backend.setting.repository; +package edonymyeon.backend.member.setting.repository; -import edonymyeon.backend.setting.domain.Setting; -import edonymyeon.backend.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/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/setting/repository/SettingRepositoryImpl.java rename to backend/src/main/java/edonymyeon/backend/member/setting/repository/SettingRepositoryImpl.java index 893ee022f..aa6beac2e 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/repository/SettingRepositoryImpl.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/repository/SettingRepositoryImpl.java @@ -1,6 +1,6 @@ -package edonymyeon.backend.setting.repository; +package edonymyeon.backend.member.setting.repository; -import edonymyeon.backend.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/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/setting/ui/SettingController.java rename to backend/src/main/java/edonymyeon/backend/member/setting/ui/SettingController.java index e0ec949b6..e12c1c381 100644 --- a/backend/src/main/java/edonymyeon/backend/setting/ui/SettingController.java +++ b/backend/src/main/java/edonymyeon/backend/member/setting/ui/SettingController.java @@ -1,11 +1,11 @@ -package edonymyeon.backend.setting.ui; +package edonymyeon.backend.member.setting.ui; -import edonymyeon.backend.auth.annotation.AuthPrincipal; +import edonymyeon.backend.member.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.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/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..bdca0adaa 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.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; @@ -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.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; 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..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.member.domain.Member; +import edonymyeon.backend.member.profile.domain.Member; import lombok.Getter; @Getter 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/main/java/edonymyeon/backend/notification/domain/Notification.java b/backend/src/main/java/edonymyeon/backend/notification/domain/Notification.java index f68c1491f..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.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 2b2276f7a..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,13 +1,13 @@ package edonymyeon.backend.notification.ui; -import edonymyeon.backend.auth.annotation.AuthPrincipal; +import edonymyeon.backend.member.auth.annotation.AuthPrincipal; import edonymyeon.backend.global.version.ApiVersion; -import edonymyeon.backend.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.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..7c5ca0ebc 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.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; 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..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.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 6f60e7844..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.auth.annotation.AuthPrincipal; +import edonymyeon.backend.member.auth.annotation.AuthPrincipal; import edonymyeon.backend.global.version.ApiVersion; -import edonymyeon.backend.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/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..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.cache.util.HotPostCachePolicy; -import edonymyeon.backend.post.application.TestCacheKeyStrategy; +import edonymyeon.backend.content.cache.util.HotPostCachePolicy; +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 47b8a0caf..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,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.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; 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..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.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.member.domain.Email; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.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 b5ef1a04a..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,7 +1,7 @@ package edonymyeon.backend.consumption.domain; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.post.domain.Post; +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; 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..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,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.member.profile.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..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,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.member.profile.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/comment/application/CommentServiceTest.java b/backend/src/test/java/edonymyeon/backend/content/comment/application/CommentServiceTest.java similarity index 68% 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 92b711e1d..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,16 +1,13 @@ -package edonymyeon.backend.comment.application; +package edonymyeon.backend.content.comment.application; 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.domain.Comment; +import edonymyeon.backend.content.comment.repository.CommentRepository; +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 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/content/comment/docs/CommentControllerDocsTest.java similarity index 94% 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 38f500bbc..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.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; @@ -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.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 98% 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 c46f92ae1..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,9 +8,9 @@ import edonymyeon.backend.TestConfig; import edonymyeon.backend.image.domain.ImageType; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.post.ImageFileCleaner; -import edonymyeon.backend.post.domain.Post; +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; import io.restassured.response.Response; 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 91% 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 3fc8b25aa..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,14 +1,14 @@ -package edonymyeon.backend.post.application; +package edonymyeon.backend.content.post.application; import edonymyeon.backend.consumption.domain.Consumption; 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.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; +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/content/post/application/PostFindingSpecificPostTest.java similarity index 86% 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 6857a8d2a..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,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.junit.jupiter.api.Assertions.assertAll; @@ -7,15 +7,15 @@ 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.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; 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/content/post/application/PostServiceFindingAllPostsTest.java similarity index 93% 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 47b768af0..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,17 +1,17 @@ -package edonymyeon.backend.post.application; +package edonymyeon.backend.content.post.application; +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.image.postimage.repository.PostImageInfoRepository; -import edonymyeon.backend.member.application.dto.ActiveMemberId; -import edonymyeon.backend.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.postimage.repository.PostImageInfoRepository; +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; +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/content/post/application/PostServiceHotPostsTest.java similarity index 91% 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 689e76ecd..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,12 +1,15 @@ -package edonymyeon.backend.post.application; +package edonymyeon.backend.content.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/content/post/application/PostServiceSearchPostsTest.java similarity index 97% 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 00e613c2f..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,9 +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.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 94% 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 c99b2b838..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; @@ -6,25 +6,25 @@ 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.ImageFileCleaner; 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.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.postimage.domain.PostImageInfo; +import edonymyeon.backend.content.post.postimage.repository.PostImageInfoRepository; +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; +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/content/post/application/PostViewTest.java similarity index 85% 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 77c599570..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,16 +1,16 @@ -package edonymyeon.backend.post.application; +package edonymyeon.backend.content.post.application; import static org.assertj.core.api.Assertions.assertThat; +import edonymyeon.backend.content.post.ImageFileCleaner; 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.post.ImageFileCleaner; -import edonymyeon.backend.post.domain.Post; -import edonymyeon.backend.post.repository.PostRepository; +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; 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/content/post/application/TestCacheKeyStrategy.java similarity index 79% 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 00617afc0..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,6 +1,6 @@ -package edonymyeon.backend.post.application; +package edonymyeon.backend.content.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/content/post/docs/MyPostControllerDocsTest.java similarity index 90% 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 fe49c429b..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.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,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.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; +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/content/post/docs/PostControllerDocsTest.java similarity index 93% 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 ac3520e7e..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,23 +1,23 @@ -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.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.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.postimage.domain.PostImageInfos; +import edonymyeon.backend.content.post.postimage.repository.PostImageInfoRepository; +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; +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.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 c90be779f..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.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.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 85% 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 e3167f786..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,17 +1,17 @@ -package edonymyeon.backend.post.integration; +package edonymyeon.backend.content.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.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; 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/content/post/integration/MyPostIntegrationTest.java similarity index 92% 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 86a1e5f24..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,10 +1,10 @@ -package edonymyeon.backend.post.integration; +package edonymyeon.backend.content.post.integration; 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.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; 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/content/post/integration/PostCommentCountIntegrationTest.java similarity index 95% 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 d6bd76157..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,15 +1,14 @@ -package edonymyeon.backend.post.integration; +package edonymyeon.backend.content.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.member.profile.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/content/post/integration/PostIntegrationTest.java similarity index 98% 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 9f99f4c21..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,20 +10,20 @@ 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.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.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.postimage.domain.PostImageInfo; +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; +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/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 1b5a2e4b6..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,10 +1,9 @@ -package edonymyeon.backend.post.integration; +package edonymyeon.backend.content.post.integration; import edonymyeon.backend.global.exception.ExceptionInformation; -import edonymyeon.backend.member.domain.Member; +import edonymyeon.backend.member.profile.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/content/post/integration/PostViewIntegrationTest.java similarity index 88% 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 d243abbea..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,11 +1,11 @@ -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.member.domain.Member; -import edonymyeon.backend.post.ImageFileCleaner; -import edonymyeon.backend.post.domain.Post; +import edonymyeon.backend.member.profile.domain.Member; +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/content/post/repository/PostRepositoryTest.java similarity index 95% 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 1a361db54..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,11 +1,11 @@ -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; +package edonymyeon.backend.content.post.repository; + +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; +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/content/post/repository/PostSpecificationTest.java similarity index 91% 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 2f5626225..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,6 +1,8 @@ -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 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/content/post/ui/PostControllerTest.java similarity index 95% 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 68ffd8ed5..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,15 +1,15 @@ -package edonymyeon.backend.post.ui; +package edonymyeon.backend.content.post.ui; -import static edonymyeon.backend.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.member.domain.Member; -import edonymyeon.backend.post.ImageFileCleaner; -import edonymyeon.backend.post.application.dto.response.PostIdResponse; +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; import java.io.IOException; 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 88% 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 796a84ca5..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; @@ -7,16 +7,16 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; 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.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; 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/content/thumbs/application/ThumbsDownServiceTest.java similarity index 88% 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 69d38dede..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; @@ -7,17 +7,17 @@ import static org.assertj.core.api.SoftAssertions.assertSoftly; 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.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; 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/content/thumbs/application/ThumbsInPostServiceTest.java similarity index 87% 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 6bade5675..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,18 +1,18 @@ -package edonymyeon.backend.thumbs.application; +package edonymyeon.backend.content.thumbs.application; 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.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; +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/content/thumbs/application/ThumbsUpServiceTest.java similarity index 90% 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 1f0d8c0d6..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,17 +1,17 @@ -package edonymyeon.backend.thumbs.application; +package edonymyeon.backend.content.thumbs.application; 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.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; 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/content/thumbs/docs/ThumbsControllerDocsTest.java similarity index 90% 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 3e9e2ef88..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.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,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.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; 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/content/thumbs/domain/AllThumbsInPostTest.java similarity index 84% 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 bf4695d3d..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,15 +1,15 @@ -package edonymyeon.backend.thumbs.domain; +package edonymyeon.backend.content.thumbs.domain; -import edonymyeon.backend.member.domain.Member; -import edonymyeon.backend.post.domain.Post; +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; 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/content/thumbs/integration/ThumbsIntegrationTest.java similarity index 94% 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 03d7afd96..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,14 +1,14 @@ -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.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.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; import edonymyeon.backend.support.EdonymyeonRestAssured; import edonymyeon.backend.support.IntegrationFixture; import io.restassured.response.ExtractableResponse; 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 87% 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 6d01dca3b..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,9 +1,11 @@ -package edonymyeon.backend.logging.application; +package edonymyeon.backend.global.logging.application; 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; @@ -14,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 ab87a05f2..e86be8ca5 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.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 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/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 0d863effc..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.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.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 90% 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 111518c45..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,11 +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.auth.application.dto.LoginRequest; +import edonymyeon.backend.member.auth.application.dto.LoginRequest; import edonymyeon.backend.global.exception.EdonymyeonException; -import edonymyeon.backend.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 f83286be6..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,23 +13,23 @@ 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.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.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.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; @@ -43,7 +43,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/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 54b2a72d4..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.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.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 96% 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 0a9707343..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,4 +1,4 @@ -package edonymyeon.backend.auth.domain; +package edonymyeon.backend.member.auth.domain; import static org.assertj.core.api.Assertions.assertThat; 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 0e73c9b25..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,18 +9,18 @@ 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.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.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.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 94% 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 779e530ca..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.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,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.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; 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/profile/domain/EmailTest.java similarity index 96% 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 78d67d771..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,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 org.assertj.core.api.Assertions.assertThatThrownBy; 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 98% 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 a81b23121..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; 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 92% 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 d46b26aff..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,7 +1,7 @@ -package edonymyeon.backend.member.domain; +package edonymyeon.backend.member.profile.domain; import static edonymyeon.backend.global.exception.ExceptionInformation.*; -import static edonymyeon.backend.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; 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 96% 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 7081f7318..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,10 +1,10 @@ -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.auth.domain.SimplePasswordEncoder; +import edonymyeon.backend.member.auth.domain.SimplePasswordEncoder; import edonymyeon.backend.global.exception.BusinessLogicException; import edonymyeon.backend.global.exception.EdonymyeonException; import org.junit.jupiter.api.Assertions; 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 96% 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 cacac34ad..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,13 +1,13 @@ -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.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.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; 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/profile/integration/MemberIntegrationTest.java similarity index 93% 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 412f22eba..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,17 +1,17 @@ -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.auth.application.dto.LoginRequest; +import edonymyeon.backend.member.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.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; 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/profile/repository/MemberRepositoryTest.java similarity index 92% 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 906323fbd..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,12 @@ -package edonymyeon.backend.member.repository; +package edonymyeon.backend.member.profile.repository; 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.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; import java.time.LocalDateTime; 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 da5a5d935..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,17 +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.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.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 90% 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 4b9a6325a..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.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.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.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 92% 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 35b8e099b..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,4 +1,4 @@ -package edonymyeon.backend.setting.domain; +package edonymyeon.backend.member.setting.domain; import static org.assertj.core.api.Assertions.assertThat; 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 3cc584951..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.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.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 e56ffd7ba..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,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.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.member.application.dto.ActiveMemberId; -import edonymyeon.backend.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.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.member.setting.application.SettingService; +import edonymyeon.backend.member.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..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,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.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.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.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.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.member.setting.application.SettingService; +import edonymyeon.backend.member.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..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,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.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.post.application.PostSlice; -import edonymyeon.backend.setting.application.SettingService; -import edonymyeon.backend.setting.domain.SettingType; +import edonymyeon.backend.content.post.ImageFileCleaner; +import edonymyeon.backend.content.post.application.PostSlice; +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.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/report/application/ReportServiceTest.java b/backend/src/test/java/edonymyeon/backend/report/application/ReportServiceTest.java index fe0965b47..342a9a54b 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.member.profile.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..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.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; @@ -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.post.ImageFileCleaner; -import edonymyeon.backend.post.domain.Post; -import edonymyeon.backend.post.repository.PostRepository; +import edonymyeon.backend.content.post.postimage.domain.PostImageInfos; +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; 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..1ac66669b 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.post.ImageFileCleaner; +import edonymyeon.backend.content.comment.domain.Comment; +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; -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/support/CommentTestSupport.java b/backend/src/test/java/edonymyeon/backend/support/CommentTestSupport.java index 18dc705c3..dc6f10b06 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.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/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..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.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.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/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..f27d17ad4 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.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 118019642..77be1ac18 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.member.profile.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..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.image.profileimage.domain.ProfileImageInfo; -import edonymyeon.backend.image.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 61cfe924f..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.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.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 4dccca99e..d933c9ce2 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.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; +import edonymyeon.backend.content.thumbs.repository.ThumbsRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component;