refactor/#78 : 얼리 리턴으로 변경

YAPP-admin · Feb 19, 2025 · 64196ee · 64196ee
1 parent d5d9768
commit 64196ee
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/app/src/main/java/com/yapp/app/official/ui/Navigator.kt b/app/src/main/java/com/yapp/app/official/ui/Navigator.kt
@@ -6,9 +6,9 @@ import androidx.navigation.NavDestination
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
-import com.yapp.feature.home.navigation.HomeRoute
 import com.yapp.feature.home.navigation.navigateToHome
 import com.yapp.feature.home.navigation.navigateToSetting
+import com.yapp.feature.login.navigation.LoginRoute
 import com.yapp.feature.login.navigation.navigateToLogin
 import com.yapp.feature.notice.navigation.navigateToNotice
 import com.yapp.feature.signup.navigation.navigateToSignUp
@@ -31,7 +31,7 @@ class NavigatorState(
         @Composable get() = navController
             .currentBackStackEntryAsState().value?.destination
 
-    val startDestination = HomeRoute
+    val startDestination = LoginRoute
 
     fun navigateLoginScreen() {
         navController.navigateToLogin()

diff --git a/feature/login/src/main/java/com/yapp/feature/login/LoginViewModel.kt b/feature/login/src/main/java/com/yapp/feature/login/LoginViewModel.kt
@@ -84,39 +84,39 @@ class LoginViewModel @Inject constructor(
         reduce: (LoginState.() -> LoginState) -> Unit,
         postSideEffect: (LoginSideEffect) -> Unit,
     ) {
-        if (!email.matches(Regex.email)){
+        if (!email.matches(Regex.email)) {
             reduce {
                 copy(
                     isLoginEnabled = false,
                     emailErrorDescription = "입력하신 이메일을 확인해주세요.",
                     passwordErrorDescription = null
                 )
             }
-        }else{
-            viewModelScope.launch {
-                loginUseCase(email, password)
-                    .onSuccess {
-                        postSideEffect(LoginSideEffect.NavigateToHome)
-                    }
-                    .onFailure {
-                        val errorMessage = it.message ?: ""
-                        reduce{copy(isLoginEnabled = false)}
-                        when (it) {
-                            is InvalidRequestArgument -> {
-                                reduce {
-                                    copy(
-                                        emailErrorDescription = null,
-                                        passwordErrorDescription = "비밀번호가 달라요. 입력하신 비밀번호를 확인해주세요."
-                                    )
-                                }
-                            }
-                            else -> {
-                                postSideEffect(LoginSideEffect.ShowToast(errorMessage))
+            return
+        }
+        viewModelScope.launch {
+            loginUseCase(email, password)
+                .onSuccess {
+                    postSideEffect(LoginSideEffect.NavigateToHome)
+                }
+                .onFailure {
+                    val errorMessage = it.message ?: ""
+                    reduce { copy(isLoginEnabled = false) }
+                    when (it) {
+                        is InvalidRequestArgument -> {
+                            reduce {
+                                copy(
+                                    emailErrorDescription = null,
+                                    passwordErrorDescription = "비밀번호가 달라요. 입력하신 비밀번호를 확인해주세요."
+                                )
                             }
                         }
-                    }
-            }
 
+                        else -> {
+                            postSideEffect(LoginSideEffect.ShowToast(errorMessage))
+                        }
+                    }
+                }
         }
     }
 }