[Merge] #71 -> develop

[Feat/#71] 설정창 / 로그아웃, 회원탈퇴 api 연결

core-ui/src/main/java/com/going/ui/extension/EnumUiState.kt

@@ -0,0 +1,5 @@
+package com.going.ui.extension
+
+enum class EnumUiState {
+    LOADING, SUCCESS, FAILURE
+}

data/src/main/java/com/going/data/datasource/AuthDataSource.kt

@@ -4,12 +4,13 @@ import com.going.data.dto.BaseResponse
 import com.going.data.dto.request.SignInRequestDto
 import com.going.data.dto.request.SignUpRequestDto
 import com.going.data.dto.response.AuthResponseDto
+import com.going.data.dto.response.SignInResponseDto
 
 interface AuthDataSource {
     suspend fun postSignIn(
         Authorization: String,
         platform: SignInRequestDto,
-    ): BaseResponse<AuthResponseDto>
+    ): BaseResponse<SignInResponseDto>
 
     suspend fun postSignUp(
         Authorization: String,

data/src/main/java/com/going/data/datasource/SettingDataSource.kt

@@ -1,7 +1,10 @@
 package com.going.data.datasource
 
+import com.going.data.dto.NonDataBaseResponse
 import com.going.data.dto.response.SignOutResponseDto
 
 interface SettingDataSource {
     suspend fun patchSignOut(): SignOutResponseDto
+
+    suspend fun deleteWithDraw(): NonDataBaseResponse<Unit>
 }

data/src/main/java/com/going/data/datasource/TodoDataSource.kt

@@ -8,7 +8,6 @@ interface TodoDataSource {
     suspend fun getTodoListData(
         tripId: Long,
         category: String,
-        progress: String
+        progress: String,
     ): BaseResponse<List<TodoResponseDto>>
-
-}
+}

data/src/main/java/com/going/data/datasourceImpl/AuthDataSourceImpl.kt

@@ -5,6 +5,7 @@ import com.going.data.dto.BaseResponse
 import com.going.data.dto.request.SignInRequestDto
 import com.going.data.dto.request.SignUpRequestDto
 import com.going.data.dto.response.AuthResponseDto
+import com.going.data.dto.response.SignInResponseDto
 import com.going.data.service.AuthService
 import javax.inject.Inject
 
@@ -14,7 +15,7 @@ class AuthDataSourceImpl @Inject constructor(
     override suspend fun postSignIn(
         Authorization: String,
         platform: SignInRequestDto,
-    ): BaseResponse<AuthResponseDto> =
+    ): BaseResponse<SignInResponseDto> =
         authService.postSignin(Authorization, platform)
 
     override suspend fun postSignUp(

data/src/main/java/com/going/data/datasourceImpl/SettingDataSourceImpl.kt

@@ -1,6 +1,7 @@
 package com.going.data.datasourceImpl
 
 import com.going.data.datasource.SettingDataSource
+import com.going.data.dto.NonDataBaseResponse
 import com.going.data.dto.response.SignOutResponseDto
 import com.going.data.service.SettingService
 import javax.inject.Inject
@@ -9,4 +10,5 @@ class SettingDataSourceImpl @Inject constructor(
     private val settingService: SettingService,
 ) : SettingDataSource {
     override suspend fun patchSignOut(): SignOutResponseDto = settingService.patchSignOut()
+    override suspend fun deleteWithDraw(): NonDataBaseResponse<Unit> = settingService.deleteWithDraw()
 }

data/src/main/java/com/going/data/dto/BaseResponse.kt

@@ -7,6 +7,8 @@ import kotlinx.serialization.Serializable
 data class BaseResponse<T>(
     @SerialName("status")
     val status: Int,
+    @SerialName("code")
+    val code: String,
     @SerialName("message")
     val message: String,
     @SerialName("data")

data/src/main/java/com/going/data/dto/NonDataBaseResponse.kt

@@ -0,0 +1,14 @@
+package com.going.data.dto
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class NonDataBaseResponse<T>(
+    @SerialName("status")
+    val status: Int,
+    @SerialName("code")
+    val code: String,
+    @SerialName("message")
+    val message: String,
+)

data/src/main/java/com/going/data/dto/response/SignInResponseDto.kt

@@ -0,0 +1,18 @@
+package com.going.data.dto.response
+
+import com.going.domain.entity.response.SignInModel
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SignInResponseDto(
+    @SerialName("accessToken")
+    val accessToken: String,
+    @SerialName("refreshToken")
+    val refreshToken: String,
+    @SerialName("isResult")
+    val isResult: Boolean,
+) {
+    fun toSignInModel() =
+        SignInModel(accessToken, refreshToken, isResult)
+}

data/src/main/java/com/going/data/repositoryImpl/AuthRepositoryImpl.kt

@@ -6,6 +6,7 @@ import com.going.data.dto.request.toSignUpRequestDto
 import com.going.domain.entity.request.RequestSignInModel
 import com.going.domain.entity.request.RequestSignUpModel
 import com.going.domain.entity.response.AuthTokenModel
+import com.going.domain.entity.response.SignInModel
 import com.going.domain.repository.AuthRepository
 import javax.inject.Inject
 
@@ -15,12 +16,12 @@ class AuthRepositoryImpl @Inject constructor(
     override suspend fun postSignIn(
         Authorization: String,
         requestSignIpModel: RequestSignInModel,
-    ): Result<AuthTokenModel> =
+    ): Result<SignInModel> =
         runCatching {
             authDataSource.postSignIn(
                 Authorization,
                 requestSignIpModel.toSignInRequestDto(),
-            ).data.toAuthTokenModel()
+            ).data.toSignInModel()
         }
 
     override suspend fun postSignUp(

data/src/main/java/com/going/data/repositoryImpl/SettingRepositoryImpl.kt

@@ -11,4 +11,8 @@ class SettingRepositoryImpl @Inject constructor(
     override suspend fun patchSignOut(): Result<SignOutModel> = runCatching {
         settingDataSource.patchSignOut().toSignOutModel()
     }
+
+    override suspend fun deleteWithDraw(): Result<Unit> = runCatching {
+        settingDataSource.deleteWithDraw()
+    }
 }

data/src/main/java/com/going/data/service/AuthService.kt

@@ -4,6 +4,7 @@ import com.going.data.dto.BaseResponse
 import com.going.data.dto.request.SignInRequestDto
 import com.going.data.dto.request.SignUpRequestDto
 import com.going.data.dto.response.AuthResponseDto
+import com.going.data.dto.response.SignInResponseDto
 import retrofit2.http.Body
 import retrofit2.http.Header
 import retrofit2.http.POST
@@ -13,7 +14,7 @@ interface AuthService {
     suspend fun postSignin(
         @Header("Authorization") Authorization: String,
         @Body body: SignInRequestDto,
-    ): BaseResponse<AuthResponseDto>
+    ): BaseResponse<SignInResponseDto>
 
     @POST("api/users/signup")
     suspend fun postSignUp(

data/src/main/java/com/going/data/service/SettingService.kt

@@ -1,9 +1,14 @@
 package com.going.data.service
 
+import com.going.data.dto.NonDataBaseResponse
 import com.going.data.dto.response.SignOutResponseDto
+import retrofit2.http.DELETE
 import retrofit2.http.PATCH
 
 interface SettingService {
     @PATCH("api/users/signout")
     suspend fun patchSignOut(): SignOutResponseDto
+
+    @DELETE("api/users/withdraw")
+    suspend fun deleteWithDraw(): NonDataBaseResponse<Unit>
 }

domain/src/main/kotlin/com/going/domain/entity/response/SignInModel.kt

@@ -0,0 +1,7 @@
+package com.going.domain.entity.response
+
+data class SignInModel(
+    val accessToken: String,
+    val refreshToken: String,
+    val isResult: Boolean,
+)

domain/src/main/kotlin/com/going/domain/repository/AuthRepository.kt

@@ -3,12 +3,13 @@ package com.going.domain.repository
 import com.going.domain.entity.request.RequestSignInModel
 import com.going.domain.entity.request.RequestSignUpModel
 import com.going.domain.entity.response.AuthTokenModel
+import com.going.domain.entity.response.SignInModel
 
 interface AuthRepository {
     suspend fun postSignIn(
         Authorization: String,
         data: RequestSignInModel,
-    ): Result<AuthTokenModel>
+    ): Result<SignInModel>
 
     suspend fun postSignUp(
         Authorization: String,

domain/src/main/kotlin/com/going/domain/repository/SettingRepository.kt

@@ -4,4 +4,6 @@ import com.going.domain.entity.response.SignOutModel
 
 interface SettingRepository {
     suspend fun patchSignOut(): Result<SignOutModel>
+
+    suspend fun deleteWithDraw(): Result<Unit>
 }

presentation/src/main/java/com/going/presentation/onboarding/signin/SignInActivity.kt

@@ -9,6 +9,7 @@ import androidx.lifecycle.lifecycleScope
 import com.going.presentation.R
 import com.going.presentation.databinding.ActivitySigninBinding
 import com.going.presentation.onboarding.signup.OnboardingProfileSettingActivity
+import com.going.presentation.setting.SettingActivity
 import com.going.presentation.tendencytest.TendencyTestActivity
 import com.going.presentation.tendencytest.TendencyTestSplashActivity
 import com.going.ui.base.BaseActivity
@@ -69,7 +70,7 @@ class SignInActivity : BaseActivity<ActivitySigninBinding>(R.layout.activity_sig
 
     private fun navigateToMainScreen() {
         // 추후 대시보드 연결시 연결 예정
-        Intent(this, OnboardingProfileSettingActivity::class.java).apply {
+        Intent(this, SettingActivity::class.java).apply {
             addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
             startActivity(this)
         }

presentation/src/main/java/com/going/presentation/onboarding/signin/SignInViewModel.kt

@@ -74,13 +74,16 @@ class SignInViewModel @Inject constructor(
             authRepository.postSignIn(accessToken, RequestSignInModel(platform)).onSuccess {
                 tokenRepository.setTokens(it.accessToken, it.refreshToken)
 
-                _postChangeTokenState.value = SignInState.SUCCESS
+                if (it.isResult) {
+                    _postChangeTokenState.value = SignInState.SUCCESS
+                } else {
+                    _postChangeTokenState.value = SignInState.TENDENCY
+                }
             }.onFailure {
                 val errorCode = toErrorCode(it)
 
                 _postChangeTokenState.value = when (errorCode) {
                     SIGN_UP -> SignInState.SIGN_UP
-                    TENDENCY -> SignInState.TENDENCY
                     else -> SignInState.FAIL
                 }
             }
@@ -90,6 +93,5 @@ class SignInViewModel @Inject constructor(
     companion object {
         const val KAKAO = "kakao"
         const val SIGN_UP = "e4041"
-        const val TENDENCY = "e4045"
     }
 }

presentation/src/main/java/com/going/presentation/setting/SettingActivity.kt

@@ -5,7 +5,9 @@ import com.going.presentation.R
 import com.going.presentation.databinding.ActivitySettingBinding
 import com.going.ui.base.BaseActivity
 import com.going.ui.extension.setOnSingleClickListener
+import dagger.hilt.android.AndroidEntryPoint
 
+@AndroidEntryPoint
 class SettingActivity : BaseActivity<ActivitySettingBinding>(R.layout.activity_setting) {
 
     private var quitDialog: SettingQuitDialogFragment? = null
@@ -21,30 +23,25 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>(R.layout.activity_s
         initLogoutClickListener()
         initQuitClickListener()
         setVersionCode()
-
     }
 
     private fun initProfileClickListener() {
         binding.layoutSettingProfile.setOnSingleClickListener {
-
         }
     }
 
     private fun initInquireClickListener() {
         binding.layoutSettingInquire.setOnSingleClickListener {
-
         }
     }
 
     private fun initPolicyClickListener() {
         binding.layoutSettingPolicy.setOnSingleClickListener {
-
         }
     }
 
     private fun initAboutDooripClickListener() {
         binding.layoutSettingAboutDoorip.setOnSingleClickListener {
-
         }
     }
 
@@ -83,5 +80,4 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>(R.layout.activity_s
     companion object {
         private const val VERSION_CODE = "v1.0"
     }
-
-}
+}

presentation/src/main/java/com/going/presentation/setting/SettingLogoutDialogFragment.kt

@@ -1,22 +1,35 @@
 package com.going.presentation.setting
 
+import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.view.WindowManager
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.flowWithLifecycle
+import androidx.lifecycle.lifecycleScope
 import com.going.presentation.R
 import com.going.presentation.databinding.FragmentSettingLogoutDialogBinding
 import com.going.ui.base.BaseDialog
+import com.going.ui.extension.EnumUiState
 import com.going.ui.extension.setOnSingleClickListener
+import com.going.ui.extension.toast
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 
-class SettingLogoutDialogFragment :
+@AndroidEntryPoint
+class SettingLogoutDialogFragment() :
     BaseDialog<FragmentSettingLogoutDialogBinding>(R.layout.fragment_setting_logout_dialog) {
 
+    private val viewModel by activityViewModels<SettingViewModel>()
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         initNegativeClickListener()
         initPositiveClickListener()
-
+        observeUserSignOutState()
     }
 
     override fun onStart() {
@@ -31,14 +44,31 @@ class SettingLogoutDialogFragment :
 
     private fun initPositiveClickListener() {
         binding.tvDialogPositive.setOnSingleClickListener {
-            // 로그아웃 버튼 눌렀을 때의 로직
+            viewModel.signOutKakao()
         }
     }
 
+    private fun observeUserSignOutState() {
+        viewModel.userSignOutState.flowWithLifecycle(lifecycle).onEach { state ->
+            when (state) {
+                EnumUiState.SUCCESS -> restartApp(requireContext())
+                EnumUiState.FAILURE -> toast(getString(R.string.server_error))
+                EnumUiState.LOADING -> {}
+            }
+        }.launchIn(lifecycleScope)
+    }
+
     private fun initNegativeClickListener() {
         binding.btnDialogNegative.setOnSingleClickListener {
             dismiss()
         }
     }
 
+    private fun restartApp(context: Context) {
+        val packageManager = context.packageManager
+        val packageName = context.packageName
+        val componentName = packageManager.getLaunchIntentForPackage(packageName)?.component
+        context.startActivity(Intent.makeRestartActivityTask(componentName))
+        Runtime.getRuntime().exit(0)
+    }
 }