New fields for schedule (#45)

* Include new fields for the speaker data in the schedule

* Add track to schedule data

* oops

* double oops

* triple oops

Author: egeakman

src/models/europython.py

@@ -178,6 +178,18 @@ def extract_answers(cls, values) -> dict:
         return values
 
 
+class EuroPythonScheduleSpeaker(BaseModel):
+    """
+    Model for EuroPython schedule speaker data
+    """
+
+    code: str
+    name: str
+    avatar: str
+    slug: str
+    website_url: str
+
+
 class EuroPythonScheduleSession(BaseModel):
     """
     Model for EuroPython schedule session data
@@ -188,7 +200,8 @@ class EuroPythonScheduleSession(BaseModel):
     slug: str
     title: str
     session_type: str
-    speakers: list[dict[str, str]]  # code, name, website_url
+    speakers: list[EuroPythonScheduleSpeaker]
+    track: str | None
     tweet: str
     level: str
     total_duration: int = Field(..., exclude=True)

src/utils/transform.py

@@ -1,6 +1,7 @@
 from src.models.europython import (
     EuroPythonScheduleBreak,
     EuroPythonScheduleSession,
+    EuroPythonScheduleSpeaker,
     EuroPythonSession,
     EuroPythonSpeaker,
     Schedule,
@@ -99,11 +100,6 @@ def pretalx_schedule_to_europython_schedule(
         Transforms the given Pretalx schedule to EuroPython schedule
         """
 
-        speakers_values = ep_speakers.values()
-        speaker_code_to_name = {s.code: s.name for s in speakers_values}
-        speaker_code_to_slug = {s.code: s.slug for s in speakers_values}
-        speaker_code_to_website_url = {s.code: s.website_url for s in speakers_values}
-
         # Merge breaks with the same start and end times
         breaks = Utils.merge_breaks(breaks)
         ep_breaks = []
@@ -130,14 +126,16 @@ def pretalx_schedule_to_europython_schedule(
                     title=session.title,
                     session_type=session.session_type,
                     speakers=[
-                        {
-                            "code": speaker_code,
-                            "name": speaker_code_to_name[speaker_code],
-                            "slug": speaker_code_to_slug[speaker_code],
-                            "website_url": speaker_code_to_website_url[speaker_code],
-                        }
+                        EuroPythonScheduleSpeaker(
+                            code=speaker_code,
+                            name=ep_speakers[speaker_code].name,
+                            avatar=ep_speakers[speaker_code].avatar,
+                            slug=ep_speakers[speaker_code].slug,
+                            website_url=ep_speakers[speaker_code].website_url,
+                        )
                         for speaker_code in session.speakers
                     ],
+                    track=session.track,
                     tweet=session.tweet,
                     level=session.level,
                     total_duration=int(session.duration),