fix: PostRepository & CommentRepository의 일부 메서드의 정렬 순서 오류 해결

src/main/java/com/example/solidconnection/community/board/controller/BoardController.java

@@ -37,7 +37,7 @@ public ResponseEntity<?> findPostsByCodeAndCategory(
             @PathVariable(value = "code") String code,
             @RequestParam(value = "category", defaultValue = "전체") String category) {
         List<PostListResponse> postsByCodeAndPostCategory = postQueryService
-                .findPostsByCodeAndPostCategory(code, category, siteUserId);
+                .findPostsByCodeAndPostCategoryOrderByCreatedAtDesc(code, category, siteUserId);
         return ResponseEntity.ok().body(postsByCodeAndPostCategory);
     }
 }

src/main/java/com/example/solidconnection/community/comment/repository/CommentRepository.java

@@ -12,30 +12,30 @@
 public interface CommentRepository extends JpaRepository<Comment, Long> {
 
     @Query(value = """
-               WITH RECURSIVE CommentTree AS (
-                       SELECT
-                               id, parent_id, post_id, site_user_id, content,
-                               created_at, updated_at, is_deleted,
-                               0 AS level, CAST(id AS CHAR(255)) AS path
-                       FROM comment
-                       WHERE post_id = :postId AND parent_id IS NULL
-                       AND site_user_id NOT IN (
-                           SELECT blocked_id FROM user_block WHERE blocker_id = :siteUserId
-                       )
-                       UNION ALL
-                       SELECT
-                               c.id, c.parent_id, c.post_id, c.site_user_id, c.content,
-                               c.created_at, c.updated_at, c.is_deleted,
-                               ct.level + 1, CONCAT(ct.path, '->', c.id)
-                       FROM comment c
-                       INNER JOIN CommentTree ct ON c.parent_id = ct.id
-                       WHERE c.site_user_id NOT IN (
-                           SELECT blocked_id FROM user_block WHERE blocker_id = :siteUserId
-                       )
-               )
-               SELECT * FROM CommentTree
-               ORDER BY path
-               """, nativeQuery = true)
+                   WITH RECURSIVE CommentTree AS (
+                           SELECT
+                                   id, parent_id, post_id, site_user_id, content,
+                                   created_at, updated_at, is_deleted,
+                                   0 AS level, CAST(id AS CHAR(255)) AS path
+                           FROM comment
+                           WHERE post_id = :postId AND parent_id IS NULL
+                           AND site_user_id NOT IN (
+                               SELECT blocked_id FROM user_block WHERE blocker_id = :siteUserId
+                           )
+                           UNION ALL
+                           SELECT
+                                   c.id, c.parent_id, c.post_id, c.site_user_id, c.content,
+                                   c.created_at, c.updated_at, c.is_deleted,
+                                   ct.level + 1, CONCAT(ct.path, '->', c.id)
+                           FROM comment c
+                           INNER JOIN CommentTree ct ON c.parent_id = ct.id
+                           WHERE c.site_user_id NOT IN (
+                               SELECT blocked_id FROM user_block WHERE blocker_id = :siteUserId
+                           )
+                   )
+                   SELECT * FROM CommentTree
+                   ORDER BY path, created_at
+                   """, nativeQuery = true)
     List<Comment> findCommentTreeByPostIdExcludingBlockedUsers(@Param("postId") Long postId, @Param("siteUserId") Long siteUserId);
 
     default Comment getById(Long id) {

src/main/java/com/example/solidconnection/community/post/repository/PostRepository.java

@@ -14,16 +14,17 @@
 
 public interface PostRepository extends JpaRepository<Post, Long> {
 
-    List<Post> findByBoardCode(String boardCode);
+    List<Post> findByBoardCodeOrderByCreatedAtDesc(String boardCode);
 
     @Query("""
-       SELECT p FROM Post p
-       WHERE p.boardCode = :boardCode
-       AND p.siteUserId NOT IN (
-           SELECT ub.blockedId FROM UserBlock ub WHERE ub.blockerId = :siteUserId
-       )
-       """)
-    List<Post> findByBoardCodeExcludingBlockedUsers(@Param("boardCode") String boardCode, @Param("siteUserId") Long siteUserId);
+           SELECT p FROM Post p
+           WHERE p.boardCode = :boardCode
+           AND p.siteUserId NOT IN (
+               SELECT ub.blockedId FROM UserBlock ub WHERE ub.blockerId = :siteUserId
+           )
+           ORDER BY p.createdAt DESC
+           """)
+    List<Post> findByBoardCodeExcludingBlockedUsersOrderByCreatedAtDesc(@Param("boardCode") String boardCode, @Param("siteUserId") Long siteUserId);
 
     @EntityGraph(attributePaths = {"postImageList"})
     Optional<Post> findPostById(Long id);

