#126 [hotfix] 기존 회원인지 아닌지 여부 로직 추가

app/src/main/java/com/sopetit/softie/data/entity/response/LoginResponse.kt

@@ -6,10 +6,12 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class LoginResponse(
     val accessToken: String,
-    val refreshToken: String
+    val refreshToken: String,
+    val isMemberDollExist: Boolean
 ) {
     fun toToken(): Token = Token(
         accessToken = this.accessToken,
-        refreshToken = this.refreshToken
+        refreshToken = this.refreshToken,
+        isMemberDollExist = this.isMemberDollExist
     )
 }

app/src/main/java/com/sopetit/softie/data/repositoryImpl/AuthRepositoryImpl.kt

@@ -17,9 +17,10 @@ class AuthRepositoryImpl @Inject constructor(
             requireNotNull(response.data).toToken()
         }
 
-    override fun initToken(accessToken: String, refreshToken: String) {
+    override fun initToken(accessToken: String, refreshToken: String, isMemberDollExist: Boolean) {
         localDataSource.accessToken = accessToken
         localDataSource.refreshToken = refreshToken
+        localDataSource.isMemberDollExist = isMemberDollExist
     }
 
     override fun initSignUpState(isSignUpState: Boolean) {

app/src/main/java/com/sopetit/softie/data/source/LocalDataSource.kt

@@ -23,10 +23,15 @@ class LocalDataSource @Inject constructor(
         set(value) = prefs.edit { putString(BEAR_TYPE, value) }
         get() = prefs.getString(BEAR_TYPE, "BROWN") ?: "BROWN"
 
+    var isMemberDollExist: Boolean
+        set(value) = prefs.edit { putBoolean(IS_MEMBER, value) }
+        get() = prefs.getBoolean(IS_MEMBER, false)
+
     companion object {
         private const val ACCESS_TOKEN = "access_token"
         private const val REFRESH_TOKEN = "refresh_token"
         private const val USER = "user"
         private const val BEAR_TYPE = "bear_type"
+        private const val IS_MEMBER = "is_member"
     }
 }

app/src/main/java/com/sopetit/softie/domain/entity/Token.kt

@@ -2,5 +2,6 @@ package com.sopetit.softie.domain.entity
 
 data class Token(
     val accessToken: String = "",
-    val refreshToken: String = ""
+    val refreshToken: String = "",
+    val isMemberDollExist: Boolean = false
 )

app/src/main/java/com/sopetit/softie/domain/repository/AuthRepository.kt

@@ -7,7 +7,7 @@ interface AuthRepository {
     suspend fun deleteAuth(): Result<Unit>
     suspend fun postLogin(socialPlatform: String): Result<Token>
     fun getSignedUp(): Boolean
-    fun initToken(accessToken: String, refreshToken: String)
+    fun initToken(accessToken: String, refreshToken: String, isMemberDollExist: Boolean)
     fun initSignUpState(isSignUpState: Boolean)
     suspend fun logOut(): Result<Unit>
     fun getBearType(): String

app/src/main/java/com/sopetit/softie/domain/usecase/InitTokenUseCase.kt

@@ -6,6 +6,6 @@ import javax.inject.Inject
 class InitTokenUseCase @Inject constructor(
     private val authRepository: AuthRepository
 ) {
-    operator fun invoke(accessToken: String, refreshToken: String) =
-        authRepository.initToken(accessToken, refreshToken)
+    operator fun invoke(accessToken: String, refreshToken: String, isMemberDollExist: Boolean) =
+        authRepository.initToken(accessToken, refreshToken, isMemberDollExist)
 }

app/src/main/java/com/sopetit/softie/ui/login/LoginActivity.kt

@@ -6,6 +6,7 @@ import androidx.activity.viewModels
 import com.sopetit.softie.R
 import com.sopetit.softie.data.service.KakaoLoginService
 import com.sopetit.softie.databinding.ActivityLoginBinding
+import com.sopetit.softie.ui.main.MainActivity
 import com.sopetit.softie.ui.storytelling.StoryTellingActivity
 import com.sopetit.softie.util.binding.BindingActivity
 import com.sopetit.softie.util.setSingleOnClickListener
@@ -50,15 +51,21 @@ class LoginActivity : BindingActivity<ActivityLoginBinding>(R.layout.activity_lo
     }
 
     private fun observeSignUp() {
-        viewModel.isSignedUp.observe(this) { isSignedUp ->
-            if (isSignedUp) {
-                startActivity(
-                    Intent(this, StoryTellingActivity::class.java).apply {
-                        addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
-                    }
-                )
-                finish()
+        viewModel.isMember.observe(this) {
+            if (viewModel.isSignedUp.value == true && viewModel.isMember.value == true) {
+                startTargetActivity(MainActivity::class.java)
+            } else if (viewModel.isSignedUp.value == true) {
+                startTargetActivity(StoryTellingActivity::class.java)
             }
         }
     }
+
+    private fun startTargetActivity(targetClass: Class<*>) {
+        startActivity(
+            Intent(this, targetClass).apply {
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
+            }
+        )
+        finish()
+    }
 }

app/src/main/java/com/sopetit/softie/ui/login/LoginViewModel.kt

@@ -1,5 +1,6 @@
 package com.sopetit.softie.ui.login
 
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -17,26 +18,33 @@ class LoginViewModel @Inject constructor(
     private val postLoginUseCase: PostLoginUseCase,
     private val initTokenUseCase: InitTokenUseCase
 ) : ViewModel() {
-    private val _isKakaoLogin = MutableLiveData(false)
-    val isKakaoLogin get() = _isKakaoLogin
+    private val _isKakaoLogin: MutableLiveData<Boolean> = MutableLiveData(false)
+    val isKakaoLogin: LiveData<Boolean> get() = _isKakaoLogin
 
-    private val _isSignedUp = MutableLiveData(false)
-    val isSignedUp get() = _isSignedUp
+    private val _isSignedUp: MutableLiveData<Boolean> = MutableLiveData(false)
+    val isSignedUp: LiveData<Boolean> get() = _isSignedUp
+    private val _isMember: MutableLiveData<Boolean> = MutableLiveData(false)
+    val isMember: LiveData<Boolean> get() = _isMember
 
     val kakaoLoginCallback: (OAuthToken?, Throwable?) -> Unit = { token, error ->
         KakaoLoginCallback { accessToken ->
             _isKakaoLogin.value = true
-            initTokenUseCase(accessToken = accessToken, refreshToken = "")
+            initTokenUseCase(accessToken = accessToken, refreshToken = "", false)
         }.handleResult(token, error)
     }
 
     fun postLogin() {
         viewModelScope.launch {
             postLoginUseCase(SOCIAL_TYPE)
                 .onSuccess { response ->
-                    initTokenUseCase(response.accessToken, response.refreshToken)
+                    initTokenUseCase(
+                        response.accessToken,
+                        response.refreshToken,
+                        response.isMemberDollExist
+                    )
                     _isSignedUp.value = true
-                    Timber.e("accessToken: ${response.accessToken}, refreshToken: ${response.refreshToken}")
+                    _isMember.value = response.isMemberDollExist
+                    Timber.e("accessToken: ${response.accessToken}, refreshToken: ${response.refreshToken}, isMember: ${response.isMemberDollExist}")
                 }.onFailure { throwable ->
                     Timber.e("$throwable")
                 }

app/src/main/java/com/sopetit/softie/ui/setting/SettingViewModel.kt

@@ -64,7 +64,7 @@ class SettingViewModel @Inject constructor(
                 .onSuccess {
                     _isDeleteAuthResponse.value = true
                     initSIgnUpStateUseCase(false)
-                    initTokenUseCase("", "")
+                    initTokenUseCase("", "", false)
                     Timber.d("회원 탈퇴 성공")
                 }.onFailure { throwable ->
                     _isDeleteAuthResponse.value = false
@@ -79,7 +79,7 @@ class SettingViewModel @Inject constructor(
                 .onSuccess {
                     _isLogOutResponse.value = true
                     initSIgnUpStateUseCase(false)
-                    initTokenUseCase("", "")
+                    initTokenUseCase("", "", true)
                     Timber.d("로그 아웃 성공")
                 }.onFailure { throwable ->
                     _isLogOutResponse.value = false