Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ public void requestFriend(Long senderId, FriendRequestCreateReqDto reqDto) {
User receiver = userRepository.findById(reqDto.receiverId())
.orElseThrow(() -> new CustomException(FriendErrorCode.USER_NOT_FOUND));

// ์ด๋ฏธ ์นœ๊ตฌ๋ฉด ๋‹ค์‹œ ์‹ ์ฒญ ๋ชปํ•˜๋„๋ก
if (friendRepository.existsByUserAndFriend(sender, receiver)) {
// ์–‘๋ฐฉํ–ฅ์œผ๋กœ ์นœ๊ตฌ ๊ด€๊ณ„ ํ™•์ธ
if (friendRepository.existsByUserAndFriend(sender, receiver)
|| friendRepository.existsByUserAndFriend(receiver, sender)) {
throw new CustomException(FriendErrorCode.ALREADY_FRIEND);
}

Expand All @@ -57,7 +58,6 @@ public void requestFriend(Long senderId, FriendRequestCreateReqDto reqDto) {
}

if (existing.getStatus() == FriendRequestStatus.REJECTED) {
// ๊ฑฐ์ ˆ๋œ ๊ฒฝ์šฐ์—๋Š” ์žฌ์‹ ์ฒญ ๊ฐ€๋Šฅํ•˜๋„๋ก
existing.reRequest();
}
});
Expand Down
Loading