feat : 알람 저장 정보 수정 및 저장 로직 변경

Author: koreatlwls

data/src/main/java/com/stop/data/local/model/Alarm.kt

@@ -2,12 +2,13 @@ package com.stop.data.local.model
 
 import com.squareup.moshi.JsonClass
 import com.stop.data.model.alarm.AlarmRepositoryItem
+import com.stop.domain.model.route.tmap.custom.Route
 
 @JsonClass(generateAdapter = true)
 data class Alarm(
     val startPosition: String,
     val endPosition: String,
-    val routes: List<String>,
+    val routes: List<Route>,
     val lastTime: String, // 막차 시간 -> 23:30:15 시분초
     val alarmTime: Int, // 10분 전 알람 설정 -> 10
     val alarmCode: Int, // 알람을 식별하기 위한 알람 ID

data/src/main/java/com/stop/data/model/alarm/AlarmRepositoryItem.kt

@@ -2,11 +2,12 @@ package com.stop.data.model.alarm
 
 import com.stop.data.local.model.Alarm
 import com.stop.domain.model.alarm.AlarmUseCaseItem
+import com.stop.domain.model.route.tmap.custom.Route
 
 data class AlarmRepositoryItem(
     val startPosition: String,
     val endPosition: String,
-    val routes: List<String>,
+    val routes: List<Route>,
     val lastTime: String, // 막차 시간 -> 23:30:15 시분초
     val alarmTime: Int, // 10분 전 알람 설정 -> 10
     val alarmCode: Int, // 알람을 식별하기 위한 알람 ID

domain/src/main/java/com/stop/domain/model/alarm/AlarmUseCaseItem.kt

@@ -1,9 +1,11 @@
 package com.stop.domain.model.alarm
 
+import com.stop.domain.model.route.tmap.custom.Route
+
 data class AlarmUseCaseItem(
     val startPosition: String,
     val endPosition: String,
-    val routes: List<String>,
+    val routes: List<Route>,
     val lastTime: String, // 막차 시간 -> 23:30:15 시분초
     val alarmTime: Int, // 10분 전 알람 설정 -> 10
     val alarmCode: Int, // 알람을 식별하기 위한 알람 ID

presentation/src/main/java/com/stop/ui/alarmsetting/AlarmSettingFragment.kt

@@ -15,6 +15,7 @@ import com.stop.AlarmFunctions
 import com.stop.AlarmWorker
 import com.stop.R
 import com.stop.databinding.FragmentAlarmSettingBinding
+import com.stop.domain.model.alarm.AlarmUseCaseItem
 import com.stop.ui.route.ClickRouteViewModel
 import dagger.hilt.android.AndroidEntryPoint
 import java.util.concurrent.TimeUnit
@@ -66,8 +67,6 @@ class AlarmSettingFragment : Fragment() {
 
     private fun initView() {
         with(binding) {
-            textViewWalk.text = getString(R.string.last_transport_walking_time, 10)
-
             numberPickerAlarmTime.minValue = 0
             numberPickerAlarmTime.maxValue = 60
 
@@ -89,7 +88,16 @@ class AlarmSettingFragment : Fragment() {
     }
 
     fun setAlarmRegisterListener() {
-        alarmSettingViewModel.saveAlarm()
+        val alarmUseCaseItem = AlarmUseCaseItem(
+            startPosition = clickRouteViewModel.clickRoute?.routes?.first()?.start?.name ?: "출발지 없음",
+            endPosition = clickRouteViewModel.clickRoute?.routes?.last()?.end?.name ?: "도착지 없음",
+            routes = clickRouteViewModel.clickRoute?.routes ?: emptyList(),
+            lastTime = clickRouteViewModel.lastTime,
+            0,
+            ALARM_CODE,
+            true
+        )
+        alarmSettingViewModel.saveAlarm(alarmUseCaseItem)
         makeAlarm()
         //makeAlarmWorker()
         binding.root.findNavController().navigate(R.id.action_alarmSetting_to_mapFragment)
@@ -116,4 +124,9 @@ class AlarmSettingFragment : Fragment() {
         _binding = null
         super.onDestroyView()
     }
+
+    companion object {
+        const val ALARM_CODE = 123
+    }
+
 }

presentation/src/main/java/com/stop/ui/alarmsetting/AlarmSettingViewModel.kt

@@ -24,29 +24,19 @@ class AlarmSettingViewModel @Inject constructor(
     var alarmMethod = true
 
     private val _alarmItem = MutableStateFlow<AlarmUseCaseItem?>(null)
-    val alarmItem : StateFlow<AlarmUseCaseItem?> = _alarmItem
+    val alarmItem: StateFlow<AlarmUseCaseItem?> = _alarmItem
 
     private val _isAlarmItemNotNull = MutableStateFlow(false)
-    val isAlarmItemNotNull : StateFlow<Boolean> = _isAlarmItemNotNull
-
-    fun saveAlarm() {
-        val alarmUseCaseItem = AlarmUseCaseItem(
-            "쑥고개로 2다길 1",
-            "현대 아남타워",
-            listOf("도보", "버스5517", "신림역", "선릉역", "도보"),
-            "23:30:00",
-            alarmTime.value ?: 0,
-            123,
-            alarmMethod
-        )
+    val isAlarmItemNotNull: StateFlow<Boolean> = _isAlarmItemNotNull
 
+    fun saveAlarm(alarmUseCaseItem: AlarmUseCaseItem) {
         viewModelScope.launch(Dispatchers.IO) {
-            saveAlarmUseCase.saveAlarm(alarmUseCaseItem)
+            saveAlarmUseCase.saveAlarm(alarmUseCaseItem.copy(alarmTime = alarmTime.value ?: 0, alarmMethod = alarmMethod))
         }
     }
 
     fun getAlarm() {
-        viewModelScope.launch(Dispatchers.IO){
+        viewModelScope.launch(Dispatchers.IO) {
             getAlarmUseCase.getAlarm().collectLatest {
                 _alarmItem.value = it