Merge branch 'Weekly' of https://github.com/kakao-tech-campus-2nd-ste…

…p3/Team8_BE into Feat/issue-#127
kakao-tech-campus-2nd-step3 · Oct 31, 2024 · b6e5599 · b6e5599
2 parents 8d19e08 + 53151a3
commit b6e5599
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 10 deletions.
diff --git a/src/main/java/com/example/sinitto/callback/service/CallbackService.java b/src/main/java/com/example/sinitto/callback/service/CallbackService.java
@@ -234,8 +234,11 @@ public CallbackForSinittoResponse getCallbackForSinitto(Long memberId, Long call
         Callback callback = callbackRepository.findById(callbackId)
                 .orElseThrow(() -> new NotFoundException("해당 콜백 id에 해당하는 콜백이 없습니다."));
 
-        if (callback.getAssignedMemberId().equals(memberId)) {
-            return new CallbackForSinittoResponse(callback.getId(), callback.getSeniorName(), callback.getPostTime(), callback.getStatus(), callback.getSeniorId(), true, callback.getSenior().getPhoneNumber());
+        if (!callback.getStatus().equals(Callback.Status.WAITING.toString())) {
+            if (callback.getAssignedMemberId() != null && callback.getAssignedMemberId().equals(memberId)) {
+                return new CallbackForSinittoResponse(callback.getId(), callback.getSeniorName(), callback.getPostTime(), callback.getStatus(), callback.getSeniorId(), true, callback.getSenior().getPhoneNumber());
+            }
+            throw new ForbiddenException("대기중인 콜백이 아닌경우 오직 할당받은 시니또만이 콜백을 조회할 수 있습니다.");
         }
 
         return new CallbackForSinittoResponse(callback.getId(), callback.getSeniorName(), callback.getPostTime(), callback.getStatus(), callback.getSeniorId(), false, "");

diff --git a/src/test/java/com/example/sinitto/callback/service/CallbackServiceTest.java b/src/test/java/com/example/sinitto/callback/service/CallbackServiceTest.java
@@ -406,7 +406,7 @@ void localDateTimeBeforeCalculateTest() {
     }
 
     @Test
-    @DisplayName("시니또용 콜백 단건 조회 - api 호출한 시니또 본인이 할당된 콜백일 경우")
+    @DisplayName("시니또용 콜백 단건 조회 - 1.대기상태 아님 2.AssignedMemberId 이 null 아님 + 해당 콜백에 할당 된 시니또 맞음 ")
     void getCallbackForSinitto() {
         //given
         Long memberId = 1L;
@@ -415,11 +415,12 @@ void getCallbackForSinitto() {
         Senior senior = mock(Senior.class);
 
         when(callbackRepository.findById(callbackId)).thenReturn(Optional.of(callback));
+
+        when(callback.getStatus()).thenReturn(Callback.Status.IN_PROGRESS.toString());
         when(callback.getAssignedMemberId()).thenReturn(1L);
         when(callback.getId()).thenReturn(1L);
         when(callback.getSeniorName()).thenReturn("SeniorName");
         when(callback.getPostTime()).thenReturn(LocalDateTime.now());
-        when(callback.getStatus()).thenReturn(Callback.Status.WAITING.toString());
         when(callback.getSeniorId()).thenReturn(1L);
         when(callback.getSenior()).thenReturn(senior);
         when(callback.getSenior().getPhoneNumber()).thenReturn("01012341234");
@@ -429,28 +430,57 @@ void getCallbackForSinitto() {
 
         //then
         assertTrue(result.isAssignedToSelf());
+        assertEquals("01012341234", result.seniorPhoneNumber());
     }
 
     @Test
-    @DisplayName("시니또용 콜백 단건 조회 - api 호출한 시니또 본인이 할당된 콜백이 아닌 경우")
+    @DisplayName("시니또용 콜백 단건 조회 - 1.대기상태 아님 2.AssignedMemberId 이 null 인 상황 ")
     void getCallbackForSinitto2() {
         //given
         Long memberId = 1L;
         Long callbackId = 1L;
         Callback callback = mock(Callback.class);
 
         when(callbackRepository.findById(callbackId)).thenReturn(Optional.of(callback));
-        when(callback.getAssignedMemberId()).thenReturn(999L); // 여기서 시니또 본인에게 할당된 콜백이 아닌걸 확인
-        when(callback.getId()).thenReturn(1L);
-        when(callback.getSeniorName()).thenReturn("SeniorName");
-        when(callback.getPostTime()).thenReturn(LocalDateTime.now());
+        when(callback.getAssignedMemberId()).thenReturn(null);
+        when(callback.getStatus()).thenReturn(Callback.Status.IN_PROGRESS.toString());
+
+        //when then
+        assertThrows(ForbiddenException.class, () -> callbackService.getCallbackForSinitto(memberId, callbackId));
+    }
+
+    @Test
+    @DisplayName("시니또용 콜백 단건 조회 - 1.대기상태 아님 2.AssignedMemberId 이 null 은 아닌데 해당 콜백에 할당된 시니또는 아닌 상황")
+    void getCallbackForSinitto3() {
+        //given
+        Long memberId = 1L;
+        Long callbackId = 1L;
+        Callback callback = mock(Callback.class);
+
+        when(callbackRepository.findById(callbackId)).thenReturn(Optional.of(callback));
+        when(callback.getAssignedMemberId()).thenReturn(999L);
+        when(callback.getStatus()).thenReturn(Callback.Status.IN_PROGRESS.toString());
+
+        //when then
+        assertThrows(ForbiddenException.class, () -> callbackService.getCallbackForSinitto(memberId, callbackId));
+    }
+
+    @Test
+    @DisplayName("시니또용 콜백 단건 조회 - 1.콜백이 '대기상태' 인 경우(모든 시니또가 조회 가능하다)")
+    void getCallbackForSinitto4() {
+        //given
+        Long memberId = 1L;
+        Long callbackId = 1L;
+        Callback callback = mock(Callback.class);
+
+        when(callbackRepository.findById(callbackId)).thenReturn(Optional.of(callback));
         when(callback.getStatus()).thenReturn(Callback.Status.WAITING.toString());
-        when(callback.getSeniorId()).thenReturn(1L);
 
         //when
         CallbackForSinittoResponse result = callbackService.getCallbackForSinitto(memberId, callbackId);
 
         //then
         assertFalse(result.isAssignedToSelf());
+        assertEquals("", result.seniorPhoneNumber());
     }
 }