Merge pull request #83 from AndrewJanong/event-bug-fix

Event bug fix
AY2324S1-CS2103T-W16-1 · Nov 2, 2023 · 0abcaa5 · 0abcaa5
2 parents 785ffeb + 5e36db0
commit 0abcaa5
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/src/main/java/seedu/address/model/event/UniqueEventList.java b/src/main/java/seedu/address/model/event/UniqueEventList.java
@@ -163,9 +163,23 @@ private Event getOverlappingEvent(Event newEvent) {
         assert !this.contains(newEvent);
         LocalDateTime newEventStartTime = newEvent.getStartTime();
         LocalDateTime newEventEndTime = newEvent.getEndTime();
+
+        assert newEventStartTime != null : "Start time should not be null";
+
+        if (newEventEndTime == null) {
+            newEventEndTime = newEventStartTime;
+        }
+
         for (Event e : this.internalList) {
             LocalDateTime startTime = e.getStartTime();
             LocalDateTime endTime = e.getEndTime();
+
+            assert startTime != null : "Start time should not be null";
+
+            if (endTime == null) {
+                endTime = startTime;
+            }
+
             if (DateTimeUtil.timeIntervalsOverlap(newEventStartTime, newEventEndTime, startTime, endTime)) {
                 return e;
             }