[SAMBAD-310]-fix : 손흔들기 accept 했을 때 프로필에서 NOT_REQUESTED로 뜨는 이슈 픽스

depromeet · Aug 28, 2024 · 438a14e · 438a14e
1 parent 0010c12
commit 438a14e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...in/java/org/depromeet/sambad/moring/meeting/handwaving/application/HandWavingService.java b/...in/java/org/depromeet/sambad/moring/meeting/handwaving/application/HandWavingService.java
@@ -45,8 +45,9 @@ public void sendHandWaving(Long userId, Long meetingId, HandWavingRequest reques
 
 	public HandWavingStatusResponse getHandWavingStatus(Long userId, Long meetingId, Long receiverMemberId) {
 		MeetingMember sender = meetingMemberService.getByUserIdAndMeetingId(userId, meetingId);
-		Optional<HandWaving> handWaving = getHandWavingBySenderIdAndReceiverId(sender.getId(), receiverMemberId);
-		return handWaving.map(waving -> HandWavingStatusResponse.of(waving.getId(), waving.getStatus()))
+		Optional<HandWaving> handWaving = getHandWavingBySenderIdAndReceiverId(sender.getId(), receiverMemberId)
+			.or(() -> getHandWavingBySenderIdAndReceiverId(receiverMemberId, sender.getId()));
+		return handWaving.map(waving -> HandWavingStatusResponse.of(waving.getStatus()))
 			.orElseGet(() -> HandWavingStatusResponse.of(NOT_REQUESTED));
 	}