Merge pull request #92 from filips123/fix-empty-lunch-time

filips123 · Nov 13, 2023 · 5594438 · 5594438
2 parents 298647c + d8a7802
commit 5594438
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/API/gimvicurnik/blueprints/calendar.py b/API/gimvicurnik/blueprints/calendar.py
@@ -201,16 +201,20 @@ def create_schedule_calendar(
             span.set_tag("event.time", model.time)
             span.set_data("event.source", model)
 
+            # Skip schedules without time
+            if not model.time:
+                logger.debug(
+                    "Skipping iCalendar event",
+                    extra={"type": "lunch-schedule", "source": model},
+                )
+
+                continue
+
             logger.debug(
                 "Preparing iCalendar event",
                 extra={"type": "lunch-schedule", "source": model},
             )
 
-            # Assert date and time exist, so mypy does not complain
-            if typing.TYPE_CHECKING:
-                assert model.date
-                assert model.time
-
             # Create event and add internal properties
             event = Event()
             event.add("DTSTAMP", datetime.now())

diff --git a/API/gimvicurnik/blueprints/schedule.py b/API/gimvicurnik/blueprints/schedule.py
@@ -23,7 +23,7 @@ def get_lunch_schedule(date: datetime.date) -> list[dict[str, Any]]:
                 {
                     "class": model[1],
                     "date": model[0].date.strftime("%Y-%m-%d"),
-                    "time": model[0].time.strftime("%H:%M"),
+                    "time": model[0].time.strftime("%H:%M") if model[0].time else None,
                     "location": model[0].location,
                     "notes": model[0].notes,
                 }
@@ -41,7 +41,7 @@ def get_lunch_schedule_for_classes(date: datetime.date, classes: list[str]) -> l
                 {
                     "class": model[1],
                     "date": model[0].date.strftime("%Y-%m-%d"),
-                    "time": model[0].time.strftime("%H:%M"),
+                    "time": model[0].time.strftime("%H:%M") if model[0].time else None,
                     "location": model[0].location,
                     "notes": model[0].notes,
                 }

diff --git a/website/src/store/modules/storage.ts b/website/src/store/modules/storage.ts
@@ -37,8 +37,8 @@ export interface DisplayedLesson {
 export interface LunchSchedule {
   class: string;
   date: string;
-  time: string;
-  location: string;
+  time: string | null;
+  location: string | null;
   notes: string | null;
 }