feat: 페이지네이션 방식을 offset 방식에서 cursorId 방식으로 수정 (#43)

8-Sprinters · Feb 4, 2024 · 207c44a · 207c44a
1 parent 7426084
commit 207c44a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/main/java/com/listywave/list/application/service/CommentService.java b/src/main/java/com/listywave/list/application/service/CommentService.java
@@ -46,19 +46,23 @@ public CommentCreateResponse create(Long listId, String accessToken, String cont
     public CommentFindResponse getComments(Long listId, int size, Long cursorId) {
         Lists list = listRepository.getById(listId);
         Long totalCount = commentRepository.countByList(list);
-
+        
         List<Comment> comments = commentRepository.getComments(listId, size, cursorId);
+
+        boolean hasNext = false;
+        if (comments.size() > size) {
+            hasNext = true;
+            comments.remove(comments.size() - 1);
+        }
+        Long cursorIdOfResult = comments.get(comments.size() - 1).getId();
+
         Map<Comment, List<Reply>> result = comments.stream()
                 .collect(toMap(
                         identity(),
                         replyRepository::getAllByComment,
                         (exists, newValue) -> exists,
                         LinkedHashMap::new
                 ));
-
-        Long cursorIdOfResult = comments.get(comments.size() - 1).getId();
-        boolean hasNext = comments.size() >= size;
-
         return CommentFindResponse.from(totalCount, cursorIdOfResult, hasNext, result);
     }
 

diff --git a/src/main/java/com/listywave/list/repository/CustomCommentRepositoryImpl.java b/src/main/java/com/listywave/list/repository/CustomCommentRepositoryImpl.java
@@ -17,10 +17,12 @@ public class CustomCommentRepositoryImpl implements CustomCommentRepository {
     public List<Comment> getComments(Long listId, int size, Long cursorId) {
         return queryFactory.selectFrom(comment)
                 .join(comment.list, lists)
-                .where(comment.list.id.eq(listId))
+                .where(
+                        comment.list.id.eq(listId),
+                        comment.id.gt(cursorId)
+                )
                 .orderBy(comment.id.asc())
-                .limit(size)
-                .offset(cursorId + 1)
+                .limit(size + 1)
                 .fetch();
     }
 }