Add Round deserialiser

Author: jolpica

jolpica/formula_one/importer/deserialisers.py

@@ -53,6 +53,7 @@ class ModelLookupCache[M: models.Model]:
             "driver__reference": "driver_reference",
             "team__reference": "team_reference",
         },
+        f1.Round: {"season__year": "year", "number": "round"},
         f1.RoundEntry: {
             "round__season__year": "year",
             "round__number": "round",
@@ -102,6 +103,8 @@ def add_to_cache(self, model: M, foreign_keys: json_models.F1ForeignKeysSchema)
             cache_key = (model.reference,)  # type: ignore[attr-defined]
         elif isinstance(model, f1.Lap):
             cache_key = (model.session_entry_id, model.number)  # type: ignore[attr-defined]
+        elif isinstance(model, f1.Round) and isinstance(foreign_keys, json_models.HasSeasonForeignKey):
+            cache_key = (foreign_keys.year, model.number)
         else:
             cache_key = tuple(getattr(foreign_keys, val) for val in self.MODEL_CACHE_FIELD_MAP[model_class].values())
         cache[cache_key] = model
@@ -259,6 +262,7 @@ class DeserialiserFactory:
         "Team": (f1.Team, json_models.TeamImport, ("reference",)),
         "Driver": (f1.Driver, json_models.DriverImport, ("reference",)),
         "TeamDriver": (f1.TeamDriver, json_models.TeamDriverImport, ("season", "team", "driver")),
+        "Round": (f1.Round, json_models.RoundImport, ("season", "number")),
         "SessionEntry": (f1.SessionEntry, json_models.SessionEntryImport, ("session", "round_entry")),
         "classification": (f1.SessionEntry, json_models.SessionEntryImport, ("session", "round_entry")),
         "session_entry": (f1.SessionEntry, json_models.SessionEntryImport, ("session", "round_entry")),

jolpica/formula_one/importer/json_models.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import datetime
 from collections.abc import Sequence
 from datetime import date, timedelta
 from typing import Annotated, Any, Literal
@@ -151,6 +152,25 @@ class TeamDriverImport(F1ImportSchema):
     objects: list[TeamDriverObject] = Field(min_length=1)
 
 
+class RoundForeignKeys(HasSeasonForeignKey):
+    pass
+
+
+class RoundObject(F1ObjectSchema):
+    number: PositiveInt | None = None
+    name: str | None = None
+    date: datetime.date | None = None
+    race_number: PositiveInt | None = None
+    wikipedia: HttpUrl | None = None
+    is_cancelled: bool | None = None
+
+
+class RoundImport(F1ImportSchema):
+    object_type: Literal["Round"]
+    foreign_keys: RoundForeignKeys
+    objects: list[RoundObject] = Field(min_length=1)
+
+
 class RoundEntryForeignKeys(HasRoundForeignKey, HasTeamDriverForeignKey):
     pass
 
@@ -224,10 +244,34 @@ class PitStopImport(F1ImportSchema):
 
 
 type F1Import = Annotated[
-    DriverImport | RoundEntryImport | SessionEntryImport | LapImport | PitStopImport, Field(discriminator="object_type")
+    RoundImport
+    | TeamDriverImport
+    | TeamImport
+    | DriverImport
+    | RoundEntryImport
+    | SessionEntryImport
+    | LapImport
+    | PitStopImport,
+    Field(discriminator="object_type"),
 ]
 
-type F1Object = DriverObject | RoundEntryObject | SessionEntryObject | LapObject | PitStopObject
+type F1Object = (
+    RoundObject
+    | TeamDriverObject
+    | TeamObject
+    | DriverObject
+    | RoundEntryObject
+    | SessionEntryObject
+    | LapObject
+    | PitStopObject
+)
 type F1ForeignKeys = (
-    DriverForeignKeys | RoundEntryForeignKeys | SessionEntryForeignKeys | LapForeignKeys | PitStopForeignKeys
+    RoundForeignKeys
+    | TeamDriverForeignKeys
+    | TeamForeignKeys
+    | DriverForeignKeys
+    | RoundEntryForeignKeys
+    | SessionEntryForeignKeys
+    | LapForeignKeys
+    | PitStopForeignKeys
 )

jolpica/formula_one/tests/imports/test_deserialisers.py

@@ -13,6 +13,16 @@
 @pytest.mark.parametrize(
     ["entry_data"],
     [
+        pytest.param(
+            {
+                "object_type": "Round",
+                "foreign_keys": {
+                    "year": 2023,
+                },
+                "objects": [{"number": 22, "is_cancelled": False, "wikipedia": "https://test"}],
+            },
+            id="Round",
+        ),
         pytest.param(
             {
                 "object_type": "RoundEntry",