[FEAT/#352] token -> user 네이밍 변경

leeeyubin · leeeyubin · commit c3fdd27e4945 · 2025-04-24T23:09:02.000+09:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -85,7 +85,7 @@ dependencies {
     implementation(projects.data.intern)
     implementation(projects.data.mypage)
     implementation(projects.data.scrap)
-    implementation(projects.data.token)
+    implementation(projects.data.user)
     implementation(projects.data.tokenreissue)
     implementation(projects.data.search)
     implementation(projects.data.update)
diff --git a/core/firebase/build.gradle.kts b/core/firebase/build.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
     implementation(projects.core.navigator)
 
     // domain
-    implementation(projects.domain.token)
+    implementation(projects.domain.user)
 
     // timber
     implementation(libs.timber)
diff --git a/core/firebase/src/main/java/com/terning/core/firebase/messageservice/TerningMessagingService.kt b/core/firebase/src/main/java/com/terning/core/firebase/messageservice/TerningMessagingService.kt
@@ -11,7 +11,7 @@ import androidx.core.net.toUri
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import com.terning.core.firebase.R
-import com.terning.domain.token.repository.TokenRepository
+import com.terning.domain.user.repository.UserRepository
 import com.terning.navigator.NavigatorProvider
 import dagger.hilt.android.AndroidEntryPoint
 import timber.log.Timber
@@ -22,7 +22,7 @@ import javax.inject.Inject
 class TerningMessagingService : FirebaseMessagingService() {
 
     @Inject
-    lateinit var tokenRepository: TokenRepository
+    lateinit var userRepository: UserRepository
 
     @Inject
     lateinit var navigatorProvider: NavigatorProvider
@@ -37,7 +37,7 @@ class TerningMessagingService : FirebaseMessagingService() {
         super.handleIntent(intent)
 
         if (intent?.getStringExtra(TITLE)?.isEmpty() == true
-            || !tokenRepository.getAlarmAvailable()
+            || !userRepository.getAlarmAvailable()
         ) return
 
         val title = intent?.getStringExtra(TITLE).orEmpty()
@@ -55,7 +55,7 @@ class TerningMessagingService : FirebaseMessagingService() {
         super.onMessageReceived(message)
 
         if (message.data.isEmpty()
-            || !tokenRepository.getAlarmAvailable()
+            || !userRepository.getAlarmAvailable()
         ) return
 
         val title = message.data[TITLE].orEmpty()
diff --git a/data/user/.gitignore b/data/user/.gitignore
diff --git a/data/user/build.gradle.kts b/data/user/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 android {
-    setNamespace("data.token")
+    setNamespace("data.user")
 }
 
 dependencies {
@@ -14,5 +14,5 @@ dependencies {
     implementation(projects.core.firebase)
 
     //domain
-    implementation(projects.domain.token)
+    implementation(projects.domain.user)
 }
diff --git a/data/user/src/main/AndroidManifest.xml b/data/user/src/main/AndroidManifest.xml
diff --git a/data/user/src/main/java/com/terning/data/user/di/RepositoryModule.kt b/data/user/src/main/java/com/terning/data/user/di/RepositoryModule.kt
@@ -1,7 +1,7 @@
-package com.terning.data.token.di
+package com.terning.data.user.di
 
-import com.terning.data.token.repositoryimpl.TokenRepositoryImpl
-import com.terning.domain.token.repository.TokenRepository
+import com.terning.data.user.repositoryimpl.UserRepositoryImpl
+import com.terning.domain.user.repository.UserRepository
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -13,5 +13,5 @@ import javax.inject.Singleton
 abstract class RepositoryModule {
     @Binds
     @Singleton
-    abstract fun bindTokenRepository(tokenRepositoryImpl: TokenRepositoryImpl): TokenRepository
+    abstract fun bindUserRepository(userRepositoryImpl: UserRepositoryImpl): UserRepository
 }
diff --git a/data/user/src/main/java/com/terning/data/user/repositoryimpl/UserRepositoryImpl.kt b/data/user/src/main/java/com/terning/data/user/repositoryimpl/UserRepositoryImpl.kt
@@ -1,14 +1,14 @@
-package com.terning.data.token.repositoryimpl
+package com.terning.data.user.repositoryimpl
 
 import com.terning.core.firebase.fcmtoken.FcmTokenProvider
 import com.terning.core.local.TerningDataStore
-import com.terning.domain.token.repository.TokenRepository
+import com.terning.domain.user.repository.UserRepository
 import javax.inject.Inject
 
-class TokenRepositoryImpl @Inject constructor(
+class UserRepositoryImpl @Inject constructor(
     private val terningDataStore: TerningDataStore,
     private val fcmTokenProvider: FcmTokenProvider
-) : TokenRepository {
+) : UserRepository {
     override fun getAccessToken(): String = terningDataStore.accessToken
 
     override fun setAccessToken(accessToken: String) {
diff --git a/domain/user/.gitignore b/domain/user/.gitignore
diff --git a/domain/user/build.gradle.kts b/domain/user/build.gradle.kts
diff --git a/domain/user/src/main/java/com/terning/domain/user/repository/UserRepository.kt b/domain/user/src/main/java/com/terning/domain/user/repository/UserRepository.kt
@@ -1,6 +1,6 @@
-package com.terning.domain.token.repository
+package com.terning.domain.user.repository
 
-interface TokenRepository {
+interface UserRepository {
     fun getAccessToken(): String
 
     fun setAccessToken(accessToken: String)
diff --git a/feature/filtering/build.gradle.kts b/feature/filtering/build.gradle.kts
@@ -11,5 +11,5 @@ android {
 dependencies {
     // domain
     implementation(projects.domain.filtering)
-    implementation(projects.domain.token)
+    implementation(projects.domain.user)
 }
diff --git a/feature/filtering/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeViewModel.kt b/feature/filtering/src/main/java/com/terning/feature/filtering/filteringthree/FilteringThreeViewModel.kt
@@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.terning.domain.filtering.entity.Filtering
 import com.terning.domain.filtering.repository.FilteringRepository
-import com.terning.domain.token.repository.TokenRepository
+import com.terning.domain.user.repository.UserRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -20,7 +20,7 @@ import com.terning.core.designsystem.R as DesignSystemR
 @HiltViewModel
 class FilteringThreeViewModel @Inject constructor(
     private val filteringRepository:FilteringRepository,
-    private val tokenRepository: TokenRepository
+    private val userRepository: UserRepository
 ) : ViewModel() {
 
     private val _state = MutableStateFlow(FilteringThreeState())
@@ -48,7 +48,7 @@ class FilteringThreeViewModel @Inject constructor(
     fun postFilteringWithServer() {
         viewModelScope.launch {
             filteringRepository.postFiltering(
-                tokenRepository.getUserId(),
+                userRepository.getUserId(),
                 state.value.run {
                     Filtering(
                         grade = grade,
diff --git a/feature/home/build.gradle.kts b/feature/home/build.gradle.kts
@@ -13,7 +13,7 @@ dependencies {
     // domain
     implementation(projects.domain.home)
     implementation(projects.domain.mypage)
-    implementation(projects.domain.token)
+    implementation(projects.domain.user)
 
     // feature
     implementation(projects.feature.dialog)
diff --git a/feature/home/src/main/java/com/terning/feature/home/HomeViewModel.kt b/feature/home/src/main/java/com/terning/feature/home/HomeViewModel.kt
@@ -12,7 +12,7 @@ import com.terning.domain.home.entity.HomeRecommendIntern
 import com.terning.domain.home.entity.HomeRecommendedIntern
 import com.terning.domain.home.repository.HomeRepository
 import com.terning.domain.mypage.repository.MyPageRepository
-import com.terning.domain.token.repository.TokenRepository
+import com.terning.domain.user.repository.UserRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
@@ -32,7 +32,7 @@ import com.terning.core.designsystem.R as DesignSystemR
 class HomeViewModel @Inject constructor(
     private val homeRepository: HomeRepository,
     private val myPageRepository: MyPageRepository,
-    private val tokenRepository: TokenRepository
+    private val userRepository: UserRepository
 ) : ViewModel() {
     private val _homeState: MutableStateFlow<HomeState> = MutableStateFlow(HomeState())
     val homeState get() = _homeState.asStateFlow()
@@ -217,13 +217,13 @@ class HomeViewModel @Inject constructor(
     }
 
     fun updateAlarmAvailability(availability: Boolean) {
-        tokenRepository.setAlarmAvailable(availability)
+        userRepository.setAlarmAvailable(availability)
     }
 
     fun updatePermissionRequested(requested: Boolean) {
-        tokenRepository.setPermissionRequested(requested)
+        userRepository.setPermissionRequested(requested)
     }
 
-    fun getPermissionRequested() : Boolean = tokenRepository.getPermissionRequested()
+    fun getPermissionRequested() : Boolean = userRepository.getPermissionRequested()
 
 }
diff --git a/feature/main/build.gradle.kts b/feature/main/build.gradle.kts
@@ -13,9 +13,6 @@ dependencies {
     implementation(projects.core.firebase)
     implementation(projects.core.navigator)
 
-    //domain
-    implementation(projects.domain.token)
-
     // feature
     implementation(projects.feature.calendar)
     implementation(projects.feature.dialog)
diff --git a/feature/mypage/build.gradle.kts b/feature/mypage/build.gradle.kts
@@ -18,7 +18,7 @@ android {
 dependencies {
     // domain
     implementation(projects.domain.mypage)
-    implementation(projects.domain.token)
+    implementation(projects.domain.user)
 
     // kakao
     implementation(libs.kakao.user)
diff --git a/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageViewModel.kt b/feature/mypage/src/main/java/com/terning/feature/mypage/mypage/MyPageViewModel.kt
@@ -5,7 +5,7 @@ import androidx.lifecycle.viewModelScope
 import com.kakao.sdk.user.UserApiClient
 import com.terning.core.designsystem.state.UiState
 import com.terning.domain.mypage.repository.MyPageRepository
-import com.terning.domain.token.repository.TokenRepository
+import com.terning.domain.user.repository.UserRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -21,7 +21,7 @@ import com.terning.core.designsystem.R as DesignSystemR
 @HiltViewModel
 class MyPageViewModel @Inject constructor(
     private val myPageRepository: MyPageRepository,
-    private val tokenRepository: TokenRepository,
+    private val userRepository: UserRepository
 ) : ViewModel() {
 
     private val _state: MutableStateFlow<MyPageState> = MutableStateFlow(MyPageState())
@@ -45,7 +45,7 @@ class MyPageViewModel @Inject constructor(
     private fun logoutApp() {
         viewModelScope.launch {
             myPageRepository.postLogout().onSuccess {
-                tokenRepository.clearInfo()
+                userRepository.clearInfo()
                 _sideEffects.emit(MyPageSideEffect.RestartApp)
             }.onFailure {
                 _sideEffects.emit(MyPageSideEffect.ShowToast(DesignSystemR.string.server_failure))
@@ -68,7 +68,7 @@ class MyPageViewModel @Inject constructor(
     private fun quitApp() {
         viewModelScope.launch {
             myPageRepository.deleteQuit().onSuccess {
-                tokenRepository.clearInfo()
+                userRepository.clearInfo()
                 _sideEffects.emit(MyPageSideEffect.RestartApp)
             }.onFailure {
                 _sideEffects.emit(MyPageSideEffect.ShowToast(DesignSystemR.string.server_failure))
@@ -133,10 +133,10 @@ class MyPageViewModel @Inject constructor(
         viewModelScope.launch { _sideEffects.emit(MyPageSideEffect.NavigateToProfileEdit) }
 
     fun updateAlarmAvailability(availability: Boolean) {
-        tokenRepository.setAlarmAvailable(availability)
+        userRepository.setAlarmAvailable(availability)
     }
 
-    fun getAlarmAvailability(): Boolean = tokenRepository.getAlarmAvailable()
+    fun getAlarmAvailability(): Boolean = userRepository.getAlarmAvailable()
 
     fun updateDialogVisibility(visibility: Boolean) {
         _state.update { currentState ->
diff --git a/feature/onboarding/build.gradle.kts b/feature/onboarding/build.gradle.kts
@@ -11,7 +11,7 @@ android {
 dependencies {
     // domain
     implementation(projects.domain.auth)
-    implementation(projects.domain.token)
+    implementation(projects.domain.user)
 
     // kakao
     implementation(libs.kakao.user)
diff --git a/feature/onboarding/src/main/java/com/terning/feature/onboarding/signin/SignInViewModel.kt b/feature/onboarding/src/main/java/com/terning/feature/onboarding/signin/SignInViewModel.kt
@@ -7,7 +7,7 @@ import com.kakao.sdk.common.model.ClientError
 import com.kakao.sdk.common.model.ClientErrorCause
 import com.terning.domain.auth.entity.SignInRequest
 import com.terning.domain.auth.repository.AuthRepository
-import com.terning.domain.token.repository.TokenRepository
+import com.terning.domain.user.repository.UserRepository
 import com.terning.feature.onboarding.R
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -20,11 +20,11 @@ import com.terning.core.designsystem.R as DesignSystemR
 @HiltViewModel
 class SignInViewModel @Inject constructor(
     private val authRepository: AuthRepository,
-    private val tokenRepository: TokenRepository,
+    private val userRepository: UserRepository
 ) : ViewModel() {
 
     init {
-        tokenRepository.clearInfo()
+        userRepository.clearInfo()
     }
 
     private val _signInSideEffects = MutableSharedFlow<SignInSideEffect>()
@@ -73,7 +73,7 @@ class SignInViewModel @Inject constructor(
 
                 else -> {
                     // todo: fcmTokenReissueRequired 분기처리 by 이유빈
-                    tokenRepository.apply {
+                    userRepository.apply {
                         setAccessToken(response.accessToken ?: return)
                         setRefreshToken(response.refreshToken ?: return)
                         setUserId(response.userId ?: return)
diff --git a/feature/onboarding/src/main/java/com/terning/feature/onboarding/signup/SignUpViewModel.kt b/feature/onboarding/src/main/java/com/terning/feature/onboarding/signup/SignUpViewModel.kt
@@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.terning.domain.auth.entity.SignUpRequest
 import com.terning.domain.auth.repository.AuthRepository
-import com.terning.domain.token.repository.TokenRepository
+import com.terning.domain.user.repository.UserRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -20,7 +20,7 @@ import com.terning.core.designsystem.R as DesignSystemR
 @HiltViewModel
 class SignUpViewModel @Inject constructor(
     private val authRepository: AuthRepository,
-    private val tokenRepository: TokenRepository
+    private val userRepository: UserRepository
 ) : ViewModel() {
 
     private val _state: MutableStateFlow<SignUpState> = MutableStateFlow(SignUpState())
@@ -47,7 +47,7 @@ class SignUpViewModel @Inject constructor(
 
     fun fetchAndSaveFcmToken() {
         viewModelScope.launch {
-            tokenRepository.fetchAndSetFcmToken()
+            userRepository.fetchAndSetFcmToken()
                 .onSuccess {
                     signUpUser()
                 }.onFailure(Timber::e)
@@ -63,11 +63,11 @@ class SignUpViewModel @Inject constructor(
                         name = name,
                         profileImage = profileImage,
                         authType = KAKA0,
-                        fcmToken = tokenRepository.getFcmToken()
+                        fcmToken = userRepository.getFcmToken()
                     )
                 }
             ).onSuccess { response ->
-                tokenRepository.apply {
+                userRepository.apply {
                     setAccessToken(response.accessToken)
                     setRefreshToken(response.refreshToken)
                     setUserId(response.userId)
diff --git a/feature/splash/build.gradle.kts b/feature/splash/build.gradle.kts
@@ -14,7 +14,7 @@ dependencies {
 
     // domain
     implementation(projects.domain.update)
-    implementation(projects.domain.token)
+    implementation(projects.domain.user)
 
     implementation(libs.semver)
 }
diff --git a/feature/splash/src/main/java/com/terning/feature/splash/SplashViewModel.kt b/feature/splash/src/main/java/com/terning/feature/splash/SplashViewModel.kt
@@ -2,9 +2,9 @@ package com.terning.feature.splash
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.terning.domain.token.repository.TokenRepository
 import com.terning.domain.update.entity.UpdateState
 import com.terning.domain.update.usecase.GetUpdateStateUseCase
+import com.terning.domain.user.repository.UserRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -17,7 +17,7 @@ import javax.inject.Inject
 
 @HiltViewModel
 class SplashViewModel @Inject constructor(
-    private val tokenRepository: TokenRepository,
+    private val userRepository: UserRepository,
     private val getLatestVersionUseCase: GetUpdateStateUseCase
 ) : ViewModel() {
 
@@ -28,7 +28,7 @@ class SplashViewModel @Inject constructor(
         MutableStateFlow(UpdateState.InitialState)
     val updateState = _updateState.asStateFlow()
 
-    private fun getAccessToken(): Boolean = tokenRepository.getAccessToken().isNotBlank()
+    private fun getAccessToken(): Boolean = userRepository.getAccessToken().isNotBlank()
 
     suspend fun showSplash() {
         _updateState.value = UpdateState.InitialState
diff --git a/settings.gradle.kts b/settings.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ plugins {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`android {`
`8`		`- setNamespace("data.token")`
	`8`	`+ setNamespace("data.user")`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`dependencies {`
`@@ -14,5 +14,5 @@ dependencies {`
`14`	`14`	`implementation(projects.core.firebase)`
`15`	`15`
`16`	`16`	`//domain`
`17`		`- implementation(projects.domain.token)`
	`17`	`+ implementation(projects.domain.user)`
`18`	`18`	`}`