[feat] #75 최초 로그인이 아닐 경우 기프티콘 홈 화면으로 이동 처리

Team-BuddyCon · May 15, 2024 · 950f376 · 950f376
1 parent 0df29ee
commit 950f376
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 10 deletions.
diff --git a/core/navigation/src/main/java/com/yapp/buddycon/navigation/BuddyConNavHost.kt b/core/navigation/src/main/java/com/yapp/buddycon/navigation/BuddyConNavHost.kt
@@ -74,9 +74,18 @@ fun BuddyConNavHost(
             }
 
             composable(route = StartUpDestination.Login.route) {
-                LoginScreen {
-                    navHostController.navigate(StartUpDestination.SignUp.route)
-                }
+                LoginScreen(
+                    onNavigateToSignUp = {
+                        navHostController.navigate(StartUpDestination.SignUp.route)
+                    },
+                    onNavigateToGifticon = {
+                        navHostController.navigate(GifticonDestination.Gifticon.route) {
+                            popUpTo(StartUpDestination.Login.route) {
+                                inclusive = true
+                            }
+                        }
+                    }
+                )
             }
 
             composable(route = StartUpDestination.SignUp.route) {

diff --git a/core/network/src/main/java/com/yapp/buddycon/network/service/auth/response/LoginResponse.kt b/core/network/src/main/java/com/yapp/buddycon/network/service/auth/response/LoginResponse.kt
@@ -11,11 +11,13 @@ data class LoginResponse(
 data class LoginResponseBody(
     val accessToken: String,
     val refreshToken: String,
-    val accessTokenExpiresIn: Long
+    val accessTokenExpiresIn: Long,
+    val isFirstLogin: Boolean
 ) {
     fun toModel() = LoginModel(
         accessToken = accessToken,
         refreshToken = refreshToken,
-        accessTokenExpiresIn = accessTokenExpiresIn
+        accessTokenExpiresIn = accessTokenExpiresIn,
+        isFirstLogin = isFirstLogin
     )
 }
diff --git a/domain/src/main/java/com/yapp/buddycon/domain/model/auth/LoginModel.kt b/domain/src/main/java/com/yapp/buddycon/domain/model/auth/LoginModel.kt
@@ -3,5 +3,6 @@ package com.yapp.buddycon.domain.model.auth
 data class LoginModel(
     val accessToken: String = "",
     val refreshToken: String = "",
-    val accessTokenExpiresIn: Long = Long.MAX_VALUE
+    val accessTokenExpiresIn: Long = Long.MAX_VALUE,
+    val isFirstLogin: Boolean = true
 )
diff --git a/feature/startup/src/main/java/com/yapp/buddycon/startup/login/LoginScreen.kt b/feature/startup/src/main/java/com/yapp/buddycon/startup/login/LoginScreen.kt
@@ -48,7 +48,8 @@ private val BuddyConLogoDescription = "BuddyConLogo"
 @Composable
 fun LoginScreen(
     loginViewModel: LoginViewModel = hiltViewModel(),
-    onNavigateToSignUp: () -> Unit = {}
+    onNavigateToSignUp: () -> Unit = {},
+    onNavigateToGifticon: () -> Unit = {}
 ) {
     val context = LocalContext.current
     val coroutineScope = rememberCoroutineScope()
@@ -58,10 +59,14 @@ fun LoginScreen(
     LaunchedEffect(Unit) {
         loginViewModel.effect.collect { effect ->
             when (effect) {
-                LoginSideEffect.Success -> {
+                LoginSideEffect.FirstLogin -> {
                     onNavigateToSignUp()
                 }
 
+                LoginSideEffect.ReLogin -> {
+                    onNavigateToGifticon()
+                }
+
                 LoginSideEffect.KakaoLoginError -> {
                     isShowKakaoLoginError = true
                 }

diff --git a/feature/startup/src/main/java/com/yapp/buddycon/startup/login/LoginSideEffect.kt b/feature/startup/src/main/java/com/yapp/buddycon/startup/login/LoginSideEffect.kt
@@ -1,5 +1,5 @@
 package com.yapp.buddycon.startup.login
 
 enum class LoginSideEffect {
-    Success, KakaoLoginError, MoaLoginError
+    FirstLogin, ReLogin, KakaoLoginError, MoaLoginError
 }
diff --git a/feature/startup/src/main/java/com/yapp/buddycon/startup/login/LoginViewModel.kt b/feature/startup/src/main/java/com/yapp/buddycon/startup/login/LoginViewModel.kt
@@ -44,7 +44,7 @@ class LoginViewModel @Inject constructor(
             tokenRepository.saveAccessToken(it.accessToken)
             tokenRepository.saveRefreshToken(it.refreshToken)
             tokenRepository.saveAccessTokenExpiresIn(it.accessTokenExpiresIn)
-            _effect.emit(LoginSideEffect.Success)
+            _effect.emit(if (it.isFirstLogin) LoginSideEffect.FirstLogin else LoginSideEffect.ReLogin)
         }.launchIn(viewModelScope)
     }