[REFACTOR/#222] UserLocalDataSource 관심사별로 분리 및 repository 구현체를 repositoryimpl 디렉토리로 통합하여 도메인 중심 구조로 정리

Author: DongChyeon

core/alarm/src/main/java/com/yapp/alarm/receivers/AlarmInteractionActivityReceiver.kt

@@ -6,7 +6,7 @@ import android.content.Intent
 import androidx.activity.ComponentActivity
 import androidx.core.net.toUri
 import com.yapp.alarm.AlarmConstants
-import com.yapp.domain.repository.UserDataRepository
+import com.yapp.domain.repository.FortuneRepository
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -20,7 +20,7 @@ import javax.inject.Inject
 class AlarmInteractionActivityReceiver(private val activity: ComponentActivity) : BroadcastReceiver() {
 
     @Inject
-    lateinit var userDataRepository: UserDataRepository
+    lateinit var fortuneRepository: FortuneRepository
 
     override fun onReceive(context: Context?, intent: Intent?) {
         val isSnoozed = intent?.getBooleanExtra(AlarmConstants.EXTRA_IS_SNOOZED, false) ?: false
@@ -30,7 +30,7 @@ class AlarmInteractionActivityReceiver(private val activity: ComponentActivity)
 
             if (!isSnoozed) {
                 CoroutineScope(Dispatchers.IO).launch {
-                    val fortuneDate = userDataRepository.fortuneDateFlow.firstOrNull()
+                    val fortuneDate = fortuneRepository.fortuneDateFlow.firstOrNull()
                     val todayDate = LocalDate.now().format(DateTimeFormatter.ISO_DATE)
 
                     if (fortuneDate != todayDate) {

core/alarm/src/main/java/com/yapp/alarm/receivers/AlarmReceiver.kt

@@ -13,7 +13,7 @@ import com.yapp.analytics.AnalyticsEvent
 import com.yapp.analytics.AnalyticsHelper
 import com.yapp.domain.model.Alarm
 import com.yapp.domain.model.toTimeString
-import com.yapp.domain.repository.UserDataRepository
+import com.yapp.domain.repository.FortuneRepository
 import com.yapp.domain.usecase.AlarmUseCase
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
@@ -34,7 +34,7 @@ class AlarmReceiver : BroadcastReceiver() {
     lateinit var androidAlarmScheduler: AndroidAlarmScheduler
 
     @Inject
-    lateinit var userDataRepository: UserDataRepository
+    lateinit var fortuneRepository: FortuneRepository
 
     @Inject
     lateinit var alarmUseCase: AlarmUseCase
@@ -107,13 +107,13 @@ class AlarmReceiver : BroadcastReceiver() {
                                 ),
                             ),
                         )
-                        val existingId = userDataRepository.firstDismissedAlarmIdFlow.firstOrNull()
+                        val existingId = fortuneRepository.firstDismissedAlarmIdFlow.firstOrNull()
                         if (existingId == null) {
                             // 첫 번째 알람 해제 기록
-                            userDataRepository.saveFirstDismissedAlarmId(alarmId)
+                            fortuneRepository.saveFirstDismissedAlarmId(alarmId)
                         } else if (existingId != alarmId) {
                             // 두 번째 알람 해제 감지 - 기존 기록 삭제
-                            userDataRepository.clearDismissedAlarmId()
+                            fortuneRepository.clearDismissedAlarmId()
                         }
                     }
 

core/alarm/src/main/java/com/yapp/alarm/services/AlarmService.kt

@@ -25,7 +25,7 @@ import com.yapp.alarm.pendingIntent.interaction.createAlarmSnoozePendingIntent
 import com.yapp.alarm.pendingIntent.interaction.createNavigateToMissionPendingIntent
 import com.yapp.domain.model.Alarm
 import com.yapp.domain.model.AlarmDay
-import com.yapp.domain.repository.UserDataRepository
+import com.yapp.domain.repository.FortuneRepository
 import com.yapp.domain.usecase.AlarmUseCase
 import com.yapp.media.sound.SoundPlayer
 import dagger.hilt.android.AndroidEntryPoint
@@ -54,7 +54,7 @@ class AlarmService : Service() {
     lateinit var androidAlarmScheduler: AndroidAlarmScheduler
 
     @Inject
-    lateinit var userDataRepository: UserDataRepository
+    lateinit var fortuneRepository: FortuneRepository
 
     private val serviceScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
 
@@ -126,7 +126,7 @@ class AlarmService : Service() {
     }
 
     private suspend fun shouldNavigateToMission(): Boolean {
-        val fortuneDate = userDataRepository.fortuneDateFlow.firstOrNull()
+        val fortuneDate = fortuneRepository.fortuneDateFlow.firstOrNull()
         val todayDate = LocalDate.now().format(DateTimeFormatter.ISO_DATE)
         return fortuneDate != todayDate
     }

…/yapp/data/remote/di/RepositoryModule.kt …ava/com/yapp/data/di/RepositoryModule.ktdata/src/main/java/com/yapp/data/remote/di/RepositoryModule.kt renamed to data/src/main/java/com/yapp/data/di/RepositoryModule.kt data/src/main/java/com/yapp/data/remote/di/RepositoryModule.kt renamed to data/src/main/java/com/yapp/data/di/RepositoryModule.kt

@@ -1,10 +1,14 @@
-package com.yapp.data.remote.di
+package com.yapp.data.di
 
-import com.yapp.data.remote.repositoryimpl.FortuneRepositoryImpl
-import com.yapp.data.remote.repositoryimpl.RemoteConfigRepositoryImpl
-import com.yapp.data.remote.repositoryimpl.SignUpRepositoryImpl
-import com.yapp.data.remote.repositoryimpl.UserInfoRepositoryImpl
+import com.yapp.data.repositoryimpl.AlarmRepositoryImpl
+import com.yapp.data.repositoryimpl.FortuneRepositoryImpl
+import com.yapp.data.repositoryimpl.ImageRepositoryImpl
+import com.yapp.data.repositoryimpl.RemoteConfigRepositoryImpl
+import com.yapp.data.repositoryimpl.SignUpRepositoryImpl
+import com.yapp.data.repositoryimpl.UserInfoRepositoryImpl
+import com.yapp.domain.repository.AlarmRepository
 import com.yapp.domain.repository.FortuneRepository
+import com.yapp.domain.repository.ImageRepository
 import com.yapp.domain.repository.RemoteConfigRepository
 import com.yapp.domain.repository.SignUpRepository
 import com.yapp.domain.repository.UserInfoRepository
@@ -19,9 +23,21 @@ import javax.inject.Singleton
 abstract class RepositoryModule {
     @Binds
     @Singleton
-    abstract fun bindsSignUpRepository(
-        signUpRepository: SignUpRepositoryImpl,
-    ): SignUpRepository
+    abstract fun bindsAlarmRepository(
+        alarmRepository: AlarmRepositoryImpl,
+    ): AlarmRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindsFortuneRepository(
+        fortuneRepository: FortuneRepositoryImpl,
+    ): FortuneRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindsImageRepository(
+        imageRepository: ImageRepositoryImpl,
+    ): ImageRepository
 
     @Binds
     @Singleton
@@ -31,9 +47,9 @@ abstract class RepositoryModule {
 
     @Binds
     @Singleton
-    abstract fun bindsFortuneRepository(
-        fortuneRepository: FortuneRepositoryImpl,
-    ): FortuneRepository
+    abstract fun bindsSignUpRepository(
+        signUpRepository: SignUpRepositoryImpl,
+    ): SignUpRepository
 
     @Binds
     @Singleton

data/src/main/java/com/yapp/data/local/datasource/AlarmLocalDataSource.kt

@@ -5,6 +5,8 @@ import com.yapp.domain.model.Alarm
 import kotlinx.coroutines.flow.Flow
 
 interface AlarmLocalDataSource {
+    val firstDismissedAlarmIdFlow: Flow<Long?>
+
     fun getAllAlarms(): Flow<List<Alarm>>
     fun getPagedAlarms(limit: Int, offset: Int): Flow<List<Alarm>>
     fun getAlarmsByTime(hour: Int, minute: Int, isAm: Boolean): Flow<List<Alarm>>
@@ -14,4 +16,6 @@ interface AlarmLocalDataSource {
     suspend fun updateAlarmActive(id: Long, active: Boolean): Int
     suspend fun getAlarm(id: Long): Alarm?
     suspend fun deleteAlarm(id: Long): Int
+    suspend fun saveFirstDismissedAlarmId(alarmId: Long)
+    suspend fun clearDismissedAlarmId()
 }

data/src/main/java/com/yapp/data/local/datasource/AlarmLocalDataSourceImpl.kt

@@ -3,14 +3,18 @@ package com.yapp.data.local.datasource
 import com.yapp.data.local.AlarmDao
 import com.yapp.data.local.AlarmEntity
 import com.yapp.data.local.toDomain
+import com.yapp.datastore.UserPreferences
 import com.yapp.domain.model.Alarm
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
 class AlarmLocalDataSourceImpl @Inject constructor(
     private val alarmDao: AlarmDao,
+    private val userPreferences: UserPreferences,
 ) : AlarmLocalDataSource {
+    override val firstDismissedAlarmIdFlow: Flow<Long?> = userPreferences.firstDismissedAlarmIdFlow
+
     override fun getAllAlarms(): Flow<List<Alarm>> {
         return alarmDao.getAllAlarms()
             .map { alarmEntities -> alarmEntities.map { it.toDomain() } }
@@ -53,4 +57,12 @@ class AlarmLocalDataSourceImpl @Inject constructor(
     override suspend fun deleteAlarm(id: Long): Int {
         return alarmDao.deleteAlarm(id)
     }
+
+    override suspend fun saveFirstDismissedAlarmId(alarmId: Long) {
+        userPreferences.saveFirstDismissedAlarmId(alarmId)
+    }
+
+    override suspend fun clearDismissedAlarmId() {
+        userPreferences.clearDismissedAlarmId()
+    }
 }

…/domain/repository/UserDataRepository.kt …cal/datasource/FortuneLocalDataSource.ktdomain/src/main/java/com/yapp/domain/repository/UserDataRepository.kt renamed to data/src/main/java/com/yapp/data/local/datasource/FortuneLocalDataSource.kt domain/src/main/java/com/yapp/domain/repository/UserDataRepository.kt renamed to data/src/main/java/com/yapp/data/local/datasource/FortuneLocalDataSource.kt

@@ -1,27 +1,20 @@
-package com.yapp.domain.repository
+package com.yapp.data.local.datasource
 
 import kotlinx.coroutines.flow.Flow
 
-interface UserDataRepository {
-    val userIdFlow: Flow<Long?>
-    val userNameFlow: Flow<String?>
-    val onboardingCompletedFlow: Flow<Boolean>
+interface FortuneLocalDataSource {
     val fortuneIdFlow: Flow<Long?>
     val fortuneDateFlow: Flow<String?>
     val fortuneImageIdFlow: Flow<Int?>
     val fortuneScoreFlow: Flow<Int?>
     val hasNewFortuneFlow: Flow<Boolean>
     val firstDismissedAlarmIdFlow: Flow<Long?>
 
-    suspend fun saveUserId(userId: Long)
-    suspend fun saveUserName(userName: String)
-    suspend fun setOnboardingCompleted()
     suspend fun saveFortuneId(fortuneId: Long)
     suspend fun markFortuneAsChecked()
     suspend fun saveFortuneImageId(imageResId: Int)
     suspend fun saveFortuneScore(score: Int)
     suspend fun saveFirstDismissedAlarmId(alarmId: Long)
     suspend fun clearDismissedAlarmId()
-    suspend fun clearUserData()
     suspend fun clearFortuneId()
 }

data/src/main/java/com/yapp/data/local/datasource/FortuneLocalDataSourceImpl.kt

@@ -0,0 +1,44 @@
+package com.yapp.data.local.datasource
+
+import com.yapp.datastore.UserPreferences
+import javax.inject.Inject
+
+class FortuneLocalDataSourceImpl @Inject constructor(
+    private val userPreferences: UserPreferences,
+) : FortuneLocalDataSource {
+
+    override val fortuneIdFlow = userPreferences.fortuneIdFlow
+    override val fortuneDateFlow = userPreferences.fortuneDateFlow
+    override val fortuneImageIdFlow = userPreferences.fortuneImageIdFlow
+    override val fortuneScoreFlow = userPreferences.fortuneScoreFlow
+    override val hasNewFortuneFlow = userPreferences.hasNewFortuneFlow
+    override val firstDismissedAlarmIdFlow = userPreferences.firstDismissedAlarmIdFlow
+
+    override suspend fun saveFortuneId(fortuneId: Long) {
+        userPreferences.saveFortuneId(fortuneId)
+    }
+
+    override suspend fun markFortuneAsChecked() {
+        userPreferences.markFortuneAsChecked()
+    }
+
+    override suspend fun saveFortuneImageId(imageResId: Int) {
+        userPreferences.saveFortuneImageId(imageResId)
+    }
+
+    override suspend fun saveFortuneScore(score: Int) {
+        userPreferences.saveFortuneScore(score)
+    }
+
+    override suspend fun saveFirstDismissedAlarmId(alarmId: Long) {
+        userPreferences.saveFirstDismissedAlarmId(alarmId)
+    }
+
+    override suspend fun clearDismissedAlarmId() {
+        userPreferences.clearDismissedAlarmId()
+    }
+
+    override suspend fun clearFortuneId() {
+        userPreferences.clearFortuneId()
+    }
+}

data/src/main/java/com/yapp/data/local/datasource/UserLocalDataSource.kt

@@ -6,22 +6,9 @@ interface UserLocalDataSource {
     val userIdFlow: Flow<Long?>
     val userNameFlow: Flow<String?>
     val onboardingCompletedFlow: Flow<Boolean>
-    val fortuneIdFlow: Flow<Long?>
-    val fortuneDateFlow: Flow<String?>
-    val fortuneImageIdFlow: Flow<Int?>
-    val fortuneScoreFlow: Flow<Int?>
-    val hasNewFortuneFlow: Flow<Boolean>
-    val firstDismissedAlarmIdFlow: Flow<Long?>
 
     suspend fun saveUserId(userId: Long)
     suspend fun saveUserName(userName: String)
     suspend fun setOnboardingCompleted()
-    suspend fun saveFortuneId(fortuneId: Long)
-    suspend fun markFortuneAsChecked()
-    suspend fun saveFortuneImageId(imageResId: Int)
-    suspend fun saveFortuneScore(score: Int)
-    suspend fun saveFirstDismissedAlarmId(alarmId: Long)
-    suspend fun clearDismissedAlarmId()
     suspend fun clearUserData()
-    suspend fun clearFortuneId()
 }

data/src/main/java/com/yapp/data/local/datasource/UserLocalDataSourceImpl.kt

@@ -11,12 +11,6 @@ class UserLocalDataSourceImpl @Inject constructor(
     override val userIdFlow: Flow<Long?> = userPreferences.userIdFlow
     override val userNameFlow: Flow<String?> = userPreferences.userNameFlow
     override val onboardingCompletedFlow: Flow<Boolean> = userPreferences.onboardingCompletedFlow
-    override val fortuneIdFlow: Flow<Long?> = userPreferences.fortuneIdFlow
-    override val fortuneDateFlow: Flow<String?> = userPreferences.fortuneDateFlow
-    override val fortuneImageIdFlow: Flow<Int?> = userPreferences.fortuneImageIdFlow
-    override val fortuneScoreFlow: Flow<Int?> = userPreferences.fortuneScoreFlow
-    override val hasNewFortuneFlow: Flow<Boolean> = userPreferences.hasNewFortuneFlow
-    override val firstDismissedAlarmIdFlow: Flow<Long?> = userPreferences.firstDismissedAlarmIdFlow
 
     override suspend fun saveUserId(userId: Long) {
         userPreferences.saveUserId(userId)
@@ -30,35 +24,7 @@ class UserLocalDataSourceImpl @Inject constructor(
         userPreferences.setOnboardingCompleted()
     }
 
-    override suspend fun saveFortuneId(fortuneId: Long) {
-        userPreferences.saveFortuneId(fortuneId)
-    }
-
-    override suspend fun markFortuneAsChecked() {
-        userPreferences.markFortuneAsChecked()
-    }
-
-    override suspend fun saveFortuneImageId(imageResId: Int) {
-        userPreferences.saveFortuneImageId(imageResId)
-    }
-
-    override suspend fun saveFortuneScore(score: Int) {
-        userPreferences.saveFortuneScore(score)
-    }
-
-    override suspend fun saveFirstDismissedAlarmId(alarmId: Long) {
-        userPreferences.saveFirstDismissedAlarmId(alarmId)
-    }
-
-    override suspend fun clearDismissedAlarmId() {
-        userPreferences.clearDismissedAlarmId()
-    }
-
     override suspend fun clearUserData() {
         userPreferences.clearUserData()
     }
-
-    override suspend fun clearFortuneId() {
-        userPreferences.clearFortuneId()
-    }
 }