From 1bb35c28866682f737c7aee7da5c95504e5300cc Mon Sep 17 00:00:00 2001
From: Hyobeen-Park <amanda0109@naver.com>
Date: Tue, 28 May 2024 13:05:51 +0900
Subject: [PATCH] =?UTF-8?q?[mod]=20#13=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?=
 =?UTF-8?q?=EC=8B=9C=20userId=20=EC=A0=84=EB=8B=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/sopt/now/presentation/Key.kt   |  1 +
 .../sopt/now/presentation/Login/LoginActivity.kt | 16 +++++++---------
 .../now/presentation/Login/LoginViewModel.kt     |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/sopt/now/presentation/Key.kt b/app/src/main/java/com/sopt/now/presentation/Key.kt
index a7d80cb..4b450ce 100644
--- a/app/src/main/java/com/sopt/now/presentation/Key.kt
+++ b/app/src/main/java/com/sopt/now/presentation/Key.kt
@@ -3,4 +3,5 @@ package com.sopt.now.presentation
 object Key {
     const val PW = "pw"
     const val USER = "user"
+    const val USERID = "userId"
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/presentation/Login/LoginActivity.kt b/app/src/main/java/com/sopt/now/presentation/Login/LoginActivity.kt
index 54db2de..47b787a 100644
--- a/app/src/main/java/com/sopt/now/presentation/Login/LoginActivity.kt
+++ b/app/src/main/java/com/sopt/now/presentation/Login/LoginActivity.kt
@@ -7,20 +7,14 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
-import com.sopt.now.R
-import com.sopt.now.data.model.request.RequestLoginDto
-import com.sopt.now.data.model.response.ResponseSignupDto
-import com.sopt.now.data.ServicePool
 import com.sopt.now.databinding.ActivityLoginBinding
 import com.sopt.now.presentation.Home.HomeActivity
+import com.sopt.now.presentation.Key.USERID
 import com.sopt.now.presentation.Signup.SignupActivity
 import com.sopt.now.presentation.common.ViewModelFactory
 import com.sopt.now.util.UiState
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
 
 class LoginActivity : AppCompatActivity() {
     private val loginViewModel: LoginViewModel by viewModels { ViewModelFactory() }
@@ -53,11 +47,15 @@ class LoginActivity : AppCompatActivity() {
 
     private fun observeLogin() {
         loginViewModel.loginState.flowWithLifecycle(lifecycle).onEach { loginState ->
-            when(loginState) {
+            when (loginState) {
                 is UiState.Success -> {
                     showToastMessage("${loginState.data} 님 로그인에 성공했습니다")
-                    startActivity(Intent(this@LoginActivity, HomeActivity::class.java))
+                    Intent(this@LoginActivity, HomeActivity::class.java).apply {
+                        putExtra(USERID, loginState.data)
+                        startActivity(this)
+                    }
                 }
+
                 is UiState.Error -> showToastMessage(loginState.message)
                 else -> Unit
             }
diff --git a/app/src/main/java/com/sopt/now/presentation/Login/LoginViewModel.kt b/app/src/main/java/com/sopt/now/presentation/Login/LoginViewModel.kt
index 7f352a9..d59ad5c 100644
--- a/app/src/main/java/com/sopt/now/presentation/Login/LoginViewModel.kt
+++ b/app/src/main/java/com/sopt/now/presentation/Login/LoginViewModel.kt
@@ -19,8 +19,8 @@ class LoginViewModel(
         val loginDto = RequestLoginDto(authenticationId, password)
         viewModelScope.launch {
             _loginState.value = UiState.Loading
-            authRepository.login(loginDto).onSuccess { memberId ->
-                _loginState.value = UiState.Success(memberId)
+            authRepository.login(loginDto).onSuccess { userId ->
+                _loginState.value = UiState.Success(userId)
             }.onFailure { exception: Throwable ->
                 _loginState.value = UiState.Error(exception.message)
             }