From 6735e3e73a5d5d522dcf42a582d387fa3e5faa07 Mon Sep 17 00:00:00 2001 From: bbbbooo Date: Sat, 4 Jan 2025 17:53:47 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix=20:=20=ED=8C=94=EB=A1=9C=EC=9A=B0?= =?UTF-8?q?=ED=95=9C=20=EC=82=AC=EB=9E=8C=20=EC=9D=B8=EC=A6=9D=EA=B8=80=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=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 --- .../java/com/codeit/todo/repository/CompleteRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); } From b41ac4fd92df272434006ef20930ee6540ae4133 Mon Sep 17 00:00:00 2001 From: bbbbooo Date: Sat, 4 Jan 2025 17:55:44 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat=20:=20=EC=9D=91=EB=8B=B5=EC=97=90=20us?= =?UTF-8?q?erId=20=ED=95=84=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../codeit/todo/web/dto/response/follow/ReadFollowResponse.java | 2 ++ 1 file changed, 2 insertions(+) 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())