[Refactor]: 내 댓글, 좋아요 여부 응답 추가

Author: shihan00321

back/src/main/java/com/back/domain/comment/controller/CommentController.java

@@ -44,7 +44,6 @@ public ResponseEntity<CommentResponse> createPost(
         return ResponseEntity.status(HttpStatus.CREATED).body(response);
     }
 
-    // fixme 게시글 목록 조회 - 정렬 조건 최신순, 좋아요순 추가하였는데 변경될 수 있음
     @GetMapping
     @Operation(summary = "댓글 목록 조회", description = "게시글 목록을 조회합니다.")
     public ResponseEntity<PageResponse<CommentResponse>> getPosts(

back/src/main/java/com/back/domain/comment/mapper/CommentMappers.java

@@ -23,18 +23,18 @@ public final class CommentMappers {
 
     private CommentMappers() {}
 
-    public static final Mapper<Comment, CommentResponse> COMMENT_READ = e -> {
+    public static CommentResponse toCommentResponse(Comment e, User user, boolean liked) {
         if (e == null) throw new MappingException("Comment is null");
         return new CommentResponse(
                 e.getId(),
                 e.isHide() ? "익명" : (e.getUser() != null ? e.getUser().getNickname() : null),
                 e.getContent(),
                 e.getLikeCount(),
-                false, // todo : 내가 쓴 댓글 여부 추후 구현
-                false, // todo : 좋아요 여부 추후 구현
+                (user != null && user.getId().equals(e.getUser().getId())),
+                liked,
                 e.getCreatedDate()
         );
-    };
+    }
 
     public static final class CommentCtxMapper implements TwoWayMapper<CommentRequest, Comment, CommentResponse> {
         private final User user;
@@ -58,7 +58,7 @@ public Comment toEntity(CommentRequest req) {
 
         @Override
         public CommentResponse toResponse(Comment entity) {
-            return COMMENT_READ.map(entity);
+            return toCommentResponse(entity, user, false);
         }
     }
 }

back/src/main/java/com/back/domain/comment/service/CommentService.java

@@ -5,6 +5,8 @@
 import com.back.domain.comment.entity.Comment;
 import com.back.domain.comment.mapper.CommentMappers;
 import com.back.domain.comment.repository.CommentRepository;
+import com.back.domain.like.repository.CommentLikeRepository;
+import com.back.domain.post.dto.PostSummaryResponse;
 import com.back.domain.post.entity.Post;
 import com.back.domain.post.repository.PostRepository;
 import com.back.domain.user.entity.User;
@@ -17,6 +19,9 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Set;
+import java.util.stream.Collectors;
+
 /**
  * 댓글 관련 비즈니스 로직을 처리하는 서비스.
  */
@@ -28,6 +33,7 @@ public class CommentService {
     private final UserRepository userRepository;
     private final PostRepository postRepository;
     private final CommentRepository commentRepository;
+    private final CommentLikeRepository commentLikeRepository;
 
     public CommentResponse createComment(Long userId, Long postId, CommentRequest request) {
         User user = userRepository.findById(userId)
@@ -41,10 +47,18 @@ public CommentResponse createComment(Long userId, Long postId, CommentRequest re
     }
 
     public Page<CommentResponse> getComments(Long userId, Long postId, Pageable pageable) {
+        User user = userRepository.findById(userId)
+                .orElse(null);
         Post post = postRepository.findById(postId)
                 .orElseThrow(() -> new ApiException(ErrorCode.POST_NOT_FOUND));
         Page<Comment> commentsPage = commentRepository.findCommentsByPostId(postId, pageable);
-        return commentsPage.map(CommentMappers.COMMENT_READ::map);
+        Set<Long> userLikedComments = getUserLikedComments(userId, commentsPage);
+
+        return commentsPage.map(comment -> CommentMappers.toCommentResponse(
+                comment,
+                user,
+                userLikedComments.contains(comment.getId())
+        ));
     }
 
     @Transactional
@@ -63,4 +77,14 @@ public void deleteComment(Long userId, Long commentId) {
         comment.checkUser(userId);
         commentRepository.delete(comment);
     }
+
+    // 특정 사용자가 한 게시글 내 댓글에서 좋아요를 누른 댓글 ID 집합 조회
+    private Set<Long> getUserLikedComments(Long userId, Page<Comment> comments) {
+        Set<Long> commentIds = comments.getContent()
+                .stream()
+                .map(Comment::getId)
+                .collect(Collectors.toSet());
+
+        return commentLikeRepository.findLikedCommentsIdsByUserAndCommentIds(userId, commentIds);
+    }
 }

back/src/main/java/com/back/domain/like/repository/CommentLikeRepository.java

@@ -2,11 +2,17 @@
 
 import com.back.domain.like.entity.CommentLike;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.Set;
+
 /**
  * 댓글 좋아요 엔티티에 대한 데이터베이스 접근을 담당하는 JpaRepository.
  */
 @Repository
 public interface CommentLikeRepository extends JpaRepository<CommentLike, Long> {
+    @Query("SELECT cl.comment.id FROM CommentLike cl WHERE cl.user.id = :userId AND cl.comment.id IN :commentIds")
+    Set<Long> findLikedCommentsIdsByUserAndCommentIds(@Param("userId") Long userId, @Param("commentIds") Set<Long> commentIds);
 }