Merge pull request #75 from team-JMT/fix/sign_up_flow

변경된 회원 가입 플로우 디테일하게 변경
team-JMT · Sep 23, 2023 · 65d60bd · 65d60bd
2 parents 59e83e6 + 91e81d1
commit 65d60bd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/domain/src/main/java/org/gdsc/domain/model/response/TokenResponse.kt b/domain/src/main/java/org/gdsc/domain/model/response/TokenResponse.kt
@@ -10,5 +10,7 @@ data class TokenResponse(
 
 enum class UserLoginAction(val value: String) {
     SIGN_UP("SIGN_UP"),
-    LOG_IN("LOG_IN")
+    LOG_IN("LOG_IN"),
+    NICKNAME_PROCESS("NICKNAME_PROCESS"),
+    PROFILE_IMAGE_PROCESS("PROFILE_IMAGE_PROCESS"),
 }
diff --git a/presentation/src/main/java/org/gdsc/presentation/login/LoginFragment.kt b/presentation/src/main/java/org/gdsc/presentation/login/LoginFragment.kt
@@ -105,12 +105,19 @@ class LoginFragment : Fragment() {
                     credential.googleIdToken?.let {
                         viewModel.postSignUpWithGoogleToken(it) { tokenResponse ->
                             when (tokenResponse.userLoginAction) {
-                                UserLoginAction.SIGN_UP.value -> {
+                                UserLoginAction.SIGN_UP.value,
+                                UserLoginAction.NICKNAME_PROCESS.value -> {
                                     val action =
                                         LoginFragmentDirections.actionLoginFragmentToSignUpNicknameFragment()
                                     findNavController().navigate(action)
                                 }
 
+                                UserLoginAction.PROFILE_IMAGE_PROCESS.value -> {
+                                    val action =
+                                        LoginFragmentDirections.actionLoginFragmentToSignUpCompleteFragment()
+                                    findNavController().navigate(action)
+                                }
+
                                 UserLoginAction.LOG_IN.value -> {
                                     val intent = Intent(requireContext(), MainActivity::class.java)
                                     startActivity(intent)

diff --git a/presentation/src/main/java/org/gdsc/presentation/login/LoginViewModel.kt b/presentation/src/main/java/org/gdsc/presentation/login/LoginViewModel.kt
@@ -75,15 +75,13 @@ class LoginViewModel @Inject constructor(
     fun requestSignUpWithImage(file: MultipartBody.Part, afterSuccessSignUp: () -> Unit) {
         viewModelScope.launch {
             postProfileImageUseCase(file)
-            postNicknameUseCase(nicknameState.value)
             afterSuccessSignUp()
         }
     }
 
     fun requestSignUpWithoutImage(afterSuccessSignUp: () -> Unit) {
         viewModelScope.launch {
             postDefaultProfileImageUseCase()
-            postNicknameUseCase(nicknameState.value)
             afterSuccessSignUp()
         }
     }
@@ -95,6 +93,7 @@ class LoginViewModel @Inject constructor(
         viewModelScope.launch {
             checkDuplicatedNicknameUseCase(nicknameState.value).let { isNotDuplicated ->
                 if (isNotDuplicated) {
+                    postNicknameUseCase(nicknameState.value)
                     onNicknameIsNotDuplicated()
                 } else {
                     onNicknameIsDuplicated()

diff --git a/presentation/src/main/res/navigation/login_nav_graph.xml b/presentation/src/main/res/navigation/login_nav_graph.xml
@@ -13,6 +13,9 @@
         <action
             android:id="@+id/action_loginFragment_to_signUpNicknameFragment"
             app:destination="@id/signUpNicknameFragment" />
+        <action
+            android:id="@+id/action_loginFragment_to_signUpCompleteFragment"
+            app:destination="@id/signUpCompleteFragment" />
     </fragment>
     <fragment
         android:id="@+id/signUpNicknameFragment"