[Data] BaseUrlProvider suspend

ajou4095 · Aug 11, 2024 · 6c576f0 · 6c576f0
1 parent c360d9f
commit 6c576f0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 24 deletions.
diff --git a/...n/kotlin/com/ray/template/android/data/remote/network/api/nonfeature/AuthenticationApi.kt b/...n/kotlin/com/ray/template/android/data/remote/network/api/nonfeature/AuthenticationApi.kt
@@ -14,16 +14,14 @@ class AuthenticationApi @Inject constructor(
     private val baseUrlProvider: BaseUrlProvider,
     private val errorMessageMapper: ErrorMessageMapper
 ) {
-    private val baseUrl: String
-        get() = baseUrlProvider.get()
 
     suspend fun logout(): Result<Unit> {
-        return client.post("$baseUrl/api/v1/auth/logout")
+        return client.post("${baseUrlProvider.get()}/api/v1/auth/logout")
             .convert(errorMessageMapper::map)
     }
 
     suspend fun withdraw(): Result<Unit> {
-        return client.delete("$baseUrl/api/v1/auth/withdraw")
+        return client.delete("${baseUrlProvider.get()}/api/v1/auth/withdraw")
             .convert(errorMessageMapper::map)
     }
 }
diff --git a/data/src/main/kotlin/com/ray/template/android/data/remote/network/api/nonfeature/TokenApi.kt b/data/src/main/kotlin/com/ray/template/android/data/remote/network/api/nonfeature/TokenApi.kt
@@ -20,14 +20,12 @@ class TokenApi @Inject constructor(
     private val baseUrlProvider: BaseUrlProvider,
     private val errorMessageMapper: ErrorMessageMapper
 ) {
-    private val baseUrl: String
-        get() = baseUrlProvider.get()
 
     suspend fun login(
         username: String,
         password: String
     ): Result<LoginRes> {
-        return noAuthClient.post("$baseUrl/api/v1/auth/login") {
+        return noAuthClient.post("${baseUrlProvider.get()}/api/v1/auth/login") {
             setBody(
                 LoginReq(
                     username = username,
@@ -41,7 +39,7 @@ class TokenApi @Inject constructor(
         username: String,
         password: String
     ): Result<RegisterRes> {
-        return noAuthClient.post("$baseUrl/api/v1/auth/register") {
+        return noAuthClient.post("${baseUrlProvider.get()}/api/v1/auth/register") {
             setBody(
                 RegisterReq(
                     username = username,
@@ -54,7 +52,7 @@ class TokenApi @Inject constructor(
     suspend fun getAccessToken(
         refreshToken: String
     ): Result<GetAccessTokenRes> {
-        return noAuthClient.post("$baseUrl/api/v1/auth/refresh") {
+        return noAuthClient.post("${baseUrlProvider.get()}/api/v1/auth/refresh") {
             header("Token-Refresh", refreshToken)
         }.convert(errorMessageMapper::map)
     }

diff --git a/data/src/main/kotlin/com/ray/template/android/data/remote/network/api/nonfeature/UserApi.kt b/data/src/main/kotlin/com/ray/template/android/data/remote/network/api/nonfeature/UserApi.kt
@@ -14,11 +14,9 @@ class UserApi @Inject constructor(
     private val baseUrlProvider: BaseUrlProvider,
     private val errorMessageMapper: ErrorMessageMapper
 ) {
-    private val baseUrl: String
-        get() = baseUrlProvider.get()
 
     suspend fun getProfile(): Result<ProfileRes> {
-        return client.get("$baseUrl/api/v1/user/profile")
+        return client.get("${baseUrlProvider.get()}/api/v1/user/profile")
             .convert(errorMessageMapper::map)
     }
 }
diff --git a/...c/main/kotlin/com/ray/template/android/data/remote/network/environment/BaseUrlProvider.kt b/...c/main/kotlin/com/ray/template/android/data/remote/network/environment/BaseUrlProvider.kt
@@ -9,25 +9,22 @@ import com.ray.template.android.data.R
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.runBlocking
 
 class BaseUrlProvider(
     @ApplicationContext private val context: Context,
     private val dataStore: DataStore<Preferences>
 ) {
-    fun get(): String {
-        val serverFlag: String = runBlocking {
-            val preferencesKey = stringPreferencesKey(KEY_SERVER_FLAG)
-            val defaultFlag = context.getString(R.string.server_flag)
+    suspend fun get(): String {
+        val preferencesKey = stringPreferencesKey(KEY_SERVER_FLAG)
+        val defaultFlag = context.getString(R.string.server_flag)
 
-            dataStore.data.map { preferences ->
-                preferences[preferencesKey]
-            }.first() ?: let {
-                dataStore.edit { preferences ->
-                    preferences[preferencesKey] = defaultFlag
-                }
-                defaultFlag
+        val serverFlag: String = dataStore.data.map { preferences ->
+            preferences[preferencesKey]
+        }.first() ?: let {
+            dataStore.edit { preferences ->
+                preferences[preferencesKey] = defaultFlag
             }
+            defaultFlag
         }
 
         when (serverFlag) {