이미 종료된 채팅에 대한 결과 확인 에러 처리 보완

TODO: 좀 더 보완할 수 있음
KU-LAST · Nov 15, 2023 · 8d677ca · 8d677ca
1 parent 5909835
commit 8d677ca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/...lin/com/last/psychat/android/core/data/datasource/remote/chat/ChatRemoteDataSourceImpl.kt b/...lin/com/last/psychat/android/core/data/datasource/remote/chat/ChatRemoteDataSourceImpl.kt
@@ -59,18 +59,16 @@ internal class ChatRemoteDataSourceImpl @Inject constructor(
       val response = service.endChatSession(endChatRequest)
       if (response.isSuccessful) {
         return response.body()
+      } else if (response.code() == 500) {
+        throw EndChatSessionResponseServerError
       } else {
-        if (response.code() == 500) {
-          throw EndChatSessionResponseServerError
-        } else {
-          val errorBody = response.errorBody()?.string() ?: "Unknown error"
-          Timber.d(Exception(errorBody))
-          throw ExceptionWrapper(
-            statusCode = response.code(),
-            message = Exception(errorBody).toAlertMessage(),
-            cause = Exception(errorBody),
-          )
-        }
+        val errorBody = response.errorBody()?.string() ?: "Unknown error"
+        Timber.d(Exception(errorBody))
+        throw ExceptionWrapper(
+          statusCode = response.code(),
+          message = Exception(errorBody).toAlertMessage(),
+          cause = Exception(errorBody),
+        )
       }
     } catch (exception: HttpException) {
       Timber.d(exception)

diff --git a/feature/chat/src/main/kotlin/com/last/psychat/android/feature/chat/ChatViewModel.kt b/feature/chat/src/main/kotlin/com/last/psychat/android/feature/chat/ChatViewModel.kt
@@ -201,11 +201,10 @@ class ChatViewModel @Inject constructor(
         }
         result.isFailure -> {
           val exception = result.exceptionOrNull()!!
-          if (exception == EndChatSessionResponseServerError) {
+          if (exception.cause == EndChatSessionResponseServerError) {
             _eventFlow.emit(ChatUiEvent.ShowToast(UiText.StringResource(R.string.already_end_chat_session)))
           } else {
             _eventFlow.emit(ChatUiEvent.ShowToast(UiText.DirectString(exception.message.toString())))
-            // _eventFlow.emit(ChatUiEvent.ShowToast(UiText.StringResource(R.string.already_end_chat_session)))
           }
         }
       }