No service display (#3)

sloria · Feb 1, 2025 · 166dbaf · 166dbaf
1 parent e2a7b7d
commit 166dbaf
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/src/app/api/mocks.py b/src/app/api/mocks.py
@@ -112,10 +112,12 @@ class TransitDataFactory(DataclassFactory[TransitData]):
         trains=[
             TrainStationDataFactory.build(
                 station_id="A01",
+                routes=["B", "Q"],
                 departures=[],
             ),
             TrainStationDataFactory.build(
                 station_id="A02",
+                routes=["2", "3"],
                 departures=[
                     TrainDepartureFactory.build(
                         route="2", wait_time_minutes=3, has_delays=False
@@ -131,6 +133,7 @@ class TransitDataFactory(DataclassFactory[TransitData]):
         trains=[
             TrainStationDataFactory.build(
                 station_id="A01",
+                routes=["B", "Q"],
                 departures=[
                     TrainDepartureFactory.build(
                         route="Q", wait_time_minutes=2, has_delays=False
@@ -142,6 +145,7 @@ class TransitDataFactory(DataclassFactory[TransitData]):
             ),
             TrainStationDataFactory.build(
                 station_id="A02",
+                routes=["2", "3"],
                 departures=[],
             ),
         ],
@@ -150,11 +154,13 @@ class TransitDataFactory(DataclassFactory[TransitData]):
         trains=[
             TrainStationDataFactory.build(
                 station_id="A01",
+                routes=["B", "Q"],
                 alerts=[],
                 departures=[],
             ),
             TrainStationDataFactory.build(
                 station_id="A02",
+                routes=["2", "3"],
                 alerts=[],
                 departures=[],
             ),

diff --git a/src/app/api/models.py b/src/app/api/models.py
@@ -9,6 +9,7 @@
 @dataclass
 class TrainStationData:
     station_id: str
+    routes: list[str]
     alerts: list[ServiceAlert] = field(default_factory=list)
     departures: list[TrainDeparture] = field(default_factory=list)
 
@@ -22,6 +23,7 @@ async def from_station_id(
         station_data = await get_station_data(station_id, routes=routes)
         return cls(
             station_id=station_id,
+            routes=sorted(routes),
             alerts=station_data.alerts,
             departures=[
                 # Only return departures for trains we can actually catch

diff --git a/src/app/tidbyt_app/trains_and_bikes.star b/src/app/tidbyt_app/trains_and_bikes.star
@@ -117,7 +117,7 @@ def TrainData(trains):
                         child = Departure(station1["departures"][1]),
                     ),
                 ] if station1["departures"] else [
-                    NoScheduledTrains(),
+                    NoScheduledTrains(station1["routes"]),
                 ],
             ),
             # Station 2 departures
@@ -129,7 +129,7 @@ def TrainData(trains):
                         child = Departure(station2["departures"][1]),
                     ),
                 ] if station2["departures"] else [
-                    NoScheduledTrains(),
+                    NoScheduledTrains(station2["routes"]),
                 ],
             ),
         ],
@@ -161,10 +161,10 @@ def Departure(departure):
         ],
     )
 
-def NoScheduledTrains():
+def NoScheduledTrains(routes):
     return render.WrappedText(
         width = 28,
-        content = "No trains",
+        content = "No {} trains".format("-".join(routes)),
         color = COLORS["orange"],
         font = "tb-8",
     )

diff --git a/.../test_app_rendering/test_rendered_output_matches_snapshots[zero_trains_at_station_1].webp b/.../test_app_rendering/test_rendered_output_matches_snapshots[zero_trains_at_station_1].webp
diff --git a/.../test_app_rendering/test_rendered_output_matches_snapshots[zero_trains_at_station_2].webp b/.../test_app_rendering/test_rendered_output_matches_snapshots[zero_trains_at_station_2].webp