From 6427fb1b9ab91cce65943b0306a0ebdd5a619bfd Mon Sep 17 00:00:00 2001 From: Suhyeon <70002218+onpyeong@users.noreply.github.com> Date: Wed, 20 Mar 2024 13:01:18 +0900 Subject: [PATCH] =?UTF-8?q?[Fix]:=20=EC=B9=9C=EA=B5=AC=20=EC=8B=A0?= =?UTF-8?q?=EC=B2=AD=20=ED=99=95=EC=9D=B8=20=EB=B3=80=EC=88=98=EB=AA=85=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20(#121)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit friendId를 memberId로 수정 Related to: #120 --- .../sobok/SobokSobok/friend/application/FriendService.java | 6 +++--- .../io/sobok/SobokSobok/friend/ui/FriendController.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/io/sobok/SobokSobok/friend/application/FriendService.java b/src/main/java/io/sobok/SobokSobok/friend/application/FriendService.java index f01267b..4c5ff7c 100644 --- a/src/main/java/io/sobok/SobokSobok/friend/application/FriendService.java +++ b/src/main/java/io/sobok/SobokSobok/friend/application/FriendService.java @@ -188,14 +188,14 @@ public UpdateFriendNameResponse updateFriendName(Long userId, Long friendId, Upd } @Transactional - public Boolean checkFriendRequest(Long userId, Long friendId) { + public Boolean checkFriendRequest(Long userId, Long memberId) { boolean AlreadyFriendRequest = false; UserServiceUtil.existsUserById(userRepository, userId); - UserServiceUtil.existsUserById(userRepository, friendId); + UserServiceUtil.existsUserById(userRepository, memberId); - if (friendQueryRepository.isAlreadyFriend(userId, friendId) || noticeRepository.existsBySenderIdAndReceiverIdAndIsOkay(userId, friendId, NoticeStatus.WAITING)) { + if (friendQueryRepository.isAlreadyFriend(userId, memberId) || noticeRepository.existsBySenderIdAndReceiverIdAndIsOkay(userId, memberId, NoticeStatus.WAITING)) { AlreadyFriendRequest = true; } diff --git a/src/main/java/io/sobok/SobokSobok/friend/ui/FriendController.java b/src/main/java/io/sobok/SobokSobok/friend/ui/FriendController.java index ebf8a20..a090f2e 100644 --- a/src/main/java/io/sobok/SobokSobok/friend/ui/FriendController.java +++ b/src/main/java/io/sobok/SobokSobok/friend/ui/FriendController.java @@ -104,21 +104,21 @@ public ResponseEntity> updateFriendName( )); } - @GetMapping("/request/{friendId}") + @GetMapping("/request/{memberId}") @Operation( summary = "친구 신청 여부 확인 API 메서드", description = "친구 신청을 했는지 확인하는 메서드입니다." ) public ResponseEntity> checkFriendRequest( @AuthenticationPrincipal User user, - @PathVariable Long friendId + @PathVariable Long memberId ) { return ResponseEntity .status(HttpStatus.OK) .body(ApiResponse.success( SuccessCode.GET_REQUEST_FRIEND_SUCCESS, - friendService.checkFriendRequest(user.getId(), friendId) + friendService.checkFriendRequest(user.getId(), memberId) )); } }