fix(RealtimeSchedule): partial revert of #1915 (#1920)

mbta · Mar 15, 2024 · 37f6809 · 37f6809
1 parent 6a94082
commit 37f6809
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 4 deletions.
diff --git a/lib/dotcom/realtime_schedule.ex b/lib/dotcom/realtime_schedule.ex
@@ -175,13 +175,13 @@ defmodule Dotcom.RealtimeSchedule do
       Task.async(fn ->
         next_two_predictions =
           [
-            route: route_pattern.route_id,
-            direction_id: route_pattern.direction_id
+            stop: stop_id,
+            route_pattern: route_pattern.id,
+            sort: "time",
+            "page[limit]": @predicted_schedules_per_stop
           ]
           |> predictions_fn.()
           |> Enum.filter(& &1.time)
-          |> Enum.filter(&(&1.stop.id == stop_id && &1.trip.route_pattern_id == route_pattern.id))
-          |> Enum.take(@predicted_schedules_per_stop)
 
         {key, next_two_predictions}
       end)

diff --git a/lib/predictions/repo.ex b/lib/predictions/repo.ex
@@ -43,8 +43,11 @@ defmodule Predictions.Repo do
   defp add_all_optional_params(opts) do
     @default_params
     |> add_optional_param(opts, :route)
+    |> add_optional_param(opts, :stop)
     |> add_optional_param(opts, :direction_id)
     |> add_optional_param(opts, :trip)
+    |> add_optional_param(opts, :route_pattern)
+    |> add_optional_param(opts, :"page[limit]")
     |> add_optional_param(opts, :sort)
   end
 

diff --git a/test/dotcom/realtime_schedule_test.exs b/test/dotcom/realtime_schedule_test.exs
@@ -189,6 +189,49 @@ defmodule Dotcom.RealtimeScheduleTest do
       %{
         stop: %{accessibility: [], address: nil, id: "place-ogmnl", name: nil, parking_lots: []},
         predicted_schedules_by_route_pattern: %{
+          "Forest Hills" => %{
+            direction_id: 0,
+            predicted_schedules: [
+              %{
+                prediction: %{
+                  __struct__: Predictions.Prediction,
+                  departing?: false,
+                  direction_id: 1,
+                  id: "prediction-40709316-70036-190",
+                  schedule_relationship: nil,
+                  status: nil,
+                  stop_sequence: 190,
+                  arrival_time: @now,
+                  departure_time: @now_departure,
+                  time: ["arriving"],
+                  track: nil,
+                  headsign: "Oak Grove",
+                  vehicle_id: "vehicle_id",
+                  platform_stop_id: "70036"
+                },
+                schedule: nil
+              },
+              %{
+                prediction: %{
+                  __struct__: Predictions.Prediction,
+                  departing?: false,
+                  direction_id: 1,
+                  id: "prediction-40709317-70036-190",
+                  schedule_relationship: nil,
+                  status: nil,
+                  stop_sequence: 190,
+                  arrival_time: @now,
+                  departure_time: @now_departure,
+                  time: ["arriving"],
+                  track: nil,
+                  headsign: "Oak Grove",
+                  vehicle_id: nil,
+                  platform_stop_id: "70036"
+                },
+                schedule: nil
+              }
+            ]
+          },
           "Oak Grove" => %{
             direction_id: 1,
             predicted_schedules: [