#219 RepositoryModule 정리 : SignRepositoryImpl대신 SignRepository를 노출시키게 변경

pknu-wap · Mar 11, 2024 · 392aa47 · 392aa47
1 parent 5f11a9a
commit 392aa47
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 30 deletions.
diff --git a/core/data/src/main/java/com/android/mediproject/core/data/RepositoryModule.kt b/core/data/src/main/java/com/android/mediproject/core/data/RepositoryModule.kt
@@ -24,9 +24,10 @@ import com.android.mediproject.core.data.safetynotification.SafetyNotificationRe
 import com.android.mediproject.core.data.safetynotification.SafetyNotificationRepositoryImpl
 import com.android.mediproject.core.data.search.SearchHistoryRepository
 import com.android.mediproject.core.data.search.SearchHistoryRepositoryImpl
+import com.android.mediproject.core.data.session.AccountSessionRepository
+import com.android.mediproject.core.data.session.AccountSessionRepositoryImpl
 import com.android.mediproject.core.data.sign.SignRepository
 import com.android.mediproject.core.data.sign.SignRepositoryImpl
-import com.android.mediproject.core.data.sign.AccountSessionRepository
 import com.android.mediproject.core.data.user.UserRepository
 import com.android.mediproject.core.data.user.UserRepositoryImpl
 import com.android.mediproject.core.database.cache.manager.MedicineDataCacheManager
@@ -45,7 +46,6 @@ import com.android.mediproject.core.network.datasource.news.recallsuspension.Rec
 import com.android.mediproject.core.network.datasource.news.safetynotification.SafetyNotificationDataSource
 import com.android.mediproject.core.network.datasource.sign.SignDataSource
 import com.android.mediproject.core.network.datasource.user.UserDataSource
-import com.android.mediproject.core.network.datasource.user.UserInfoDataSource
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -115,18 +115,9 @@ object RepositoryModule {
     internal fun providesSignRepositoryImpl(
         signDataSource: SignDataSource,
         appDataStore: AppDataStore,
-        userInfoRepository: UserInfoRepository,
-    ): SignRepositoryImpl = SignRepositoryImpl(signDataSource, appDataStore, userInfoRepository)
+        accountSessionRepository: AccountSessionRepository,
+    ): SignRepository = SignRepositoryImpl(signDataSource, accountSessionRepository, appDataStore)
 
-    @Provides
-    internal fun providesSignRepository(
-        signRepositoryImpl: SignRepositoryImpl,
-    ): SignRepository = signRepositoryImpl
-
-    @Provides
-    internal fun providesTokenRepository(
-        signRepositoryImpl: SignRepositoryImpl,
-    ): AccountSessionRepository = signRepositoryImpl
 
     @Provides
     @Singleton
@@ -143,16 +134,10 @@ object RepositoryModule {
 
     @Provides
     @Singleton
-    fun providesUserInfoRepository(
-        userInfoDataSource: UserInfoDataSource, appDataStore: AppDataStore,
-    ): UserInfoRepository = UserInfoRepositoryImpl(userInfoDataSource, appDataStore)
-
-    /*    @Provides
-        @Singleton
-        fun providesTokenRepository(
-            tokenDataSource: TokenDataSource,
-            tokenServer: TokenServer,
-        ): TokenRepository = TokenRepositoryImpl(tokenDataSource, tokenServer)*/
+    fun providesAccountSessionRepository(
+        appDataStore: AppDataStore,
+    ): AccountSessionRepository = AccountSessionRepositoryImpl(appDataStore)
+
 
     @Provides
     @Singleton

diff --git a/core/data/src/main/java/com/android/mediproject/core/data/comments/CommentsRepositoryImpl.kt b/core/data/src/main/java/com/android/mediproject/core/data/comments/CommentsRepositoryImpl.kt
@@ -4,7 +4,7 @@ import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
 import com.android.mediproject.core.common.SERVER_PAGE_SIZE
-import com.android.mediproject.core.data.sign.AccountSessionRepository
+import com.android.mediproject.core.data.session.AccountSessionRepository
 import com.android.mediproject.core.model.comments.CommentChangedResponse
 import com.android.mediproject.core.model.comments.CommentListResponse
 import com.android.mediproject.core.model.comments.LikeResponse

diff --git a/...ore/data/sign/AccountSessionRepository.kt → .../data/session/AccountSessionRepository.kt b/...ore/data/sign/AccountSessionRepository.kt → .../data/session/AccountSessionRepository.kt
@@ -1,4 +1,4 @@
-package com.android.mediproject.core.data.sign
+package com.android.mediproject.core.data.session
 
 import com.amazonaws.mobileconnectors.cognitoidentityprovider.CognitoUserSession
 

diff --git a/...data/sign/AccountSessionRepositoryImpl.kt → ...a/session/AccountSessionRepositoryImpl.kt b/...data/sign/AccountSessionRepositoryImpl.kt → ...a/session/AccountSessionRepositoryImpl.kt
@@ -1,4 +1,4 @@
-package com.android.mediproject.core.data.sign
+package com.android.mediproject.core.data.session
 
 import com.amazonaws.mobileconnectors.cognitoidentityprovider.CognitoUserSession
 import com.android.mediproject.core.datastore.AppDataStore

diff --git a/core/data/src/main/java/com/android/mediproject/core/data/sign/SignRepositoryImpl.kt b/core/data/src/main/java/com/android/mediproject/core/data/sign/SignRepositoryImpl.kt
@@ -1,6 +1,7 @@
 package com.android.mediproject.core.data.sign
 
 import com.amazonaws.services.cognitoidentityprovider.model.UserNotConfirmedException
+import com.android.mediproject.core.data.session.AccountSessionRepository
 import com.android.mediproject.core.datastore.AppDataStore
 import com.android.mediproject.core.model.sign.LoginParameter
 import com.android.mediproject.core.model.sign.SignUpParameter
@@ -12,7 +13,6 @@ internal class SignRepositoryImpl(
     private val appDataStore: AppDataStore,
 ) : SignRepository {
 
-
     override suspend fun login(loginParameter: LoginParameter) = signDataSource.logIn(loginParameter).fold(
         onSuccess = {
             accountSessionRepository.updateSession(it.userSession)
@@ -29,7 +29,6 @@ internal class SignRepositoryImpl(
         },
     )
 
-
     override suspend fun signUp(signUpParameter: SignUpParameter): Result<Boolean> {
         signDataSource.signUp(signUpParameter).onSuccess {
             appDataStore.saveSkipIntro(true)
@@ -43,7 +42,6 @@ internal class SignRepositoryImpl(
     }
 }
 
-
 sealed interface LoginState {
     data object Success : LoginState
     data object NotVerified : LoginState

diff --git a/core/domain/src/main/java/com/android/mediproject/core/domain/GetTokenUseCase.kt b/core/domain/src/main/java/com/android/mediproject/core/domain/GetTokenUseCase.kt
@@ -1,6 +1,6 @@
 package com.android.mediproject.core.domain
 
-import com.android.mediproject.core.data.sign.AccountSessionRepository
+import com.android.mediproject.core.data.session.AccountSessionRepository
 import com.android.mediproject.core.model.token.CurrentTokens
 import com.android.mediproject.core.model.token.TokenState
 import kotlinx.coroutines.flow.Flow