Skip to content

fix : 팔로우들의 인증글 목록 가져오는 쿼리 수정 #188

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
Jan 5, 2025
Merged

fix : 팔로우들의 인증글 목록 가져오는 쿼리 수정 #188

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
d3be3f6
fix : 팔로우들의 인증글 목록 가져오는 쿼리 수정
bbbbooo Jan 5, 2025
285ae11
Merge branch 'develop' of https://github.com/slid-todo/back into feat…
bbbbooo Jan 5, 2025
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
9 changes: 5 additions & 4 deletions src/main/java/com/codeit/todo/repository/CompleteRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@
public interface CompleteRepository extends JpaRepository<Complete, Integer> {
List<Complete> findByTodo_TodoId(int todoId);

@Query("select c from Complete c where c.todo.goal.user.userId in :userIds order by c.createdAt desc")
Slice<Complete> findByFollowees(@Param("userIds") List<Integer> userIds, Pageable pageable);
@Query("select c from Complete c where c.todo.goal.user.userId in :userIds and c.completeStatus = :completeStatus order by c.createdAt desc")
Slice<Complete> findByFollowees(@Param("userIds") List<Integer> userIds, Pageable pageable, @Param("completeStatus") String completeStatus);

@Query("select c from Complete c where c.todo.goal.user.userId in :userIds and c.completeId < :completeId order by c.createdAt desc")
Slice<Complete> findByFolloweesAfterCompleteId(@Param("userIds")List<Integer> followeeIds, @Param("completeId") Integer completeId, Pageable pageable);
@Query("select c from Complete c where c.todo.goal.user.userId in :userIds and c.completeId < :completeId and c.completeStatus = :completeStatus order by c.createdAt desc")
Slice<Complete> findByFolloweesAfterCompleteId(@Param("userIds")List<Integer> followeeIds, @Param("completeId") Integer completeId, Pageable pageable,
@Param("completeStatus") String completeStatus);
}
6 changes: 4 additions & 2 deletions src/main/java/com/codeit/todo/service/follow/impl/FollowServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
@Transactional
public class FollowServiceImpl implements FollowService {

private static final String COMPLETE = "인증";

private final FollowRepository followRepository;
private final CompleteRepository completeRepository;
private final LikesRepository likesRepository;
Expand All @@ -45,9 +47,9 @@ public Slice<ReadFollowResponse> readFollows(int userId, ReadFollowRequest reque

Slice<Complete> completes;
if (Objects.isNull(request.lastCompleteId()) || request.lastCompleteId() <= 0) {
completes = completeRepository.findByFollowees(followeeIds, pageable);
completes = completeRepository.findByFollowees(followeeIds, pageable, COMPLETE);
} else {
completes = completeRepository.findByFolloweesAfterCompleteId(followeeIds, request.lastCompleteId(), pageable);
completes = completeRepository.findByFolloweesAfterCompleteId(followeeIds, request.lastCompleteId(), pageable, COMPLETE);
}

List<ReadFollowResponse> responses = completes.stream()
Expand Down
Loading