From be04136cba1add2711d93b45cf8f3fbf1700a771 Mon Sep 17 00:00:00 2001 From: hosung-222 Date: Wed, 23 Oct 2024 16:48:33 +0900 Subject: [PATCH] =?UTF-8?q?:recycle:=20Fix:=20=EB=82=98=EC=97=90=EA=B2=8C?= =?UTF-8?q?=EC=84=9C=20=EC=B6=9C=EB=B0=9C/=EB=8F=84=EC=B0=A9=ED=95=9C=20?= =?UTF-8?q?=EC=B9=9C=EA=B5=AC=EA=B4=80=EA=B3=84=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EB=8F=84=EB=A9=94=EC=9D=B8=20=EB=A1=9C=EC=A7=81=20=EB=B6=84?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 출발/도착 친구관계 분리 - 관련 : #384 --- .../api/user/service/FriendManageService.java | 4 ++-- .../user/repository/FriendshipRepository.java | 2 ++ .../domains/user/service/FriendshipService.java | 12 +++++++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/application/external-api-v2/src/main/java/com/namo/spring/application/external/api/user/service/FriendManageService.java b/application/external-api-v2/src/main/java/com/namo/spring/application/external/api/user/service/FriendManageService.java index 70eebf7a..07933a71 100644 --- a/application/external-api-v2/src/main/java/com/namo/spring/application/external/api/user/service/FriendManageService.java +++ b/application/external-api-v2/src/main/java/com/namo/spring/application/external/api/user/service/FriendManageService.java @@ -52,7 +52,7 @@ public void requestFriendShip(Member me, Member target) { */ public Page getReceivedFriendRequests(Long memberId, int page) { Pageable pageable = PageRequest.of(page - 1, REQUEST_PAGE_SIZE); - return friendshipService.readAllFriendshipByStatus(memberId, FriendshipStatus.PENDING, pageable); + return friendshipService.readAllReceivedFriendshipByStatus(memberId, FriendshipStatus.PENDING, pageable); } /** @@ -118,7 +118,7 @@ public void checkMemberIsFriend(Long memberId, Long friendId) { public Page getAcceptedFriendship(Long memberId, int page) { Pageable pageable = PageRequest.of(page - 1, REQUEST_PAGE_SIZE, Sort.by(Sort.Order.desc("isFavorite"), Sort.Order.desc("createdAt"))); - return friendshipService.readAllFriendshipByStatus(memberId, FriendshipStatus.ACCEPTED, pageable); + return friendshipService.readAllRequestFriendshipByStatus(memberId, FriendshipStatus.ACCEPTED, pageable); } public Friendship getAcceptedFriendship(Long memberId, Long friendId){ diff --git a/storage/db-mysql-v2/src/main/java/com/namo/spring/db/mysql/domains/user/repository/FriendshipRepository.java b/storage/db-mysql-v2/src/main/java/com/namo/spring/db/mysql/domains/user/repository/FriendshipRepository.java index ff75e522..db6f8a7c 100644 --- a/storage/db-mysql-v2/src/main/java/com/namo/spring/db/mysql/domains/user/repository/FriendshipRepository.java +++ b/storage/db-mysql-v2/src/main/java/com/namo/spring/db/mysql/domains/user/repository/FriendshipRepository.java @@ -50,4 +50,6 @@ List findBirthdayVisibleFriendIdsByPeriod( LocalDate endDate); Optional findByMemberIdAndFriendIdAndStatus(Long memberId, Long friendId, FriendshipStatus status); + + Page findAllByMemberIdAndStatus(Long memberId, FriendshipStatus status, Pageable pageable); } diff --git a/storage/db-mysql-v2/src/main/java/com/namo/spring/db/mysql/domains/user/service/FriendshipService.java b/storage/db-mysql-v2/src/main/java/com/namo/spring/db/mysql/domains/user/service/FriendshipService.java index 1ec47255..14d67ce7 100644 --- a/storage/db-mysql-v2/src/main/java/com/namo/spring/db/mysql/domains/user/service/FriendshipService.java +++ b/storage/db-mysql-v2/src/main/java/com/namo/spring/db/mysql/domains/user/service/FriendshipService.java @@ -33,10 +33,20 @@ public Friendship createFriendShip(Friendship friendship){ return friendshipRepository.save(friendship); } - public Page readAllFriendshipByStatus(Long memberId, FriendshipStatus status, Pageable pageable) { + /** + * memberId(나)에게 도착한 친구 관계로 탐색 + */ + public Page readAllReceivedFriendshipByStatus(Long memberId, FriendshipStatus status, Pageable pageable) { return friendshipRepository.findAllByFriendIdAndStatus(memberId, status, pageable); } + /** + * memberId(나)에서 시작한 친구 관계로 탐색 + */ + public Page readAllRequestFriendshipByStatus(Long memberId, FriendshipStatus status, Pageable pageable) { + return friendshipRepository.findAllByMemberIdAndStatus(memberId, status, pageable); + } + public Optional readFriendshipByStatus(Long friendshipId, FriendshipStatus status){ return friendshipRepository.findByIdAndStatus(friendshipId, status); }