hotfix: 댓글이 없을 때 조회 시 에러 발생 해결

8-Sprinters · Feb 7, 2024 · 257b6e4 · 257b6e4
1 parent 98a4861
commit 257b6e4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/main/java/com/listywave/list/application/dto/response/CommentFindResponse.java b/src/main/java/com/listywave/list/application/dto/response/CommentFindResponse.java
@@ -1,5 +1,7 @@
 package com.listywave.list.application.dto.response;
 
+import static java.util.Collections.emptyList;
+
 import com.listywave.list.application.domain.Comment;
 import com.listywave.list.application.domain.Reply;
 import java.time.LocalDateTime;
@@ -15,6 +17,15 @@ public record CommentFindResponse(
         List<CommentResponse> comments
 ) {
 
+    public static CommentFindResponse emptyResponse() {
+        return CommentFindResponse.builder()
+                .totalCount(0L)
+                .cursorId(0L)
+                .hasNext(false)
+                .comments(emptyList())
+                .build();
+    }
+
     public static CommentFindResponse from(
             Long totalCount,
             Long cursorId,

diff --git a/src/main/java/com/listywave/list/application/service/CommentService.java b/src/main/java/com/listywave/list/application/service/CommentService.java
@@ -49,6 +49,10 @@ public CommentFindResponse getComments(Long listId, int size, Long cursorId) {
 
         List<Comment> comments = commentRepository.getComments(listId, size, cursorId);
 
+        if (comments.isEmpty()) {
+            return CommentFindResponse.emptyResponse();
+        }
+
         boolean hasNext = false;
         if (comments.size() > size) {
             hasNext = true;