Merge pull request #130 from TeamHY2/Feature/#98-extend-timer

[Fix] 열람실 연장하기 버튼을 눌렀을 때 발생한 문제를 해결한다

main-presentation/src/main/java/com/teamhy2/feature/home/HomeScreen.kt

@@ -122,7 +122,12 @@ fun HomeRoute(
                         homeViewModel.updateStudyRoomExtendDialogVisibility(false)
                     },
                     onRightButtonClick = {
-                        homeViewModel.updateStudyRoomExtendDialogVisibility(false)
+                        homeViewModel.run {
+                            updateStudyRoomExtendDialogVisibility(false)
+                            saveStudyDay(true)
+                            updateTimerRunning(true)
+                            updateSelectedTime(LocalDateTime.now().truncatedTo(ChronoUnit.MINUTES))
+                        }
                         startTimer(
                             LocalDateTime.now().truncatedTo(ChronoUnit.MINUTES),
                             homeViewModel,
@@ -147,7 +152,7 @@ fun HomeRoute(
                     onRightButtonClick = {
                         homeViewModel.updateStudyRoomEndDialogVisibility(false)
                         homeViewModel.updateTimerRunning(false)
-                        homeViewModel.saveStudyDay()
+                        homeViewModel.saveStudyDay(false)
                     },
                     onDismiss = {
                         homeViewModel.updateStudyRoomEndDialogVisibility(false)
@@ -171,12 +176,6 @@ fun HomeRoute(
                 },
                 onStudyRoomExtendClick = {
                     homeViewModel.updateStudyRoomExtendDialogVisibility(true)
-                    startTimer(
-                        LocalDateTime.now().truncatedTo(ChronoUnit.MINUTES),
-                        homeViewModel,
-                        timerViewModel,
-                        onSendNotification,
-                    )
                 },
                 onStudyRoomEndClick = {
                     homeViewModel.updateStudyRoomEndDialogVisibility(true)
@@ -221,7 +220,7 @@ private fun startTimer(
                 },
                 Timer.TIME_OVER_SECONDS to {
                     homeViewModel.updateTimerRunning(false)
-                    homeViewModel.saveStudyDay()
+                    homeViewModel.saveStudyDay(false)
                 },
             ),
     )

main-presentation/src/main/java/com/teamhy2/feature/home/HomeViewModel.kt

@@ -63,7 +63,7 @@ class HomeViewModel
             }
         }
 
-        fun saveStudyDay() {
+        fun saveStudyDay(isExtend: Boolean) {
             val currentState = _homeUiState.value
             if (currentState is HomeUiState.Success) {
                 val startDateTime =
@@ -76,7 +76,7 @@ class HomeViewModel
                 viewModelScope.launch {
                     studyDayRepository.saveStudyDay(startDateTime, endDateTime)
                         .onSuccess {
-                            loadHomeData()
+                            if (!isExtend) loadHomeData()
                         }.onFailure { throwable ->
                             _errorFlow.emit(throwable)
                         }

timer-presentation/src/main/java/com/teamhy2/hongikyeolgong2/timer/prsentation/TimerViewModel.kt

@@ -6,6 +6,7 @@ import com.teamhy2.hongikyeolgong2.timer.model.Timer
 import com.teamhy2.hongikyeolgong2.timer.model.TimerRepository
 import com.teamhy2.hongikyeolgong2.timer.prsentation.model.TimerUiModel
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -21,6 +22,7 @@ class TimerViewModel
         private val timerRepository: TimerRepository,
     ) : ViewModel() {
         private lateinit var timer: Timer
+        private var timerJob: Job? = null
 
         private val _timerState = MutableStateFlow(TimerUiModel())
         val timerState: StateFlow<TimerUiModel> = _timerState.asStateFlow()
@@ -44,6 +46,7 @@ class TimerViewModel
             duration: Duration = durationHour.value,
             events: Map<Long, () -> Unit>,
         ) {
+            timerJob?.cancel()
             timer = Timer(startTime, duration, events)
             _timerState.value =
                 TimerUiModel(
@@ -58,13 +61,17 @@ class TimerViewModel
         }
 
         private fun startTimer() {
-            viewModelScope.launch {
-                timer.emitTimerEvents().collect {
-                    _timerState.value =
-                        _timerState.value.copy(
-                            leftTime = timer.formattedLeftTime,
-                        )
+            timerJob =
+                viewModelScope.launch {
+                    timer.emitTimerEvents().collect { timeLeft ->
+                        _timerState.value =
+                            _timerState.value.copy(
+                                leftTime = timer.formattedLeftTime,
+                            )
+                        if (timeLeft <= 0) {
+                            timerJob?.cancel()
+                        }
+                    }
                 }
-            }
         }
     }