From 9898dd51b02f39a389eeb7f8c68415578c3c9479 Mon Sep 17 00:00:00 2001 From: soheeparklee Date: Fri, 3 Jan 2025 14:46:36 +0100 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=ED=80=B4=EB=A6=AC=20=EC=88=9C?= =?UTF-8?q?=EC=84=9C=20=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/FollowRepository.java | 4 ++-- .../codeit/todo/service/follow/impl/FollowServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/codeit/todo/repository/FollowRepository.java b/src/main/java/com/codeit/todo/repository/FollowRepository.java index 41948db..7976cfd 100644 --- a/src/main/java/com/codeit/todo/repository/FollowRepository.java +++ b/src/main/java/com/codeit/todo/repository/FollowRepository.java @@ -14,8 +14,8 @@ public interface FollowRepository extends JpaRepository { @Query( "SELECT COUNT(f) > 0 " + "FROM Follow f " + - "WHERE f.follower.userId = :targetUserId " + - "AND f.followee.userId = :userId " + "WHERE f.follower.userId = :userId " + + "AND f.followee.userId = :targetUserId " ) boolean existsByFollower_FollowerIdAndFollowee_FolloweeId(@Param("userId")int userId, @Param("targetUserId")int targetUserId); 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 6f90b98..771f095 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 @@ -67,7 +67,7 @@ public Slice readFollows(int userId, ReadFollowRequest reque @Override public CreateFollowResponse registerFollow(int followerId, int followeeId) { - if (followRepository.existsByFollower_FollowerIdAndFollowee_FolloweeId(followeeId, followerId)) { + if (followRepository.existsByFollower_FollowerIdAndFollowee_FolloweeId(followerId, followeeId)) { throw new AuthorizationDeniedException("이미 팔로우로 등록한 회원입니다."); } @@ -82,7 +82,7 @@ public CreateFollowResponse registerFollow(int followerId, int followeeId) { @Override public DeleteFollowResponse cancelFollow(int followerId, int followeeId) { - if (!followRepository.existsByFollower_FollowerIdAndFollowee_FolloweeId(followeeId, followerId)) { + if (!followRepository.existsByFollower_FollowerIdAndFollowee_FolloweeId(followerId, followeeId)) { throw new AuthorizationDeniedException("팔로우 내역이 존재하지 않습니다."); } From 1eeb2a07348052e734621e2e8c2c71db906e45e2 Mon Sep 17 00:00:00 2001 From: soheeparklee Date: Fri, 3 Jan 2025 14:53:22 +0100 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0?= =?UTF-8?q?=20=EC=9D=B4=EB=A6=84=20=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/FollowRepository.java | 6 +++--- .../codeit/todo/service/user/impl/UserServiceImpl.java | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/codeit/todo/repository/FollowRepository.java b/src/main/java/com/codeit/todo/repository/FollowRepository.java index 7976cfd..74a99e3 100644 --- a/src/main/java/com/codeit/todo/repository/FollowRepository.java +++ b/src/main/java/com/codeit/todo/repository/FollowRepository.java @@ -14,10 +14,10 @@ public interface FollowRepository extends JpaRepository { @Query( "SELECT COUNT(f) > 0 " + "FROM Follow f " + - "WHERE f.follower.userId = :userId " + - "AND f.followee.userId = :targetUserId " + "WHERE f.follower.userId = :followerId " + + "AND f.followee.userId = :followeeId " ) - boolean existsByFollower_FollowerIdAndFollowee_FolloweeId(@Param("userId")int userId, @Param("targetUserId")int targetUserId); + boolean existsByFollower_FollowerIdAndFollowee_FolloweeId(@Param("followerId")int followerId, @Param("followeeId")int followeeId); @Query("SELECT COUNT(*) FROM Follow f " + "WHERE f.follower.userId = :userId ") diff --git a/src/main/java/com/codeit/todo/service/user/impl/UserServiceImpl.java b/src/main/java/com/codeit/todo/service/user/impl/UserServiceImpl.java index e3f664e..74e865e 100644 --- a/src/main/java/com/codeit/todo/service/user/impl/UserServiceImpl.java +++ b/src/main/java/com/codeit/todo/service/user/impl/UserServiceImpl.java @@ -143,12 +143,12 @@ public UpdatePasswordResponse updatePassword(int userId, UpdatePasswordRequest p @Transactional(readOnly = true) @Override - public ReadTargetUserResponse findTargetUserProfile(int userId, int targetUserId) { - User targetUser = getUser(targetUserId); + public ReadTargetUserResponse findTargetUserProfile(int followeeId, int followerId) { + User targetUser = getUser(followerId); - boolean isFollow = followRepository.existsByFollower_FollowerIdAndFollowee_FolloweeId(userId, targetUserId); + boolean isFollow = followRepository.existsByFollower_FollowerIdAndFollowee_FolloweeId(followerId, followeeId); - List responses = goalRepository.findByUser_UserId(targetUserId).stream() + List responses = goalRepository.findByUser_UserId(followerId).stream() .flatMap(goal -> goal.getTodos().stream()) .flatMap(todo -> todo.getCompletes().stream()) .map(ReadTargetUserCompleteResponse::from)