Skip to content

Fix: 무한스크롤 수정 #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbbbooo merged 2 commits into from
Dec 28, 2024
Merged

Fix: 무한스크롤 수정 #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9151480
feat: nextCursor로 다음번 오는 목표 아이디 반환
soheeparklee Dec 28, 2024
904be70
fix: 사용되지 않는 코드 삭제
soheeparklee Dec 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/main/java/com/codeit/todo/service/goal/impl/GoalServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -124,7 +125,11 @@ public Slice<ReadTodosWithGoalsResponse> findAllGoals(int userId, ReadTodoComple

List<ReadTodosWithGoalsResponse> 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<Goal> getGoalsPagination(int userId, ReadTodoCompleteWithGoalRequest request, Pageable pageable){
Expand Down
11 changes: 0 additions & 11 deletions src/main/java/com/codeit/todo/service/todo/impl/TodoServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,15 +291,4 @@ public List<ReadTodosResponse> makeTodosResponses(List<Todo> todos){
return ReadTodosResponse.from(todo, completeResponses);
}).toList();
}

public Slice<Goal> getGoalsPagination(int userId, ReadTodoCompleteWithGoalRequest request, Pageable pageable){
Slice<Goal> 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;
}
}
Loading