[BOOK-151] refactor: dataStore 의존성 구분을 위한 @qualifier 도입

Author: easyhooon

core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/repository/DefaultAuthRepository.kt

@@ -2,7 +2,7 @@ package com.ninecraft.booket.core.data.impl.repository
 
 import com.ninecraft.booket.core.common.utils.runSuspendCatching
 import com.ninecraft.booket.core.data.api.repository.AuthRepository
-import com.ninecraft.booket.core.datastore.api.datasource.TokenPreferencesDataSource
+import com.ninecraft.booket.core.datastore.api.datasource.TokenDataSource
 import com.ninecraft.booket.core.network.request.LoginRequest
 import com.ninecraft.booket.core.network.service.ReedService
 import javax.inject.Inject
@@ -11,7 +11,7 @@ private const val KAKAO_PROVIDER_TYPE = "KAKAO"
 
 internal class DefaultAuthRepository @Inject constructor(
     private val service: ReedService,
-    private val tokenDatasource: TokenPreferencesDataSource,
+    private val tokenDatasource: TokenDataSource,
 ) : AuthRepository {
     override suspend fun login(accessToken: String) = runSuspendCatching {
         val response = service.login(

…datasource/TokenPreferencesDataSource.kt …astore/api/datasource/TokenDataSource.ktcore/datastore/api/src/main/kotlin/com/ninecraft/booket/core/datastore/api/datasource/TokenPreferencesDataSource.kt renamed to core/datastore/api/src/main/kotlin/com/ninecraft/booket/core/datastore/api/datasource/TokenDataSource.kt core/datastore/api/src/main/kotlin/com/ninecraft/booket/core/datastore/api/datasource/TokenPreferencesDataSource.kt renamed to core/datastore/api/src/main/kotlin/com/ninecraft/booket/core/datastore/api/datasource/TokenDataSource.kt

@@ -2,7 +2,7 @@ package com.ninecraft.booket.core.datastore.api.datasource
 
 import kotlinx.coroutines.flow.Flow
 
-interface TokenPreferencesDataSource {
+interface TokenDataSource {
     val accessToken: Flow<String>
     val refreshToken: Flow<String>
     suspend fun getAccessToken(): String

core/datastore/impl/src/androidTest/java/com/ninecraft/booket/core/datastore/impl/TokenPreferenceDataSourceTest.kt

@@ -5,7 +5,7 @@ import androidx.datastore.preferences.core.PreferenceDataStoreFactory
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.ninecraft.booket.core.datastore.impl.datasource.DefaultTokenPreferencesDataSource
+import com.ninecraft.booket.core.datastore.impl.datasource.DefaultTokenDataSource
 import com.ninecraft.booket.core.datastore.impl.security.CryptoManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -26,7 +26,7 @@ import kotlin.io.path.createTempDirectory
 @RunWith(AndroidJUnit4::class)
 class TokenPreferenceDataSourceTest {
     private lateinit var dataStore: DataStore<Preferences>
-    private lateinit var dataSource: DefaultTokenPreferencesDataSource
+    private lateinit var dataSource: DefaultTokenDataSource
     private lateinit var cryptoManager: CryptoManager
     private lateinit var tempFile: File
 
@@ -41,7 +41,7 @@ class TokenPreferenceDataSourceTest {
         )
 
         cryptoManager = CryptoManager()
-        dataSource = DefaultTokenPreferencesDataSource(dataStore, cryptoManager)
+        dataSource = DefaultTokenDataSource(dataStore, cryptoManager)
     }
 
     @After

core/datastore/impl/src/main/kotlin/com/ninecraft/booket/core/datastore/impl/datasource/DefaultRecentSearchDataSource.kt

@@ -5,6 +5,7 @@ import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
 import com.ninecraft.booket.core.datastore.api.datasource.RecentSearchDataSource
+import com.ninecraft.booket.core.datastore.impl.di.RecentSearchDataStore
 import com.ninecraft.booket.core.datastore.impl.util.handleIOException
 import com.orhanobut.logger.Logger
 import kotlinx.coroutines.flow.Flow
@@ -14,7 +15,7 @@ import kotlinx.serialization.json.Json
 import javax.inject.Inject
 
 class DefaultRecentSearchDataSource @Inject constructor(
-    private val dataStore: DataStore<Preferences>,
+    @RecentSearchDataStore private val dataStore: DataStore<Preferences>,
 ) : RecentSearchDataSource {
     @Suppress("TooGenericExceptionCaught")
     override val recentSearches: Flow<List<String>> = dataStore.data

…rce/DefaultTokenPreferencesDataSource.kt …mpl/datasource/DefaultTokenDataSource.ktcore/datastore/impl/src/main/kotlin/com/ninecraft/booket/core/datastore/impl/datasource/DefaultTokenPreferencesDataSource.kt renamed to core/datastore/impl/src/main/kotlin/com/ninecraft/booket/core/datastore/impl/datasource/DefaultTokenDataSource.kt core/datastore/impl/src/main/kotlin/com/ninecraft/booket/core/datastore/impl/datasource/DefaultTokenPreferencesDataSource.kt renamed to core/datastore/impl/src/main/kotlin/com/ninecraft/booket/core/datastore/impl/datasource/DefaultTokenDataSource.kt

@@ -4,7 +4,8 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
-import com.ninecraft.booket.core.datastore.api.datasource.TokenPreferencesDataSource
+import com.ninecraft.booket.core.datastore.api.datasource.TokenDataSource
+import com.ninecraft.booket.core.datastore.impl.di.TokenDataStore
 import com.ninecraft.booket.core.datastore.impl.security.CryptoManager
 import com.ninecraft.booket.core.datastore.impl.util.handleIOException
 import com.orhanobut.logger.Logger
@@ -14,10 +15,10 @@ import kotlinx.coroutines.flow.map
 import java.security.GeneralSecurityException
 import javax.inject.Inject
 
-class DefaultTokenPreferencesDataSource @Inject constructor(
-    private val dataStore: DataStore<Preferences>,
+class DefaultTokenDataSource @Inject constructor(
+    @TokenDataStore private val dataStore: DataStore<Preferences>,
     private val cryptoManager: CryptoManager,
-) : TokenPreferencesDataSource {
+) : TokenDataSource {
     override val accessToken: Flow<String> = decryptStringFlow(ACCESS_TOKEN)
     override val refreshToken: Flow<String> = decryptStringFlow(REFRESH_TOKEN)
 
@@ -59,7 +60,7 @@ class DefaultTokenPreferencesDataSource @Inject constructor(
             }.orEmpty()
         }
 
-    companion object {
+    companion object Companion {
         private val ACCESS_TOKEN = stringPreferencesKey("ACCESS_TOKEN")
         private val REFRESH_TOKEN = stringPreferencesKey("REFRESH_TOKEN")
     }

core/datastore/impl/src/main/kotlin/com/ninecraft/booket/core/datastore/impl/di/DataStoreModule.kt

@@ -5,9 +5,9 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.preferencesDataStore
 import com.ninecraft.booket.core.datastore.api.datasource.RecentSearchDataSource
-import com.ninecraft.booket.core.datastore.api.datasource.TokenPreferencesDataSource
+import com.ninecraft.booket.core.datastore.api.datasource.TokenDataSource
 import com.ninecraft.booket.core.datastore.impl.datasource.DefaultRecentSearchDataSource
-import com.ninecraft.booket.core.datastore.impl.datasource.DefaultTokenPreferencesDataSource
+import com.ninecraft.booket.core.datastore.impl.datasource.DefaultTokenDataSource
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
@@ -19,14 +19,25 @@ import javax.inject.Singleton
 @Module
 @InstallIn(SingletonComponent::class)
 object DataStoreModule {
-    private const val TOKEN_DATASTORE_NAME = "TOKENS_PREFERENCES"
-    private val Context.dataStore by preferencesDataStore(name = TOKEN_DATASTORE_NAME)
+    private const val TOKEN_DATASTORE_NAME = "TOKENS_DATASTORE"
+    private const val RECENT_SEARCH_DATASTORE_NAME = "RECENT_SEARCH_DATASTORE"
 
+    private val Context.tokenDataStore by preferencesDataStore(name = TOKEN_DATASTORE_NAME)
+    private val Context.recentSearchDataStore by preferencesDataStore(name = RECENT_SEARCH_DATASTORE_NAME)
+
+    @TokenDataStore
     @Provides
     @Singleton
     fun provideTokenDataStore(
         @ApplicationContext context: Context,
-    ): DataStore<Preferences> = context.dataStore
+    ): DataStore<Preferences> = context.tokenDataStore
+
+    @RecentSearchDataStore
+    @Provides
+    @Singleton
+    fun provideRecentSearchDataStore(
+        @ApplicationContext context: Context,
+    ): DataStore<Preferences> = context.recentSearchDataStore
 }
 
 @Module
@@ -35,9 +46,9 @@ abstract class DataStoreBindModule {
 
     @Binds
     @Singleton
-    abstract fun bindTokenPreferencesDataSource(
-        defaultTokenPreferencesDataSource: DefaultTokenPreferencesDataSource,
-    ): TokenPreferencesDataSource
+    abstract fun bindTokenDataSource(
+        defaultTokenDataSource: DefaultTokenDataSource,
+    ): TokenDataSource
 
     @Binds
     @Singleton

core/datastore/impl/src/main/kotlin/com/ninecraft/booket/core/datastore/impl/di/DataStoreQualifier.kt

@@ -0,0 +1,11 @@
+package com.ninecraft.booket.core.datastore.impl.di
+
+import javax.inject.Qualifier
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class TokenDataStore
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class RecentSearchDataStore

core/network/src/main/kotlin/com/ninecraft/booket/core/network/TokenAuthenticator.kt

@@ -1,6 +1,6 @@
 package com.ninecraft.booket.core.network
 
-import com.ninecraft.booket.core.datastore.api.datasource.TokenPreferencesDataSource
+import com.ninecraft.booket.core.datastore.api.datasource.TokenDataSource
 import com.ninecraft.booket.core.network.request.RefreshTokenRequest
 import com.ninecraft.booket.core.network.service.ReedService
 import com.orhanobut.logger.Logger
@@ -14,7 +14,7 @@ import javax.inject.Provider
 
 @Suppress("TooGenericExceptionCaught")
 class TokenAuthenticator @Inject constructor(
-    private val tokenDataSource: TokenPreferencesDataSource,
+    private val tokenDataSource: TokenDataSource,
     private val serviceProvider: Provider<ReedService>,
 ) : Authenticator {
     override fun authenticate(route: Route?, response: Response): Request? {

core/network/src/main/kotlin/com/ninecraft/booket/core/network/TokenInterceptor.kt

@@ -1,14 +1,14 @@
 package com.ninecraft.booket.core.network
 
-import com.ninecraft.booket.core.datastore.api.datasource.TokenPreferencesDataSource
+import com.ninecraft.booket.core.datastore.api.datasource.TokenDataSource
 import kotlinx.coroutines.runBlocking
 import okhttp3.Interceptor
 import okhttp3.Response
 import javax.inject.Inject
 
 internal class TokenInterceptor @Inject constructor(
     @Suppress("unused")
-    private val tokenDataSource: TokenPreferencesDataSource,
+    private val tokenDataSource: TokenDataSource,
 ) : Interceptor {
 
     private val noAuthEndpoints = setOf(