Fix schedule

NMertsch · NMertsch · commit f17330946a0d · 2025-05-25T15:34:04.000+02:00
diff --git a/src/download.py b/src/download.py
@@ -24,7 +24,11 @@
 }
 
 base_url = f"https://pretalx.com/api/events/{Config.event}/"
-schedule_url = base_url + "schedules/latest/"
+schedule_url = (
+    base_url
+    + "schedules/latest?expand="
+    + "slots,slots.submission,slots.submission.submission_type,slots.submission.track,slots.room"
+)
 
 # Build resource list dynamically based on exclusions
 resources = [
diff --git a/src/models/pretalx.py b/src/models/pretalx.py
@@ -149,3 +149,28 @@ class PretalxSchedule(BaseModel):
 
     slots: list[PretalxSubmission]
     breaks: list[PretalxScheduleBreak]
+
+    @model_validator(mode="before")
+    @classmethod
+    def process_values(cls, values) -> dict:
+        submission_slots = []
+        break_slots = []
+        for slot_dict in values["slots"]:
+            # extract nested slot fields into slot
+            slot_object = PretalxSlot.model_validate(slot_dict)
+            slot_dict["slot"] = slot_object
+            slot_dict["room"] = slot_object.room
+            slot_dict["start"] = slot_object.start
+            slot_dict["end"] = slot_object.end
+
+            if slot_dict.get("submission") is None:
+                break_slots.append(slot_dict)
+            else:
+                # merge submission fields into slot
+                slot_dict.update(slot_dict.get("submission", {}))
+
+                submission_slots.append(slot_dict)
+
+        values["slots"] = submission_slots
+        values["breaks"] = break_slots
+        return values
