From b08b3831f9df31e8fe63dfbf8553b4e0b13b37be Mon Sep 17 00:00:00 2001
From: tgyuu-An <atg0614@gmail.com>
Date: Sat, 17 Feb 2024 18:01:03 +0900
Subject: [PATCH] =?UTF-8?q?[FEATURE]=20#125=20:=20=EC=9D=BC=EC=A0=95=20?=
 =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=EB=B0=8F=20=EC=88=98=EC=A0=95=20=EC=9C=A0?=
 =?UTF-8?q?=ED=9A=A8=EC=84=B1=20=EA=B2=80=EC=A6=9D=20=EB=A1=9C=EC=A7=81=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../event/edit/EventEditViewModel.kt           | 18 ++++++++++++++++--
 .../registration/EventRegistrationViewModel.kt |  6 ++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/edit/EventEditViewModel.kt b/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/edit/EventEditViewModel.kt
index 46bf4550..74ed8604 100644
--- a/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/edit/EventEditViewModel.kt
+++ b/feature/management-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/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationViewModel.kt b/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationViewModel.kt
index 6407792e..72972ad7 100644
--- a/feature/management-event/src/main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationViewModel.kt
+++ b/feature/management-event/src/main/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,