fix: 안부전화는 시니어만 다르면 동시에 여러개 가능하다

kakao-tech-campus-2nd-step3 · Nov 6, 2024 · 44203a2 · 44203a2
1 parent c0f0f86
commit 44203a2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/src/main/java/com/example/sinitto/helloCall/repository/HelloCallRepository.java b/src/main/java/com/example/sinitto/helloCall/repository/HelloCallRepository.java
@@ -20,5 +20,5 @@ public interface HelloCallRepository extends JpaRepository<HelloCall, Long> {
 
     boolean existsBySeniorAndStatusIn(Senior senior, List<HelloCall.Status> statuses);
 
-    Optional<HelloCall> findByMemberAndStatus(Member member, HelloCall.Status status);
+    List<HelloCall> findByMemberAndStatus(Member member, HelloCall.Status status);
 }
diff --git a/src/main/java/com/example/sinitto/helloCall/service/HelloCallService.java b/src/main/java/com/example/sinitto/helloCall/service/HelloCallService.java
@@ -323,10 +323,9 @@ public List<HelloCallResponse> readOwnHelloCallBySinitto(Long memberId) {
     @Transactional
     public void cancelAssignedHelloCallIfInProgress(Member member) {
 
-        HelloCall helloCall = helloCallRepository.findByMemberAndStatus(member, HelloCall.Status.IN_PROGRESS)
-                .orElse(null);
+        List<HelloCall> helloCalls = helloCallRepository.findByMemberAndStatus(member, HelloCall.Status.IN_PROGRESS);
 
-        if (helloCall != null) {
+        for (HelloCall helloCall : helloCalls) {
             helloCall.changeStatusToWaiting();
             helloCall.setMember(null);
         }

diff --git a/src/test/java/com/example/sinitto/hellocall/service/HelloCallServiceTest.java b/src/test/java/com/example/sinitto/hellocall/service/HelloCallServiceTest.java
@@ -872,14 +872,14 @@ void cancelAssignedHelloCallIfInProgressTest1() {
         Member member = mock(Member.class);
         HelloCall helloCall = mock(HelloCall.class);
 
-        when(helloCallRepository.findByMemberAndStatus(member, HelloCall.Status.IN_PROGRESS)).thenReturn(Optional.of(helloCall));
+        when(helloCallRepository.findByMemberAndStatus(member, HelloCall.Status.IN_PROGRESS)).thenReturn(List.of(helloCall));
 
         // when
         helloCallService.cancelAssignedHelloCallIfInProgress(member);
 
         // then
-        verify(helloCall, atLeastOnce()).changeStatusToWaiting();
-        verify(helloCall, atLeastOnce()).setMember(null);
+        verify(helloCall, times(1)).changeStatusToWaiting();
+        verify(helloCall, times(1)).setMember(null);
     }
 
     @Test
@@ -889,7 +889,7 @@ void cancelAssignedHelloCallIfInProgressTest2() {
         Member member = mock(Member.class);
         HelloCall helloCall = mock(HelloCall.class);
 
-        when(helloCallRepository.findByMemberAndStatus(member, HelloCall.Status.IN_PROGRESS)).thenReturn(Optional.empty());
+        when(helloCallRepository.findByMemberAndStatus(member, HelloCall.Status.IN_PROGRESS)).thenReturn(List.of());
 
         // when
         helloCallService.cancelAssignedHelloCallIfInProgress(member);