Move route_id check to a shared helper

mbta · Jun 13, 2024 · a22e752 · a22e752
1 parent 099efbe
commit a22e752
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 20 deletions.
diff --git a/lib/predictions/last_trip.ex b/lib/predictions/last_trip.ex
@@ -1,18 +1,12 @@
 defmodule Predictions.LastTrip do
+  alias Predictions.Predictions
+
   defp get_running_trips(predictions_feed) do
     predictions_feed["entity"]
     |> Stream.map(& &1["trip_update"])
     |> Stream.filter(
-      &(&1["trip"]["route_id"] in [
-          "Red",
-          "Blue",
-          "Orange",
-          "Green-B",
-          "Green-C",
-          "Green-D",
-          "Green-E",
-          "Mattapan"
-        ] and &1["trip"]["schedule_relationship"] != "CANCELED")
+      &(Predictions.relevant_rail_route?(&1["trip"]["route_id"]) and
+          &1["trip"]["schedule_relationship"] != "CANCELED")
     )
   end
 

diff --git a/lib/predictions/predictions.ex b/lib/predictions/predictions.ex
@@ -11,16 +11,8 @@ defmodule Predictions.Predictions do
       feed_message["entity"]
       |> Stream.map(& &1["trip_update"])
       |> Stream.filter(
-        &(&1["trip"]["route_id"] in [
-            "Red",
-            "Blue",
-            "Orange",
-            "Green-B",
-            "Green-C",
-            "Green-D",
-            "Green-E",
-            "Mattapan"
-          ] and &1["trip"]["schedule_relationship"] != "CANCELED")
+        &(relevant_rail_route?(&1["trip"]["route_id"]) and
+            &1["trip"]["schedule_relationship"] != "CANCELED")
       )
       |> Stream.flat_map(&transform_stop_time_updates/1)
       |> Stream.filter(fn {update, _, _, _, _, _, _} ->
@@ -125,6 +117,19 @@ defmodule Predictions.Predictions do
     Jason.decode!(body)
   end
 
+  def relevant_rail_route?(route_id) do
+    route_id in [
+      "Red",
+      "Blue",
+      "Orange",
+      "Green-B",
+      "Green-C",
+      "Green-D",
+      "Green-E",
+      "Mattapan"
+    ]
+  end
+
   @spec translate_schedule_relationship(String.t()) :: :skipped | :scheduled
   defp translate_schedule_relationship("SKIPPED") do
     :skipped