From d3be3f66663ca9bb86110603364c9d4fc8075603 Mon Sep 17 00:00:00 2001 From: bbbbooo Date: Sun, 5 Jan 2025 20:27:06 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=ED=8C=94=EB=A1=9C=EC=9A=B0=EB=93=A4?= =?UTF-8?q?=EC=9D=98=20=EC=9D=B8=EC=A6=9D=EA=B8=80=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EA=B0=80=EC=A0=B8=EC=98=A4=EB=8A=94=20=EC=BF=BC=EB=A6=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/codeit/todo/repository/CompleteRepository.java | 9 +++++---- .../todo/service/follow/impl/FollowServiceImpl.java | 6 ++++-- 2 files changed, 9 insertions(+), 6 deletions(-) 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()