[chore] Remote Local 레포지토리 통합 및 데이터 소스 분리

domain/src/main/kotlin/com/mashup/dorabangs/domain/repository/UserDataStoreRepository.kt → data/src/main/kotlin/com/mashup/dorabangs/data/datasource/local/api/UserLocalDataSource.kt

@@ -1,10 +1,14 @@
-package com.mashup.dorabangs.domain.repository
+package com.mashup.dorabangs.data.datasource.local.api
 
 import kotlinx.coroutines.flow.Flow
 
-interface UserDataStoreRepository {
+interface UserLocalDataSource {
+
     suspend fun setUserAccessToken(accessToken: String)
-    fun getUserAccessToken(): Flow<String>
+
     suspend fun setIsFirstEntry(isFirst: Boolean)
+
+    fun getUserAccessToken(): Flow<String>
+
     fun getIsFirstEntry(): Flow<Boolean>
-}
+}

data/src/main/kotlin/com/mashup/dorabangs/data/datasource/local/UserPreferenceDataSource.kt → data/src/main/kotlin/com/mashup/dorabangs/data/datasource/local/impl/UserLocalDataSourceImpl.kt

@@ -1,34 +1,35 @@
-package com.mashup.dorabangs.data.datasource.local
+package com.mashup.dorabangs.data.datasource.local.impl
 
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.emptyPreferences
 import androidx.datastore.preferences.core.stringPreferencesKey
+import com.mashup.dorabangs.data.datasource.local.api.UserLocalDataSource
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.map
 import java.io.IOException
 import javax.inject.Inject
 
