Skip to content

fix: 팔로워 여부 가져오는 쿼리 수정 #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbbbooo merged 2 commits into from
Jan 4, 2025
Merged

fix: 팔로워 여부 가져오는 쿼리 수정 #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9898dd5
fix: 퀴리 순서 수정
soheeparklee Jan 3, 2025
1eeb2a0
fix: 파라미터 이름 수정
soheeparklee Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/com/codeit/todo/repository/FollowRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ public interface FollowRepository extends JpaRepository<Follow, Integer> {
@Query(
"SELECT COUNT(f) > 0 " +
"FROM Follow f " +
"WHERE f.follower.userId = :targetUserId " +
"AND f.followee.userId = :userId "
"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 ")
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/codeit/todo/service/follow/impl/FollowServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public Slice<ReadFollowResponse> 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("이미 팔로우로 등록한 회원입니다.");
}

Expand All @@ -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("팔로우 내역이 존재하지 않습니다.");
}

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/codeit/todo/service/user/impl/UserServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<ReadTargetUserCompleteResponse> responses = goalRepository.findByUser_UserId(targetUserId).stream()
List<ReadTargetUserCompleteResponse> responses = goalRepository.findByUser_UserId(followerId).stream()
.flatMap(goal -> goal.getTodos().stream())
.flatMap(todo -> todo.getCompletes().stream())
.map(ReadTargetUserCompleteResponse::from)
Expand Down
Loading