feat: 포스트 댓글 조회 기능 구현

hyobin-yang · hyobin-yang · commit 92e375c3484f · 2026-01-15T18:52:24.000+09:00
diff --git a/src/main/generated/com/daramg/server/user/domain/QUser.java b/src/main/generated/com/daramg/server/user/domain/QUser.java
@@ -31,6 +31,8 @@ public class QUser extends EntityPathBase<User> {
     //inherited
     public final DateTimePath<java.time.LocalDateTime> createdAt = _super.createdAt;
 
+    public final DateTimePath<java.time.LocalDateTime> deletedAt = createDateTime("deletedAt", java.time.LocalDateTime.class);
+
     public final StringPath email = createString("email");
 
     public final NumberPath<Integer> followerCount = createNumber("followerCount", Integer.class);
@@ -51,6 +53,8 @@ public class QUser extends EntityPathBase<User> {
     //inherited
     public final DateTimePath<java.time.LocalDateTime> updatedAt = _super.updatedAt;
 
+    public final EnumPath<UserStatus> userStatus = createEnum("userStatus", UserStatus.class);
+
     public QUser(String variable) {
         super(User.class, forVariable(variable));
     }
diff --git a/src/main/java/com/daramg/server/comment/dto/CommentResponseDto.java b/src/main/java/com/daramg/server/comment/dto/CommentResponseDto.java
@@ -0,0 +1,63 @@
+package com.daramg.server.comment.dto;
+
+import com.daramg.server.comment.domain.Comment;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+public record CommentResponseDto(
+        Long id,
+        String content,
+        boolean isDeleted,
+        int likeCount,
+        int childCommentCount,
+        LocalDateTime createdAt,
+        String writerNickname,
+        String writerProfileImage,
+        Boolean isLiked,
+        List<ChildCommentResponseDto> childComments
+) {
+
+    public static CommentResponseDto from(Comment comment, Boolean isLiked, List<ChildCommentResponseDto> childComments) {
+        int childCommentCount = childComments != null ? childComments.size() : 0;
+
+        return new CommentResponseDto(
+                comment.getId(),
+                comment.getContent(),
+                comment.isDeleted(),
+                comment.getLikeCount(),
+                childCommentCount,
+                comment.getCreatedAt(),
+                comment.getUser().getNickname(),
+                comment.getUser().getProfileImage(),
+                isLiked,
+                childComments
+        );
+    }
+
+    public record ChildCommentResponseDto(
+            Long id,
+            String content,
+            boolean isDeleted,
+            int likeCount,
+            LocalDateTime createdAt,
+            String writerNickname,
+            String writerProfileImage,
+            Boolean isLiked
+    ) {
+
+        public static ChildCommentResponseDto from(Comment comment, Boolean isLiked) {
+            return new ChildCommentResponseDto(
+                    comment.getId(),
+                    comment.getContent(),
+                    comment.isDeleted(),
+                    comment.getLikeCount(),
+                    comment.getCreatedAt(),
+                    comment.getUser().getNickname(),
+                    comment.getUser().getProfileImage(),
+                    isLiked
+            );
+        }
+    }
+}
+
diff --git a/src/main/java/com/daramg/server/comment/repository/CommentLikeRepository.java b/src/main/java/com/daramg/server/comment/repository/CommentLikeRepository.java
@@ -3,8 +3,11 @@
 import com.daramg.server.comment.domain.CommentLike;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 public interface CommentLikeRepository extends JpaRepository<CommentLike, Long> {
     boolean existsByCommentIdAndUserId(Long commentId, Long userId);
     void deleteByCommentIdAndUserId(Long commentId, Long userId);
     void deleteAllByCommentId(Long commentId);
+    List<CommentLike> findByCommentIdInAndUserId(Iterable<Long> commentIds, Long userId);
 }
diff --git a/src/main/java/com/daramg/server/comment/repository/CommentRepository.java b/src/main/java/com/daramg/server/comment/repository/CommentRepository.java
@@ -1,7 +1,13 @@
 package com.daramg.server.comment.repository;
 
 import com.daramg.server.comment.domain.Comment;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 public interface CommentRepository extends JpaRepository<Comment, Long> {
+
+    @EntityGraph(attributePaths = {"user", "childComments", "childComments.user"})
+    List<Comment> findByPostIdAndIsBlockedFalseOrderByCreatedAtAsc(Long postId);
 }
diff --git a/src/main/java/com/daramg/server/post/application/PostQueryService.java b/src/main/java/com/daramg/server/post/application/PostQueryService.java
@@ -1,6 +1,12 @@
 package com.daramg.server.post.application;
 
+import com.daramg.server.comment.domain.Comment;
+import com.daramg.server.comment.domain.CommentLike;
+import com.daramg.server.comment.dto.CommentResponseDto;
+import com.daramg.server.comment.repository.CommentLikeRepository;
+import com.daramg.server.comment.repository.CommentRepository;
 import com.daramg.server.common.application.EntityUtils;
+import com.daramg.server.common.domain.BaseEntity;
 import com.daramg.server.common.dto.PageRequestDto;
 import com.daramg.server.common.dto.PageResponseDto;
 import com.daramg.server.common.util.PagingUtils;
@@ -22,8 +28,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-import java.util.Set;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
@@ -36,6 +42,8 @@ public class PostQueryService {
     private final PagingUtils pagingUtils;
     private final EntityUtils entityUtils;
     private final ComposerLikeRepository composerLikeRepository;
+    private final CommentRepository commentRepository;
+    private final CommentLikeRepository commentLikeRepository;
 
     public PageResponseDto<PostResponseDto> getAllPublishedFreePosts(PageRequestDto pageRequest, User user){
         List<FreePost> posts = postQueryRepository.getAllFreePostsWithPaging(pageRequest);
@@ -113,7 +121,11 @@ public PostDetailResponse getPostById(Long postId, User user) {
         Post post = entityUtils.getEntity(postId, Post.class);
         Boolean isLiked = user != null ? postLikeRepository.existsByPostIdAndUserId(postId, user.getId()) : null;
         Boolean isScrapped = user != null ? postScrapRepository.existsByPostIdAndUserId(postId, user.getId()) : null;
-        return PostDetailResponse.from(post, isLiked, isScrapped);
+        List<Comment> comments = commentRepository.findByPostIdAndIsBlockedFalseOrderByCreatedAtAsc(postId);
+
+        List<CommentResponseDto> commentDtos = mapCommentsWithChildren(comments, user);
+
+        return PostDetailResponse.from(post, isLiked, isScrapped, commentDtos);
     }
 
     public ComposerWithPostsResponseDto getComposerWithPosts(Long composerId, PageRequestDto pageRequest, User user) {
@@ -164,17 +176,72 @@ private PostResponseDto toPostResponseDto(Post post, User user, Set<Long> likedP
 
     private Set<Long> getLikedPostIds(List<Post> posts, User user) {
         if (user == null || posts.isEmpty()) {
-            return java.util.Collections.emptySet();
+            return Collections.emptySet();
         }
         List<Long> postIds = posts.stream().map(Post::getId).toList();
         return postLikeRepository.findPostIdsByPostIdsAndUserId(postIds, user.getId());
     }
 
     private Set<Long> getScrappedPostIds(List<Post> posts, User user) {
         if (user == null || posts.isEmpty()) {
-            return java.util.Collections.emptySet();
+            return Collections.emptySet();
         }
         List<Long> postIds = posts.stream().map(Post::getId).toList();
         return postScrapRepository.findPostIdsByPostIdsAndUserId(postIds, user.getId());
     }
+
+    private List<CommentResponseDto> mapCommentsWithChildren(List<Comment> allComments, User user) {
+        if (allComments.isEmpty()) {
+            return List.of();
+        }
+
+        // 부모/자식 댓글 분리 (작성시간 오름차순 정렬)
+        List<Comment> parentComments = allComments.stream()
+                .filter(comment -> comment.getParentComment() == null)
+                .sorted(Comparator.comparing((Comment c) -> c.getCreatedAt()).thenComparingLong(BaseEntity::getId))
+                .toList();
+
+        Map<Long, List<Comment>> childrenByParentId = allComments.stream()
+                .filter(comment -> comment.getParentComment() != null)
+                .collect(Collectors.groupingBy(comment -> comment.getParentComment().getId()));
+
+        // 현재 로그인 유저가 좋아요한 댓글 ID 모음
+        Set<Long> likedCommentIds = getLikedCommentIds(allComments, user);
+
+        return parentComments.stream()
+                .map(parent -> {
+                    List<Comment> children = childrenByParentId.getOrDefault(parent.getId(), List.of())
+                            .stream()
+                            .sorted(Comparator.comparing((Comment c) -> c.getCreatedAt()).thenComparingLong(BaseEntity::getId))
+                            .toList();
+
+                    List<CommentResponseDto.ChildCommentResponseDto> childDtos = children.stream()
+                            .map(child -> CommentResponseDto.ChildCommentResponseDto.from(
+                                    child,
+                                    user != null && likedCommentIds.contains(child.getId())
+                            ))
+                            .toList();
+
+                    Boolean isParentLiked = user != null ? likedCommentIds.contains(parent.getId()) : null;
+
+                    return CommentResponseDto.from(parent, isParentLiked, childDtos);
+                })
+                .toList();
+    }
+
+    private Set<Long> getLikedCommentIds(List<Comment> comments, User user) {
+        if (user == null || comments.isEmpty()) {
+            return Collections.emptySet();
+        }
+
+        List<Long> commentIds = comments.stream()
+                .map(Comment::getId)
+                .toList();
+
+        List<CommentLike> likes = commentLikeRepository.findByCommentIdInAndUserId(commentIds, user.getId());
+
+        return likes.stream()
+                .map(like -> like.getComment().getId())
+                .collect(Collectors.toSet());
+    }
 }
diff --git a/src/main/java/com/daramg/server/post/dto/PostDetailResponse.java b/src/main/java/com/daramg/server/post/dto/PostDetailResponse.java
@@ -2,6 +2,7 @@
 
 import com.daramg.server.common.exception.BusinessException;
 import com.daramg.server.composer.domain.Composer;
+import com.daramg.server.comment.dto.CommentResponseDto;
 import com.daramg.server.post.domain.CurationPost;
 import com.daramg.server.post.domain.FreePost;
 import com.daramg.server.post.domain.Post;
@@ -15,6 +16,8 @@
 
 public record PostDetailResponse(
         Long id,
+        String writerNickname,
+        String writerProfileImage,
         String title,
         String content,
         List<String> images,
@@ -26,18 +29,22 @@ public record PostDetailResponse(
         boolean isBlocked,
         LocalDateTime createdAt,
         LocalDateTime updatedAt,
-        String writerNickname,
         PostType type,
         ComposerInfo primaryComposer,
         List<ComposerInfo> additionalComposers,
         Boolean isLiked,
-        Boolean isScrapped
+        Boolean isScrapped,
+        List<CommentResponseDto> comments
 ) {
     public static PostDetailResponse from(Post post) {
-        return from(post, null, null);
+        return from(post, null, null, List.of());
     }
 
     public static PostDetailResponse from(Post post, Boolean isLiked, Boolean isScrapped) {
+        return from(post, isLiked, isScrapped, List.of());
+    }
+
+    public static PostDetailResponse from(Post post, Boolean isLiked, Boolean isScrapped, List<CommentResponseDto> comments) {
         PostType type = getPostType(post);
         ComposerInfo primaryComposer = null;
         List<ComposerInfo> additionalComposers = null;
@@ -59,6 +66,8 @@ public static PostDetailResponse from(Post post, Boolean isLiked, Boolean isScra
 
         return new PostDetailResponse(
                 post.getId(),
+                post.getUser().getNickname(),
+                post.getUser().getProfileImage(),
                 post.getTitle(),
                 post.getContent(),
                 post.getImages(),
@@ -70,12 +79,12 @@ public static PostDetailResponse from(Post post, Boolean isLiked, Boolean isScra
                 post.isBlocked(),
                 post.getCreatedAt(),
                 post.getUpdatedAt(),
-                post.getUser().getNickname(),
                 type,
                 primaryComposer,
                 additionalComposers,
                 isLiked,
-                isScrapped
+                isScrapped,
+                comments
         );
     }
 
