From 812a7dbd4ca8671c1e2465bcf789d14fc25536bd Mon Sep 17 00:00:00 2001
From: boiledegg <tjrwns2163@naver.com>
Date: Fri, 7 Jun 2024 16:51:05 +0900
Subject: [PATCH] =?UTF-8?q?MOD/#19:=20=EC=82=AC=EC=9A=A9=EC=9E=90=EC=A0=80?=
 =?UTF-8?q?=EC=9E=A5=EC=86=8C=20=EA=B4=80=EB=A0=A8=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sopt/now/compose/container/SoptAppContainer.kt   | 7 +------
 .../now/compose/container/impl/UserRepositoryImpl.kt     | 8 ++++----
 .../now/compose/container/repository/UserRepository.kt   | 9 ++++-----
 .../sopt/now/compose/ui/screens/login/LoginViewModel.kt  | 2 +-
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/sopt/now/compose/container/SoptAppContainer.kt b/app/src/main/java/com/sopt/now/compose/container/SoptAppContainer.kt
index d67ecf7..df24a06 100644
--- a/app/src/main/java/com/sopt/now/compose/container/SoptAppContainer.kt
+++ b/app/src/main/java/com/sopt/now/compose/container/SoptAppContainer.kt
@@ -59,10 +59,7 @@ class SoptAppContainer(context: Context): AppContainer {
     }
 
     private val okHttpClientWithInterceptor: OkHttpClient.Builder by lazy {
-        val memberId = context
-            .getSharedPreferences(PREFERENCE_ID, Context.MODE_PRIVATE)
-            .getString(USER_ID_KEY, "")
-            .orEmpty()
+        val memberId = userRepository.getUserId()
 
         OkHttpClient.Builder().apply {
             addInterceptor(Interceptor { chain ->
@@ -78,7 +75,5 @@ class SoptAppContainer(context: Context): AppContainer {
     companion object{
         const val BASE_URL = BuildConfig.AUTH_BASE_URL
         const val PREFERENCE_ID = "SOPT"
-
-        private const val TAG = "SoptAppContainer"
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/now/compose/container/impl/UserRepositoryImpl.kt b/app/src/main/java/com/sopt/now/compose/container/impl/UserRepositoryImpl.kt
index ccfe51c..9b80b36 100644
--- a/app/src/main/java/com/sopt/now/compose/container/impl/UserRepositoryImpl.kt
+++ b/app/src/main/java/com/sopt/now/compose/container/impl/UserRepositoryImpl.kt
@@ -7,7 +7,7 @@ import com.sopt.now.compose.models.User
 class UserRepositoryImpl(
     private val sharedPreferences: SharedPreferences
 ) : UserRepository {
-    override suspend fun getUserProfile(): User {
+    override fun getUserProfile(): User {
         sharedPreferences.run {
             val id = getString(ID_KEY, "") ?: ""
             val pw = getString(PW_KEY, "") ?: ""
@@ -17,7 +17,7 @@ class UserRepositoryImpl(
         }
     }
 
-    override suspend fun setUserProfile(user: User) {
+    override fun setUserProfile(user: User) {
         val edit = sharedPreferences.edit()
         edit.run {
             putString(ID_KEY, user.id)
@@ -28,11 +28,11 @@ class UserRepositoryImpl(
         }
     }
 
-    override suspend fun getUserId(): String {
+    override fun getUserId(): String {
         return sharedPreferences.getString(USER_ID_KEY, "").orEmpty()
     }
 
-    override suspend fun setUserId(userId: String) {
+    override fun setUserId(userId: String) {
             val edit = sharedPreferences.edit()
             edit.putString(USER_ID_KEY, userId).apply()
 
diff --git a/app/src/main/java/com/sopt/now/compose/container/repository/UserRepository.kt b/app/src/main/java/com/sopt/now/compose/container/repository/UserRepository.kt
index ed52578..737bc77 100644
--- a/app/src/main/java/com/sopt/now/compose/container/repository/UserRepository.kt
+++ b/app/src/main/java/com/sopt/now/compose/container/repository/UserRepository.kt
@@ -5,10 +5,9 @@ import android.util.Log
 import com.sopt.now.compose.models.User
 
 interface UserRepository {
-    suspend fun getUserProfile(): User?
-    suspend fun setUserProfile(user: User)
-
-    suspend fun getUserId(): String
-    suspend fun setUserId(userId: String)
+    fun getUserProfile(): User?
+    fun setUserProfile(user: User)
+    fun getUserId(): String
+    fun setUserId(userId: String)
 }
 
diff --git a/app/src/main/java/com/sopt/now/compose/ui/screens/login/LoginViewModel.kt b/app/src/main/java/com/sopt/now/compose/ui/screens/login/LoginViewModel.kt
index 5620750..0631c5b 100644
--- a/app/src/main/java/com/sopt/now/compose/ui/screens/login/LoginViewModel.kt
+++ b/app/src/main/java/com/sopt/now/compose/ui/screens/login/LoginViewModel.kt
@@ -80,7 +80,7 @@ class LoginViewModel(
         password =  _uiState.value.pw
     )
 
-    private fun setUserIdInPreference(userId: String) = viewModelScope.launch {
+    private fun setUserIdInPreference(userId: String) {
         userRepository.setUserId(userId)
     }