-class UserPreferenceDataSource @Inject constructor(
+class UserLocalDataSourceImpl @Inject constructor(
     private val dataStore: DataStore<Preferences>,
-) {
+) : UserLocalDataSource {
 
-    suspend fun setUserAccessToken(accessToken: String) {
+    override suspend fun setUserAccessToken(accessToken: String) {
         setDataStore(stringPreferencesKey(ACCESS_TOKEN), accessToken)
     }
 
-    suspend fun setIsFirstEntry(isFirst: Boolean) {
+    override suspend fun setIsFirstEntry(isFirst: Boolean) {
         setDataStore(booleanPreferencesKey(FIRST_ENTRY), isFirst)
     }
 
-    fun getUserAccessToken(): Flow<String> {
+    override fun getUserAccessToken(): Flow<String> {
         return getDataStore(stringPreferencesKey(ACCESS_TOKEN), "")
     }
 
-    fun getIsFirstEntry(): Flow<Boolean> {
+    override fun getIsFirstEntry(): Flow<Boolean> {
         return getDataStore(booleanPreferencesKey(FIRST_ENTRY), false)
     }
 
@@ -51,6 +52,7 @@ class UserPreferenceDataSource @Inject constructor(
                 preferences[key] ?: defaultValue
             }
     }
+
     companion object {
         private const val ACCESS_TOKEN = "ACCESS_TOKEN"
         private const val FIRST_ENTRY = "FIRST_ENTRY"

data/src/main/kotlin/com/mashup/dorabangs/data/datasource/remote/api/UserRemoteDataSource.kt

@@ -0,0 +1,8 @@
+package com.mashup.dorabangs.data.datasource.remote.api
+
+import com.mashup.dorabangs.data.model.DeviceTokenDataModel
+
+interface UserRemoteDataSource {
+
+    suspend fun registerUser(deviceToken: DeviceTokenDataModel): String
+}

data/src/main/kotlin/com/mashup/dorabangs/data/datasource/remote/impl/UserRemoteDataSourceImpl.kt

@@ -0,0 +1,16 @@
+package com.mashup.dorabangs.data.datasource.remote.impl
+
+import com.mashup.dorabangs.data.datasource.remote.api.UserRemoteDataSource
+import com.mashup.dorabangs.data.model.DeviceTokenDataModel
+import com.mashup.dorabangs.data.network.service.UserService
+import javax.inject.Inject
+
+class UserRemoteDataSourceImpl @Inject constructor(
+    private val userService: UserService
+) : UserRemoteDataSource {
+
+    override suspend fun registerUser(deviceToken: DeviceTokenDataModel): String =
+        userService.registerUser(deviceToken)
+            ?.data
+            ?.accessToken ?: ""
+}

data/src/main/kotlin/com/mashup/dorabangs/data/di/DataSourceModule.kt

@@ -0,0 +1,29 @@
+package com.mashup.dorabangs.data.di
+
+import com.mashup.dorabangs.data.datasource.local.api.UserLocalDataSource
+import com.mashup.dorabangs.data.datasource.local.impl.UserLocalDataSourceImpl
+import com.mashup.dorabangs.data.datasource.remote.api.UserRemoteDataSource
+import com.mashup.dorabangs.data.datasource.remote.impl.UserRemoteDataSourceImpl
+import dagger.Binds
+import dagger.Module
+import dagger.Reusable
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class DataSourceModule {
+
+    @Binds
+    @Reusable
+    abstract fun bindUserLocalDataSource(
+        dataSource: UserLocalDataSourceImpl,
+    ): UserLocalDataSource
+
+    @Binds
+    @Reusable
+    abstract fun bindUserRemoteDataSource(
+        dataSource: UserRemoteDataSourceImpl,
+    ): UserRemoteDataSource
+}

data/src/main/kotlin/com/mashup/dorabangs/data/di/NetworkModule.kt

@@ -4,7 +4,7 @@ import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor
 import com.facebook.flipper.plugins.network.NetworkFlipperPlugin
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import com.mashup.dorabangs.data.BuildConfig
-import com.mashup.dorabangs.domain.usecase.user.GetUserAccessTokenUseCase
+import com.mashup.dorabangs.data.datasource.local.api.UserLocalDataSource
 import dagger.Module
 import dagger.Provides
 import dagger.Reusable
@@ -40,13 +40,13 @@ object NetworkModule {
     fun providesDorabangsOkHttpClient(
         httpLoggingInterceptor: HttpLoggingInterceptor,
         flipperOkhttpInterceptor: FlipperOkhttpInterceptor,
-        getUserAccessTokenUseCase: GetUserAccessTokenUseCase,
+        userLocalDataSource: UserLocalDataSource,
     ): OkHttpClient =
         OkHttpClient.Builder().apply {
             addInterceptor(
                 Interceptor { chain ->
                     val token = runBlocking {
-                        runCatching { getUserAccessTokenUseCase() }.getOrDefault("")
+                        runCatching { userLocalDataSource.getUserAccessToken() }.getOrDefault("")
                     }
                     val request = chain.request().newBuilder()
                         .addHeader(AUTHORIZATION, "Bearer $token")

data/src/main/kotlin/com/mashup/dorabangs/data/di/RepositoryModule.kt

@@ -1,28 +1,19 @@
 package com.mashup.dorabangs.data.di
 
-import com.mashup.dorabangs.data.repository.UserDataStoreRepositoryImpl
-import com.mashup.dorabangs.data.repository.UserRemoteRepositoryImpl
-import com.mashup.dorabangs.domain.repository.UserDataStoreRepository
-import com.mashup.dorabangs.domain.repository.UserRemoteRepository
+import com.mashup.dorabangs.data.repository.UserRepositoryImpl
+import com.mashup.dorabangs.domain.repository.UserRepository
 import dagger.Binds
 import dagger.Module
 import dagger.Reusable
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 abstract class RepositoryModule {
     @Binds
     @Reusable
-    abstract fun bindUserDataStoreRepository(
-        userDataStoreRepositoryImpl: UserDataStoreRepositoryImpl,
-    ): UserDataStoreRepository
-
-    @Binds
-    @Reusable
-    abstract fun bindUserRemoteRepository(
-        userRemoteRepositoryImpl: UserRemoteRepositoryImpl,
-    ): UserRemoteRepository
+    abstract fun bindUserRepository(
+        repositoryImpl: UserRepositoryImpl,
+    ): UserRepository
 }

data/src/main/kotlin/com/mashup/dorabangs/data/network/service/UserService.kt

@@ -2,12 +2,11 @@ package com.mashup.dorabangs.data.network.service
 
 import com.mashup.dorabangs.data.model.DeviceTokenDataModel
 import com.mashup.dorabangs.data.model.UserAccessTokenResponseModel
-import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.POST
 
 interface UserService {
 
     @POST("users")
-    suspend fun registerUser(@Body deviceToken: DeviceTokenDataModel): Response<UserAccessTokenResponseModel>
+    suspend fun registerUser(@Body deviceToken: DeviceTokenDataModel): UserAccessTokenResponseModel
 }

data/src/main/kotlin/com/mashup/dorabangs/data/repository/UserRepositoryImpl.kt

@@ -0,0 +1,34 @@
+package com.mashup.dorabangs.data.repository
+
+import com.mashup.dorabangs.data.datasource.local.api.UserLocalDataSource
+import com.mashup.dorabangs.data.datasource.remote.api.UserRemoteDataSource
+import com.mashup.dorabangs.data.model.asData
+import com.mashup.dorabangs.domain.model.DeviceToken
+import com.mashup.dorabangs.domain.repository.UserRepository
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Inject
+
+class UserRepositoryImpl @Inject constructor(
+    private val userLocalDataSource: UserLocalDataSource,
+    private val userRemoteDataSource: UserRemoteDataSource,
+) : UserRepository {
+    override suspend fun setUserAccessToken(accessToken: String) {
+        userLocalDataSource.setUserAccessToken(accessToken = accessToken)
+    }
+
+    override fun getUserAccessToken(): Flow<String> {
+        return userLocalDataSource.getUserAccessToken()
+    }
+
+    override suspend fun setIsFirstEntry(isFirst: Boolean) {
+        userLocalDataSource.setIsFirstEntry(isFirst = isFirst)
+    }
+
+    override fun getIsFirstEntry(): Flow<Boolean> {
+        return userLocalDataSource.getIsFirstEntry()
+    }
+
+    override suspend fun registerDeviceToken(deviceToken: DeviceToken): String {
+        return userRemoteDataSource.registerUser(deviceToken.asData())
+    }
+}

domain/src/main/kotlin/com/mashup/dorabangs/domain/repository/UserRepository.kt

@@ -0,0 +1,12 @@
+package com.mashup.dorabangs.domain.repository
+
+import com.mashup.dorabangs.domain.model.DeviceToken
+import kotlinx.coroutines.flow.Flow
+
+interface UserRepository {
+    suspend fun setUserAccessToken(accessToken: String)
+    fun getUserAccessToken(): Flow<String>
+    suspend fun setIsFirstEntry(isFirst: Boolean)
+    fun getIsFirstEntry(): Flow<Boolean>
+    suspend fun registerDeviceToken(deviceToken: DeviceToken): String
+}

domain/src/main/kotlin/com/mashup/dorabangs/domain/usecase/user/GetIsFirstEntryUseCase.kt

@@ -1,13 +1,13 @@
 package com.mashup.dorabangs.domain.usecase.user
 
-import com.mashup.dorabangs.domain.repository.UserDataStoreRepository
+import com.mashup.dorabangs.domain.repository.UserRepository
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 class GetIsFirstEntryUseCase @Inject constructor(
-    private val userDataStoreRepository: UserDataStoreRepository,
+    private val userRepository: UserRepository,
 ) {
     operator fun invoke(): Flow<Boolean> {
-        return userDataStoreRepository.getIsFirstEntry()
+        return userRepository.getIsFirstEntry()
     }
 }

domain/src/main/kotlin/com/mashup/dorabangs/domain/usecase/user/GetUserAccessTokenUseCase.kt

@@ -1,13 +1,13 @@
 package com.mashup.dorabangs.domain.usecase.user
 
-import com.mashup.dorabangs.domain.repository.UserDataStoreRepository
+import com.mashup.dorabangs.domain.repository.UserRepository
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 class GetUserAccessTokenUseCase @Inject constructor(
-    private val userDataStoreRepository: UserDataStoreRepository,
+    private val userRepository: UserRepository,
 ) {
     operator fun invoke(): Flow<String> {
-        return userDataStoreRepository.getUserAccessToken()
+        return userRepository.getUserAccessToken()
     }
 }

domain/src/main/kotlin/com/mashup/dorabangs/domain/usecase/user/RegisterUserUseCase.kt

@@ -1,14 +1,14 @@
 package com.mashup.dorabangs.domain.usecase.user
 
 import com.mashup.dorabangs.domain.model.DeviceToken
-import com.mashup.dorabangs.domain.repository.UserRemoteRepository
+import com.mashup.dorabangs.domain.repository.UserRepository
 import javax.inject.Inject
 
 class RegisterUserUseCase @Inject constructor(
-    private val userRemoteRepository: UserRemoteRepository,
+    private val userRepository: UserRepository,
 ) {
 
     suspend operator fun invoke(deviceToken: DeviceToken): String {
-        return userRemoteRepository.registerUser(deviceToken)
+        return userRepository.registerDeviceToken(deviceToken)
     }
 }

domain/src/main/kotlin/com/mashup/dorabangs/domain/usecase/user/SetIsFirstEntryUseCase.kt

@@ -1,12 +1,12 @@
 package com.mashup.dorabangs.domain.usecase.user
 
-import com.mashup.dorabangs.domain.repository.UserDataStoreRepository
+import com.mashup.dorabangs.domain.repository.UserRepository
 import javax.inject.Inject
 
 class SetIsFirstEntryUseCase @Inject constructor(
-    private val userDataStoreRepository: UserDataStoreRepository,
+    private val userRepository: UserRepository,
 ) {
     suspend operator fun invoke(isFirst: Boolean) {
-        userDataStoreRepository.setIsFirstEntry(isFirst = isFirst)
+        userRepository.setIsFirstEntry(isFirst = isFirst)
     }
 }

domain/src/main/kotlin/com/mashup/dorabangs/domain/usecase/user/SetUserAccessTokenUseCase.kt

@@ -1,12 +1,12 @@
 package com.mashup.dorabangs.domain.usecase.user
 
-import com.mashup.dorabangs.domain.repository.UserDataStoreRepository
+import com.mashup.dorabangs.domain.repository.UserRepository
 import javax.inject.Inject
 
 class SetUserAccessTokenUseCase @Inject constructor(
-    private val userDataStoreRepository: UserDataStoreRepository,
+    private val userRepository: UserRepository,
 ) {
     suspend operator fun invoke(accessToken: String) {
-        userDataStoreRepository.setUserAccessToken(accessToken = accessToken)
+        userRepository.setUserAccessToken(accessToken = accessToken)
     }
 }