[FIX] 미션 없음 선택 시 미션 화면 이동 방지

Author: DongChyeon

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

@@ -3,10 +3,10 @@ package com.yapp.alarm.receivers
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.core.net.toUri
 import com.yapp.alarm.AlarmConstants
+import com.yapp.domain.model.MissionType
 import com.yapp.domain.repository.FortuneRepository
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
@@ -31,27 +31,33 @@ class AlarmInteractionActivityReceiver(private val activity: ComponentActivity)
 
             if (!isSnoozed) {
                 val notificationId = intent.getLongExtra(AlarmConstants.EXTRA_NOTIFICATION_ID, -1L)
-                val missionType = intent.getIntExtra(AlarmConstants.EXTRA_MISSION_TYPE, -1)
+                val missionTypeRaw = intent.getIntExtra(AlarmConstants.EXTRA_MISSION_TYPE, -1)
                 val missionCount = intent.getIntExtra(AlarmConstants.EXTRA_MISSION_COUNT, -1)
 
-                if (notificationId == -1L || missionType == -1 || missionCount == -1) {
-                    Log.e("AlarmInteraction", "필수 값 누락")
-                    return
-                }
+                val missionType = MissionType.fromInt(missionTypeRaw)
+
+                val hasValidMissionData = (
+                    notificationId != -1L &&
+                        missionType != MissionType.NONE &&
+                        missionCount != -1
+                    )
+
+                if (!hasValidMissionData) return
 
                 CoroutineScope(Dispatchers.IO).launch {
                     val fortuneDate = fortuneRepository.fortuneDateFlow.firstOrNull()
                     val todayDate = LocalDate.now().format(DateTimeFormatter.ISO_DATE)
 
-                    if (fortuneDate != todayDate) {
+                    val shouldLaunchMission = fortuneDate != todayDate
+
+                    if (shouldLaunchMission) {
                         context?.let {
                             val uriString =
-                                "orbitapp://mission?notificationId=$notificationId&missionType=$missionType&missionCount=$missionCount"
-                            val missionIntent =
-                                Intent(Intent.ACTION_VIEW, uriString.toUri()).apply {
-                                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                                    setPackage(context.packageName)
-                                }
+                                "orbitapp://mission?notificationId=$notificationId&missionType=${missionType.value}&missionCount=$missionCount"
+                            val missionIntent = Intent(Intent.ACTION_VIEW, uriString.toUri()).apply {
+                                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                setPackage(it.packageName)
+                            }
                             it.startActivity(missionIntent)
                         }
                     }

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

@@ -25,6 +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.model.MissionType
 import com.yapp.domain.repository.FortuneRepository
 import com.yapp.domain.usecase.AlarmUseCase
 import com.yapp.media.sound.SoundPlayer
@@ -113,7 +114,7 @@ class AlarmService : Service() {
             false -> {
                 startForeground(
                     notificationId.toInt(),
-                    createNotification(alarm, shouldNavigateToMission()),
+                    createNotification(alarm, shouldNavigateToMission(alarm.missionType)),
                 )
                 if (alarm.isVibrationEnabled) startVibration()
                 if (alarm.isSoundEnabled) startSound(alarm.soundUri, alarm.soundVolume)
@@ -125,7 +126,11 @@ class AlarmService : Service() {
         }
     }
 
-    private suspend fun shouldNavigateToMission(): Boolean {
+    private suspend fun shouldNavigateToMission(
+        missionType: MissionType,
+    ): Boolean {
+        if (missionType == MissionType.NONE) return false
+
         val fortuneDate = fortuneRepository.fortuneDateFlow.firstOrNull()
         val todayDate = LocalDate.now().format(DateTimeFormatter.ISO_DATE)
         return fortuneDate != todayDate

feature/alarm-interaction/src/main/java/com/yapp/alarm/interaction/action/AlarmActionContract.kt

@@ -14,7 +14,7 @@ class AlarmActionContract {
         val snoozeEnabled: Boolean = true,
         val snoozeInterval: Int = 5,
         val snoozeCount: Int = 5,
-        val isFirstMission: Boolean? = null,
+        val shouldShowMissionStart: Boolean? = null,
     ) : UiState
 
     sealed class Action {

feature/alarm-interaction/src/main/java/com/yapp/alarm/interaction/action/AlarmActionScreen.kt

@@ -84,7 +84,7 @@ internal fun AlarmActionScreen(
             snoozeEnabled = state.snoozeEnabled,
             snoozeInterval = state.snoozeInterval,
             snoozeCount = state.snoozeCount,
-            isFirstMission = state.isFirstMission,
+            isFirstMission = state.shouldShowMissionStart,
             onSnoozeClick = { processAction(AlarmActionContract.Action.Snooze) },
             onDismissClick = {
                 processAction(AlarmActionContract.Action.Dismiss)

feature/alarm-interaction/src/main/java/com/yapp/alarm/interaction/action/AlarmActionViewModel.kt

@@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModel
 import com.yapp.alarm.pendingIntent.interaction.createAlarmDismissIntent
 import com.yapp.alarm.pendingIntent.interaction.createAlarmSnoozeIntent
 import com.yapp.domain.model.Alarm
+import com.yapp.domain.model.MissionType
 import com.yapp.domain.repository.FortuneRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.delay
@@ -33,7 +34,7 @@ class AlarmActionViewModel @Inject constructor(
     override val container: Container<AlarmActionContract.State, AlarmActionContract.SideEffect> = container(
         initialState = AlarmActionContract.State(),
     ) {
-        fetchIsFirstMission()
+        fetchShouldShowMissionStart()
         initializeAlarmState()
         startClock()
     }
@@ -58,13 +59,16 @@ class AlarmActionViewModel @Inject constructor(
         }
     }
 
-    private fun fetchIsFirstMission() = intent {
+    private fun fetchShouldShowMissionStart() = intent {
+        val missionType = alarm?.missionType
         val fortuneDate = fortuneRepository.fortuneDateFlow.firstOrNull()
         val todayDate = LocalDate.now().format(DateTimeFormatter.ISO_DATE)
-        val isFirstMission = fortuneDate != todayDate
+        val shouldShowMissionStart = missionType != null &&
+            missionType != MissionType.NONE &&
+            fortuneDate != todayDate
 
         reduce {
-            state.copy(isFirstMission = isFirstMission)
+            state.copy(shouldShowMissionStart = shouldShowMissionStart)
         }
     }