[FEATURE] #125 : 일정 등록 및 수정 유효성 검증 로직 추가

pknu-wap · Feb 17, 2024 · b08b383 · b08b383
1 parent 74435b9
commit b08b383
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/...ment-event/src/main/java/com/wap/wapp/feature/management/event/edit/EventEditViewModel.kt b/...ment-event/src/main/java/com/wap/wapp/feature/management/event/edit/EventEditViewModel.kt
@@ -104,6 +104,11 @@ class EventEditViewModel @Inject constructor(
             return
         }
 
+        if (!isValidEndTime(_eventEndTime.value)) {
+            emitValidationErrorMessage("일정 종료는 시작보다 늦어야 합니다.")
+            return
+        }
+
         viewModelScope.launch {
             updateEventUseCase(
                 eventTitle = _eventTitle.value,
@@ -130,8 +135,17 @@ class EventEditViewModel @Inject constructor(
         }
     }
 
-    private fun isValidEndTime(eventTime: LocalTime): Boolean =
-        _eventEndDate.value == _eventStartDate.value && eventTime > _eventStartTime.value
+    private fun isValidEndTime(eventTime: LocalTime): Boolean {
+        if (_eventEndDate.value > _eventStartDate.value) {
+            return true
+        }
+
+        if (_eventEndDate.value == _eventStartDate.value && eventTime > _eventStartTime.value) {
+            return true
+        }
+
+        return false
+    }
 
     private fun isValidEndDate(eventDate: LocalDate): Boolean = eventDate >= _eventStartDate.value
 

diff --git a/...ain/java/com/wap/wapp/feature/management/event/registration/EventRegistrationViewModel.kt b/...ain/java/com/wap/wapp/feature/management/event/registration/EventRegistrationViewModel.kt
@@ -105,6 +105,12 @@ class EventRegistrationViewModel @Inject constructor(
             emitValidationErrorMessage("장소를 입력 하세요.")
             return
         }
+
+        if (!isValidEndTime(_eventEndTime.value)) {
+            emitValidationErrorMessage("일정 종료는 시작보다 늦어야 합니다.")
+            return
+        }
+
         viewModelScope.launch {
             postEventUseCase(
                 eventTitle = _eventTitle.value,