fix: impossible to edit an event in some conditions #49

bayang · Oct 24, 2022 · cfa0ad1 · cfa0ad1
1 parent 1d2edd9
commit cfa0ad1
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/main/kotlin/io/github/bayang/jelu/dao/ReadingEventRepository.kt b/src/main/kotlin/io/github/bayang/jelu/dao/ReadingEventRepository.kt
@@ -210,17 +210,22 @@ class ReadingEventRepository {
     }
 
     fun updateReadingEvent(readingEventId: UUID, updateReadingEventDto: UpdateReadingEventDto): ReadingEvent {
+        val entity = ReadingEvent[readingEventId]
         if (updateReadingEventDto.startDate != null &&
             updateReadingEventDto.eventDate != null &&
             updateReadingEventDto.eventDate.isBefore(updateReadingEventDto.startDate)
         ) {
             throw JeluException("start date cannot be after event date")
-        }
-        val entity = ReadingEvent[readingEventId]
-        if (updateReadingEventDto.eventDate != null && updateReadingEventDto.eventDate.isBefore(entity.startDate)) {
+        } else if (updateReadingEventDto.eventDate != null &&
+            updateReadingEventDto.startDate == null &&
+            updateReadingEventDto.eventDate.isBefore(entity.startDate)
+        ) {
             throw JeluException("event date cannot be before start date")
-        }
-        if (updateReadingEventDto.startDate != null && entity.endDate != null && updateReadingEventDto.startDate.isAfter(entity.endDate)) {
+        } else if (updateReadingEventDto.startDate != null &&
+            entity.endDate != null &&
+            updateReadingEventDto.eventDate == null &&
+            updateReadingEventDto.startDate.isAfter(entity.endDate)
+        ) {
             throw JeluException("start date cannot be after end date")
         }
         return entity.apply {