From 8433e162480a7eb4154b526824148dd423f22024 Mon Sep 17 00:00:00 2001 From: jhg3410 Date: Sat, 13 Jul 2024 14:16:41 +0900 Subject: [PATCH] =?UTF-8?q?moneymong-323=20refactor:=20=EB=B6=88=ED=95=84?= =?UTF-8?q?=EC=9A=94=ED=95=9C=20=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C=20?= =?UTF-8?q?=EB=B0=8F=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EB=84=A4=EC=9D=B4?= =?UTF-8?q?=EB=B0=8D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moneymong/network/util/AuthInterceptor.kt | 1 - .../moneymong/data/di/DataSourceModule.kt | 19 ++++++------------- .../moneymong/data/di/RepositoryModule.kt | 17 +++++------------ .../repository/login/LoginRepositoryImpl.kt | 15 --------------- .../{login => token}/TokenRepositoryImpl.kt | 2 +- .../domain/repository/LoginRepository.kt | 7 ------- .../PostAccessTokenUseCase.kt | 2 +- .../usecase/{login => token}/TokenUseCase.kt | 2 +- .../feature/sign/viewmodel/LoginViewModel.kt | 4 ++-- .../feature/sign/viewmodel/SplashViewModel.kt | 2 +- 10 files changed, 17 insertions(+), 54 deletions(-) delete mode 100644 data/src/main/java/com/moneymong/moneymong/data/repository/login/LoginRepositoryImpl.kt rename data/src/main/java/com/moneymong/moneymong/data/repository/{login => token}/TokenRepositoryImpl.kt (98%) delete mode 100644 domain/src/main/java/com/moneymong/moneymong/domain/repository/LoginRepository.kt rename domain/src/main/java/com/moneymong/moneymong/domain/usecase/{login => token}/PostAccessTokenUseCase.kt (92%) rename domain/src/main/java/com/moneymong/moneymong/domain/usecase/{login => token}/TokenUseCase.kt (91%) diff --git a/core/network/src/main/java/com/moneymong/moneymong/network/util/AuthInterceptor.kt b/core/network/src/main/java/com/moneymong/moneymong/network/util/AuthInterceptor.kt index 16ceb716..924232e0 100644 --- a/core/network/src/main/java/com/moneymong/moneymong/network/util/AuthInterceptor.kt +++ b/core/network/src/main/java/com/moneymong/moneymong/network/util/AuthInterceptor.kt @@ -1,6 +1,5 @@ package com.moneymong.moneymong.network.util -import com.moneymong.moneymong.domain.repository.LoginRepository import com.moneymong.moneymong.domain.repository.TokenRepository import com.moneymong.moneymong.network.BuildConfig import kotlinx.coroutines.runBlocking diff --git a/data/src/main/java/com/moneymong/moneymong/data/di/DataSourceModule.kt b/data/src/main/java/com/moneymong/moneymong/data/di/DataSourceModule.kt index 84502359..65ac8784 100644 --- a/data/src/main/java/com/moneymong/moneymong/data/di/DataSourceModule.kt +++ b/data/src/main/java/com/moneymong/moneymong/data/di/DataSourceModule.kt @@ -2,14 +2,6 @@ package com.moneymong.moneymong.data.di import com.moneymong.moneymong.data.datasource.agency.AgencyLocalDataSource import com.moneymong.moneymong.data.datasource.agency.AgencyLocalDataSourceImpl -import com.moneymong.moneymong.data.datasource.login.LoginLocalDataSource -import com.moneymong.moneymong.data.datasource.login.LoginLocalDataSourceImpl -import com.moneymong.moneymong.data.datasource.login.LoginRemoteDataSource -import com.moneymong.moneymong.data.datasource.login.LoginRemoteDataSourceImpl -import com.moneymong.moneymong.data.datasource.login.TokenRemoteDataSource -import com.moneymong.moneymong.data.datasource.login.TokenRemoteDataSourceImpl -import com.moneymong.moneymong.data.datasource.signup.UnivRemoteDataSource -import com.moneymong.moneymong.data.datasource.signup.UnivRemoteDataSourceImpl import com.moneymong.moneymong.data.datasource.agency.AgencyRemoteDataSource import com.moneymong.moneymong.data.datasource.agency.AgencyRemoteDataSourceImpl import com.moneymong.moneymong.data.datasource.ledger.LedgerLocalDataSource @@ -18,10 +10,16 @@ import com.moneymong.moneymong.data.datasource.ledger.LedgerRemoteDataSource import com.moneymong.moneymong.data.datasource.ledger.LedgerRemoteDataSourceImpl import com.moneymong.moneymong.data.datasource.ledgerdetail.LedgerDetailRemoteDataSource import com.moneymong.moneymong.data.datasource.ledgerdetail.LedgerDetailRemoteDataSourceImpl +import com.moneymong.moneymong.data.datasource.login.LoginLocalDataSource +import com.moneymong.moneymong.data.datasource.login.LoginLocalDataSourceImpl +import com.moneymong.moneymong.data.datasource.login.TokenRemoteDataSource +import com.moneymong.moneymong.data.datasource.login.TokenRemoteDataSourceImpl import com.moneymong.moneymong.data.datasource.member.MemberRemoteDataSource import com.moneymong.moneymong.data.datasource.member.MemberRemoteDataSourceImpl import com.moneymong.moneymong.data.datasource.ocr.OCRRemoteDataSource import com.moneymong.moneymong.data.datasource.ocr.OCRRemoteDataSourceImpl +import com.moneymong.moneymong.data.datasource.signup.UnivRemoteDataSource +import com.moneymong.moneymong.data.datasource.signup.UnivRemoteDataSourceImpl import com.moneymong.moneymong.data.datasource.user.UserLocalDataSource import com.moneymong.moneymong.data.datasource.user.UserLocalDataSourceImpl import com.moneymong.moneymong.data.datasource.user.UserRemoteDataSource @@ -35,11 +33,6 @@ import dagger.hilt.components.SingletonComponent @InstallIn(SingletonComponent::class) interface DataSourceModule { - @Binds - fun bindLoginDataSource( - loginRemoteDataSourceImpl: LoginRemoteDataSourceImpl - ): LoginRemoteDataSource - @Binds fun bindUnivDataSource( univRemoteDataSourceImpl: UnivRemoteDataSourceImpl diff --git a/data/src/main/java/com/moneymong/moneymong/data/di/RepositoryModule.kt b/data/src/main/java/com/moneymong/moneymong/data/di/RepositoryModule.kt index d231f318..911bffe9 100644 --- a/data/src/main/java/com/moneymong/moneymong/data/di/RepositoryModule.kt +++ b/data/src/main/java/com/moneymong/moneymong/data/di/RepositoryModule.kt @@ -1,18 +1,16 @@ package com.moneymong.moneymong.data.di -import com.moneymong.moneymong.data.repository.login.LoginRepositoryImpl -import com.moneymong.moneymong.data.repository.login.TokenRepositoryImpl -import com.moneymong.moneymong.data.repository.signup.UnivRepositoryImpl -import com.moneymong.moneymong.domain.repository.LoginRepository -import com.moneymong.moneymong.domain.repository.TokenRepository -import com.moneymong.moneymong.domain.repository.UnivRepository import com.moneymong.moneymong.data.repository.agency.AgencyRepositoryImpl -import com.moneymong.moneymong.domain.repository.AgencyRepository import com.moneymong.moneymong.data.repository.ledger.LedgerRepositoryImpl import com.moneymong.moneymong.data.repository.ledgerdetail.LedgerDetailRepositoryImpl import com.moneymong.moneymong.data.repository.member.MemberRepositoryImpl import com.moneymong.moneymong.data.repository.ocr.OCRRepositoryImpl +import com.moneymong.moneymong.data.repository.signup.UnivRepositoryImpl +import com.moneymong.moneymong.data.repository.token.TokenRepositoryImpl import com.moneymong.moneymong.data.repository.user.UserRepositoryImpl +import com.moneymong.moneymong.domain.repository.AgencyRepository +import com.moneymong.moneymong.domain.repository.TokenRepository +import com.moneymong.moneymong.domain.repository.UnivRepository import com.moneymong.moneymong.domain.repository.ledger.LedgerRepository import com.moneymong.moneymong.domain.repository.ledgerdetail.LedgerDetailRepository import com.moneymong.moneymong.domain.repository.member.MemberRepository @@ -28,11 +26,6 @@ import javax.inject.Singleton @InstallIn(SingletonComponent::class) interface RepositoryModule { - @Binds - fun bindLoginRepository( - loginRepositoryImpl: LoginRepositoryImpl - ): LoginRepository - @Binds fun bindUnivRepository( univRepositoryImpl: UnivRepositoryImpl diff --git a/data/src/main/java/com/moneymong/moneymong/data/repository/login/LoginRepositoryImpl.kt b/data/src/main/java/com/moneymong/moneymong/data/repository/login/LoginRepositoryImpl.kt deleted file mode 100644 index 553fbe42..00000000 --- a/data/src/main/java/com/moneymong/moneymong/data/repository/login/LoginRepositoryImpl.kt +++ /dev/null @@ -1,15 +0,0 @@ -package com.moneymong.moneymong.data.repository.login - -import com.moneymong.moneymong.data.datasource.login.LoginRemoteDataSource -import com.moneymong.moneymong.domain.repository.LoginRepository -import com.moneymong.moneymong.model.sign.LoginType -import javax.inject.Inject - -class LoginRepositoryImpl @Inject constructor( - private val remoteDataSource: LoginRemoteDataSource, -) : LoginRepository { - - override suspend fun postAccessToken(type: LoginType, accessToken: String): Result { - return remoteDataSource.postAccessToken(type = type, accessToken = accessToken) - } -} \ No newline at end of file diff --git a/data/src/main/java/com/moneymong/moneymong/data/repository/login/TokenRepositoryImpl.kt b/data/src/main/java/com/moneymong/moneymong/data/repository/token/TokenRepositoryImpl.kt similarity index 98% rename from data/src/main/java/com/moneymong/moneymong/data/repository/login/TokenRepositoryImpl.kt rename to data/src/main/java/com/moneymong/moneymong/data/repository/token/TokenRepositoryImpl.kt index 7d1d9df7..d2c01644 100644 --- a/data/src/main/java/com/moneymong/moneymong/data/repository/login/TokenRepositoryImpl.kt +++ b/data/src/main/java/com/moneymong/moneymong/data/repository/token/TokenRepositoryImpl.kt @@ -1,4 +1,4 @@ -package com.moneymong.moneymong.data.repository.login +package com.moneymong.moneymong.data.repository.token import com.moneymong.moneymong.data.datasource.login.LoginLocalDataSource import com.moneymong.moneymong.data.datasource.login.TokenRemoteDataSource diff --git a/domain/src/main/java/com/moneymong/moneymong/domain/repository/LoginRepository.kt b/domain/src/main/java/com/moneymong/moneymong/domain/repository/LoginRepository.kt deleted file mode 100644 index b85cff22..00000000 --- a/domain/src/main/java/com/moneymong/moneymong/domain/repository/LoginRepository.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.moneymong.moneymong.domain.repository - -import com.moneymong.moneymong.model.sign.LoginType - -interface LoginRepository { - suspend fun postAccessToken(type: LoginType, accessToken: String): Result -} \ No newline at end of file diff --git a/domain/src/main/java/com/moneymong/moneymong/domain/usecase/login/PostAccessTokenUseCase.kt b/domain/src/main/java/com/moneymong/moneymong/domain/usecase/token/PostAccessTokenUseCase.kt similarity index 92% rename from domain/src/main/java/com/moneymong/moneymong/domain/usecase/login/PostAccessTokenUseCase.kt rename to domain/src/main/java/com/moneymong/moneymong/domain/usecase/token/PostAccessTokenUseCase.kt index a2f85098..a0955c18 100644 --- a/domain/src/main/java/com/moneymong/moneymong/domain/usecase/login/PostAccessTokenUseCase.kt +++ b/domain/src/main/java/com/moneymong/moneymong/domain/usecase/token/PostAccessTokenUseCase.kt @@ -1,4 +1,4 @@ -package com.moneymong.moneymong.domain.usecase.login +package com.moneymong.moneymong.domain.usecase.token import com.moneymong.moneymong.domain.repository.TokenRepository import com.moneymong.moneymong.domain.repository.user.UserRepository diff --git a/domain/src/main/java/com/moneymong/moneymong/domain/usecase/login/TokenUseCase.kt b/domain/src/main/java/com/moneymong/moneymong/domain/usecase/token/TokenUseCase.kt similarity index 91% rename from domain/src/main/java/com/moneymong/moneymong/domain/usecase/login/TokenUseCase.kt rename to domain/src/main/java/com/moneymong/moneymong/domain/usecase/token/TokenUseCase.kt index 43428995..7aafbe6d 100644 --- a/domain/src/main/java/com/moneymong/moneymong/domain/usecase/login/TokenUseCase.kt +++ b/domain/src/main/java/com/moneymong/moneymong/domain/usecase/token/TokenUseCase.kt @@ -1,4 +1,4 @@ -package com.moneymong.moneymong.domain.usecase.login +package com.moneymong.moneymong.domain.usecase.token import com.moneymong.moneymong.domain.repository.TokenRepository import com.moneymong.moneymong.model.sign.UserDataStoreInfoResponse diff --git a/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/viewmodel/LoginViewModel.kt b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/viewmodel/LoginViewModel.kt index 7061da93..522b86c5 100644 --- a/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/viewmodel/LoginViewModel.kt +++ b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/viewmodel/LoginViewModel.kt @@ -1,8 +1,8 @@ package com.moneymong.moneymong.feature.sign.viewmodel import com.moneymong.moneymong.common.base.BaseViewModel -import com.moneymong.moneymong.domain.usecase.login.PostAccessTokenUseCase -import com.moneymong.moneymong.domain.usecase.login.TokenUseCase +import com.moneymong.moneymong.domain.usecase.token.PostAccessTokenUseCase +import com.moneymong.moneymong.domain.usecase.token.TokenUseCase import com.moneymong.moneymong.feature.sign.sideeffect.LoginSideEffect import com.moneymong.moneymong.feature.sign.state.LoginState import com.moneymong.moneymong.model.sign.LoginType diff --git a/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/viewmodel/SplashViewModel.kt b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/viewmodel/SplashViewModel.kt index 0cdc55f1..27159da2 100644 --- a/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/viewmodel/SplashViewModel.kt +++ b/feature/sign/src/main/java/com/moneymong/moneymong/feature/sign/viewmodel/SplashViewModel.kt @@ -2,7 +2,7 @@ package com.moneymong.moneymong.feature.sign.viewmodel import android.util.Log import com.moneymong.moneymong.common.base.BaseViewModel -import com.moneymong.moneymong.domain.usecase.login.TokenUseCase +import com.moneymong.moneymong.domain.usecase.token.TokenUseCase import com.moneymong.moneymong.feature.sign.sideeffect.SplashSideEffect import com.moneymong.moneymong.feature.sign.state.SplashState import dagger.hilt.android.lifecycle.HiltViewModel