diff --git a/src/main/java/com/codeit/todo/repository/CompleteRepository.java b/src/main/java/com/codeit/todo/repository/CompleteRepository.java index 56170ad..e8484db 100644 --- a/src/main/java/com/codeit/todo/repository/CompleteRepository.java +++ b/src/main/java/com/codeit/todo/repository/CompleteRepository.java @@ -12,9 +12,10 @@ public interface CompleteRepository extends JpaRepository { List findByTodo_TodoId(int todoId); - @Query("select c from Complete c where c.todo.goal.user.userId in :userIds order by c.createdAt desc") - Slice findByFollowees(@Param("userIds") List 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 findByFollowees(@Param("userIds") List 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 findByFolloweesAfterCompleteId(@Param("userIds")List 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 findByFolloweesAfterCompleteId(@Param("userIds")List followeeIds, @Param("completeId") Integer completeId, Pageable pageable, + @Param("completeStatus") String completeStatus); } diff --git a/src/main/java/com/codeit/todo/service/follow/impl/FollowServiceImpl.java b/src/main/java/com/codeit/todo/service/follow/impl/FollowServiceImpl.java index 771f095..ee50a9d 100644 --- a/src/main/java/com/codeit/todo/service/follow/impl/FollowServiceImpl.java +++ b/src/main/java/com/codeit/todo/service/follow/impl/FollowServiceImpl.java @@ -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; @@ -45,9 +47,9 @@ public Slice readFollows(int userId, ReadFollowRequest reque Slice 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 responses = completes.stream()