From 91514806d8819b8d320b640e919109322f74045e Mon Sep 17 00:00:00 2001 From: soheeparklee Date: Sat, 28 Dec 2024 12:39:54 +0100 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20nextCursor=EB=A1=9C=20=EB=8B=A4?= =?UTF-8?q?=EC=9D=8C=EB=B2=88=20=EC=98=A4=EB=8A=94=20=EB=AA=A9=ED=91=9C=20?= =?UTF-8?q?=EC=95=84=EC=9D=B4=EB=94=94=20=EB=B0=98=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/codeit/todo/service/goal/impl/GoalServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/codeit/todo/service/goal/impl/GoalServiceImpl.java b/src/main/java/com/codeit/todo/service/goal/impl/GoalServiceImpl.java index a2d1a2d..e48ec34 100644 --- a/src/main/java/com/codeit/todo/service/goal/impl/GoalServiceImpl.java +++ b/src/main/java/com/codeit/todo/service/goal/impl/GoalServiceImpl.java @@ -19,6 +19,7 @@ import com.codeit.todo.web.dto.response.goal.CreateGoalResponse; import com.codeit.todo.web.dto.response.goal.ReadGoalsResponse; import com.codeit.todo.web.dto.response.goal.UpdateGoalResponse; +import com.codeit.todo.web.dto.response.slice.CustomSlice; import com.codeit.todo.web.dto.response.todo.ReadTodosResponse; import com.codeit.todo.web.dto.response.todo.ReadTodosWithGoalsResponse; import lombok.RequiredArgsConstructor; @@ -124,7 +125,11 @@ public Slice findAllGoals(int userId, ReadTodoComple List sortedGoalsResponses = sortAllGoals(goalsResponses); - return new SliceImpl<>(sortedGoalsResponses, pageable, goals.hasNext()); + + Integer nextCursor = goals.hasNext() + ? goals.getContent().get(goals.getContent().size() -1).getGoalId() + : null; + return new CustomSlice<>(sortedGoalsResponses, pageable, goals.hasNext(), nextCursor); } private Slice getGoalsPagination(int userId, ReadTodoCompleteWithGoalRequest request, Pageable pageable){ From 904be7075287df17ad309b9324a3d9cec975b79f Mon Sep 17 00:00:00 2001 From: soheeparklee Date: Sat, 28 Dec 2024 12:40:21 +0100 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EC=82=AC=EC=9A=A9=EB=90=98=EC=A7=80?= =?UTF-8?q?=20=EC=95=8A=EB=8A=94=20=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../todo/service/todo/impl/TodoServiceImpl.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/main/java/com/codeit/todo/service/todo/impl/TodoServiceImpl.java b/src/main/java/com/codeit/todo/service/todo/impl/TodoServiceImpl.java index a01a70a..dd0af5a 100644 --- a/src/main/java/com/codeit/todo/service/todo/impl/TodoServiceImpl.java +++ b/src/main/java/com/codeit/todo/service/todo/impl/TodoServiceImpl.java @@ -291,15 +291,4 @@ public List makeTodosResponses(List todos){ return ReadTodosResponse.from(todo, completeResponses); }).toList(); } - - public Slice getGoalsPagination(int userId, ReadTodoCompleteWithGoalRequest request, Pageable pageable){ - Slice goals; - if (Objects.isNull(request.lastGoalId()) || request.lastGoalId() <= 0) { - goals = goalRepository.findByUser_UserId(userId, pageable); - } else { - goals = goalRepository.findByGoalIdAndUser_UserId(request.lastGoalId(), userId, pageable); - } - - return goals; - } }