Skip to content

fix: 무한스크롤 할 때 lastGoalId부터 불러오기로 수정 #158

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 1 commit into from
Dec 29, 2024
Merged

fix: 무한스크롤 할 때 lastGoalId부터 불러오기로 수정 #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion src/main/java/com/codeit/todo/repository/GoalRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@ public interface GoalRepository extends JpaRepository<Goal, Integer> {

Slice<Goal> findByUser_UserId(@Param("userId") int userId, Pageable pageable);

Slice<Goal> findByGoalIdAndUser_UserId(@Param("lastGoalId") Integer lastGoalId, @Param("userId") int userId, Pageable pageable);
@Query(
"SELECT g FROM Goal g " +
"WHERE g.user.userId = :userId " +
"AND g.goalId > :lastGoalId "
)
Slice<Goal> findByGoalIdAndUser_UserIdAndGoalIdGreaterThan(@Param("userId") int userId, @Param("lastGoalId")int lastGoalId, Pageable pageable);

@Query("""
select g
Expand All @@ -40,4 +45,5 @@ public interface GoalRepository extends JpaRepository<Goal, Integer> {
Slice<Goal> findByUserAndHasTodosAfterLastGoalId(@Param("lastGoalId") Integer lastGoalId, @Param("userId") int userId, Pageable pageable, @Param("today") LocalDate today);

List<Goal> findByGoalTitleContains(@Param("keyword") String keyword);

}
3 changes: 2 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 @@ -137,7 +137,8 @@ private Slice<Goal> getGoalsPagination(int userId, ReadTodoCompleteWithGoalReque
if (Objects.isNull(request.lastGoalId()) || request.lastGoalId() <= 0) {
goals = goalRepository.findByUser_UserId(userId, pageable);
} else {
goals = goalRepository.findByGoalIdAndUser_UserId(request.lastGoalId(), userId, pageable);
int lastGoalId = request.lastGoalId();
goals = goalRepository.findByGoalIdAndUser_UserIdAndGoalIdGreaterThan(userId, lastGoalId, pageable);
}
return goals;
}
Expand Down
Loading