[MERGE] #116 -> develop

[FEAT/#116] 계정탈퇴 / 서버통신 구현
teamterning · Jul 17, 2024 · 2effe98 · 2effe98
2 parents 2dc83de + 11e8ea9
commit 2effe98
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 9 deletions.
diff --git a/...rc/main/java/com/terning/core/designsystem/component/bottomsheet/MyPageQuitBottomSheet.kt b/...rc/main/java/com/terning/core/designsystem/component/bottomsheet/MyPageQuitBottomSheet.kt
@@ -16,7 +16,6 @@ import com.terning.core.R
 import com.terning.core.designsystem.component.button.DeleteRoundButton
 import com.terning.core.designsystem.component.button.RoundButton
 import com.terning.core.designsystem.theme.TerningTheme
-import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -50,12 +49,7 @@ fun MyPageQuitBottomSheet(
                     cornerRadius = 10.dp,
                     text = R.string.my_page_quit_button,
                     onButtonClick = {
-                        scope.launch { sheetState.hide() }
-                            .invokeOnCompletion {
-                                if (!sheetState.isVisible) {
-                                    onQuitClick()
-                                }
-                            }
+                        onQuitClick()
                     },
                     modifier = modifier.padding(
                         start = 24.dp,

diff --git a/data/src/main/java/com/terning/data/datasource/MyPageDataSource.kt b/data/src/main/java/com/terning/data/datasource/MyPageDataSource.kt
@@ -4,4 +4,6 @@ import com.terning.data.dto.NonDataBaseResponse
 
 interface MyPageDataSource {
     suspend fun postLogout(): NonDataBaseResponse
+
+    suspend fun deleteQuit(): NonDataBaseResponse
 }
diff --git a/data/src/main/java/com/terning/data/datasourceimpl/MyPageDataSourceImpl.kt b/data/src/main/java/com/terning/data/datasourceimpl/MyPageDataSourceImpl.kt
@@ -9,4 +9,6 @@ class MyPageDataSourceImpl @Inject constructor(
     private val myPageService: MyPageService
 ) : MyPageDataSource {
     override suspend fun postLogout(): NonDataBaseResponse = myPageService.postLogout()
+
+    override suspend fun deleteQuit(): NonDataBaseResponse = myPageService.deleteQuit()
 }
diff --git a/data/src/main/java/com/terning/data/repositoryimpl/MyPageRepositoryImpl.kt b/data/src/main/java/com/terning/data/repositoryimpl/MyPageRepositoryImpl.kt
@@ -11,4 +11,9 @@ class MyPageRepositoryImpl @Inject constructor(
         runCatching {
             myPageDataSource.postLogout()
         }
+
+    override suspend fun deleteQuit(): Result<Unit> =
+        runCatching{
+            myPageDataSource.deleteQuit()
+        }
 }
diff --git a/data/src/main/java/com/terning/data/service/MyPageService.kt b/data/src/main/java/com/terning/data/service/MyPageService.kt
@@ -1,9 +1,13 @@
 package com.terning.data.service
 
 import com.terning.data.dto.NonDataBaseResponse
+import retrofit2.http.DELETE
 import retrofit2.http.POST
 
 interface MyPageService {
     @POST("api/v1/auth/logout")
     suspend fun postLogout(): NonDataBaseResponse
+
+    @DELETE("api/v1/auth/withdraw")
+    suspend fun deleteQuit(): NonDataBaseResponse
 }
diff --git a/domain/src/main/java/com/terning/domain/repository/MyPageRepository.kt b/domain/src/main/java/com/terning/domain/repository/MyPageRepository.kt
@@ -2,4 +2,6 @@ package com.terning.domain.repository
 
 interface MyPageRepository {
     suspend fun postLogout() : Result<Unit>
+
+    suspend fun deleteQuit() : Result<Unit>
 }
diff --git a/feature/src/main/java/com/terning/feature/mypage/MyPageRoute.kt b/feature/src/main/java/com/terning/feature/mypage/MyPageRoute.kt
@@ -59,7 +59,7 @@ fun MyPageRoute(
         MyPageQuitBottomSheet(
             onDismiss = { showQuitBottomSheet = false },
             onQuitClick = {
-                viewModel.patchQuit()
+                viewModel.quitKakao()
             }
         )
     }

diff --git a/feature/src/main/java/com/terning/feature/mypage/MyPageViewModel.kt b/feature/src/main/java/com/terning/feature/mypage/MyPageViewModel.kt
@@ -60,7 +60,24 @@ class MyPageViewModel @Inject constructor(
         }
     }
 
-    fun patchQuit() {
+    fun quitKakao() {
+        UserApiClient.instance.unlink { error ->
+            if (error == null) {
+                deleteQuit()
+            } else {
+                _state.value = _state.value.copy(isSuccess = UiState.Failure(error.toString()))
+            }
+        }
+    }
 
+    private fun deleteQuit() {
+        viewModelScope.launch {
+            myPageRepository.deleteQuit().onSuccess {
+                tokenRepository.clearInfo()
+                _state.value = _state.value.copy(isSuccess = UiState.Success(true))
+            }.onFailure {
+                _state.value = _state.value.copy(isSuccess = UiState.Failure(it.toString()))
+            }
+        }
     }
 }