From 81d9f2d2c36585997756b85cf947b38a0738fb49 Mon Sep 17 00:00:00 2001
From: ulsandonghun <donghoon141@naver.com>
Date: Sun, 7 Apr 2024 20:05:09 +0900
Subject: [PATCH] =?UTF-8?q?[fix]=20:=20=ED=8E=98=EC=9D=B4=EC=A7=95=20?=
 =?UTF-8?q?=EC=9D=B4=EC=8A=88=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cona/KUsukKusuk/comment/service/CommentService.java  | 5 +++--
 .../java/com/cona/KUsukKusuk/user/service/UserService.java   | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/cona/KUsukKusuk/comment/service/CommentService.java b/src/main/java/com/cona/KUsukKusuk/comment/service/CommentService.java
index 202d8d2..321b233 100644
--- a/src/main/java/com/cona/KUsukKusuk/comment/service/CommentService.java
+++ b/src/main/java/com/cona/KUsukKusuk/comment/service/CommentService.java
@@ -14,6 +14,7 @@
 import com.cona.KUsukKusuk.user.dto.BoomarkLikeResponseDto;
 import com.cona.KUsukKusuk.user.dto.PageInfo;
 import com.cona.KUsukKusuk.user.service.UserService;
+import java.util.Collections;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -116,8 +117,8 @@ public List<CommentListResponseDto> getPagedComments( int
         int start = Math.min(pageNumber * pageSize, comments.size());
         int end = Math.min((pageNumber + 1) * pageSize, comments.size());
 
-        if (start > end) {
-            start = end;
+        if (start >= comments.size()) {
+            return Collections.emptyList(); // 페이지 범위를 벗어나면 빈 리스트 반환
         }
         PageInfo pageInfo = new PageInfo();
         pageInfo.setTotalElements(comments.size());
diff --git a/src/main/java/com/cona/KUsukKusuk/user/service/UserService.java b/src/main/java/com/cona/KUsukKusuk/user/service/UserService.java
index 732e0bd..b4c56e0 100644
--- a/src/main/java/com/cona/KUsukKusuk/user/service/UserService.java
+++ b/src/main/java/com/cona/KUsukKusuk/user/service/UserService.java
@@ -29,6 +29,7 @@
 import jakarta.transaction.Transactional;
 import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -290,8 +291,8 @@ public List<BoomarkLikeResponseDto> getBookmarkandLikes(int pageNumber, int page
         int start = Math.min(pageNumber * pageSize, distinctSpots.size());
         int end = Math.min((pageNumber + 1) * pageSize, distinctSpots.size());
 
-        if (start > end) {
-            start = end;
+        if (start >= distinctSpots.size()) {
+            return Collections.emptyList();
         }
         PageInfo pageInfo = new PageInfo();
         pageInfo.setTotalElements(distinctSpots.size());