[REFACTOR/#278] 운세 생성 상태 관리를 FortuneCreationTracker로 이관

DongChyeon · DongChyeon · commit 360666f9ab02 · 2025-12-01T03:12:24.000+09:00
diff --git a/core/alarm/src/main/java/com/yapp/alarm/receivers/AlarmInteractionActivityReceiver.kt b/core/alarm/src/main/java/com/yapp/alarm/receivers/AlarmInteractionActivityReceiver.kt
@@ -6,9 +6,10 @@ import android.content.Intent
 import androidx.activity.ComponentActivity
 import androidx.core.net.toUri
 import com.yapp.alarm.AlarmConstants
-import com.yapp.domain.model.FortuneCreateStatus
+import com.yapp.domain.model.FortuneCreationState
 import com.yapp.domain.model.MissionType
 import com.yapp.domain.repository.FortuneRepository
+import com.yapp.domain.tracker.FortuneCreationTracker
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -23,6 +24,9 @@ class AlarmInteractionActivityReceiver(private val activity: ComponentActivity)
     @Inject
     lateinit var fortuneRepository: FortuneRepository
 
+    @Inject
+    lateinit var fortuneCreationTracker: FortuneCreationTracker
+
     override fun onReceive(context: Context?, intent: Intent?) {
         val isSnoozed = intent?.getBooleanExtra(AlarmConstants.EXTRA_IS_SNOOZED, false) ?: false
 
@@ -46,16 +50,15 @@ class AlarmInteractionActivityReceiver(private val activity: ComponentActivity)
                 CoroutineScope(Dispatchers.Main).launch {
                     try {
                         if (!hasValidMissionData) {
-                            val (fortuneCreateStatus, hasUnseenFortune) = withContext(Dispatchers.IO) {
-                                val status = fortuneRepository.fortuneCreateStatusFlow.first()
+                            val (fortuneCreationState, hasUnseenFortune) = withContext(Dispatchers.IO) {
+                                val todayFortune = fortuneCreationTracker.state.first()
                                 val unseen = fortuneRepository.hasUnseenFortuneFlow.first()
-                                status to unseen
+
+                                todayFortune to unseen
                             }
 
-                            when (fortuneCreateStatus) {
-                                is FortuneCreateStatus.Creating,
-                                is FortuneCreateStatus.Failure,
-                                -> {
+                            when (fortuneCreationState) {
+                                is FortuneCreationState.Start -> {
                                     context?.let { ctx ->
                                         val uri = "orbitapp://fortune".toUri()
                                         val fortuneIntent = Intent(Intent.ACTION_VIEW, uri).apply {
@@ -65,8 +68,7 @@ class AlarmInteractionActivityReceiver(private val activity: ComponentActivity)
                                         ctx.startActivity(fortuneIntent)
                                     }
                                 }
-
-                                is FortuneCreateStatus.Success -> {
+                                is FortuneCreationState.Success -> {
                                     if (hasUnseenFortune) {
                                         context?.let { ctx ->
                                             val uri = "orbitapp://fortune".toUri()
@@ -79,8 +81,7 @@ class AlarmInteractionActivityReceiver(private val activity: ComponentActivity)
                                         }
                                     }
                                 }
-
-                                FortuneCreateStatus.Idle -> { }
+                                is FortuneCreationState.Failure -> { }
                             }
                         } else {
                             context?.let { ctx ->
diff --git a/feature/fortune/src/main/java/com/yapp/fortune/FortuneViewModel.kt b/feature/fortune/src/main/java/com/yapp/fortune/FortuneViewModel.kt
@@ -4,8 +4,9 @@ import android.app.Application
 import android.util.Log
 import androidx.annotation.DrawableRes
 import androidx.lifecycle.ViewModel
-import com.yapp.domain.model.FortuneCreateStatus
+import com.yapp.domain.model.FortuneCreationState
 import com.yapp.domain.repository.FortuneRepository
+import com.yapp.domain.tracker.FortuneCreationTracker
 import com.yapp.fortune.page.toFortunePages
 import com.yapp.media.decoder.ImageUtils
 import com.yapp.media.storage.ImageSaver
@@ -25,6 +26,7 @@ class FortuneViewModel @Inject constructor(
     private val application: Application,
     private val fortuneRepository: FortuneRepository,
     private val imageSaver: ImageSaver,
+    private val fortuneCreationTracker: FortuneCreationTracker,
 ) : ViewModel(), ContainerHost<FortuneContract.State, FortuneContract.SideEffect> {
 
     override val container: Container<FortuneContract.State, FortuneContract.SideEffect> = container(
@@ -51,33 +53,27 @@ class FortuneViewModel @Inject constructor(
     }
 
     private fun observeFortune() = intent {
-        fortuneRepository.fortuneCreateStatusFlow.collect { status ->
+        fortuneCreationTracker.state.collect { status ->
             when (status) {
-                is FortuneCreateStatus.Creating -> {
+                is FortuneCreationState.Start -> {
                     reduce { state.copy(isLoading = true) }
                 }
 
-                is FortuneCreateStatus.Success -> {
+                is FortuneCreationState.Success -> {
                     fetchAndUpdateFortune(
                         fortuneId = status.fortuneId,
                         isFirstAlarmDismissedToday = fortuneRepository.isFirstAlarmDismissedTodayFlow.first(),
                     )
                 }
 
-                is FortuneCreateStatus.Failure -> {
+                FortuneCreationState.Failure -> {
                     reduce {
                         state.copy(
                             isLoading = false,
                             isCreateFailureDialogVisible = true,
                         )
                     }
                 }
-
-                is FortuneCreateStatus.Idle -> {
-                    if (!state.isCreateFailureDialogVisible) {
-                        postSideEffect(FortuneContract.SideEffect.NavigateToHome)
-                    }
-                }
             }
         }
     }
diff --git a/feature/mission/src/main/java/com/yapp/mission/MissionViewModel.kt b/feature/mission/src/main/java/com/yapp/mission/MissionViewModel.kt
@@ -6,7 +6,6 @@ import androidx.lifecycle.ViewModel
 import com.yapp.alarm.pendingIntent.interaction.createAlarmDismissIntent
 import com.yapp.analytics.AnalyticsEvent
 import com.yapp.analytics.AnalyticsHelper
-import com.yapp.domain.model.FortuneCreateStatus
 import com.yapp.domain.model.MissionMode
 import com.yapp.domain.model.MissionType
 import com.yapp.domain.repository.FortuneRepository
@@ -139,16 +138,10 @@ class MissionViewModel @Inject constructor(
             return@intent
         }
 
-        val fortuneCreateStatus = fortuneRepository.fortuneCreateStatusFlow.first()
+        val hasTodayFortune = fortuneRepository.hasTodayFortune()
         val hasUnseenFortune = fortuneRepository.hasUnseenFortuneFlow.first()
 
-        val shouldOpenFortune = when (fortuneCreateStatus) {
-            is FortuneCreateStatus.Creating,
-            is FortuneCreateStatus.Failure,
-            -> true
-            is FortuneCreateStatus.Success -> hasUnseenFortune
-            FortuneCreateStatus.Idle -> false
-        }
+        val shouldOpenFortune = !hasTodayFortune || hasUnseenFortune
 
         postSideEffect(
             if (shouldOpenFortune) {

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,9 @@ import android.app.Application`
`4`	`4`	`import android.util.Log`
`5`	`5`	`import androidx.annotation.DrawableRes`
`6`	`6`	`import androidx.lifecycle.ViewModel`
`7`		`-import com.yapp.domain.model.FortuneCreateStatus`
	`7`	`+import com.yapp.domain.model.FortuneCreationState`
`8`	`8`	`import com.yapp.domain.repository.FortuneRepository`
	`9`	`+import com.yapp.domain.tracker.FortuneCreationTracker`
`9`	`10`	`import com.yapp.fortune.page.toFortunePages`
`10`	`11`	`import com.yapp.media.decoder.ImageUtils`
`11`	`12`	`import com.yapp.media.storage.ImageSaver`
`@@ -25,6 +26,7 @@ class FortuneViewModel @Inject constructor(`
`25`	`26`	`private val application: Application,`
`26`	`27`	`private val fortuneRepository: FortuneRepository,`
`27`	`28`	`private val imageSaver: ImageSaver,`
	`29`	`+ private val fortuneCreationTracker: FortuneCreationTracker,`
`28`	`30`	`) : ViewModel(), ContainerHost<FortuneContract.State, FortuneContract.SideEffect> {`
`29`	`31`
`30`	`32`	`override val container: Container<FortuneContract.State, FortuneContract.SideEffect> = container(`
`@@ -51,33 +53,27 @@ class FortuneViewModel @Inject constructor(`
`51`	`53`	`}`
`52`	`54`
`53`	`55`	`private fun observeFortune() = intent {`
`54`		`- fortuneRepository.fortuneCreateStatusFlow.collect { status ->`
	`56`	`+ fortuneCreationTracker.state.collect { status ->`
`55`	`57`	`when (status) {`
`56`		`- is FortuneCreateStatus.Creating -> {`
	`58`	`+ is FortuneCreationState.Start -> {`
`57`	`59`	`reduce { state.copy(isLoading = true) }`
`58`	`60`	`}`
`59`	`61`
`60`		`- is FortuneCreateStatus.Success -> {`
	`62`	`+ is FortuneCreationState.Success -> {`
`61`	`63`	`fetchAndUpdateFortune(`
`62`	`64`	`fortuneId = status.fortuneId,`
`63`	`65`	`isFirstAlarmDismissedToday = fortuneRepository.isFirstAlarmDismissedTodayFlow.first(),`
`64`	`66`	`)`
`65`	`67`	`}`
`66`	`68`
`67`		`- is FortuneCreateStatus.Failure -> {`
	`69`	`+ FortuneCreationState.Failure -> {`
`68`	`70`	`reduce {`
`69`	`71`	`state.copy(`
`70`	`72`	`isLoading = false,`
`71`	`73`	`isCreateFailureDialogVisible = true,`
`72`	`74`	`)`
`73`	`75`	`}`
`74`	`76`	`}`
`75`		`-`
`76`		`- is FortuneCreateStatus.Idle -> {`
`77`		`- if (!state.isCreateFailureDialogVisible) {`
`78`		`- postSideEffect(FortuneContract.SideEffect.NavigateToHome)`
`79`		`- }`
`80`		`- }`
`81`	`77`	`}`
`82`	`78`	`}`
`83`	`79`	`}`