From 392aa473588f45bc97c07124e31a87c7cfa2079a Mon Sep 17 00:00:00 2001 From: JSPark <48265129+pknujsp@users.noreply.github.com> Date: Mon, 11 Mar 2024 16:54:58 +0900 Subject: [PATCH] =?UTF-8?q?#219=20RepositoryModule=20=EC=A0=95=EB=A6=AC=20?= =?UTF-8?q?:=20SignRepositoryImpl=EB=8C=80=EC=8B=A0=20SignRepository?= =?UTF-8?q?=EB=A5=BC=20=EB=85=B8=EC=B6=9C=EC=8B=9C=ED=82=A4=EA=B2=8C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mediproject/core/data/RepositoryModule.kt | 31 +++++-------------- .../data/comments/CommentsRepositoryImpl.kt | 2 +- .../AccountSessionRepository.kt | 2 +- .../AccountSessionRepositoryImpl.kt | 2 +- .../core/data/sign/SignRepositoryImpl.kt | 4 +-- .../core/domain/GetTokenUseCase.kt | 2 +- 6 files changed, 13 insertions(+), 30 deletions(-) rename core/data/src/main/java/com/android/mediproject/core/data/{sign => session}/AccountSessionRepository.kt (86%) rename core/data/src/main/java/com/android/mediproject/core/data/{sign => session}/AccountSessionRepositoryImpl.kt (94%) 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 index 5c5a782b..e3203fa1 100644 --- 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 index cea56105..b2df3765 100644 --- 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/core/data/src/main/java/com/android/mediproject/core/data/sign/AccountSessionRepository.kt b/core/data/src/main/java/com/android/mediproject/core/data/session/AccountSessionRepository.kt similarity index 86% rename from core/data/src/main/java/com/android/mediproject/core/data/sign/AccountSessionRepository.kt rename to core/data/src/main/java/com/android/mediproject/core/data/session/AccountSessionRepository.kt index 8700ae07..49e3d5c9 100644 --- a/core/data/src/main/java/com/android/mediproject/core/data/sign/AccountSessionRepository.kt +++ b/core/data/src/main/java/com/android/mediproject/core/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/core/data/src/main/java/com/android/mediproject/core/data/sign/AccountSessionRepositoryImpl.kt b/core/data/src/main/java/com/android/mediproject/core/data/session/AccountSessionRepositoryImpl.kt similarity index 94% rename from core/data/src/main/java/com/android/mediproject/core/data/sign/AccountSessionRepositoryImpl.kt rename to core/data/src/main/java/com/android/mediproject/core/data/session/AccountSessionRepositoryImpl.kt index 508afd59..7b538d8b 100644 --- a/core/data/src/main/java/com/android/mediproject/core/data/sign/AccountSessionRepositoryImpl.kt +++ b/core/data/src/main/java/com/android/mediproject/core/data/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 index 8177ab6d..eb410224 100644 --- 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 { 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 index 37c1db67..7d24d5ac 100644 --- 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