diff --git a/src/main/java/com/codeit/todo/repository/CompleteRepository.java b/src/main/java/com/codeit/todo/repository/CompleteRepository.java index c1165e4..56170ad 100644 --- a/src/main/java/com/codeit/todo/repository/CompleteRepository.java +++ b/src/main/java/com/codeit/todo/repository/CompleteRepository.java @@ -15,6 +15,6 @@ public interface CompleteRepository extends JpaRepository { @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.completeId > :completeId order by c.createdAt desc") + @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); } diff --git a/src/main/java/com/codeit/todo/web/dto/response/follow/ReadFollowResponse.java b/src/main/java/com/codeit/todo/web/dto/response/follow/ReadFollowResponse.java index cc25411..2ba143a 100644 --- a/src/main/java/com/codeit/todo/web/dto/response/follow/ReadFollowResponse.java +++ b/src/main/java/com/codeit/todo/web/dto/response/follow/ReadFollowResponse.java @@ -8,6 +8,7 @@ @Builder public record ReadFollowResponse( int completeId, + int userId, String completePic, String completeContent, String profilePic, @@ -22,6 +23,7 @@ public record ReadFollowResponse( public static ReadFollowResponse from(Complete complete, Boolean likeStatus) { return ReadFollowResponse.builder() .completeId(complete.getCompleteId()) + .userId(complete.getTodo().getGoal().getUser().getUserId()) .completePic(complete.getCompletePic()) .completeContent(complete.getNote()) .profilePic(complete.getTodo().getGoal().getUser().getProfilePic())