src/main/java/com/example/solidconnection/community/post/service/PostQueryService.java

@@ -46,17 +46,17 @@ public class PostQueryService {
     private final RedisUtils redisUtils;
 
     @Transactional(readOnly = true)
-    public List<PostListResponse> findPostsByCodeAndPostCategory(String code, String category, Long siteUserId) {
+    public List<PostListResponse> findPostsByCodeAndPostCategoryOrderByCreatedAtDesc(String code, String category, Long siteUserId) {
 
         String boardCode = validateCode(code);
         PostCategory postCategory = validatePostCategory(category);
         boardRepository.getByCode(boardCode);
 
-        List<Post> postList; // todo : 추후 개선 필요(현재 최신순으로 응답나가지 않고 있음)
+        List<Post> postList;
         if (siteUserId != null) {
-            postList = postRepository.findByBoardCodeExcludingBlockedUsers(boardCode, siteUserId);
+            postList = postRepository.findByBoardCodeExcludingBlockedUsersOrderByCreatedAtDesc(boardCode, siteUserId);
         } else {
-            postList = postRepository.findByBoardCode(boardCode);
+            postList = postRepository.findByBoardCodeOrderByCreatedAtDesc(boardCode);
         }
         return PostListResponse.from(getPostListByPostCategory(postList, postCategory));
     }

src/test/java/com/example/solidconnection/common/helper/TestTimeHelper.java

@@ -0,0 +1,19 @@
+package com.example.solidconnection.common.helper;
+
+import com.example.solidconnection.common.BaseEntity;
+import java.lang.reflect.Field;
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
+
+public class TestTimeHelper {
+
+    public static void setCreatedAt(BaseEntity entity, ZonedDateTime time) {
+        try {
+            Field field = BaseEntity.class.getDeclaredField("createdAt");
+            field.setAccessible(true);
+            field.set(entity, time.truncatedTo(ChronoUnit.MICROS));
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

src/test/java/com/example/solidconnection/community/comment/fixture/CommentFixture.java

@@ -32,4 +32,19 @@ public class CommentFixture {
                 .parentComment(parentComment)
                 .createChild();
     }
+
+    public Comment 자식_댓글_지연저장(
+            String content,
+            Post post,
+            SiteUser siteUser,
+            Comment parentComment,
+            long secondsDelay
+    ) {
+        return commentFixtureBuilder
+                .content(content)
+                .post(post)
+                .siteUser(siteUser)
+                .parentComment(parentComment)
+                .createChildWithDelaySeconds(secondsDelay);
+    }
 }

src/test/java/com/example/solidconnection/community/comment/fixture/CommentFixtureBuilder.java

@@ -1,5 +1,6 @@
 package com.example.solidconnection.community.comment.fixture;
 
+import com.example.solidconnection.common.helper.TestTimeHelper;
 import com.example.solidconnection.community.comment.domain.Comment;
 import com.example.solidconnection.community.comment.repository.CommentRepository;
 import com.example.solidconnection.community.post.domain.Post;
@@ -46,8 +47,18 @@ public Comment createParent() {
 
     public Comment createChild() {
         Comment comment = new Comment(content);
-        comment.setPostAndSiteUserId(post, siteUser.getId());
         comment.setParentCommentAndPostAndSiteUserId(parentComment, post, siteUser.getId());
         return commentRepository.save(comment);
     }
+
+    public Comment createChildWithDelaySeconds(long seconds) {
+        Comment comment = new Comment(content);
+        comment.setParentCommentAndPostAndSiteUserId(parentComment, post, siteUser.getId());
+
+        Comment saved = commentRepository.save(comment);
+
+        TestTimeHelper.setCreatedAt(saved, saved.getCreatedAt().plusSeconds(seconds));
+
+        return commentRepository.save(saved);
+    }
 }

src/test/java/com/example/solidconnection/community/comment/service/CommentServiceTest.java

@@ -82,34 +82,55 @@ void setUp() {
     class 댓글_조회_테스트 {
 
         @Test
-        void 게시글의_모든_댓글을_조회한다() {
+        void 게시글의_모든_댓글과_대댓글을_생성시간_기준으로_정렬해_조회한다() {
             // given
             Comment parentComment = commentFixture.부모_댓글("부모 댓글", post, user1);
-            Comment childComment = commentFixture.자식_댓글("자식 댓글 1", post, user2, parentComment);
-            List<Comment> comments = List.of(parentComment, childComment);
+            Comment childComment1 = commentFixture.자식_댓글("자식 댓글 1", post, user2, parentComment);
+            Comment childComment2 = commentFixture.자식_댓글_지연저장("자식 댓글 2", post, user1, parentComment, 3);
+            Comment childComment3 = commentFixture.자식_댓글_지연저장("자식 댓글 3", post, user2, parentComment, 5);
+            List<Comment> comments = List.of(parentComment, childComment1, childComment2, childComment3);
 
             // when
             List<PostFindCommentResponse> responses = commentService.findCommentsByPostId(user1.getId(), post.getId());
 
             // then
             assertAll(
-                    () -> assertThat(responses).hasSize(comments.size()),
                     () -> assertThat(responses)
                             .filteredOn(response -> response.id().equals(parentComment.getId()))
                             .singleElement()
                             .satisfies(response -> assertAll(
-                                    () -> assertThat(response.id()).isEqualTo(parentComment.getId()),
                                     () -> assertThat(response.parentId()).isNull(),
                                     () -> assertThat(response.isOwner()).isTrue()
                             )),
                     () -> assertThat(responses)
-                            .filteredOn(response -> response.id().equals(childComment.getId()))
+                            .filteredOn(response -> response.id().equals(childComment1.getId()))
                             .singleElement()
                             .satisfies(response -> assertAll(
-                                    () -> assertThat(response.id()).isEqualTo(childComment.getId()),
                                     () -> assertThat(response.parentId()).isEqualTo(parentComment.getId()),
                                     () -> assertThat(response.isOwner()).isFalse()
-                            ))
+                            )),
+                    () -> assertThat(responses)
+                            .filteredOn(response -> response.id().equals(childComment2.getId()))
+                            .singleElement()
+                            .satisfies(response -> assertAll(
+                                    () -> assertThat(response.parentId()).isEqualTo(parentComment.getId()),
+                                    () -> assertThat(response.isOwner()).isTrue()
+                            )),
+                    () -> assertThat(responses)
+                            .filteredOn(response -> response.id().equals(childComment3.getId()))
+                            .singleElement()
+                            .satisfies(response -> assertAll(
+                                    () -> assertThat(response.parentId()).isEqualTo(parentComment.getId()),
+                                    () -> assertThat(response.isOwner()).isFalse()
+                            )),
+                    () -> assertThat(responses)
+                            .extracting(PostFindCommentResponse::id)
+                            .containsExactly(
+                                    parentComment.getId(),
+                                    childComment1.getId(),
+                                    childComment2.getId(),
+                                    childComment3.getId()
+                            )
             );
         }
 
@@ -198,24 +219,27 @@ class 댓글_조회_테스트 {
             userBlockFixture.유저_차단(user1.getId(), user2.getId());
             Comment parentComment1 = commentFixture.부모_댓글("부모 댓글1", post, user1);
             Comment childComment1 = commentFixture.자식_댓글("자식 댓글1", post, user1, parentComment1);
-            Comment childComment2 = commentFixture.자식_댓글("자식 댓글2", post, user2, parentComment1);
-            Comment parentCommen2 = commentFixture.부모_댓글("부모 댓글2", post, user2);
-            Comment childComment3 = commentFixture.자식_댓글("자식 댓글1", post, user1, parentCommen2);
-            Comment childComment4 = commentFixture.자식_댓글("자식 댓글1", post, user1, parentCommen2);
-
+            Comment childComment2 = commentFixture.자식_댓글_지연저장("자식 댓글2", post, user2, parentComment1, 2);
+            Comment childComment3 = commentFixture.자식_댓글_지연저장("자식 댓글3", post, user1, parentComment1, 3);
+            Comment parentComment2 = commentFixture.부모_댓글("부모 댓글2", post, user2);
+            Comment childComment4 = commentFixture.자식_댓글("자식 댓글1", post, user1, parentComment2);
+            Comment childComment5 = commentFixture.자식_댓글_지연저장("자식 댓글1", post, user1, parentComment2, 2);
 
             // when
             List<PostFindCommentResponse> responses = commentService.findCommentsByPostId(user1.getId(), post.getId());
 
             // then
             assertAll(
-                () -> assertThat(responses).hasSize(2),
-                () -> assertThat(responses)
-                        .extracting(PostFindCommentResponse::id)
-                        .containsExactly(parentComment1.getId(), childComment1.getId()),
-                () -> assertThat(responses)
-                        .extracting(PostFindCommentResponse::id)
-                        .doesNotContain(childComment2.getId(), parentCommen2.getId(), childComment3.getId(), childComment4.getId())
+                    () -> assertThat(responses).hasSize(3),
+                    () -> assertThat(responses)
+                            .extracting(PostFindCommentResponse::id)
+                            .containsExactly(parentComment1.getId(), childComment1.getId(), childComment3.getId()),
+                    () -> assertThat(responses)
+                            .extracting(PostFindCommentResponse::id)
+                            .doesNotContain(childComment2.getId(), parentComment2.getId(), childComment4.getId(), childComment5.getId()),
+                    () -> assertThat(responses)
+                            .extracting(PostFindCommentResponse::id)
+                            .containsSubsequence(parentComment1.getId(), childComment1.getId(), childComment3.getId())
             );
         }
     }

src/test/java/com/example/solidconnection/community/post/fixture/PostFixture.java

@@ -47,4 +47,25 @@ public class PostFixture {
                 .siteUser(siteUser)
                 .create();
     }
+
+    public Post 게시글_지연저장(
+            String title,
+            String content,
+            Boolean isQuestion,
+            PostCategory postCategory,
+            Board board,
+            SiteUser siteUser,
+            long secondsDelay
+    ) {
+        return postFixtureBuilder
+                .title(title)
+                .content(content)
+                .isQuestion(isQuestion)
+                .likeCount(0L)
+                .viewCount(0L)
+                .postCategory(postCategory)
+                .board(board)
+                .siteUser(siteUser)
+                .createWithDelaySeconds(secondsDelay);
+    }
 }

src/test/java/com/example/solidconnection/community/post/fixture/PostFixtureBuilder.java

@@ -1,5 +1,6 @@
 package com.example.solidconnection.community.post.fixture;
 
+import com.example.solidconnection.common.helper.TestTimeHelper;
 import com.example.solidconnection.community.board.domain.Board;
 import com.example.solidconnection.community.post.domain.Post;
 import com.example.solidconnection.community.post.domain.PostCategory;
@@ -74,4 +75,20 @@ public Post create() {
         post.setBoardAndSiteUserId(board.getCode(), siteUser.getId());
         return postRepository.save(post);
     }
+
+    public Post createWithDelaySeconds(long seconds) {
+        Post post = new Post(
+                title,
+                content,
+                isQuestion,
+                likeCount,
+                viewCount,
+                postCategory);
+        post.setBoardAndSiteUserId(board.getCode(), siteUser.getId());
+
+        Post saved = postRepository.save(post);
+
+        TestTimeHelper.setCreatedAt(saved, saved.getCreatedAt().plusSeconds(seconds));
+        return postRepository.save(post);
+    }
 }