From 6ce30343fc2fc2e0dbcb2a69959e198546c5993e Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Fri, 7 Feb 2025 10:53:15 +0900 Subject: [PATCH 1/4] =?UTF-8?q?refactor:=20board,=20comment,=20post=20?= =?UTF-8?q?=ED=8C=A8=ED=82=A4=EC=A7=80=EB=A5=BC=20community=20=ED=8C=A8?= =?UTF-8?q?=ED=82=A4=EC=A7=80=EB=A1=9C=20=EC=9D=B4=EB=8F=99=20=EB=B0=8F=20?= =?UTF-8?q?=ED=86=B5=ED=95=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/board}/BoardController.java | 6 ++--- .../comment}/CommentController.java | 14 +++++------ .../controller/post}/PostController.java | 24 +++++++++---------- .../domain/board}/Board.java | 4 ++-- .../domain/comment}/Comment.java | 4 ++-- .../domain/post}/Post.java | 9 ++++--- .../domain/post}/PostImage.java | 4 ++-- .../domain/post}/PostLike.java | 2 +- .../dto/board}/PostFindBoardResponse.java | 4 ++-- .../dto/comment}/CommentCreateRequest.java | 6 ++--- .../dto/comment}/CommentCreateResponse.java | 4 ++-- .../dto/comment}/CommentDeleteResponse.java | 2 +- .../dto/comment}/CommentUpdateRequest.java | 2 +- .../dto/comment}/CommentUpdateResponse.java | 4 ++-- .../dto/comment}/PostFindCommentResponse.java | 4 ++-- .../dto/post}/BoardFindPostResponse.java | 6 ++--- .../dto/post}/PostCreateRequest.java | 6 ++--- .../dto/post}/PostCreateResponse.java | 4 ++-- .../dto/post}/PostDeleteResponse.java | 2 +- .../dto/post}/PostDislikeResponse.java | 4 ++-- .../dto/post}/PostFindPostImageResponse.java | 4 ++-- .../dto/post}/PostFindResponse.java | 8 +++---- .../dto/post}/PostLikeResponse.java | 4 ++-- .../dto/post}/PostUpdateRequest.java | 2 +- .../dto/post}/PostUpdateResponse.java | 4 ++-- .../repository/board}/BoardRepository.java | 4 ++-- .../comment}/CommentRepository.java | 4 ++-- .../repository/post}/PostImageRepository.java | 4 ++-- .../repository/post}/PostLikeRepository.java | 6 ++--- .../repository/post}/PostRepository.java | 4 ++-- .../service/board}/BoardService.java | 10 ++++---- .../service/comment}/CommentService.java | 24 +++++++++---------- .../service/post}/PostCommandService.java | 22 ++++++++--------- .../service/post}/PostLikeService.java | 14 +++++------ .../service/post}/PostQueryService.java | 18 +++++++------- .../service/UpdateViewCountService.java | 4 ++-- .../siteuser/domain/SiteUser.java | 6 ++--- .../board/service/BoardServiceTest.java | 5 ++-- .../comment/service/CommentServiceTest.java | 23 +++++++++--------- .../PostLikeCountConcurrencyTest.java | 10 ++++---- .../PostViewCountConcurrencyTest.java | 8 +++---- .../post/service/PostCommandServiceTest.java | 21 ++++++++-------- .../post/service/PostLikeServiceTest.java | 13 +++++----- .../post/service/PostQueryServiceTest.java | 21 ++++++++-------- .../integration/BaseIntegrationTest.java | 12 +++++----- 45 files changed, 187 insertions(+), 183 deletions(-) rename src/main/java/com/example/solidconnection/{board/controller => community/controller/board}/BoardController.java (87%) rename src/main/java/com/example/solidconnection/{comment/controller => community/controller/comment}/CommentController.java (80%) rename src/main/java/com/example/solidconnection/{post/controller => community/controller/post}/PostController.java (82%) rename src/main/java/com/example/solidconnection/{board/domain => community/domain/board}/Board.java (85%) rename src/main/java/com/example/solidconnection/{comment/domain => community/domain/comment}/Comment.java (96%) rename src/main/java/com/example/solidconnection/{post/domain => community/domain/post}/Post.java (92%) rename src/main/java/com/example/solidconnection/{entity => community/domain/post}/PostImage.java (88%) rename src/main/java/com/example/solidconnection/{post/domain => community/domain/post}/PostLike.java (96%) rename src/main/java/com/example/solidconnection/{board/dto => community/dto/board}/PostFindBoardResponse.java (69%) rename src/main/java/com/example/solidconnection/{comment/dto => community/dto/comment}/CommentCreateRequest.java (81%) rename src/main/java/com/example/solidconnection/{comment/dto => community/dto/comment}/CommentCreateResponse.java (62%) rename src/main/java/com/example/solidconnection/{comment/dto => community/dto/comment}/CommentDeleteResponse.java (50%) rename src/main/java/com/example/solidconnection/{comment/dto => community/dto/comment}/CommentUpdateRequest.java (85%) rename src/main/java/com/example/solidconnection/{comment/dto => community/dto/comment}/CommentUpdateResponse.java (62%) rename src/main/java/com/example/solidconnection/{comment/dto => community/dto/comment}/PostFindCommentResponse.java (88%) rename src/main/java/com/example/solidconnection/{post/dto => community/dto/post}/BoardFindPostResponse.java (87%) rename src/main/java/com/example/solidconnection/{post/dto => community/dto/post}/PostCreateRequest.java (87%) rename src/main/java/com/example/solidconnection/{post/dto => community/dto/post}/PostCreateResponse.java (62%) rename src/main/java/com/example/solidconnection/{post/dto => community/dto/post}/PostDeleteResponse.java (50%) rename src/main/java/com/example/solidconnection/{post/dto => community/dto/post}/PostDislikeResponse.java (68%) rename src/main/java/com/example/solidconnection/{post/dto => community/dto/post}/PostFindPostImageResponse.java (82%) rename src/main/java/com/example/solidconnection/{post/dto => community/dto/post}/PostFindResponse.java (86%) rename src/main/java/com/example/solidconnection/{post/dto => community/dto/post}/PostLikeResponse.java (68%) rename src/main/java/com/example/solidconnection/{post/dto => community/dto/post}/PostUpdateRequest.java (92%) rename src/main/java/com/example/solidconnection/{post/dto => community/dto/post}/PostUpdateResponse.java (62%) rename src/main/java/com/example/solidconnection/{board/repository => community/repository/board}/BoardRepository.java (88%) rename src/main/java/com/example/solidconnection/{comment/repository => community/repository/comment}/CommentRepository.java (91%) rename src/main/java/com/example/solidconnection/{repositories => community/repository/post}/PostImageRepository.java (61%) rename src/main/java/com/example/solidconnection/{post/repository => community/repository/post}/PostLikeRepository.java (79%) rename src/main/java/com/example/solidconnection/{post/repository => community/repository/post}/PostRepository.java (93%) rename src/main/java/com/example/solidconnection/{board/service => community/service/board}/BoardService.java (85%) rename src/main/java/com/example/solidconnection/{comment/service => community/service/comment}/CommentService.java (84%) rename src/main/java/com/example/solidconnection/{post/service => community/service/post}/PostCommandService.java (87%) rename src/main/java/com/example/solidconnection/{post/service => community/service/post}/PostLikeService.java (83%) rename src/main/java/com/example/solidconnection/{post/service => community/service/post}/PostQueryService.java (80%) diff --git a/src/main/java/com/example/solidconnection/board/controller/BoardController.java b/src/main/java/com/example/solidconnection/community/controller/board/BoardController.java similarity index 87% rename from src/main/java/com/example/solidconnection/board/controller/BoardController.java rename to src/main/java/com/example/solidconnection/community/controller/board/BoardController.java index f6ebb27d0..e0514745b 100644 --- a/src/main/java/com/example/solidconnection/board/controller/BoardController.java +++ b/src/main/java/com/example/solidconnection/community/controller/board/BoardController.java @@ -1,7 +1,7 @@ -package com.example.solidconnection.board.controller; +package com.example.solidconnection.community.controller.board; -import com.example.solidconnection.board.service.BoardService; -import com.example.solidconnection.post.dto.BoardFindPostResponse; +import com.example.solidconnection.community.service.board.BoardService; +import com.example.solidconnection.community.dto.post.BoardFindPostResponse; import com.example.solidconnection.type.BoardCode; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/example/solidconnection/comment/controller/CommentController.java b/src/main/java/com/example/solidconnection/community/controller/comment/CommentController.java similarity index 80% rename from src/main/java/com/example/solidconnection/comment/controller/CommentController.java rename to src/main/java/com/example/solidconnection/community/controller/comment/CommentController.java index fda360b4a..250622f02 100644 --- a/src/main/java/com/example/solidconnection/comment/controller/CommentController.java +++ b/src/main/java/com/example/solidconnection/community/controller/comment/CommentController.java @@ -1,11 +1,11 @@ -package com.example.solidconnection.comment.controller; +package com.example.solidconnection.community.controller.comment; -import com.example.solidconnection.comment.dto.CommentCreateRequest; -import com.example.solidconnection.comment.dto.CommentCreateResponse; -import com.example.solidconnection.comment.dto.CommentDeleteResponse; -import com.example.solidconnection.comment.dto.CommentUpdateRequest; -import com.example.solidconnection.comment.dto.CommentUpdateResponse; -import com.example.solidconnection.comment.service.CommentService; +import com.example.solidconnection.community.dto.comment.CommentCreateRequest; +import com.example.solidconnection.community.dto.comment.CommentCreateResponse; +import com.example.solidconnection.community.dto.comment.CommentDeleteResponse; +import com.example.solidconnection.community.dto.comment.CommentUpdateRequest; +import com.example.solidconnection.community.dto.comment.CommentUpdateResponse; +import com.example.solidconnection.community.service.comment.CommentService; import com.example.solidconnection.custom.resolver.AuthorizedUser; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.validation.Valid; diff --git a/src/main/java/com/example/solidconnection/post/controller/PostController.java b/src/main/java/com/example/solidconnection/community/controller/post/PostController.java similarity index 82% rename from src/main/java/com/example/solidconnection/post/controller/PostController.java rename to src/main/java/com/example/solidconnection/community/controller/post/PostController.java index bc3f9d123..560563462 100644 --- a/src/main/java/com/example/solidconnection/post/controller/PostController.java +++ b/src/main/java/com/example/solidconnection/community/controller/post/PostController.java @@ -1,17 +1,17 @@ -package com.example.solidconnection.post.controller; +package com.example.solidconnection.community.controller.post; import com.example.solidconnection.custom.resolver.AuthorizedUser; -import com.example.solidconnection.post.dto.PostCreateRequest; -import com.example.solidconnection.post.dto.PostCreateResponse; -import com.example.solidconnection.post.dto.PostDeleteResponse; -import com.example.solidconnection.post.dto.PostDislikeResponse; -import com.example.solidconnection.post.dto.PostFindResponse; -import com.example.solidconnection.post.dto.PostLikeResponse; -import com.example.solidconnection.post.dto.PostUpdateRequest; -import com.example.solidconnection.post.dto.PostUpdateResponse; -import com.example.solidconnection.post.service.PostCommandService; -import com.example.solidconnection.post.service.PostLikeService; -import com.example.solidconnection.post.service.PostQueryService; +import com.example.solidconnection.community.dto.post.PostCreateRequest; +import com.example.solidconnection.community.dto.post.PostCreateResponse; +import com.example.solidconnection.community.dto.post.PostDeleteResponse; +import com.example.solidconnection.community.dto.post.PostDislikeResponse; +import com.example.solidconnection.community.dto.post.PostFindResponse; +import com.example.solidconnection.community.dto.post.PostLikeResponse; +import com.example.solidconnection.community.dto.post.PostUpdateRequest; +import com.example.solidconnection.community.dto.post.PostUpdateResponse; +import com.example.solidconnection.community.service.post.PostCommandService; +import com.example.solidconnection.community.service.post.PostLikeService; +import com.example.solidconnection.community.service.post.PostQueryService; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/solidconnection/board/domain/Board.java b/src/main/java/com/example/solidconnection/community/domain/board/Board.java similarity index 85% rename from src/main/java/com/example/solidconnection/board/domain/Board.java rename to src/main/java/com/example/solidconnection/community/domain/board/Board.java index 77d0aada8..a957eaa7c 100644 --- a/src/main/java/com/example/solidconnection/board/domain/Board.java +++ b/src/main/java/com/example/solidconnection/community/domain/board/Board.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.board.domain; +package com.example.solidconnection.community.domain.board; -import com.example.solidconnection.post.domain.Post; +import com.example.solidconnection.community.domain.post.Post; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/com/example/solidconnection/comment/domain/Comment.java b/src/main/java/com/example/solidconnection/community/domain/comment/Comment.java similarity index 96% rename from src/main/java/com/example/solidconnection/comment/domain/Comment.java rename to src/main/java/com/example/solidconnection/community/domain/comment/Comment.java index a4d147a61..181d2a358 100644 --- a/src/main/java/com/example/solidconnection/comment/domain/Comment.java +++ b/src/main/java/com/example/solidconnection/community/domain/comment/Comment.java @@ -1,7 +1,7 @@ -package com.example.solidconnection.comment.domain; +package com.example.solidconnection.community.domain.comment; import com.example.solidconnection.entity.common.BaseEntity; -import com.example.solidconnection.post.domain.Post; +import com.example.solidconnection.community.domain.post.Post; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; diff --git a/src/main/java/com/example/solidconnection/post/domain/Post.java b/src/main/java/com/example/solidconnection/community/domain/post/Post.java similarity index 92% rename from src/main/java/com/example/solidconnection/post/domain/Post.java rename to src/main/java/com/example/solidconnection/community/domain/post/Post.java index 31125f8bd..9fdc52440 100644 --- a/src/main/java/com/example/solidconnection/post/domain/Post.java +++ b/src/main/java/com/example/solidconnection/community/domain/post/Post.java @@ -1,10 +1,9 @@ -package com.example.solidconnection.post.domain; +package com.example.solidconnection.community.domain.post; -import com.example.solidconnection.board.domain.Board; -import com.example.solidconnection.comment.domain.Comment; -import com.example.solidconnection.entity.PostImage; +import com.example.solidconnection.community.domain.board.Board; +import com.example.solidconnection.community.domain.comment.Comment; import com.example.solidconnection.entity.common.BaseEntity; -import com.example.solidconnection.post.dto.PostUpdateRequest; +import com.example.solidconnection.community.dto.post.PostUpdateRequest; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.type.PostCategory; import jakarta.persistence.CascadeType; diff --git a/src/main/java/com/example/solidconnection/entity/PostImage.java b/src/main/java/com/example/solidconnection/community/domain/post/PostImage.java similarity index 88% rename from src/main/java/com/example/solidconnection/entity/PostImage.java rename to src/main/java/com/example/solidconnection/community/domain/post/PostImage.java index 653beecc4..f42e591e3 100644 --- a/src/main/java/com/example/solidconnection/entity/PostImage.java +++ b/src/main/java/com/example/solidconnection/community/domain/post/PostImage.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.entity; +package com.example.solidconnection.community.domain.post; -import com.example.solidconnection.post.domain.Post; +import com.example.solidconnection.community.domain.post.Post; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/src/main/java/com/example/solidconnection/post/domain/PostLike.java b/src/main/java/com/example/solidconnection/community/domain/post/PostLike.java similarity index 96% rename from src/main/java/com/example/solidconnection/post/domain/PostLike.java rename to src/main/java/com/example/solidconnection/community/domain/post/PostLike.java index 9edf4052e..cfba2238a 100644 --- a/src/main/java/com/example/solidconnection/post/domain/PostLike.java +++ b/src/main/java/com/example/solidconnection/community/domain/post/PostLike.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.post.domain; +package com.example.solidconnection.community.domain.post; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.persistence.Entity; diff --git a/src/main/java/com/example/solidconnection/board/dto/PostFindBoardResponse.java b/src/main/java/com/example/solidconnection/community/dto/board/PostFindBoardResponse.java similarity index 69% rename from src/main/java/com/example/solidconnection/board/dto/PostFindBoardResponse.java rename to src/main/java/com/example/solidconnection/community/dto/board/PostFindBoardResponse.java index b06baa305..84db91a5a 100644 --- a/src/main/java/com/example/solidconnection/board/dto/PostFindBoardResponse.java +++ b/src/main/java/com/example/solidconnection/community/dto/board/PostFindBoardResponse.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.board.dto; +package com.example.solidconnection.community.dto.board; -import com.example.solidconnection.board.domain.Board; +import com.example.solidconnection.community.domain.board.Board; public record PostFindBoardResponse( String code, diff --git a/src/main/java/com/example/solidconnection/comment/dto/CommentCreateRequest.java b/src/main/java/com/example/solidconnection/community/dto/comment/CommentCreateRequest.java similarity index 81% rename from src/main/java/com/example/solidconnection/comment/dto/CommentCreateRequest.java rename to src/main/java/com/example/solidconnection/community/dto/comment/CommentCreateRequest.java index c2065685b..76b107460 100644 --- a/src/main/java/com/example/solidconnection/comment/dto/CommentCreateRequest.java +++ b/src/main/java/com/example/solidconnection/community/dto/comment/CommentCreateRequest.java @@ -1,7 +1,7 @@ -package com.example.solidconnection.comment.dto; +package com.example.solidconnection.community.dto.comment; -import com.example.solidconnection.comment.domain.Comment; -import com.example.solidconnection.post.domain.Post; +import com.example.solidconnection.community.domain.comment.Comment; +import com.example.solidconnection.community.domain.post.Post; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; diff --git a/src/main/java/com/example/solidconnection/comment/dto/CommentCreateResponse.java b/src/main/java/com/example/solidconnection/community/dto/comment/CommentCreateResponse.java similarity index 62% rename from src/main/java/com/example/solidconnection/comment/dto/CommentCreateResponse.java rename to src/main/java/com/example/solidconnection/community/dto/comment/CommentCreateResponse.java index 60d7529c2..f3b719be5 100644 --- a/src/main/java/com/example/solidconnection/comment/dto/CommentCreateResponse.java +++ b/src/main/java/com/example/solidconnection/community/dto/comment/CommentCreateResponse.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.comment.dto; +package com.example.solidconnection.community.dto.comment; -import com.example.solidconnection.comment.domain.Comment; +import com.example.solidconnection.community.domain.comment.Comment; public record CommentCreateResponse( Long id diff --git a/src/main/java/com/example/solidconnection/comment/dto/CommentDeleteResponse.java b/src/main/java/com/example/solidconnection/community/dto/comment/CommentDeleteResponse.java similarity index 50% rename from src/main/java/com/example/solidconnection/comment/dto/CommentDeleteResponse.java rename to src/main/java/com/example/solidconnection/community/dto/comment/CommentDeleteResponse.java index 393e4fe8b..c293f8c71 100644 --- a/src/main/java/com/example/solidconnection/comment/dto/CommentDeleteResponse.java +++ b/src/main/java/com/example/solidconnection/community/dto/comment/CommentDeleteResponse.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.comment.dto; +package com.example.solidconnection.community.dto.comment; public record CommentDeleteResponse( Long id diff --git a/src/main/java/com/example/solidconnection/comment/dto/CommentUpdateRequest.java b/src/main/java/com/example/solidconnection/community/dto/comment/CommentUpdateRequest.java similarity index 85% rename from src/main/java/com/example/solidconnection/comment/dto/CommentUpdateRequest.java rename to src/main/java/com/example/solidconnection/community/dto/comment/CommentUpdateRequest.java index d99429931..56bb4c97f 100644 --- a/src/main/java/com/example/solidconnection/comment/dto/CommentUpdateRequest.java +++ b/src/main/java/com/example/solidconnection/community/dto/comment/CommentUpdateRequest.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.comment.dto; +package com.example.solidconnection.community.dto.comment; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; diff --git a/src/main/java/com/example/solidconnection/comment/dto/CommentUpdateResponse.java b/src/main/java/com/example/solidconnection/community/dto/comment/CommentUpdateResponse.java similarity index 62% rename from src/main/java/com/example/solidconnection/comment/dto/CommentUpdateResponse.java rename to src/main/java/com/example/solidconnection/community/dto/comment/CommentUpdateResponse.java index b621ab111..02a7a6fbb 100644 --- a/src/main/java/com/example/solidconnection/comment/dto/CommentUpdateResponse.java +++ b/src/main/java/com/example/solidconnection/community/dto/comment/CommentUpdateResponse.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.comment.dto; +package com.example.solidconnection.community.dto.comment; -import com.example.solidconnection.comment.domain.Comment; +import com.example.solidconnection.community.domain.comment.Comment; public record CommentUpdateResponse( Long id diff --git a/src/main/java/com/example/solidconnection/comment/dto/PostFindCommentResponse.java b/src/main/java/com/example/solidconnection/community/dto/comment/PostFindCommentResponse.java similarity index 88% rename from src/main/java/com/example/solidconnection/comment/dto/PostFindCommentResponse.java rename to src/main/java/com/example/solidconnection/community/dto/comment/PostFindCommentResponse.java index a0d68066a..47a00ed2a 100644 --- a/src/main/java/com/example/solidconnection/comment/dto/PostFindCommentResponse.java +++ b/src/main/java/com/example/solidconnection/community/dto/comment/PostFindCommentResponse.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.comment.dto; +package com.example.solidconnection.community.dto.comment; -import com.example.solidconnection.comment.domain.Comment; +import com.example.solidconnection.community.domain.comment.Comment; import com.example.solidconnection.siteuser.dto.PostFindSiteUserResponse; import java.time.ZonedDateTime; diff --git a/src/main/java/com/example/solidconnection/post/dto/BoardFindPostResponse.java b/src/main/java/com/example/solidconnection/community/dto/post/BoardFindPostResponse.java similarity index 87% rename from src/main/java/com/example/solidconnection/post/dto/BoardFindPostResponse.java rename to src/main/java/com/example/solidconnection/community/dto/post/BoardFindPostResponse.java index 4f475824c..27661fb93 100644 --- a/src/main/java/com/example/solidconnection/post/dto/BoardFindPostResponse.java +++ b/src/main/java/com/example/solidconnection/community/dto/post/BoardFindPostResponse.java @@ -1,7 +1,7 @@ -package com.example.solidconnection.post.dto; +package com.example.solidconnection.community.dto.post; -import com.example.solidconnection.entity.PostImage; -import com.example.solidconnection.post.domain.Post; +import com.example.solidconnection.community.domain.post.PostImage; +import com.example.solidconnection.community.domain.post.Post; import java.time.ZonedDateTime; import java.util.List; diff --git a/src/main/java/com/example/solidconnection/post/dto/PostCreateRequest.java b/src/main/java/com/example/solidconnection/community/dto/post/PostCreateRequest.java similarity index 87% rename from src/main/java/com/example/solidconnection/post/dto/PostCreateRequest.java rename to src/main/java/com/example/solidconnection/community/dto/post/PostCreateRequest.java index a1ba1c696..db1215231 100644 --- a/src/main/java/com/example/solidconnection/post/dto/PostCreateRequest.java +++ b/src/main/java/com/example/solidconnection/community/dto/post/PostCreateRequest.java @@ -1,7 +1,7 @@ -package com.example.solidconnection.post.dto; +package com.example.solidconnection.community.dto.post; -import com.example.solidconnection.board.domain.Board; -import com.example.solidconnection.post.domain.Post; +import com.example.solidconnection.community.domain.board.Board; +import com.example.solidconnection.community.domain.post.Post; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.type.PostCategory; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/example/solidconnection/post/dto/PostCreateResponse.java b/src/main/java/com/example/solidconnection/community/dto/post/PostCreateResponse.java similarity index 62% rename from src/main/java/com/example/solidconnection/post/dto/PostCreateResponse.java rename to src/main/java/com/example/solidconnection/community/dto/post/PostCreateResponse.java index a514ffca6..4be7fe3e4 100644 --- a/src/main/java/com/example/solidconnection/post/dto/PostCreateResponse.java +++ b/src/main/java/com/example/solidconnection/community/dto/post/PostCreateResponse.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.post.dto; +package com.example.solidconnection.community.dto.post; -import com.example.solidconnection.post.domain.Post; +import com.example.solidconnection.community.domain.post.Post; public record PostCreateResponse( Long id diff --git a/src/main/java/com/example/solidconnection/post/dto/PostDeleteResponse.java b/src/main/java/com/example/solidconnection/community/dto/post/PostDeleteResponse.java similarity index 50% rename from src/main/java/com/example/solidconnection/post/dto/PostDeleteResponse.java rename to src/main/java/com/example/solidconnection/community/dto/post/PostDeleteResponse.java index 23c67670d..b9d65847e 100644 --- a/src/main/java/com/example/solidconnection/post/dto/PostDeleteResponse.java +++ b/src/main/java/com/example/solidconnection/community/dto/post/PostDeleteResponse.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.post.dto; +package com.example.solidconnection.community.dto.post; public record PostDeleteResponse( Long id diff --git a/src/main/java/com/example/solidconnection/post/dto/PostDislikeResponse.java b/src/main/java/com/example/solidconnection/community/dto/post/PostDislikeResponse.java similarity index 68% rename from src/main/java/com/example/solidconnection/post/dto/PostDislikeResponse.java rename to src/main/java/com/example/solidconnection/community/dto/post/PostDislikeResponse.java index 14de9987d..39eaf37f0 100644 --- a/src/main/java/com/example/solidconnection/post/dto/PostDislikeResponse.java +++ b/src/main/java/com/example/solidconnection/community/dto/post/PostDislikeResponse.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.post.dto; +package com.example.solidconnection.community.dto.post; -import com.example.solidconnection.post.domain.Post; +import com.example.solidconnection.community.domain.post.Post; public record PostDislikeResponse( Long likeCount, diff --git a/src/main/java/com/example/solidconnection/post/dto/PostFindPostImageResponse.java b/src/main/java/com/example/solidconnection/community/dto/post/PostFindPostImageResponse.java similarity index 82% rename from src/main/java/com/example/solidconnection/post/dto/PostFindPostImageResponse.java rename to src/main/java/com/example/solidconnection/community/dto/post/PostFindPostImageResponse.java index 63adf0020..c7b6d5574 100644 --- a/src/main/java/com/example/solidconnection/post/dto/PostFindPostImageResponse.java +++ b/src/main/java/com/example/solidconnection/community/dto/post/PostFindPostImageResponse.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.post.dto; +package com.example.solidconnection.community.dto.post; -import com.example.solidconnection.entity.PostImage; +import com.example.solidconnection.community.domain.post.PostImage; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/example/solidconnection/post/dto/PostFindResponse.java b/src/main/java/com/example/solidconnection/community/dto/post/PostFindResponse.java similarity index 86% rename from src/main/java/com/example/solidconnection/post/dto/PostFindResponse.java rename to src/main/java/com/example/solidconnection/community/dto/post/PostFindResponse.java index 1562dd5bc..0421d147b 100644 --- a/src/main/java/com/example/solidconnection/post/dto/PostFindResponse.java +++ b/src/main/java/com/example/solidconnection/community/dto/post/PostFindResponse.java @@ -1,8 +1,8 @@ -package com.example.solidconnection.post.dto; +package com.example.solidconnection.community.dto.post; -import com.example.solidconnection.board.dto.PostFindBoardResponse; -import com.example.solidconnection.comment.dto.PostFindCommentResponse; -import com.example.solidconnection.post.domain.Post; +import com.example.solidconnection.community.dto.board.PostFindBoardResponse; +import com.example.solidconnection.community.dto.comment.PostFindCommentResponse; +import com.example.solidconnection.community.domain.post.Post; import com.example.solidconnection.siteuser.dto.PostFindSiteUserResponse; import java.time.ZonedDateTime; diff --git a/src/main/java/com/example/solidconnection/post/dto/PostLikeResponse.java b/src/main/java/com/example/solidconnection/community/dto/post/PostLikeResponse.java similarity index 68% rename from src/main/java/com/example/solidconnection/post/dto/PostLikeResponse.java rename to src/main/java/com/example/solidconnection/community/dto/post/PostLikeResponse.java index 35d7d58c9..51a8f776c 100644 --- a/src/main/java/com/example/solidconnection/post/dto/PostLikeResponse.java +++ b/src/main/java/com/example/solidconnection/community/dto/post/PostLikeResponse.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.post.dto; +package com.example.solidconnection.community.dto.post; -import com.example.solidconnection.post.domain.Post; +import com.example.solidconnection.community.domain.post.Post; public record PostLikeResponse( Long likeCount, diff --git a/src/main/java/com/example/solidconnection/post/dto/PostUpdateRequest.java b/src/main/java/com/example/solidconnection/community/dto/post/PostUpdateRequest.java similarity index 92% rename from src/main/java/com/example/solidconnection/post/dto/PostUpdateRequest.java rename to src/main/java/com/example/solidconnection/community/dto/post/PostUpdateRequest.java index b9bdc6f54..26aabb014 100644 --- a/src/main/java/com/example/solidconnection/post/dto/PostUpdateRequest.java +++ b/src/main/java/com/example/solidconnection/community/dto/post/PostUpdateRequest.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.post.dto; +package com.example.solidconnection.community.dto.post; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/example/solidconnection/post/dto/PostUpdateResponse.java b/src/main/java/com/example/solidconnection/community/dto/post/PostUpdateResponse.java similarity index 62% rename from src/main/java/com/example/solidconnection/post/dto/PostUpdateResponse.java rename to src/main/java/com/example/solidconnection/community/dto/post/PostUpdateResponse.java index 70d656766..34d311cb4 100644 --- a/src/main/java/com/example/solidconnection/post/dto/PostUpdateResponse.java +++ b/src/main/java/com/example/solidconnection/community/dto/post/PostUpdateResponse.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.post.dto; +package com.example.solidconnection.community.dto.post; -import com.example.solidconnection.post.domain.Post; +import com.example.solidconnection.community.domain.post.Post; public record PostUpdateResponse( Long id diff --git a/src/main/java/com/example/solidconnection/board/repository/BoardRepository.java b/src/main/java/com/example/solidconnection/community/repository/board/BoardRepository.java similarity index 88% rename from src/main/java/com/example/solidconnection/board/repository/BoardRepository.java rename to src/main/java/com/example/solidconnection/community/repository/board/BoardRepository.java index 5c4538279..e5e915943 100644 --- a/src/main/java/com/example/solidconnection/board/repository/BoardRepository.java +++ b/src/main/java/com/example/solidconnection/community/repository/board/BoardRepository.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.board.repository; +package com.example.solidconnection.community.repository.board; -import com.example.solidconnection.board.domain.Board; +import com.example.solidconnection.community.domain.board.Board; import com.example.solidconnection.custom.exception.CustomException; import com.example.solidconnection.custom.exception.ErrorCode; import org.springframework.data.jpa.repository.EntityGraph; diff --git a/src/main/java/com/example/solidconnection/comment/repository/CommentRepository.java b/src/main/java/com/example/solidconnection/community/repository/comment/CommentRepository.java similarity index 91% rename from src/main/java/com/example/solidconnection/comment/repository/CommentRepository.java rename to src/main/java/com/example/solidconnection/community/repository/comment/CommentRepository.java index ce37c42a1..3c3ee6ea3 100644 --- a/src/main/java/com/example/solidconnection/comment/repository/CommentRepository.java +++ b/src/main/java/com/example/solidconnection/community/repository/comment/CommentRepository.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.comment.repository; +package com.example.solidconnection.community.repository.comment; -import com.example.solidconnection.comment.domain.Comment; +import com.example.solidconnection.community.domain.comment.Comment; import com.example.solidconnection.custom.exception.CustomException; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/example/solidconnection/repositories/PostImageRepository.java b/src/main/java/com/example/solidconnection/community/repository/post/PostImageRepository.java similarity index 61% rename from src/main/java/com/example/solidconnection/repositories/PostImageRepository.java rename to src/main/java/com/example/solidconnection/community/repository/post/PostImageRepository.java index 0ae776877..ea304c904 100644 --- a/src/main/java/com/example/solidconnection/repositories/PostImageRepository.java +++ b/src/main/java/com/example/solidconnection/community/repository/post/PostImageRepository.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.repositories; +package com.example.solidconnection.community.repository.post; -import com.example.solidconnection.entity.PostImage; +import com.example.solidconnection.community.domain.post.PostImage; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/solidconnection/post/repository/PostLikeRepository.java b/src/main/java/com/example/solidconnection/community/repository/post/PostLikeRepository.java similarity index 79% rename from src/main/java/com/example/solidconnection/post/repository/PostLikeRepository.java rename to src/main/java/com/example/solidconnection/community/repository/post/PostLikeRepository.java index bebde7a92..4346a423c 100644 --- a/src/main/java/com/example/solidconnection/post/repository/PostLikeRepository.java +++ b/src/main/java/com/example/solidconnection/community/repository/post/PostLikeRepository.java @@ -1,8 +1,8 @@ -package com.example.solidconnection.post.repository; +package com.example.solidconnection.community.repository.post; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.post.domain.Post; -import com.example.solidconnection.post.domain.PostLike; +import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.domain.post.PostLike; import com.example.solidconnection.siteuser.domain.SiteUser; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/solidconnection/post/repository/PostRepository.java b/src/main/java/com/example/solidconnection/community/repository/post/PostRepository.java similarity index 93% rename from src/main/java/com/example/solidconnection/post/repository/PostRepository.java rename to src/main/java/com/example/solidconnection/community/repository/post/PostRepository.java index e96881147..bb1d8df0e 100644 --- a/src/main/java/com/example/solidconnection/post/repository/PostRepository.java +++ b/src/main/java/com/example/solidconnection/community/repository/post/PostRepository.java @@ -1,7 +1,7 @@ -package com.example.solidconnection.post.repository; +package com.example.solidconnection.community.repository.post; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.post.domain.Post; +import com.example.solidconnection.community.domain.post.Post; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; diff --git a/src/main/java/com/example/solidconnection/board/service/BoardService.java b/src/main/java/com/example/solidconnection/community/service/board/BoardService.java similarity index 85% rename from src/main/java/com/example/solidconnection/board/service/BoardService.java rename to src/main/java/com/example/solidconnection/community/service/board/BoardService.java index 2513e0903..493405d78 100644 --- a/src/main/java/com/example/solidconnection/board/service/BoardService.java +++ b/src/main/java/com/example/solidconnection/community/service/board/BoardService.java @@ -1,11 +1,11 @@ -package com.example.solidconnection.board.service; +package com.example.solidconnection.community.service.board; -import com.example.solidconnection.board.domain.Board; -import com.example.solidconnection.board.repository.BoardRepository; +import com.example.solidconnection.community.domain.board.Board; +import com.example.solidconnection.community.repository.board.BoardRepository; import com.example.solidconnection.custom.exception.CustomException; import com.example.solidconnection.custom.exception.ErrorCode; -import com.example.solidconnection.post.domain.Post; -import com.example.solidconnection.post.dto.BoardFindPostResponse; +import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.dto.post.BoardFindPostResponse; import com.example.solidconnection.type.BoardCode; import com.example.solidconnection.type.PostCategory; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/solidconnection/comment/service/CommentService.java b/src/main/java/com/example/solidconnection/community/service/comment/CommentService.java similarity index 84% rename from src/main/java/com/example/solidconnection/comment/service/CommentService.java rename to src/main/java/com/example/solidconnection/community/service/comment/CommentService.java index b7c1c6068..cfa141811 100644 --- a/src/main/java/com/example/solidconnection/comment/service/CommentService.java +++ b/src/main/java/com/example/solidconnection/community/service/comment/CommentService.java @@ -1,16 +1,16 @@ -package com.example.solidconnection.comment.service; - -import com.example.solidconnection.comment.domain.Comment; -import com.example.solidconnection.comment.dto.CommentCreateRequest; -import com.example.solidconnection.comment.dto.CommentCreateResponse; -import com.example.solidconnection.comment.dto.CommentDeleteResponse; -import com.example.solidconnection.comment.dto.CommentUpdateRequest; -import com.example.solidconnection.comment.dto.CommentUpdateResponse; -import com.example.solidconnection.comment.dto.PostFindCommentResponse; -import com.example.solidconnection.comment.repository.CommentRepository; +package com.example.solidconnection.community.service.comment; + +import com.example.solidconnection.community.domain.comment.Comment; +import com.example.solidconnection.community.dto.comment.CommentCreateRequest; +import com.example.solidconnection.community.dto.comment.CommentCreateResponse; +import com.example.solidconnection.community.dto.comment.CommentDeleteResponse; +import com.example.solidconnection.community.dto.comment.CommentUpdateRequest; +import com.example.solidconnection.community.dto.comment.CommentUpdateResponse; +import com.example.solidconnection.community.dto.comment.PostFindCommentResponse; +import com.example.solidconnection.community.repository.comment.CommentRepository; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.post.domain.Post; -import com.example.solidconnection.post.repository.PostRepository; +import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.repository.post.PostRepository; import com.example.solidconnection.siteuser.domain.SiteUser; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/example/solidconnection/post/service/PostCommandService.java b/src/main/java/com/example/solidconnection/community/service/post/PostCommandService.java similarity index 87% rename from src/main/java/com/example/solidconnection/post/service/PostCommandService.java rename to src/main/java/com/example/solidconnection/community/service/post/PostCommandService.java index 74eb86310..3bc350f15 100644 --- a/src/main/java/com/example/solidconnection/post/service/PostCommandService.java +++ b/src/main/java/com/example/solidconnection/community/service/post/PostCommandService.java @@ -1,16 +1,16 @@ -package com.example.solidconnection.post.service; +package com.example.solidconnection.community.service.post; -import com.example.solidconnection.board.domain.Board; -import com.example.solidconnection.board.repository.BoardRepository; +import com.example.solidconnection.community.domain.board.Board; +import com.example.solidconnection.community.repository.board.BoardRepository; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.entity.PostImage; -import com.example.solidconnection.post.domain.Post; -import com.example.solidconnection.post.dto.PostCreateRequest; -import com.example.solidconnection.post.dto.PostCreateResponse; -import com.example.solidconnection.post.dto.PostDeleteResponse; -import com.example.solidconnection.post.dto.PostUpdateRequest; -import com.example.solidconnection.post.dto.PostUpdateResponse; -import com.example.solidconnection.post.repository.PostRepository; +import com.example.solidconnection.community.domain.post.PostImage; +import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.dto.post.PostCreateRequest; +import com.example.solidconnection.community.dto.post.PostCreateResponse; +import com.example.solidconnection.community.dto.post.PostDeleteResponse; +import com.example.solidconnection.community.dto.post.PostUpdateRequest; +import com.example.solidconnection.community.dto.post.PostUpdateResponse; +import com.example.solidconnection.community.repository.post.PostRepository; import com.example.solidconnection.s3.S3Service; import com.example.solidconnection.s3.UploadedFileUrlResponse; import com.example.solidconnection.service.RedisService; diff --git a/src/main/java/com/example/solidconnection/post/service/PostLikeService.java b/src/main/java/com/example/solidconnection/community/service/post/PostLikeService.java similarity index 83% rename from src/main/java/com/example/solidconnection/post/service/PostLikeService.java rename to src/main/java/com/example/solidconnection/community/service/post/PostLikeService.java index 5aaf994c7..55c8e07bb 100644 --- a/src/main/java/com/example/solidconnection/post/service/PostLikeService.java +++ b/src/main/java/com/example/solidconnection/community/service/post/PostLikeService.java @@ -1,12 +1,12 @@ -package com.example.solidconnection.post.service; +package com.example.solidconnection.community.service.post; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.post.domain.Post; -import com.example.solidconnection.post.domain.PostLike; -import com.example.solidconnection.post.dto.PostDislikeResponse; -import com.example.solidconnection.post.dto.PostLikeResponse; -import com.example.solidconnection.post.repository.PostLikeRepository; -import com.example.solidconnection.post.repository.PostRepository; +import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.domain.post.PostLike; +import com.example.solidconnection.community.dto.post.PostDislikeResponse; +import com.example.solidconnection.community.dto.post.PostLikeResponse; +import com.example.solidconnection.community.repository.post.PostLikeRepository; +import com.example.solidconnection.community.repository.post.PostRepository; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.type.BoardCode; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/solidconnection/post/service/PostQueryService.java b/src/main/java/com/example/solidconnection/community/service/post/PostQueryService.java similarity index 80% rename from src/main/java/com/example/solidconnection/post/service/PostQueryService.java rename to src/main/java/com/example/solidconnection/community/service/post/PostQueryService.java index a45ca3968..d017ede7e 100644 --- a/src/main/java/com/example/solidconnection/post/service/PostQueryService.java +++ b/src/main/java/com/example/solidconnection/community/service/post/PostQueryService.java @@ -1,14 +1,14 @@ -package com.example.solidconnection.post.service; +package com.example.solidconnection.community.service.post; -import com.example.solidconnection.board.dto.PostFindBoardResponse; -import com.example.solidconnection.comment.dto.PostFindCommentResponse; -import com.example.solidconnection.comment.service.CommentService; +import com.example.solidconnection.community.dto.board.PostFindBoardResponse; +import com.example.solidconnection.community.dto.comment.PostFindCommentResponse; +import com.example.solidconnection.community.service.comment.CommentService; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.post.domain.Post; -import com.example.solidconnection.post.dto.PostFindPostImageResponse; -import com.example.solidconnection.post.dto.PostFindResponse; -import com.example.solidconnection.post.repository.PostLikeRepository; -import com.example.solidconnection.post.repository.PostRepository; +import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.dto.post.PostFindPostImageResponse; +import com.example.solidconnection.community.dto.post.PostFindResponse; +import com.example.solidconnection.community.repository.post.PostLikeRepository; +import com.example.solidconnection.community.repository.post.PostRepository; import com.example.solidconnection.service.RedisService; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.dto.PostFindSiteUserResponse; diff --git a/src/main/java/com/example/solidconnection/service/UpdateViewCountService.java b/src/main/java/com/example/solidconnection/service/UpdateViewCountService.java index 55d4d9eba..0fbd9c56a 100644 --- a/src/main/java/com/example/solidconnection/service/UpdateViewCountService.java +++ b/src/main/java/com/example/solidconnection/service/UpdateViewCountService.java @@ -1,7 +1,7 @@ package com.example.solidconnection.service; -import com.example.solidconnection.post.domain.Post; -import com.example.solidconnection.post.repository.PostRepository; +import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.repository.post.PostRepository; import com.example.solidconnection.util.RedisUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java b/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java index 2c2a5d8be..a84874b13 100644 --- a/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java +++ b/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java @@ -1,8 +1,8 @@ package com.example.solidconnection.siteuser.domain; -import com.example.solidconnection.comment.domain.Comment; -import com.example.solidconnection.post.domain.Post; -import com.example.solidconnection.post.domain.PostLike; +import com.example.solidconnection.community.domain.comment.Comment; +import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.domain.post.PostLike; import com.example.solidconnection.score.domain.GpaScore; import com.example.solidconnection.score.domain.LanguageTestScore; import com.example.solidconnection.type.Gender; diff --git a/src/test/java/com/example/solidconnection/board/service/BoardServiceTest.java b/src/test/java/com/example/solidconnection/board/service/BoardServiceTest.java index 98c2b28fa..e790eadfe 100644 --- a/src/test/java/com/example/solidconnection/board/service/BoardServiceTest.java +++ b/src/test/java/com/example/solidconnection/board/service/BoardServiceTest.java @@ -1,7 +1,8 @@ package com.example.solidconnection.board.service; -import com.example.solidconnection.post.domain.Post; -import com.example.solidconnection.post.dto.BoardFindPostResponse; +import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.dto.post.BoardFindPostResponse; +import com.example.solidconnection.community.service.board.BoardService; import com.example.solidconnection.support.integration.BaseIntegrationTest; import com.example.solidconnection.type.BoardCode; import com.example.solidconnection.type.PostCategory; diff --git a/src/test/java/com/example/solidconnection/comment/service/CommentServiceTest.java b/src/test/java/com/example/solidconnection/comment/service/CommentServiceTest.java index d38463dcb..b5fbe6028 100644 --- a/src/test/java/com/example/solidconnection/comment/service/CommentServiceTest.java +++ b/src/test/java/com/example/solidconnection/comment/service/CommentServiceTest.java @@ -1,17 +1,18 @@ package com.example.solidconnection.comment.service; -import com.example.solidconnection.board.domain.Board; -import com.example.solidconnection.comment.domain.Comment; -import com.example.solidconnection.comment.dto.CommentCreateRequest; -import com.example.solidconnection.comment.dto.CommentCreateResponse; -import com.example.solidconnection.comment.dto.CommentDeleteResponse; -import com.example.solidconnection.comment.dto.CommentUpdateRequest; -import com.example.solidconnection.comment.dto.CommentUpdateResponse; -import com.example.solidconnection.comment.dto.PostFindCommentResponse; -import com.example.solidconnection.comment.repository.CommentRepository; +import com.example.solidconnection.community.domain.board.Board; +import com.example.solidconnection.community.domain.comment.Comment; +import com.example.solidconnection.community.dto.comment.CommentCreateRequest; +import com.example.solidconnection.community.dto.comment.CommentCreateResponse; +import com.example.solidconnection.community.dto.comment.CommentDeleteResponse; +import com.example.solidconnection.community.dto.comment.CommentUpdateRequest; +import com.example.solidconnection.community.dto.comment.CommentUpdateResponse; +import com.example.solidconnection.community.dto.comment.PostFindCommentResponse; +import com.example.solidconnection.community.repository.comment.CommentRepository; +import com.example.solidconnection.community.service.comment.CommentService; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.post.domain.Post; -import com.example.solidconnection.post.repository.PostRepository; +import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.repository.post.PostRepository; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.support.integration.BaseIntegrationTest; import com.example.solidconnection.type.PostCategory; diff --git a/src/test/java/com/example/solidconnection/concurrency/PostLikeCountConcurrencyTest.java b/src/test/java/com/example/solidconnection/concurrency/PostLikeCountConcurrencyTest.java index 544b31b4c..41e2da0f3 100644 --- a/src/test/java/com/example/solidconnection/concurrency/PostLikeCountConcurrencyTest.java +++ b/src/test/java/com/example/solidconnection/concurrency/PostLikeCountConcurrencyTest.java @@ -1,10 +1,10 @@ package com.example.solidconnection.concurrency; -import com.example.solidconnection.board.domain.Board; -import com.example.solidconnection.board.repository.BoardRepository; -import com.example.solidconnection.post.domain.Post; -import com.example.solidconnection.post.repository.PostRepository; -import com.example.solidconnection.post.service.PostLikeService; +import com.example.solidconnection.community.domain.board.Board; +import com.example.solidconnection.community.repository.board.BoardRepository; +import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.repository.post.PostRepository; +import com.example.solidconnection.community.service.post.PostLikeService; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.TestContainerSpringBootTest; diff --git a/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java b/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java index 678e2b084..651108809 100644 --- a/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java +++ b/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java @@ -1,9 +1,9 @@ package com.example.solidconnection.concurrency; -import com.example.solidconnection.board.domain.Board; -import com.example.solidconnection.board.repository.BoardRepository; -import com.example.solidconnection.post.domain.Post; -import com.example.solidconnection.post.repository.PostRepository; +import com.example.solidconnection.community.domain.board.Board; +import com.example.solidconnection.community.repository.board.BoardRepository; +import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.repository.post.PostRepository; import com.example.solidconnection.service.RedisService; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; diff --git a/src/test/java/com/example/solidconnection/post/service/PostCommandServiceTest.java b/src/test/java/com/example/solidconnection/post/service/PostCommandServiceTest.java index 3cdc5a40c..71c448b95 100644 --- a/src/test/java/com/example/solidconnection/post/service/PostCommandServiceTest.java +++ b/src/test/java/com/example/solidconnection/post/service/PostCommandServiceTest.java @@ -1,16 +1,17 @@ package com.example.solidconnection.post.service; -import com.example.solidconnection.board.domain.Board; +import com.example.solidconnection.community.domain.board.Board; +import com.example.solidconnection.community.service.post.PostCommandService; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.entity.PostImage; -import com.example.solidconnection.post.domain.Post; -import com.example.solidconnection.post.dto.PostCreateRequest; -import com.example.solidconnection.post.dto.PostCreateResponse; -import com.example.solidconnection.post.dto.PostDeleteResponse; -import com.example.solidconnection.post.dto.PostUpdateRequest; -import com.example.solidconnection.post.dto.PostUpdateResponse; -import com.example.solidconnection.post.repository.PostRepository; -import com.example.solidconnection.repositories.PostImageRepository; +import com.example.solidconnection.community.domain.post.PostImage; +import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.dto.post.PostCreateRequest; +import com.example.solidconnection.community.dto.post.PostCreateResponse; +import com.example.solidconnection.community.dto.post.PostDeleteResponse; +import com.example.solidconnection.community.dto.post.PostUpdateRequest; +import com.example.solidconnection.community.dto.post.PostUpdateResponse; +import com.example.solidconnection.community.repository.post.PostRepository; +import com.example.solidconnection.community.repository.post.PostImageRepository; import com.example.solidconnection.s3.S3Service; import com.example.solidconnection.s3.UploadedFileUrlResponse; import com.example.solidconnection.service.RedisService; diff --git a/src/test/java/com/example/solidconnection/post/service/PostLikeServiceTest.java b/src/test/java/com/example/solidconnection/post/service/PostLikeServiceTest.java index 460b9a15b..6689bd5c5 100644 --- a/src/test/java/com/example/solidconnection/post/service/PostLikeServiceTest.java +++ b/src/test/java/com/example/solidconnection/post/service/PostLikeServiceTest.java @@ -1,12 +1,13 @@ package com.example.solidconnection.post.service; -import com.example.solidconnection.board.domain.Board; +import com.example.solidconnection.community.domain.board.Board; +import com.example.solidconnection.community.service.post.PostLikeService; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.post.domain.Post; -import com.example.solidconnection.post.dto.PostDislikeResponse; -import com.example.solidconnection.post.dto.PostLikeResponse; -import com.example.solidconnection.post.repository.PostLikeRepository; -import com.example.solidconnection.post.repository.PostRepository; +import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.dto.post.PostDislikeResponse; +import com.example.solidconnection.community.dto.post.PostLikeResponse; +import com.example.solidconnection.community.repository.post.PostLikeRepository; +import com.example.solidconnection.community.repository.post.PostRepository; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.support.integration.BaseIntegrationTest; import com.example.solidconnection.type.PostCategory; diff --git a/src/test/java/com/example/solidconnection/post/service/PostQueryServiceTest.java b/src/test/java/com/example/solidconnection/post/service/PostQueryServiceTest.java index d9acf5845..b16aef8f7 100644 --- a/src/test/java/com/example/solidconnection/post/service/PostQueryServiceTest.java +++ b/src/test/java/com/example/solidconnection/post/service/PostQueryServiceTest.java @@ -1,15 +1,16 @@ package com.example.solidconnection.post.service; -import com.example.solidconnection.board.domain.Board; -import com.example.solidconnection.comment.domain.Comment; -import com.example.solidconnection.comment.dto.PostFindCommentResponse; -import com.example.solidconnection.comment.repository.CommentRepository; -import com.example.solidconnection.entity.PostImage; -import com.example.solidconnection.post.domain.Post; -import com.example.solidconnection.post.dto.PostFindPostImageResponse; -import com.example.solidconnection.post.dto.PostFindResponse; -import com.example.solidconnection.post.repository.PostRepository; -import com.example.solidconnection.repositories.PostImageRepository; +import com.example.solidconnection.community.domain.board.Board; +import com.example.solidconnection.community.domain.comment.Comment; +import com.example.solidconnection.community.dto.comment.PostFindCommentResponse; +import com.example.solidconnection.community.repository.comment.CommentRepository; +import com.example.solidconnection.community.service.post.PostQueryService; +import com.example.solidconnection.community.domain.post.PostImage; +import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.dto.post.PostFindPostImageResponse; +import com.example.solidconnection.community.dto.post.PostFindResponse; +import com.example.solidconnection.community.repository.post.PostRepository; +import com.example.solidconnection.community.repository.post.PostImageRepository; import com.example.solidconnection.service.RedisService; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.support.integration.BaseIntegrationTest; diff --git a/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java b/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java index ec29b8499..e3e3e4497 100644 --- a/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java +++ b/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java @@ -4,15 +4,15 @@ import com.example.solidconnection.application.domain.Gpa; import com.example.solidconnection.application.domain.LanguageTest; import com.example.solidconnection.application.repository.ApplicationRepository; -import com.example.solidconnection.board.domain.Board; -import com.example.solidconnection.board.repository.BoardRepository; +import com.example.solidconnection.community.domain.board.Board; +import com.example.solidconnection.community.repository.board.BoardRepository; import com.example.solidconnection.entity.Country; -import com.example.solidconnection.entity.PostImage; +import com.example.solidconnection.community.domain.post.PostImage; import com.example.solidconnection.entity.Region; -import com.example.solidconnection.post.domain.Post; -import com.example.solidconnection.post.repository.PostRepository; +import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.repository.post.PostRepository; import com.example.solidconnection.repositories.CountryRepository; -import com.example.solidconnection.repositories.PostImageRepository; +import com.example.solidconnection.community.repository.post.PostImageRepository; import com.example.solidconnection.repositories.RegionRepository; import com.example.solidconnection.score.domain.GpaScore; import com.example.solidconnection.score.domain.LanguageTestScore; From 2d14f19ae4121c4ede16507af1fd2ade97eacfd0 Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Fri, 7 Feb 2025 11:11:20 +0900 Subject: [PATCH 2/4] =?UTF-8?q?refactor:=20=EA=B2=8C=EC=8B=9C=EA=B8=80=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20API=20PostController?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/board/BoardController.java | 16 ------ .../controller/post/PostController.java | 11 ++++ ...ostResponse.java => PostListResponse.java} | 10 ++-- .../community/service/board/BoardService.java | 52 ------------------- .../service/post/PostQueryService.java | 38 +++++++++++++- 5 files changed, 53 insertions(+), 74 deletions(-) rename src/main/java/com/example/solidconnection/community/dto/post/{BoardFindPostResponse.java => PostListResponse.java} (83%) diff --git a/src/main/java/com/example/solidconnection/community/controller/board/BoardController.java b/src/main/java/com/example/solidconnection/community/controller/board/BoardController.java index e0514745b..02a9f1003 100644 --- a/src/main/java/com/example/solidconnection/community/controller/board/BoardController.java +++ b/src/main/java/com/example/solidconnection/community/controller/board/BoardController.java @@ -1,14 +1,10 @@ package com.example.solidconnection.community.controller.board; -import com.example.solidconnection.community.service.board.BoardService; -import com.example.solidconnection.community.dto.post.BoardFindPostResponse; import com.example.solidconnection.type.BoardCode; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; @@ -19,8 +15,6 @@ @RequestMapping("/communities") public class BoardController { - private final BoardService boardService; - // todo: 회원별로 접근 가능한 게시판 목록 조회 기능 개발 @GetMapping() public ResponseEntity findAccessibleCodes() { @@ -30,14 +24,4 @@ public ResponseEntity findAccessibleCodes() { } return ResponseEntity.ok().body(accessibleCodeList); } - - @GetMapping("/{code}") - public ResponseEntity findPostsByCodeAndCategory( - @PathVariable(value = "code") String code, - @RequestParam(value = "category", defaultValue = "전체") String category) { - - List postsByCodeAndPostCategory = boardService - .findPostsByCodeAndPostCategory(code, category); - return ResponseEntity.ok().body(postsByCodeAndPostCategory); - } } diff --git a/src/main/java/com/example/solidconnection/community/controller/post/PostController.java b/src/main/java/com/example/solidconnection/community/controller/post/PostController.java index 560563462..2560240fd 100644 --- a/src/main/java/com/example/solidconnection/community/controller/post/PostController.java +++ b/src/main/java/com/example/solidconnection/community/controller/post/PostController.java @@ -1,5 +1,6 @@ package com.example.solidconnection.community.controller.post; +import com.example.solidconnection.community.dto.post.PostListResponse; import com.example.solidconnection.custom.resolver.AuthorizedUser; import com.example.solidconnection.community.dto.post.PostCreateRequest; import com.example.solidconnection.community.dto.post.PostCreateResponse; @@ -39,6 +40,16 @@ public class PostController { private final PostCommandService postCommandService; private final PostLikeService postLikeService; + @GetMapping("/{code}") + public ResponseEntity findPostsByCodeAndCategory( + @PathVariable(value = "code") String code, + @RequestParam(value = "category", defaultValue = "전체") String category) { + + List postsByCodeAndPostCategory = postQueryService + .findPostsByCodeAndPostCategory(code, category); + return ResponseEntity.ok().body(postsByCodeAndPostCategory); + } + @PostMapping(value = "/{code}/posts") public ResponseEntity createPost( @AuthorizedUser SiteUser siteUser, diff --git a/src/main/java/com/example/solidconnection/community/dto/post/BoardFindPostResponse.java b/src/main/java/com/example/solidconnection/community/dto/post/PostListResponse.java similarity index 83% rename from src/main/java/com/example/solidconnection/community/dto/post/BoardFindPostResponse.java rename to src/main/java/com/example/solidconnection/community/dto/post/PostListResponse.java index 27661fb93..9b59caf4a 100644 --- a/src/main/java/com/example/solidconnection/community/dto/post/BoardFindPostResponse.java +++ b/src/main/java/com/example/solidconnection/community/dto/post/PostListResponse.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.stream.Collectors; -public record BoardFindPostResponse( +public record PostListResponse( Long id, String title, String content, @@ -19,8 +19,8 @@ public record BoardFindPostResponse( String url ) { - public static BoardFindPostResponse from(Post post) { - return new BoardFindPostResponse( + public static PostListResponse from(Post post) { + return new PostListResponse( post.getId(), post.getTitle(), post.getContent(), @@ -33,9 +33,9 @@ public static BoardFindPostResponse from(Post post) { ); } - public static List from(List postList) { + public static List from(List postList) { return postList.stream() - .map(BoardFindPostResponse::from) + .map(PostListResponse::from) .collect(Collectors.toList()); } diff --git a/src/main/java/com/example/solidconnection/community/service/board/BoardService.java b/src/main/java/com/example/solidconnection/community/service/board/BoardService.java index 493405d78..b1614ad98 100644 --- a/src/main/java/com/example/solidconnection/community/service/board/BoardService.java +++ b/src/main/java/com/example/solidconnection/community/service/board/BoardService.java @@ -1,61 +1,9 @@ package com.example.solidconnection.community.service.board; -import com.example.solidconnection.community.domain.board.Board; -import com.example.solidconnection.community.repository.board.BoardRepository; -import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.custom.exception.ErrorCode; -import com.example.solidconnection.community.domain.post.Post; -import com.example.solidconnection.community.dto.post.BoardFindPostResponse; -import com.example.solidconnection.type.BoardCode; -import com.example.solidconnection.type.PostCategory; import lombok.RequiredArgsConstructor; -import org.apache.commons.lang3.EnumUtils; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.stream.Collectors; - -import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_POST_CATEGORY; @Service @RequiredArgsConstructor public class BoardService { - private final BoardRepository boardRepository; - - @Transactional(readOnly = true) - public List findPostsByCodeAndPostCategory(String code, String category) { - - String boardCode = validateCode(code); - PostCategory postCategory = validatePostCategory(category); - - Board board = boardRepository.getByCodeUsingEntityGraph(boardCode); - List postList = getPostListByPostCategory(board.getPostList(), postCategory); - - return BoardFindPostResponse.from(postList); - } - - private String validateCode(String code) { - try { - return String.valueOf(BoardCode.valueOf(code)); - } catch (IllegalArgumentException ex) { - throw new CustomException(ErrorCode.INVALID_BOARD_CODE); - } - } - - private PostCategory validatePostCategory(String category) { - if (!EnumUtils.isValidEnum(PostCategory.class, category)) { - throw new CustomException(INVALID_POST_CATEGORY); - } - return PostCategory.valueOf(category); - } - - private List getPostListByPostCategory(List postList, PostCategory postCategory) { - if (postCategory.equals(PostCategory.전체)) { - return postList; - } - return postList.stream() - .filter(post -> post.getCategory().equals(postCategory)) - .collect(Collectors.toList()); - } } diff --git a/src/main/java/com/example/solidconnection/community/service/post/PostQueryService.java b/src/main/java/com/example/solidconnection/community/service/post/PostQueryService.java index d017ede7e..d1c7ba758 100644 --- a/src/main/java/com/example/solidconnection/community/service/post/PostQueryService.java +++ b/src/main/java/com/example/solidconnection/community/service/post/PostQueryService.java @@ -1,7 +1,10 @@ package com.example.solidconnection.community.service.post; +import com.example.solidconnection.community.domain.board.Board; import com.example.solidconnection.community.dto.board.PostFindBoardResponse; import com.example.solidconnection.community.dto.comment.PostFindCommentResponse; +import com.example.solidconnection.community.dto.post.PostListResponse; +import com.example.solidconnection.community.repository.board.BoardRepository; import com.example.solidconnection.community.service.comment.CommentService; import com.example.solidconnection.custom.exception.CustomException; import com.example.solidconnection.community.domain.post.Post; @@ -13,24 +16,41 @@ import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.dto.PostFindSiteUserResponse; import com.example.solidconnection.type.BoardCode; +import com.example.solidconnection.type.PostCategory; import com.example.solidconnection.util.RedisUtils; import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.EnumUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.stream.Collectors; import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_BOARD_CODE; +import static com.example.solidconnection.custom.exception.ErrorCode.INVALID_POST_CATEGORY; @Service @RequiredArgsConstructor public class PostQueryService { + private final BoardRepository boardRepository; private final PostRepository postRepository; + private final PostLikeRepository postLikeRepository; private final CommentService commentService; private final RedisService redisService; private final RedisUtils redisUtils; - private final PostLikeRepository postLikeRepository; + + @Transactional(readOnly = true) + public List findPostsByCodeAndPostCategory(String code, String category) { + + String boardCode = validateCode(code); + PostCategory postCategory = validatePostCategory(category); + + Board board = boardRepository.getByCodeUsingEntityGraph(boardCode); + List postList = getPostListByPostCategory(board.getPostList(), postCategory); + + return PostListResponse.from(postList); + } @Transactional(readOnly = true) public PostFindResponse findPostById(SiteUser siteUser, String code, Long postId) { @@ -70,4 +90,20 @@ private Boolean getIsLiked(Post post, SiteUser siteUser) { return postLikeRepository.findPostLikeByPostAndSiteUser(post, siteUser) .isPresent(); } + + private PostCategory validatePostCategory(String category) { + if (!EnumUtils.isValidEnum(PostCategory.class, category)) { + throw new CustomException(INVALID_POST_CATEGORY); + } + return PostCategory.valueOf(category); + } + + private List getPostListByPostCategory(List postList, PostCategory postCategory) { + if (postCategory.equals(PostCategory.전체)) { + return postList; + } + return postList.stream() + .filter(post -> post.getCategory().equals(postCategory)) + .collect(Collectors.toList()); + } } From 9200cd8ffddb0bd49ce5773208a8319b4d5a16b6 Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Fri, 7 Feb 2025 11:12:27 +0900 Subject: [PATCH 3/4] =?UTF-8?q?test:=20=EB=B3=80=EA=B2=BD=EB=90=9C=20?= =?UTF-8?q?=ED=8C=A8=ED=82=A4=EC=A7=80=20=EA=B5=AC=EC=A1=B0=EC=97=90=20?= =?UTF-8?q?=EB=A7=9E=EA=B2=8C=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EA=B5=AC?= =?UTF-8?q?=EC=A1=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../board/service/BoardServiceTest.java | 73 ------------------- .../service/comment}/CommentServiceTest.java | 2 +- .../service/post}/PostCommandServiceTest.java | 2 +- .../service/post}/PostLikeServiceTest.java | 2 +- .../service/post}/PostQueryServiceTest.java | 56 +++++++++++++- 5 files changed, 57 insertions(+), 78 deletions(-) delete mode 100644 src/test/java/com/example/solidconnection/board/service/BoardServiceTest.java rename src/test/java/com/example/solidconnection/{comment/service => community/service/comment}/CommentServiceTest.java (99%) rename src/test/java/com/example/solidconnection/{post/service => community/service/post}/PostCommandServiceTest.java (99%) rename src/test/java/com/example/solidconnection/{post/service => community/service/post}/PostLikeServiceTest.java (98%) rename src/test/java/com/example/solidconnection/{post/service => community/service/post}/PostQueryServiceTest.java (69%) diff --git a/src/test/java/com/example/solidconnection/board/service/BoardServiceTest.java b/src/test/java/com/example/solidconnection/board/service/BoardServiceTest.java deleted file mode 100644 index e790eadfe..000000000 --- a/src/test/java/com/example/solidconnection/board/service/BoardServiceTest.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.example.solidconnection.board.service; - -import com.example.solidconnection.community.domain.post.Post; -import com.example.solidconnection.community.dto.post.BoardFindPostResponse; -import com.example.solidconnection.community.service.board.BoardService; -import com.example.solidconnection.support.integration.BaseIntegrationTest; -import com.example.solidconnection.type.BoardCode; -import com.example.solidconnection.type.PostCategory; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; - -import java.time.ZonedDateTime; -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; - -@DisplayName("게시판 서비스 테스트") -class BoardServiceTest extends BaseIntegrationTest { - - @Autowired - private BoardService boardService; - - @Test - void 게시판_코드와_카테고리로_게시글_목록을_조회한다() { - // given - List posts = List.of( - 미주권_자유게시글, 아시아권_자유게시글, 유럽권_자유게시글, 자유게시판_자유게시글, - 미주권_질문게시글, 아시아권_질문게시글, 유럽권_질문게시글, 자유게시판_질문게시글 - ); - List expectedPosts = posts.stream() - .filter(post -> post.getCategory().equals(PostCategory.자유) && post.getBoard().getCode().equals(BoardCode.FREE.name())) - .toList(); - List expectedResponses = BoardFindPostResponse.from(expectedPosts); - - // when - List actualResponses = boardService.findPostsByCodeAndPostCategory( - BoardCode.FREE.name(), - PostCategory.자유.name() - ); - - // then - assertThat(actualResponses) - .usingRecursiveComparison() - .ignoringFieldsOfTypes(ZonedDateTime.class) - .isEqualTo(expectedResponses); - } - - @Test - void 전체_카테고리로_조회시_해당_게시판의_모든_게시글을_조회한다() { - // given - List posts = List.of( - 미주권_자유게시글, 아시아권_자유게시글, 유럽권_자유게시글, 자유게시판_자유게시글, - 미주권_질문게시글, 아시아권_질문게시글, 유럽권_질문게시글, 자유게시판_질문게시글 - ); - List expectedPosts = posts.stream() - .filter(post -> post.getBoard().getCode().equals(BoardCode.FREE.name())) - .toList(); - List expectedResponses = BoardFindPostResponse.from(expectedPosts); - - // when - List actualResponses = boardService.findPostsByCodeAndPostCategory( - BoardCode.FREE.name(), - PostCategory.전체.name() - ); - - // then - assertThat(actualResponses) - .usingRecursiveComparison() - .ignoringFieldsOfTypes(ZonedDateTime.class) - .isEqualTo(expectedResponses); - } -} diff --git a/src/test/java/com/example/solidconnection/comment/service/CommentServiceTest.java b/src/test/java/com/example/solidconnection/community/service/comment/CommentServiceTest.java similarity index 99% rename from src/test/java/com/example/solidconnection/comment/service/CommentServiceTest.java rename to src/test/java/com/example/solidconnection/community/service/comment/CommentServiceTest.java index b5fbe6028..ff2d390de 100644 --- a/src/test/java/com/example/solidconnection/comment/service/CommentServiceTest.java +++ b/src/test/java/com/example/solidconnection/community/service/comment/CommentServiceTest.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.comment.service; +package com.example.solidconnection.community.service.comment; import com.example.solidconnection.community.domain.board.Board; import com.example.solidconnection.community.domain.comment.Comment; diff --git a/src/test/java/com/example/solidconnection/post/service/PostCommandServiceTest.java b/src/test/java/com/example/solidconnection/community/service/post/PostCommandServiceTest.java similarity index 99% rename from src/test/java/com/example/solidconnection/post/service/PostCommandServiceTest.java rename to src/test/java/com/example/solidconnection/community/service/post/PostCommandServiceTest.java index 71c448b95..4a4418f2e 100644 --- a/src/test/java/com/example/solidconnection/post/service/PostCommandServiceTest.java +++ b/src/test/java/com/example/solidconnection/community/service/post/PostCommandServiceTest.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.post.service; +package com.example.solidconnection.community.service.post; import com.example.solidconnection.community.domain.board.Board; import com.example.solidconnection.community.service.post.PostCommandService; diff --git a/src/test/java/com/example/solidconnection/post/service/PostLikeServiceTest.java b/src/test/java/com/example/solidconnection/community/service/post/PostLikeServiceTest.java similarity index 98% rename from src/test/java/com/example/solidconnection/post/service/PostLikeServiceTest.java rename to src/test/java/com/example/solidconnection/community/service/post/PostLikeServiceTest.java index 6689bd5c5..e3bf356a3 100644 --- a/src/test/java/com/example/solidconnection/post/service/PostLikeServiceTest.java +++ b/src/test/java/com/example/solidconnection/community/service/post/PostLikeServiceTest.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.post.service; +package com.example.solidconnection.community.service.post; import com.example.solidconnection.community.domain.board.Board; import com.example.solidconnection.community.service.post.PostLikeService; diff --git a/src/test/java/com/example/solidconnection/post/service/PostQueryServiceTest.java b/src/test/java/com/example/solidconnection/community/service/post/PostQueryServiceTest.java similarity index 69% rename from src/test/java/com/example/solidconnection/post/service/PostQueryServiceTest.java rename to src/test/java/com/example/solidconnection/community/service/post/PostQueryServiceTest.java index b16aef8f7..7bd399bb6 100644 --- a/src/test/java/com/example/solidconnection/post/service/PostQueryServiceTest.java +++ b/src/test/java/com/example/solidconnection/community/service/post/PostQueryServiceTest.java @@ -1,10 +1,10 @@ -package com.example.solidconnection.post.service; +package com.example.solidconnection.community.service.post; import com.example.solidconnection.community.domain.board.Board; import com.example.solidconnection.community.domain.comment.Comment; import com.example.solidconnection.community.dto.comment.PostFindCommentResponse; +import com.example.solidconnection.community.dto.post.PostListResponse; import com.example.solidconnection.community.repository.comment.CommentRepository; -import com.example.solidconnection.community.service.post.PostQueryService; import com.example.solidconnection.community.domain.post.PostImage; import com.example.solidconnection.community.domain.post.Post; import com.example.solidconnection.community.dto.post.PostFindPostImageResponse; @@ -14,12 +14,14 @@ import com.example.solidconnection.service.RedisService; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.support.integration.BaseIntegrationTest; +import com.example.solidconnection.type.BoardCode; import com.example.solidconnection.type.PostCategory; import com.example.solidconnection.util.RedisUtils; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import java.time.ZonedDateTime; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; @@ -46,6 +48,56 @@ class PostQueryServiceTest extends BaseIntegrationTest { @Autowired private PostImageRepository postImageRepository; + @Test + void 게시판_코드와_카테고리로_게시글_목록을_조회한다() { + // given + List posts = List.of( + 미주권_자유게시글, 아시아권_자유게시글, 유럽권_자유게시글, 자유게시판_자유게시글, + 미주권_질문게시글, 아시아권_질문게시글, 유럽권_질문게시글, 자유게시판_질문게시글 + ); + List expectedPosts = posts.stream() + .filter(post -> post.getCategory().equals(PostCategory.자유) && post.getBoard().getCode().equals(BoardCode.FREE.name())) + .toList(); + List expectedResponses = PostListResponse.from(expectedPosts); + + // when + List actualResponses = postQueryService.findPostsByCodeAndPostCategory( + BoardCode.FREE.name(), + PostCategory.자유.name() + ); + + // then + assertThat(actualResponses) + .usingRecursiveComparison() + .ignoringFieldsOfTypes(ZonedDateTime.class) + .isEqualTo(expectedResponses); + } + + @Test + void 전체_카테고리로_조회시_해당_게시판의_모든_게시글을_조회한다() { + // given + List posts = List.of( + 미주권_자유게시글, 아시아권_자유게시글, 유럽권_자유게시글, 자유게시판_자유게시글, + 미주권_질문게시글, 아시아권_질문게시글, 유럽권_질문게시글, 자유게시판_질문게시글 + ); + List expectedPosts = posts.stream() + .filter(post -> post.getBoard().getCode().equals(BoardCode.FREE.name())) + .toList(); + List expectedResponses = PostListResponse.from(expectedPosts); + + // when + List actualResponses = postQueryService.findPostsByCodeAndPostCategory( + BoardCode.FREE.name(), + PostCategory.전체.name() + ); + + // then + assertThat(actualResponses) + .usingRecursiveComparison() + .ignoringFieldsOfTypes(ZonedDateTime.class) + .isEqualTo(expectedResponses); + } + @Test void 게시글을_성공적으로_조회한다() { // given From b60138c34e6d63fb9b5495f94ad8e403f3becd1b Mon Sep 17 00:00:00 2001 From: Gyuhyeok99 <126947828+Gyuhyeok99@users.noreply.github.com> Date: Fri, 7 Feb 2025 16:23:09 +0900 Subject: [PATCH 4/4] =?UTF-8?q?refactor:=20=EB=A0=88=EC=9D=B4=EC=96=B4?= =?UTF-8?q?=EB=B3=84=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EA=B5=AC=EC=A1=B0?= =?UTF-8?q?=EB=A5=BC=20=EB=8F=84=EB=A9=94=EC=9D=B8=20=EC=A4=91=EC=8B=AC?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller}/BoardController.java | 2 +- .../{domain/board => board/domain}/Board.java | 4 +-- .../dto}/PostFindBoardResponse.java | 4 +-- .../repository}/BoardRepository.java | 4 +-- .../board => board/service}/BoardService.java | 2 +- .../controller}/CommentController.java | 14 +++++----- .../comment => comment/domain}/Comment.java | 4 +-- .../dto}/CommentCreateRequest.java | 6 ++--- .../dto}/CommentCreateResponse.java | 4 +-- .../dto}/CommentDeleteResponse.java | 2 +- .../dto}/CommentUpdateRequest.java | 2 +- .../dto}/CommentUpdateResponse.java | 4 +-- .../dto}/PostFindCommentResponse.java | 4 +-- .../repository}/CommentRepository.java | 4 +-- .../service}/CommentService.java | 24 ++++++++--------- .../controller}/PostController.java | 26 +++++++++--------- .../{domain/post => post/domain}/Post.java | 8 +++--- .../post => post/domain}/PostImage.java | 3 +-- .../post => post/domain}/PostLike.java | 2 +- .../post => post/dto}/PostCreateRequest.java | 6 ++--- .../post => post/dto}/PostCreateResponse.java | 4 +-- .../post => post/dto}/PostDeleteResponse.java | 2 +- .../dto}/PostDislikeResponse.java | 4 +-- .../dto}/PostFindPostImageResponse.java | 4 +-- .../post => post/dto}/PostFindResponse.java | 8 +++--- .../post => post/dto}/PostLikeResponse.java | 4 +-- .../post => post/dto}/PostListResponse.java | 6 ++--- .../post => post/dto}/PostUpdateRequest.java | 2 +- .../post => post/dto}/PostUpdateResponse.java | 4 +-- .../repository}/PostImageRepository.java | 4 +-- .../repository}/PostLikeRepository.java | 6 ++--- .../repository}/PostRepository.java | 4 +-- .../service}/PostCommandService.java | 22 +++++++-------- .../service}/PostLikeService.java | 14 +++++----- .../service}/PostQueryService.java | 26 +++++++++--------- .../service/UpdateViewCountService.java | 4 +-- .../siteuser/domain/SiteUser.java | 6 ++--- .../service}/CommentServiceTest.java | 27 +++++++++---------- .../service}/PostCommandServiceTest.java | 23 ++++++++-------- .../service}/PostLikeServiceTest.java | 15 +++++------ .../service}/PostQueryServiceTest.java | 26 +++++++++--------- .../PostLikeCountConcurrencyTest.java | 10 +++---- .../PostViewCountConcurrencyTest.java | 8 +++--- .../integration/BaseIntegrationTest.java | 12 ++++----- 44 files changed, 185 insertions(+), 189 deletions(-) rename src/main/java/com/example/solidconnection/community/{controller/board => board/controller}/BoardController.java (93%) rename src/main/java/com/example/solidconnection/community/{domain/board => board/domain}/Board.java (85%) rename src/main/java/com/example/solidconnection/community/{dto/board => board/dto}/PostFindBoardResponse.java (70%) rename src/main/java/com/example/solidconnection/community/{repository/board => board/repository}/BoardRepository.java (88%) rename src/main/java/com/example/solidconnection/community/{service/board => board/service}/BoardService.java (71%) rename src/main/java/com/example/solidconnection/community/{controller/comment => comment/controller}/CommentController.java (83%) rename src/main/java/com/example/solidconnection/community/{domain/comment => comment/domain}/Comment.java (96%) rename src/main/java/com/example/solidconnection/community/{dto/comment => comment/dto}/CommentCreateRequest.java (82%) rename src/main/java/com/example/solidconnection/community/{dto/comment => comment/dto}/CommentCreateResponse.java (64%) rename src/main/java/com/example/solidconnection/community/{dto/comment => comment/dto}/CommentDeleteResponse.java (50%) rename src/main/java/com/example/solidconnection/community/{dto/comment => comment/dto}/CommentUpdateRequest.java (85%) rename src/main/java/com/example/solidconnection/community/{dto/comment => comment/dto}/CommentUpdateResponse.java (64%) rename src/main/java/com/example/solidconnection/community/{dto/comment => comment/dto}/PostFindCommentResponse.java (89%) rename src/main/java/com/example/solidconnection/community/{repository/comment => comment/repository}/CommentRepository.java (92%) rename src/main/java/com/example/solidconnection/community/{service/comment => comment/service}/CommentService.java (86%) rename src/main/java/com/example/solidconnection/community/{controller/post => post/controller}/PostController.java (85%) rename src/main/java/com/example/solidconnection/community/{domain/post => post/domain}/Post.java (92%) rename src/main/java/com/example/solidconnection/community/{domain/post => post/domain}/PostImage.java (88%) rename src/main/java/com/example/solidconnection/community/{domain/post => post/domain}/PostLike.java (96%) rename src/main/java/com/example/solidconnection/community/{dto/post => post/dto}/PostCreateRequest.java (87%) rename src/main/java/com/example/solidconnection/community/{dto/post => post/dto}/PostCreateResponse.java (62%) rename src/main/java/com/example/solidconnection/community/{dto/post => post/dto}/PostDeleteResponse.java (50%) rename src/main/java/com/example/solidconnection/community/{dto/post => post/dto}/PostDislikeResponse.java (68%) rename src/main/java/com/example/solidconnection/community/{dto/post => post/dto}/PostFindPostImageResponse.java (83%) rename src/main/java/com/example/solidconnection/community/{dto/post => post/dto}/PostFindResponse.java (88%) rename src/main/java/com/example/solidconnection/community/{dto/post => post/dto}/PostLikeResponse.java (68%) rename src/main/java/com/example/solidconnection/community/{dto/post => post/dto}/PostListResponse.java (87%) rename src/main/java/com/example/solidconnection/community/{dto/post => post/dto}/PostUpdateRequest.java (92%) rename src/main/java/com/example/solidconnection/community/{dto/post => post/dto}/PostUpdateResponse.java (62%) rename src/main/java/com/example/solidconnection/community/{repository/post => post/repository}/PostImageRepository.java (62%) rename src/main/java/com/example/solidconnection/community/{repository/post => post/repository}/PostLikeRepository.java (79%) rename src/main/java/com/example/solidconnection/community/{repository/post => post/repository}/PostRepository.java (93%) rename src/main/java/com/example/solidconnection/community/{service/post => post/service}/PostCommandService.java (88%) rename src/main/java/com/example/solidconnection/community/{service/post => post/service}/PostLikeService.java (84%) rename src/main/java/com/example/solidconnection/community/{service/post => post/service}/PostQueryService.java (84%) rename src/test/java/com/example/solidconnection/community/{service/comment => comment/service}/CommentServiceTest.java (95%) rename src/test/java/com/example/solidconnection/community/{service/post => post/service}/PostCommandServiceTest.java (95%) rename src/test/java/com/example/solidconnection/community/{service/post => post/service}/PostLikeServiceTest.java (90%) rename src/test/java/com/example/solidconnection/community/{service/post => post/service}/PostQueryServiceTest.java (90%) diff --git a/src/main/java/com/example/solidconnection/community/controller/board/BoardController.java b/src/main/java/com/example/solidconnection/community/board/controller/BoardController.java similarity index 93% rename from src/main/java/com/example/solidconnection/community/controller/board/BoardController.java rename to src/main/java/com/example/solidconnection/community/board/controller/BoardController.java index 02a9f1003..9329535a1 100644 --- a/src/main/java/com/example/solidconnection/community/controller/board/BoardController.java +++ b/src/main/java/com/example/solidconnection/community/board/controller/BoardController.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.community.controller.board; +package com.example.solidconnection.community.board.controller; import com.example.solidconnection.type.BoardCode; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/solidconnection/community/domain/board/Board.java b/src/main/java/com/example/solidconnection/community/board/domain/Board.java similarity index 85% rename from src/main/java/com/example/solidconnection/community/domain/board/Board.java rename to src/main/java/com/example/solidconnection/community/board/domain/Board.java index a957eaa7c..fbf13b44d 100644 --- a/src/main/java/com/example/solidconnection/community/domain/board/Board.java +++ b/src/main/java/com/example/solidconnection/community/board/domain/Board.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.community.domain.board; +package com.example.solidconnection.community.board.domain; -import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.post.domain.Post; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/com/example/solidconnection/community/dto/board/PostFindBoardResponse.java b/src/main/java/com/example/solidconnection/community/board/dto/PostFindBoardResponse.java similarity index 70% rename from src/main/java/com/example/solidconnection/community/dto/board/PostFindBoardResponse.java rename to src/main/java/com/example/solidconnection/community/board/dto/PostFindBoardResponse.java index 84db91a5a..e4f66afdd 100644 --- a/src/main/java/com/example/solidconnection/community/dto/board/PostFindBoardResponse.java +++ b/src/main/java/com/example/solidconnection/community/board/dto/PostFindBoardResponse.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.community.dto.board; +package com.example.solidconnection.community.board.dto; -import com.example.solidconnection.community.domain.board.Board; +import com.example.solidconnection.community.board.domain.Board; public record PostFindBoardResponse( String code, diff --git a/src/main/java/com/example/solidconnection/community/repository/board/BoardRepository.java b/src/main/java/com/example/solidconnection/community/board/repository/BoardRepository.java similarity index 88% rename from src/main/java/com/example/solidconnection/community/repository/board/BoardRepository.java rename to src/main/java/com/example/solidconnection/community/board/repository/BoardRepository.java index e5e915943..06dd01161 100644 --- a/src/main/java/com/example/solidconnection/community/repository/board/BoardRepository.java +++ b/src/main/java/com/example/solidconnection/community/board/repository/BoardRepository.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.community.repository.board; +package com.example.solidconnection.community.board.repository; -import com.example.solidconnection.community.domain.board.Board; +import com.example.solidconnection.community.board.domain.Board; import com.example.solidconnection.custom.exception.CustomException; import com.example.solidconnection.custom.exception.ErrorCode; import org.springframework.data.jpa.repository.EntityGraph; diff --git a/src/main/java/com/example/solidconnection/community/service/board/BoardService.java b/src/main/java/com/example/solidconnection/community/board/service/BoardService.java similarity index 71% rename from src/main/java/com/example/solidconnection/community/service/board/BoardService.java rename to src/main/java/com/example/solidconnection/community/board/service/BoardService.java index b1614ad98..c918f8126 100644 --- a/src/main/java/com/example/solidconnection/community/service/board/BoardService.java +++ b/src/main/java/com/example/solidconnection/community/board/service/BoardService.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.community.service.board; +package com.example.solidconnection.community.board.service; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/example/solidconnection/community/controller/comment/CommentController.java b/src/main/java/com/example/solidconnection/community/comment/controller/CommentController.java similarity index 83% rename from src/main/java/com/example/solidconnection/community/controller/comment/CommentController.java rename to src/main/java/com/example/solidconnection/community/comment/controller/CommentController.java index 250622f02..e215fea72 100644 --- a/src/main/java/com/example/solidconnection/community/controller/comment/CommentController.java +++ b/src/main/java/com/example/solidconnection/community/comment/controller/CommentController.java @@ -1,11 +1,11 @@ -package com.example.solidconnection.community.controller.comment; +package com.example.solidconnection.community.comment.controller; -import com.example.solidconnection.community.dto.comment.CommentCreateRequest; -import com.example.solidconnection.community.dto.comment.CommentCreateResponse; -import com.example.solidconnection.community.dto.comment.CommentDeleteResponse; -import com.example.solidconnection.community.dto.comment.CommentUpdateRequest; -import com.example.solidconnection.community.dto.comment.CommentUpdateResponse; -import com.example.solidconnection.community.service.comment.CommentService; +import com.example.solidconnection.community.comment.dto.CommentCreateRequest; +import com.example.solidconnection.community.comment.dto.CommentCreateResponse; +import com.example.solidconnection.community.comment.dto.CommentDeleteResponse; +import com.example.solidconnection.community.comment.dto.CommentUpdateRequest; +import com.example.solidconnection.community.comment.dto.CommentUpdateResponse; +import com.example.solidconnection.community.comment.service.CommentService; import com.example.solidconnection.custom.resolver.AuthorizedUser; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.validation.Valid; diff --git a/src/main/java/com/example/solidconnection/community/domain/comment/Comment.java b/src/main/java/com/example/solidconnection/community/comment/domain/Comment.java similarity index 96% rename from src/main/java/com/example/solidconnection/community/domain/comment/Comment.java rename to src/main/java/com/example/solidconnection/community/comment/domain/Comment.java index 181d2a358..abed4b8f0 100644 --- a/src/main/java/com/example/solidconnection/community/domain/comment/Comment.java +++ b/src/main/java/com/example/solidconnection/community/comment/domain/Comment.java @@ -1,7 +1,7 @@ -package com.example.solidconnection.community.domain.comment; +package com.example.solidconnection.community.comment.domain; import com.example.solidconnection.entity.common.BaseEntity; -import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.post.domain.Post; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; diff --git a/src/main/java/com/example/solidconnection/community/dto/comment/CommentCreateRequest.java b/src/main/java/com/example/solidconnection/community/comment/dto/CommentCreateRequest.java similarity index 82% rename from src/main/java/com/example/solidconnection/community/dto/comment/CommentCreateRequest.java rename to src/main/java/com/example/solidconnection/community/comment/dto/CommentCreateRequest.java index 76b107460..610f602c8 100644 --- a/src/main/java/com/example/solidconnection/community/dto/comment/CommentCreateRequest.java +++ b/src/main/java/com/example/solidconnection/community/comment/dto/CommentCreateRequest.java @@ -1,7 +1,7 @@ -package com.example.solidconnection.community.dto.comment; +package com.example.solidconnection.community.comment.dto; -import com.example.solidconnection.community.domain.comment.Comment; -import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.comment.domain.Comment; +import com.example.solidconnection.community.post.domain.Post; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; diff --git a/src/main/java/com/example/solidconnection/community/dto/comment/CommentCreateResponse.java b/src/main/java/com/example/solidconnection/community/comment/dto/CommentCreateResponse.java similarity index 64% rename from src/main/java/com/example/solidconnection/community/dto/comment/CommentCreateResponse.java rename to src/main/java/com/example/solidconnection/community/comment/dto/CommentCreateResponse.java index f3b719be5..58964f326 100644 --- a/src/main/java/com/example/solidconnection/community/dto/comment/CommentCreateResponse.java +++ b/src/main/java/com/example/solidconnection/community/comment/dto/CommentCreateResponse.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.community.dto.comment; +package com.example.solidconnection.community.comment.dto; -import com.example.solidconnection.community.domain.comment.Comment; +import com.example.solidconnection.community.comment.domain.Comment; public record CommentCreateResponse( Long id diff --git a/src/main/java/com/example/solidconnection/community/dto/comment/CommentDeleteResponse.java b/src/main/java/com/example/solidconnection/community/comment/dto/CommentDeleteResponse.java similarity index 50% rename from src/main/java/com/example/solidconnection/community/dto/comment/CommentDeleteResponse.java rename to src/main/java/com/example/solidconnection/community/comment/dto/CommentDeleteResponse.java index c293f8c71..5283bb87f 100644 --- a/src/main/java/com/example/solidconnection/community/dto/comment/CommentDeleteResponse.java +++ b/src/main/java/com/example/solidconnection/community/comment/dto/CommentDeleteResponse.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.community.dto.comment; +package com.example.solidconnection.community.comment.dto; public record CommentDeleteResponse( Long id diff --git a/src/main/java/com/example/solidconnection/community/dto/comment/CommentUpdateRequest.java b/src/main/java/com/example/solidconnection/community/comment/dto/CommentUpdateRequest.java similarity index 85% rename from src/main/java/com/example/solidconnection/community/dto/comment/CommentUpdateRequest.java rename to src/main/java/com/example/solidconnection/community/comment/dto/CommentUpdateRequest.java index 56bb4c97f..6e14dab45 100644 --- a/src/main/java/com/example/solidconnection/community/dto/comment/CommentUpdateRequest.java +++ b/src/main/java/com/example/solidconnection/community/comment/dto/CommentUpdateRequest.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.community.dto.comment; +package com.example.solidconnection.community.comment.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; diff --git a/src/main/java/com/example/solidconnection/community/dto/comment/CommentUpdateResponse.java b/src/main/java/com/example/solidconnection/community/comment/dto/CommentUpdateResponse.java similarity index 64% rename from src/main/java/com/example/solidconnection/community/dto/comment/CommentUpdateResponse.java rename to src/main/java/com/example/solidconnection/community/comment/dto/CommentUpdateResponse.java index 02a7a6fbb..5446753e4 100644 --- a/src/main/java/com/example/solidconnection/community/dto/comment/CommentUpdateResponse.java +++ b/src/main/java/com/example/solidconnection/community/comment/dto/CommentUpdateResponse.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.community.dto.comment; +package com.example.solidconnection.community.comment.dto; -import com.example.solidconnection.community.domain.comment.Comment; +import com.example.solidconnection.community.comment.domain.Comment; public record CommentUpdateResponse( Long id diff --git a/src/main/java/com/example/solidconnection/community/dto/comment/PostFindCommentResponse.java b/src/main/java/com/example/solidconnection/community/comment/dto/PostFindCommentResponse.java similarity index 89% rename from src/main/java/com/example/solidconnection/community/dto/comment/PostFindCommentResponse.java rename to src/main/java/com/example/solidconnection/community/comment/dto/PostFindCommentResponse.java index 47a00ed2a..f1fd78ad0 100644 --- a/src/main/java/com/example/solidconnection/community/dto/comment/PostFindCommentResponse.java +++ b/src/main/java/com/example/solidconnection/community/comment/dto/PostFindCommentResponse.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.community.dto.comment; +package com.example.solidconnection.community.comment.dto; -import com.example.solidconnection.community.domain.comment.Comment; +import com.example.solidconnection.community.comment.domain.Comment; import com.example.solidconnection.siteuser.dto.PostFindSiteUserResponse; import java.time.ZonedDateTime; diff --git a/src/main/java/com/example/solidconnection/community/repository/comment/CommentRepository.java b/src/main/java/com/example/solidconnection/community/comment/repository/CommentRepository.java similarity index 92% rename from src/main/java/com/example/solidconnection/community/repository/comment/CommentRepository.java rename to src/main/java/com/example/solidconnection/community/comment/repository/CommentRepository.java index 3c3ee6ea3..e5feb3f04 100644 --- a/src/main/java/com/example/solidconnection/community/repository/comment/CommentRepository.java +++ b/src/main/java/com/example/solidconnection/community/comment/repository/CommentRepository.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.community.repository.comment; +package com.example.solidconnection.community.comment.repository; -import com.example.solidconnection.community.domain.comment.Comment; +import com.example.solidconnection.community.comment.domain.Comment; import com.example.solidconnection.custom.exception.CustomException; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/example/solidconnection/community/service/comment/CommentService.java b/src/main/java/com/example/solidconnection/community/comment/service/CommentService.java similarity index 86% rename from src/main/java/com/example/solidconnection/community/service/comment/CommentService.java rename to src/main/java/com/example/solidconnection/community/comment/service/CommentService.java index cfa141811..209dd6987 100644 --- a/src/main/java/com/example/solidconnection/community/service/comment/CommentService.java +++ b/src/main/java/com/example/solidconnection/community/comment/service/CommentService.java @@ -1,16 +1,16 @@ -package com.example.solidconnection.community.service.comment; - -import com.example.solidconnection.community.domain.comment.Comment; -import com.example.solidconnection.community.dto.comment.CommentCreateRequest; -import com.example.solidconnection.community.dto.comment.CommentCreateResponse; -import com.example.solidconnection.community.dto.comment.CommentDeleteResponse; -import com.example.solidconnection.community.dto.comment.CommentUpdateRequest; -import com.example.solidconnection.community.dto.comment.CommentUpdateResponse; -import com.example.solidconnection.community.dto.comment.PostFindCommentResponse; -import com.example.solidconnection.community.repository.comment.CommentRepository; +package com.example.solidconnection.community.comment.service; + +import com.example.solidconnection.community.comment.domain.Comment; +import com.example.solidconnection.community.comment.dto.CommentCreateRequest; +import com.example.solidconnection.community.comment.dto.CommentCreateResponse; +import com.example.solidconnection.community.comment.dto.CommentDeleteResponse; +import com.example.solidconnection.community.comment.dto.CommentUpdateRequest; +import com.example.solidconnection.community.comment.dto.CommentUpdateResponse; +import com.example.solidconnection.community.comment.dto.PostFindCommentResponse; +import com.example.solidconnection.community.comment.repository.CommentRepository; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.community.domain.post.Post; -import com.example.solidconnection.community.repository.post.PostRepository; +import com.example.solidconnection.community.post.domain.Post; +import com.example.solidconnection.community.post.repository.PostRepository; import com.example.solidconnection.siteuser.domain.SiteUser; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/example/solidconnection/community/controller/post/PostController.java b/src/main/java/com/example/solidconnection/community/post/controller/PostController.java similarity index 85% rename from src/main/java/com/example/solidconnection/community/controller/post/PostController.java rename to src/main/java/com/example/solidconnection/community/post/controller/PostController.java index 2560240fd..a2479f08b 100644 --- a/src/main/java/com/example/solidconnection/community/controller/post/PostController.java +++ b/src/main/java/com/example/solidconnection/community/post/controller/PostController.java @@ -1,18 +1,18 @@ -package com.example.solidconnection.community.controller.post; +package com.example.solidconnection.community.post.controller; -import com.example.solidconnection.community.dto.post.PostListResponse; +import com.example.solidconnection.community.post.dto.PostListResponse; import com.example.solidconnection.custom.resolver.AuthorizedUser; -import com.example.solidconnection.community.dto.post.PostCreateRequest; -import com.example.solidconnection.community.dto.post.PostCreateResponse; -import com.example.solidconnection.community.dto.post.PostDeleteResponse; -import com.example.solidconnection.community.dto.post.PostDislikeResponse; -import com.example.solidconnection.community.dto.post.PostFindResponse; -import com.example.solidconnection.community.dto.post.PostLikeResponse; -import com.example.solidconnection.community.dto.post.PostUpdateRequest; -import com.example.solidconnection.community.dto.post.PostUpdateResponse; -import com.example.solidconnection.community.service.post.PostCommandService; -import com.example.solidconnection.community.service.post.PostLikeService; -import com.example.solidconnection.community.service.post.PostQueryService; +import com.example.solidconnection.community.post.dto.PostCreateRequest; +import com.example.solidconnection.community.post.dto.PostCreateResponse; +import com.example.solidconnection.community.post.dto.PostDeleteResponse; +import com.example.solidconnection.community.post.dto.PostDislikeResponse; +import com.example.solidconnection.community.post.dto.PostFindResponse; +import com.example.solidconnection.community.post.dto.PostLikeResponse; +import com.example.solidconnection.community.post.dto.PostUpdateRequest; +import com.example.solidconnection.community.post.dto.PostUpdateResponse; +import com.example.solidconnection.community.post.service.PostCommandService; +import com.example.solidconnection.community.post.service.PostLikeService; +import com.example.solidconnection.community.post.service.PostQueryService; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/solidconnection/community/domain/post/Post.java b/src/main/java/com/example/solidconnection/community/post/domain/Post.java similarity index 92% rename from src/main/java/com/example/solidconnection/community/domain/post/Post.java rename to src/main/java/com/example/solidconnection/community/post/domain/Post.java index 9fdc52440..4d96b9b22 100644 --- a/src/main/java/com/example/solidconnection/community/domain/post/Post.java +++ b/src/main/java/com/example/solidconnection/community/post/domain/Post.java @@ -1,9 +1,9 @@ -package com.example.solidconnection.community.domain.post; +package com.example.solidconnection.community.post.domain; -import com.example.solidconnection.community.domain.board.Board; -import com.example.solidconnection.community.domain.comment.Comment; +import com.example.solidconnection.community.board.domain.Board; +import com.example.solidconnection.community.comment.domain.Comment; import com.example.solidconnection.entity.common.BaseEntity; -import com.example.solidconnection.community.dto.post.PostUpdateRequest; +import com.example.solidconnection.community.post.dto.PostUpdateRequest; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.type.PostCategory; import jakarta.persistence.CascadeType; diff --git a/src/main/java/com/example/solidconnection/community/domain/post/PostImage.java b/src/main/java/com/example/solidconnection/community/post/domain/PostImage.java similarity index 88% rename from src/main/java/com/example/solidconnection/community/domain/post/PostImage.java rename to src/main/java/com/example/solidconnection/community/post/domain/PostImage.java index f42e591e3..5bf885741 100644 --- a/src/main/java/com/example/solidconnection/community/domain/post/PostImage.java +++ b/src/main/java/com/example/solidconnection/community/post/domain/PostImage.java @@ -1,6 +1,5 @@ -package com.example.solidconnection.community.domain.post; +package com.example.solidconnection.community.post.domain; -import com.example.solidconnection.community.domain.post.Post; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/src/main/java/com/example/solidconnection/community/domain/post/PostLike.java b/src/main/java/com/example/solidconnection/community/post/domain/PostLike.java similarity index 96% rename from src/main/java/com/example/solidconnection/community/domain/post/PostLike.java rename to src/main/java/com/example/solidconnection/community/post/domain/PostLike.java index cfba2238a..bbe1ff361 100644 --- a/src/main/java/com/example/solidconnection/community/domain/post/PostLike.java +++ b/src/main/java/com/example/solidconnection/community/post/domain/PostLike.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.community.domain.post; +package com.example.solidconnection.community.post.domain; import com.example.solidconnection.siteuser.domain.SiteUser; import jakarta.persistence.Entity; diff --git a/src/main/java/com/example/solidconnection/community/dto/post/PostCreateRequest.java b/src/main/java/com/example/solidconnection/community/post/dto/PostCreateRequest.java similarity index 87% rename from src/main/java/com/example/solidconnection/community/dto/post/PostCreateRequest.java rename to src/main/java/com/example/solidconnection/community/post/dto/PostCreateRequest.java index db1215231..db271a80f 100644 --- a/src/main/java/com/example/solidconnection/community/dto/post/PostCreateRequest.java +++ b/src/main/java/com/example/solidconnection/community/post/dto/PostCreateRequest.java @@ -1,7 +1,7 @@ -package com.example.solidconnection.community.dto.post; +package com.example.solidconnection.community.post.dto; -import com.example.solidconnection.community.domain.board.Board; -import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.board.domain.Board; +import com.example.solidconnection.community.post.domain.Post; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.type.PostCategory; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/example/solidconnection/community/dto/post/PostCreateResponse.java b/src/main/java/com/example/solidconnection/community/post/dto/PostCreateResponse.java similarity index 62% rename from src/main/java/com/example/solidconnection/community/dto/post/PostCreateResponse.java rename to src/main/java/com/example/solidconnection/community/post/dto/PostCreateResponse.java index 4be7fe3e4..51cc0c72e 100644 --- a/src/main/java/com/example/solidconnection/community/dto/post/PostCreateResponse.java +++ b/src/main/java/com/example/solidconnection/community/post/dto/PostCreateResponse.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.community.dto.post; +package com.example.solidconnection.community.post.dto; -import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.post.domain.Post; public record PostCreateResponse( Long id diff --git a/src/main/java/com/example/solidconnection/community/dto/post/PostDeleteResponse.java b/src/main/java/com/example/solidconnection/community/post/dto/PostDeleteResponse.java similarity index 50% rename from src/main/java/com/example/solidconnection/community/dto/post/PostDeleteResponse.java rename to src/main/java/com/example/solidconnection/community/post/dto/PostDeleteResponse.java index b9d65847e..f98f5264f 100644 --- a/src/main/java/com/example/solidconnection/community/dto/post/PostDeleteResponse.java +++ b/src/main/java/com/example/solidconnection/community/post/dto/PostDeleteResponse.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.community.dto.post; +package com.example.solidconnection.community.post.dto; public record PostDeleteResponse( Long id diff --git a/src/main/java/com/example/solidconnection/community/dto/post/PostDislikeResponse.java b/src/main/java/com/example/solidconnection/community/post/dto/PostDislikeResponse.java similarity index 68% rename from src/main/java/com/example/solidconnection/community/dto/post/PostDislikeResponse.java rename to src/main/java/com/example/solidconnection/community/post/dto/PostDislikeResponse.java index 39eaf37f0..83ffc8305 100644 --- a/src/main/java/com/example/solidconnection/community/dto/post/PostDislikeResponse.java +++ b/src/main/java/com/example/solidconnection/community/post/dto/PostDislikeResponse.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.community.dto.post; +package com.example.solidconnection.community.post.dto; -import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.post.domain.Post; public record PostDislikeResponse( Long likeCount, diff --git a/src/main/java/com/example/solidconnection/community/dto/post/PostFindPostImageResponse.java b/src/main/java/com/example/solidconnection/community/post/dto/PostFindPostImageResponse.java similarity index 83% rename from src/main/java/com/example/solidconnection/community/dto/post/PostFindPostImageResponse.java rename to src/main/java/com/example/solidconnection/community/post/dto/PostFindPostImageResponse.java index c7b6d5574..648bdb72c 100644 --- a/src/main/java/com/example/solidconnection/community/dto/post/PostFindPostImageResponse.java +++ b/src/main/java/com/example/solidconnection/community/post/dto/PostFindPostImageResponse.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.community.dto.post; +package com.example.solidconnection.community.post.dto; -import com.example.solidconnection.community.domain.post.PostImage; +import com.example.solidconnection.community.post.domain.PostImage; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/example/solidconnection/community/dto/post/PostFindResponse.java b/src/main/java/com/example/solidconnection/community/post/dto/PostFindResponse.java similarity index 88% rename from src/main/java/com/example/solidconnection/community/dto/post/PostFindResponse.java rename to src/main/java/com/example/solidconnection/community/post/dto/PostFindResponse.java index 0421d147b..735defac1 100644 --- a/src/main/java/com/example/solidconnection/community/dto/post/PostFindResponse.java +++ b/src/main/java/com/example/solidconnection/community/post/dto/PostFindResponse.java @@ -1,8 +1,8 @@ -package com.example.solidconnection.community.dto.post; +package com.example.solidconnection.community.post.dto; -import com.example.solidconnection.community.dto.board.PostFindBoardResponse; -import com.example.solidconnection.community.dto.comment.PostFindCommentResponse; -import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.board.dto.PostFindBoardResponse; +import com.example.solidconnection.community.comment.dto.PostFindCommentResponse; +import com.example.solidconnection.community.post.domain.Post; import com.example.solidconnection.siteuser.dto.PostFindSiteUserResponse; import java.time.ZonedDateTime; diff --git a/src/main/java/com/example/solidconnection/community/dto/post/PostLikeResponse.java b/src/main/java/com/example/solidconnection/community/post/dto/PostLikeResponse.java similarity index 68% rename from src/main/java/com/example/solidconnection/community/dto/post/PostLikeResponse.java rename to src/main/java/com/example/solidconnection/community/post/dto/PostLikeResponse.java index 51a8f776c..35b2840c0 100644 --- a/src/main/java/com/example/solidconnection/community/dto/post/PostLikeResponse.java +++ b/src/main/java/com/example/solidconnection/community/post/dto/PostLikeResponse.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.community.dto.post; +package com.example.solidconnection.community.post.dto; -import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.post.domain.Post; public record PostLikeResponse( Long likeCount, diff --git a/src/main/java/com/example/solidconnection/community/dto/post/PostListResponse.java b/src/main/java/com/example/solidconnection/community/post/dto/PostListResponse.java similarity index 87% rename from src/main/java/com/example/solidconnection/community/dto/post/PostListResponse.java rename to src/main/java/com/example/solidconnection/community/post/dto/PostListResponse.java index 9b59caf4a..f02af017e 100644 --- a/src/main/java/com/example/solidconnection/community/dto/post/PostListResponse.java +++ b/src/main/java/com/example/solidconnection/community/post/dto/PostListResponse.java @@ -1,7 +1,7 @@ -package com.example.solidconnection.community.dto.post; +package com.example.solidconnection.community.post.dto; -import com.example.solidconnection.community.domain.post.PostImage; -import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.post.domain.PostImage; +import com.example.solidconnection.community.post.domain.Post; import java.time.ZonedDateTime; import java.util.List; diff --git a/src/main/java/com/example/solidconnection/community/dto/post/PostUpdateRequest.java b/src/main/java/com/example/solidconnection/community/post/dto/PostUpdateRequest.java similarity index 92% rename from src/main/java/com/example/solidconnection/community/dto/post/PostUpdateRequest.java rename to src/main/java/com/example/solidconnection/community/post/dto/PostUpdateRequest.java index 26aabb014..339be3519 100644 --- a/src/main/java/com/example/solidconnection/community/dto/post/PostUpdateRequest.java +++ b/src/main/java/com/example/solidconnection/community/post/dto/PostUpdateRequest.java @@ -1,4 +1,4 @@ -package com.example.solidconnection.community.dto.post; +package com.example.solidconnection.community.post.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/example/solidconnection/community/dto/post/PostUpdateResponse.java b/src/main/java/com/example/solidconnection/community/post/dto/PostUpdateResponse.java similarity index 62% rename from src/main/java/com/example/solidconnection/community/dto/post/PostUpdateResponse.java rename to src/main/java/com/example/solidconnection/community/post/dto/PostUpdateResponse.java index 34d311cb4..5c35f031d 100644 --- a/src/main/java/com/example/solidconnection/community/dto/post/PostUpdateResponse.java +++ b/src/main/java/com/example/solidconnection/community/post/dto/PostUpdateResponse.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.community.dto.post; +package com.example.solidconnection.community.post.dto; -import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.post.domain.Post; public record PostUpdateResponse( Long id diff --git a/src/main/java/com/example/solidconnection/community/repository/post/PostImageRepository.java b/src/main/java/com/example/solidconnection/community/post/repository/PostImageRepository.java similarity index 62% rename from src/main/java/com/example/solidconnection/community/repository/post/PostImageRepository.java rename to src/main/java/com/example/solidconnection/community/post/repository/PostImageRepository.java index ea304c904..54c43f375 100644 --- a/src/main/java/com/example/solidconnection/community/repository/post/PostImageRepository.java +++ b/src/main/java/com/example/solidconnection/community/post/repository/PostImageRepository.java @@ -1,6 +1,6 @@ -package com.example.solidconnection.community.repository.post; +package com.example.solidconnection.community.post.repository; -import com.example.solidconnection.community.domain.post.PostImage; +import com.example.solidconnection.community.post.domain.PostImage; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/solidconnection/community/repository/post/PostLikeRepository.java b/src/main/java/com/example/solidconnection/community/post/repository/PostLikeRepository.java similarity index 79% rename from src/main/java/com/example/solidconnection/community/repository/post/PostLikeRepository.java rename to src/main/java/com/example/solidconnection/community/post/repository/PostLikeRepository.java index 4346a423c..417e97310 100644 --- a/src/main/java/com/example/solidconnection/community/repository/post/PostLikeRepository.java +++ b/src/main/java/com/example/solidconnection/community/post/repository/PostLikeRepository.java @@ -1,8 +1,8 @@ -package com.example.solidconnection.community.repository.post; +package com.example.solidconnection.community.post.repository; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.community.domain.post.Post; -import com.example.solidconnection.community.domain.post.PostLike; +import com.example.solidconnection.community.post.domain.Post; +import com.example.solidconnection.community.post.domain.PostLike; import com.example.solidconnection.siteuser.domain.SiteUser; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/example/solidconnection/community/repository/post/PostRepository.java b/src/main/java/com/example/solidconnection/community/post/repository/PostRepository.java similarity index 93% rename from src/main/java/com/example/solidconnection/community/repository/post/PostRepository.java rename to src/main/java/com/example/solidconnection/community/post/repository/PostRepository.java index bb1d8df0e..336189b05 100644 --- a/src/main/java/com/example/solidconnection/community/repository/post/PostRepository.java +++ b/src/main/java/com/example/solidconnection/community/post/repository/PostRepository.java @@ -1,7 +1,7 @@ -package com.example.solidconnection.community.repository.post; +package com.example.solidconnection.community.post.repository; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.community.domain.post.Post; +import com.example.solidconnection.community.post.domain.Post; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; diff --git a/src/main/java/com/example/solidconnection/community/service/post/PostCommandService.java b/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java similarity index 88% rename from src/main/java/com/example/solidconnection/community/service/post/PostCommandService.java rename to src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java index 3bc350f15..1e66b52a4 100644 --- a/src/main/java/com/example/solidconnection/community/service/post/PostCommandService.java +++ b/src/main/java/com/example/solidconnection/community/post/service/PostCommandService.java @@ -1,16 +1,16 @@ -package com.example.solidconnection.community.service.post; +package com.example.solidconnection.community.post.service; -import com.example.solidconnection.community.domain.board.Board; -import com.example.solidconnection.community.repository.board.BoardRepository; +import com.example.solidconnection.community.board.domain.Board; +import com.example.solidconnection.community.board.repository.BoardRepository; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.community.domain.post.PostImage; -import com.example.solidconnection.community.domain.post.Post; -import com.example.solidconnection.community.dto.post.PostCreateRequest; -import com.example.solidconnection.community.dto.post.PostCreateResponse; -import com.example.solidconnection.community.dto.post.PostDeleteResponse; -import com.example.solidconnection.community.dto.post.PostUpdateRequest; -import com.example.solidconnection.community.dto.post.PostUpdateResponse; -import com.example.solidconnection.community.repository.post.PostRepository; +import com.example.solidconnection.community.post.domain.PostImage; +import com.example.solidconnection.community.post.domain.Post; +import com.example.solidconnection.community.post.dto.PostCreateRequest; +import com.example.solidconnection.community.post.dto.PostCreateResponse; +import com.example.solidconnection.community.post.dto.PostDeleteResponse; +import com.example.solidconnection.community.post.dto.PostUpdateRequest; +import com.example.solidconnection.community.post.dto.PostUpdateResponse; +import com.example.solidconnection.community.post.repository.PostRepository; import com.example.solidconnection.s3.S3Service; import com.example.solidconnection.s3.UploadedFileUrlResponse; import com.example.solidconnection.service.RedisService; diff --git a/src/main/java/com/example/solidconnection/community/service/post/PostLikeService.java b/src/main/java/com/example/solidconnection/community/post/service/PostLikeService.java similarity index 84% rename from src/main/java/com/example/solidconnection/community/service/post/PostLikeService.java rename to src/main/java/com/example/solidconnection/community/post/service/PostLikeService.java index 55c8e07bb..045c069cd 100644 --- a/src/main/java/com/example/solidconnection/community/service/post/PostLikeService.java +++ b/src/main/java/com/example/solidconnection/community/post/service/PostLikeService.java @@ -1,12 +1,12 @@ -package com.example.solidconnection.community.service.post; +package com.example.solidconnection.community.post.service; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.community.domain.post.Post; -import com.example.solidconnection.community.domain.post.PostLike; -import com.example.solidconnection.community.dto.post.PostDislikeResponse; -import com.example.solidconnection.community.dto.post.PostLikeResponse; -import com.example.solidconnection.community.repository.post.PostLikeRepository; -import com.example.solidconnection.community.repository.post.PostRepository; +import com.example.solidconnection.community.post.domain.Post; +import com.example.solidconnection.community.post.domain.PostLike; +import com.example.solidconnection.community.post.dto.PostDislikeResponse; +import com.example.solidconnection.community.post.dto.PostLikeResponse; +import com.example.solidconnection.community.post.repository.PostLikeRepository; +import com.example.solidconnection.community.post.repository.PostRepository; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.type.BoardCode; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/example/solidconnection/community/service/post/PostQueryService.java b/src/main/java/com/example/solidconnection/community/post/service/PostQueryService.java similarity index 84% rename from src/main/java/com/example/solidconnection/community/service/post/PostQueryService.java rename to src/main/java/com/example/solidconnection/community/post/service/PostQueryService.java index d1c7ba758..1d7f292ea 100644 --- a/src/main/java/com/example/solidconnection/community/service/post/PostQueryService.java +++ b/src/main/java/com/example/solidconnection/community/post/service/PostQueryService.java @@ -1,17 +1,17 @@ -package com.example.solidconnection.community.service.post; - -import com.example.solidconnection.community.domain.board.Board; -import com.example.solidconnection.community.dto.board.PostFindBoardResponse; -import com.example.solidconnection.community.dto.comment.PostFindCommentResponse; -import com.example.solidconnection.community.dto.post.PostListResponse; -import com.example.solidconnection.community.repository.board.BoardRepository; -import com.example.solidconnection.community.service.comment.CommentService; +package com.example.solidconnection.community.post.service; + +import com.example.solidconnection.community.board.domain.Board; +import com.example.solidconnection.community.board.dto.PostFindBoardResponse; +import com.example.solidconnection.community.comment.dto.PostFindCommentResponse; +import com.example.solidconnection.community.post.dto.PostListResponse; +import com.example.solidconnection.community.board.repository.BoardRepository; +import com.example.solidconnection.community.comment.service.CommentService; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.community.domain.post.Post; -import com.example.solidconnection.community.dto.post.PostFindPostImageResponse; -import com.example.solidconnection.community.dto.post.PostFindResponse; -import com.example.solidconnection.community.repository.post.PostLikeRepository; -import com.example.solidconnection.community.repository.post.PostRepository; +import com.example.solidconnection.community.post.domain.Post; +import com.example.solidconnection.community.post.dto.PostFindPostImageResponse; +import com.example.solidconnection.community.post.dto.PostFindResponse; +import com.example.solidconnection.community.post.repository.PostLikeRepository; +import com.example.solidconnection.community.post.repository.PostRepository; import com.example.solidconnection.service.RedisService; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.dto.PostFindSiteUserResponse; diff --git a/src/main/java/com/example/solidconnection/service/UpdateViewCountService.java b/src/main/java/com/example/solidconnection/service/UpdateViewCountService.java index 0fbd9c56a..2b67e25ec 100644 --- a/src/main/java/com/example/solidconnection/service/UpdateViewCountService.java +++ b/src/main/java/com/example/solidconnection/service/UpdateViewCountService.java @@ -1,7 +1,7 @@ package com.example.solidconnection.service; -import com.example.solidconnection.community.domain.post.Post; -import com.example.solidconnection.community.repository.post.PostRepository; +import com.example.solidconnection.community.post.domain.Post; +import com.example.solidconnection.community.post.repository.PostRepository; import com.example.solidconnection.util.RedisUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java b/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java index a84874b13..83a439b19 100644 --- a/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java +++ b/src/main/java/com/example/solidconnection/siteuser/domain/SiteUser.java @@ -1,8 +1,8 @@ package com.example.solidconnection.siteuser.domain; -import com.example.solidconnection.community.domain.comment.Comment; -import com.example.solidconnection.community.domain.post.Post; -import com.example.solidconnection.community.domain.post.PostLike; +import com.example.solidconnection.community.comment.domain.Comment; +import com.example.solidconnection.community.post.domain.Post; +import com.example.solidconnection.community.post.domain.PostLike; import com.example.solidconnection.score.domain.GpaScore; import com.example.solidconnection.score.domain.LanguageTestScore; import com.example.solidconnection.type.Gender; diff --git a/src/test/java/com/example/solidconnection/community/service/comment/CommentServiceTest.java b/src/test/java/com/example/solidconnection/community/comment/service/CommentServiceTest.java similarity index 95% rename from src/test/java/com/example/solidconnection/community/service/comment/CommentServiceTest.java rename to src/test/java/com/example/solidconnection/community/comment/service/CommentServiceTest.java index ff2d390de..fca6cd41e 100644 --- a/src/test/java/com/example/solidconnection/community/service/comment/CommentServiceTest.java +++ b/src/test/java/com/example/solidconnection/community/comment/service/CommentServiceTest.java @@ -1,18 +1,17 @@ -package com.example.solidconnection.community.service.comment; - -import com.example.solidconnection.community.domain.board.Board; -import com.example.solidconnection.community.domain.comment.Comment; -import com.example.solidconnection.community.dto.comment.CommentCreateRequest; -import com.example.solidconnection.community.dto.comment.CommentCreateResponse; -import com.example.solidconnection.community.dto.comment.CommentDeleteResponse; -import com.example.solidconnection.community.dto.comment.CommentUpdateRequest; -import com.example.solidconnection.community.dto.comment.CommentUpdateResponse; -import com.example.solidconnection.community.dto.comment.PostFindCommentResponse; -import com.example.solidconnection.community.repository.comment.CommentRepository; -import com.example.solidconnection.community.service.comment.CommentService; +package com.example.solidconnection.community.comment.service; + +import com.example.solidconnection.community.board.domain.Board; +import com.example.solidconnection.community.comment.domain.Comment; +import com.example.solidconnection.community.comment.dto.CommentCreateRequest; +import com.example.solidconnection.community.comment.dto.CommentCreateResponse; +import com.example.solidconnection.community.comment.dto.CommentDeleteResponse; +import com.example.solidconnection.community.comment.dto.CommentUpdateRequest; +import com.example.solidconnection.community.comment.dto.CommentUpdateResponse; +import com.example.solidconnection.community.comment.dto.PostFindCommentResponse; +import com.example.solidconnection.community.comment.repository.CommentRepository; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.community.domain.post.Post; -import com.example.solidconnection.community.repository.post.PostRepository; +import com.example.solidconnection.community.post.domain.Post; +import com.example.solidconnection.community.post.repository.PostRepository; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.support.integration.BaseIntegrationTest; import com.example.solidconnection.type.PostCategory; diff --git a/src/test/java/com/example/solidconnection/community/service/post/PostCommandServiceTest.java b/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java similarity index 95% rename from src/test/java/com/example/solidconnection/community/service/post/PostCommandServiceTest.java rename to src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java index 4a4418f2e..a8052a89c 100644 --- a/src/test/java/com/example/solidconnection/community/service/post/PostCommandServiceTest.java +++ b/src/test/java/com/example/solidconnection/community/post/service/PostCommandServiceTest.java @@ -1,17 +1,16 @@ -package com.example.solidconnection.community.service.post; +package com.example.solidconnection.community.post.service; -import com.example.solidconnection.community.domain.board.Board; -import com.example.solidconnection.community.service.post.PostCommandService; +import com.example.solidconnection.community.board.domain.Board; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.community.domain.post.PostImage; -import com.example.solidconnection.community.domain.post.Post; -import com.example.solidconnection.community.dto.post.PostCreateRequest; -import com.example.solidconnection.community.dto.post.PostCreateResponse; -import com.example.solidconnection.community.dto.post.PostDeleteResponse; -import com.example.solidconnection.community.dto.post.PostUpdateRequest; -import com.example.solidconnection.community.dto.post.PostUpdateResponse; -import com.example.solidconnection.community.repository.post.PostRepository; -import com.example.solidconnection.community.repository.post.PostImageRepository; +import com.example.solidconnection.community.post.domain.PostImage; +import com.example.solidconnection.community.post.domain.Post; +import com.example.solidconnection.community.post.dto.PostCreateRequest; +import com.example.solidconnection.community.post.dto.PostCreateResponse; +import com.example.solidconnection.community.post.dto.PostDeleteResponse; +import com.example.solidconnection.community.post.dto.PostUpdateRequest; +import com.example.solidconnection.community.post.dto.PostUpdateResponse; +import com.example.solidconnection.community.post.repository.PostRepository; +import com.example.solidconnection.community.post.repository.PostImageRepository; import com.example.solidconnection.s3.S3Service; import com.example.solidconnection.s3.UploadedFileUrlResponse; import com.example.solidconnection.service.RedisService; diff --git a/src/test/java/com/example/solidconnection/community/service/post/PostLikeServiceTest.java b/src/test/java/com/example/solidconnection/community/post/service/PostLikeServiceTest.java similarity index 90% rename from src/test/java/com/example/solidconnection/community/service/post/PostLikeServiceTest.java rename to src/test/java/com/example/solidconnection/community/post/service/PostLikeServiceTest.java index e3bf356a3..1b1e1d2fd 100644 --- a/src/test/java/com/example/solidconnection/community/service/post/PostLikeServiceTest.java +++ b/src/test/java/com/example/solidconnection/community/post/service/PostLikeServiceTest.java @@ -1,13 +1,12 @@ -package com.example.solidconnection.community.service.post; +package com.example.solidconnection.community.post.service; -import com.example.solidconnection.community.domain.board.Board; -import com.example.solidconnection.community.service.post.PostLikeService; +import com.example.solidconnection.community.board.domain.Board; import com.example.solidconnection.custom.exception.CustomException; -import com.example.solidconnection.community.domain.post.Post; -import com.example.solidconnection.community.dto.post.PostDislikeResponse; -import com.example.solidconnection.community.dto.post.PostLikeResponse; -import com.example.solidconnection.community.repository.post.PostLikeRepository; -import com.example.solidconnection.community.repository.post.PostRepository; +import com.example.solidconnection.community.post.domain.Post; +import com.example.solidconnection.community.post.dto.PostDislikeResponse; +import com.example.solidconnection.community.post.dto.PostLikeResponse; +import com.example.solidconnection.community.post.repository.PostLikeRepository; +import com.example.solidconnection.community.post.repository.PostRepository; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.support.integration.BaseIntegrationTest; import com.example.solidconnection.type.PostCategory; diff --git a/src/test/java/com/example/solidconnection/community/service/post/PostQueryServiceTest.java b/src/test/java/com/example/solidconnection/community/post/service/PostQueryServiceTest.java similarity index 90% rename from src/test/java/com/example/solidconnection/community/service/post/PostQueryServiceTest.java rename to src/test/java/com/example/solidconnection/community/post/service/PostQueryServiceTest.java index 7bd399bb6..33246e981 100644 --- a/src/test/java/com/example/solidconnection/community/service/post/PostQueryServiceTest.java +++ b/src/test/java/com/example/solidconnection/community/post/service/PostQueryServiceTest.java @@ -1,16 +1,16 @@ -package com.example.solidconnection.community.service.post; - -import com.example.solidconnection.community.domain.board.Board; -import com.example.solidconnection.community.domain.comment.Comment; -import com.example.solidconnection.community.dto.comment.PostFindCommentResponse; -import com.example.solidconnection.community.dto.post.PostListResponse; -import com.example.solidconnection.community.repository.comment.CommentRepository; -import com.example.solidconnection.community.domain.post.PostImage; -import com.example.solidconnection.community.domain.post.Post; -import com.example.solidconnection.community.dto.post.PostFindPostImageResponse; -import com.example.solidconnection.community.dto.post.PostFindResponse; -import com.example.solidconnection.community.repository.post.PostRepository; -import com.example.solidconnection.community.repository.post.PostImageRepository; +package com.example.solidconnection.community.post.service; + +import com.example.solidconnection.community.board.domain.Board; +import com.example.solidconnection.community.comment.domain.Comment; +import com.example.solidconnection.community.comment.dto.PostFindCommentResponse; +import com.example.solidconnection.community.post.dto.PostListResponse; +import com.example.solidconnection.community.comment.repository.CommentRepository; +import com.example.solidconnection.community.post.domain.PostImage; +import com.example.solidconnection.community.post.domain.Post; +import com.example.solidconnection.community.post.dto.PostFindPostImageResponse; +import com.example.solidconnection.community.post.dto.PostFindResponse; +import com.example.solidconnection.community.post.repository.PostRepository; +import com.example.solidconnection.community.post.repository.PostImageRepository; import com.example.solidconnection.service.RedisService; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.support.integration.BaseIntegrationTest; diff --git a/src/test/java/com/example/solidconnection/concurrency/PostLikeCountConcurrencyTest.java b/src/test/java/com/example/solidconnection/concurrency/PostLikeCountConcurrencyTest.java index 41e2da0f3..3903f31ff 100644 --- a/src/test/java/com/example/solidconnection/concurrency/PostLikeCountConcurrencyTest.java +++ b/src/test/java/com/example/solidconnection/concurrency/PostLikeCountConcurrencyTest.java @@ -1,10 +1,10 @@ package com.example.solidconnection.concurrency; -import com.example.solidconnection.community.domain.board.Board; -import com.example.solidconnection.community.repository.board.BoardRepository; -import com.example.solidconnection.community.domain.post.Post; -import com.example.solidconnection.community.repository.post.PostRepository; -import com.example.solidconnection.community.service.post.PostLikeService; +import com.example.solidconnection.community.board.domain.Board; +import com.example.solidconnection.community.board.repository.BoardRepository; +import com.example.solidconnection.community.post.domain.Post; +import com.example.solidconnection.community.post.repository.PostRepository; +import com.example.solidconnection.community.post.service.PostLikeService; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; import com.example.solidconnection.support.TestContainerSpringBootTest; diff --git a/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java b/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java index 651108809..2cb6eaa27 100644 --- a/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java +++ b/src/test/java/com/example/solidconnection/concurrency/PostViewCountConcurrencyTest.java @@ -1,9 +1,9 @@ package com.example.solidconnection.concurrency; -import com.example.solidconnection.community.domain.board.Board; -import com.example.solidconnection.community.repository.board.BoardRepository; -import com.example.solidconnection.community.domain.post.Post; -import com.example.solidconnection.community.repository.post.PostRepository; +import com.example.solidconnection.community.board.domain.Board; +import com.example.solidconnection.community.board.repository.BoardRepository; +import com.example.solidconnection.community.post.domain.Post; +import com.example.solidconnection.community.post.repository.PostRepository; import com.example.solidconnection.service.RedisService; import com.example.solidconnection.siteuser.domain.SiteUser; import com.example.solidconnection.siteuser.repository.SiteUserRepository; diff --git a/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java b/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java index e3e3e4497..483c5d133 100644 --- a/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java +++ b/src/test/java/com/example/solidconnection/support/integration/BaseIntegrationTest.java @@ -4,15 +4,15 @@ import com.example.solidconnection.application.domain.Gpa; import com.example.solidconnection.application.domain.LanguageTest; import com.example.solidconnection.application.repository.ApplicationRepository; -import com.example.solidconnection.community.domain.board.Board; -import com.example.solidconnection.community.repository.board.BoardRepository; +import com.example.solidconnection.community.board.domain.Board; +import com.example.solidconnection.community.board.repository.BoardRepository; import com.example.solidconnection.entity.Country; -import com.example.solidconnection.community.domain.post.PostImage; +import com.example.solidconnection.community.post.domain.PostImage; import com.example.solidconnection.entity.Region; -import com.example.solidconnection.community.domain.post.Post; -import com.example.solidconnection.community.repository.post.PostRepository; +import com.example.solidconnection.community.post.domain.Post; +import com.example.solidconnection.community.post.repository.PostRepository; import com.example.solidconnection.repositories.CountryRepository; -import com.example.solidconnection.community.repository.post.PostImageRepository; +import com.example.solidconnection.community.post.repository.PostImageRepository; import com.example.solidconnection.repositories.RegionRepository; import com.example.solidconnection.score.domain.GpaScore; import com.example.solidconnection.score.domain.LanguageTestScore;