Merge pull request #180 from SWM-KAWAI-MANS/PAR-355

#PAR-355 : 회원탈퇴 시 약관동의부터 다시 받도록 보장
SWM-KAWAI-MANS · Sep 18, 2023 · 9765a00 · 9765a00
2 parents 9f1cae0 + be0becf
commit 9765a00
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/...s/src/main/java/online/partyrun/partyrunapplication/feature/settings/SettingsViewModel.kt b/...s/src/main/java/online/partyrun/partyrunapplication/feature/settings/SettingsViewModel.kt
@@ -9,6 +9,7 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import online.partyrun.partyrunapplication.core.common.result.onFailure
 import online.partyrun.partyrunapplication.core.common.result.onSuccess
+import online.partyrun.partyrunapplication.core.domain.agreement.SaveAgreementStateUseCase
 import online.partyrun.partyrunapplication.core.domain.auth.GoogleSignOutUseCase
 import online.partyrun.partyrunapplication.core.domain.member.DeleteAccountUseCase
 import timber.log.Timber
@@ -17,8 +18,8 @@ import javax.inject.Inject
 @HiltViewModel
 class SettingsViewModel @Inject constructor(
     private val deleteAccountUseCase: DeleteAccountUseCase,
-    private val googleSignOutUseCase: GoogleSignOutUseCase
-
+    private val googleSignOutUseCase: GoogleSignOutUseCase,
+    private val saveAgreementStateUseCase: SaveAgreementStateUseCase
 ) : ViewModel() {
     private val _settingsUiState = MutableStateFlow(SettingsUiState())
     val settingsUiState: StateFlow<SettingsUiState> = _settingsUiState
@@ -33,16 +34,20 @@ class SettingsViewModel @Inject constructor(
     fun deleteAccount() = viewModelScope.launch {
         deleteAccountUseCase().collect { result ->
             result.onSuccess {
+                googleSignOutUseCase()
                 _settingsUiState.update { state ->
                     state.copy(
                         isAccountDeletionSuccess = true,
                     )
                 }
-                googleSignOutUseCase()
             }.onFailure { errorMessage, code ->
                 Timber.e("$code $errorMessage")
             }
         }
     }
 
-}
+    fun saveAgreementState(isChecked: Boolean) = viewModelScope.launch {
+        saveAgreementStateUseCase(isChecked)
+    }
+
+}
diff --git a/...s/src/main/java/online/partyrun/partyrunapplication/feature/settings/UnsubscribeScreen.kt b/...s/src/main/java/online/partyrun/partyrunapplication/feature/settings/UnsubscribeScreen.kt
@@ -155,6 +155,7 @@ private fun ConfirmButton(
 ) {
     PartyRunGradientButton(
         onClick = {
+            settingsViewModel.saveAgreementState(isChecked = false)
             settingsViewModel.deleteAccount()
         },
         modifier = Modifier