Merge branch 'master' into rm-haverhill-test-change

Author: Robert-Meyer-MBTA

.tool-versions

@@ -1,4 +1,4 @@
-elixir 1.16.3-otp-25
-erlang 25.3.2.12
+elixir 1.17.3-otp-27
+erlang 27.2
 python 3.9.16
 poetry 1.7.0

Dockerfile

@@ -1,6 +1,6 @@
-ARG ELIXIR_VERSION=1.16.3
-ARG ERLANG_VERSION=25.3.2.12
-ARG ALPINE_VERSION=3.17.7
+ARG ELIXIR_VERSION=1.17.3
+ARG ERLANG_VERSION=27.2
+ARG ALPINE_VERSION=3.21.0
 
 FROM hexpm/elixir:${ELIXIR_VERSION}-erlang-${ERLANG_VERSION}-alpine-${ALPINE_VERSION} as builder
 
@@ -28,7 +28,7 @@ RUN mix release
 # The one the elixir image was built with
 FROM alpine:${ALPINE_VERSION}
 
-RUN apk add --no-cache libssl1.1 dumb-init libstdc++ libgcc ncurses-libs && \
+RUN apk add --no-cache libssl3 dumb-init libstdc++ libgcc ncurses-libs && \
   mkdir /work /api && \
   adduser -D api && chown api /work
 

apps/api_web/.sobelow-skips

@@ -1,3 +1,4 @@
 
 89AB244CFEA58A837123CC326E49CD13
-C925E5F931492531D9372392664AE12C
+C925E5F931492531D9372392664AE12C
+CB8E15060F63E711108608C13BA30278

apps/api_web/config/config.exs

@@ -51,7 +51,16 @@ config :api_web, :versions,
 
 config :logger, :console,
   format: "$date $time $metadata[$level] $message\n",
-  metadata: [:request_id]
+  metadata: [
+    :request_id,
+    :api_key,
+    :ip,
+    :records,
+    :api_version,
+    :concurrent,
+    :metadata_keep,
+    :metadata_value
+  ]
 
 # JSON-API configuration
 config :phoenix, json_library: Jason

apps/api_web/config/prod.exs

@@ -46,9 +46,7 @@ config :logger,
   level: :info,
   backends: [:console, Sentry.LoggerBackend]
 
-config :logger, :console,
-  format: "$dateT$time [$level] node=$node $metadata$message\n",
-  metadata: [:request_id, :api_key, :ip, :records, :api_version, :concurrent]
+config :logger, :console, format: "$dateT$time [$level] node=$node $metadata$message\n"
 
 config :ehmon, :report_mf, {:ehmon, :info_report}
 

apps/api_web/lib/api_web/api_controller_helpers.ex

@@ -39,10 +39,12 @@ defmodule ApiWeb.ApiControllerHelpers do
   end
 
   def index(module, conn, params) do
-    conn
-    |> get_format()
-    |> index_for_format()
-    |> apply(:call, [conn, module, params])
+    mod =
+      conn
+      |> get_format()
+      |> index_for_format()
+
+    mod.call(conn, module, params)
   end
 
   def call(conn, module, params) do

apps/api_web/lib/api_web/controllers/prediction_controller.ex

@@ -102,19 +102,17 @@ defmodule ApiWeb.PredictionController do
           {:error, :only_route_type}
 
         p when map_size(p) > 0 ->
-          filtered_params
-          |> Params.split_on_comma("trip")
+          trip_ids = Params.split_on_comma(filtered_params, "trip")
+
+          {trip_ids, route_pattern_ids}
           |> case do
-            [] ->
-              case route_pattern_ids do
-                [] ->
-                  all_stops_and_routes(stop_ids, route_ids, matchers)
+            {[], []} ->
+              all_stops_and_routes(stop_ids, route_ids, matchers)
 
-                route_pattern_ids ->
-                  all_stops_and_route_patterns(stop_ids, route_pattern_ids, matchers)
-              end
+            {[], route_pattern_ids} ->
+              all_stops_and_route_patterns(stop_ids, route_pattern_ids, matchers)
 
-            trip_ids ->
+            {trip_ids, _} ->
               all_stops_and_trips(stop_ids, trip_ids, matchers)
           end
           |> Prediction.filter_by_route_type(route_types)

apps/api_web/lib/api_web/event_stream/diff.ex

@@ -23,17 +23,7 @@ defmodule ApiWeb.EventStream.Diff do
     if update_size <= map_size(list_2_map) do
       add = Enum.filter(map_list_2, &item_in_map(added_map, &1))
       update = Map.values(updated_map)
-
-      remove =
-        map_list_1
-        |> Enum.flat_map(fn item ->
-          if item_in_map(removed_map, item) do
-            [Map.take(item, ~w(id type))]
-          else
-            []
-          end
-        end)
-        |> Enum.reverse()
+      remove = find_removed_items(map_list_1, removed_map)
 
       %{
         add: add,
@@ -50,6 +40,17 @@ defmodule ApiWeb.EventStream.Diff do
     %{reset: [map_list_2]}
   end
 
+  defp find_removed_items(map, removed_map) do
+    map
+    |> Enum.flat_map(fn item ->
+      if(item_in_map(removed_map, item),
+        do: [Map.take(item, ~w(id type))],
+        else: []
+      )
+    end)
+    |> Enum.reverse()
+  end
+
   defp by_key(%{"type" => type, "id" => id} = item), do: {{type, id}, item}
 
   defp item_in_map(map, %{"type" => type, "id" => id}) do

apps/api_web/lib/api_web/plugs/modified_since_handler.ex

@@ -51,7 +51,7 @@ defmodule ApiWeb.Plugs.ModifiedSinceHandler do
          last_modified_header = State.Metadata.last_modified_header(mod),
          conn = Plug.Conn.put_resp_header(conn, "last-modified", last_modified_header),
          {conn, [if_modified_since_header]} <- {conn, get_req_header(conn, "if-modified-since")},
-         {conn, false} <- {conn, is_modified?(last_modified_header, if_modified_since_header)} do
+         {conn, false} <- {conn, modified?(last_modified_header, if_modified_since_header)} do
       conn
       |> send_resp(:not_modified, "")
       |> halt()
@@ -64,12 +64,12 @@ defmodule ApiWeb.Plugs.ModifiedSinceHandler do
     end
   end
 
-  def is_modified?(same, same) do
+  def modified?(same, same) do
     # shortcut if the headers have the same value
     false
   end
 
-  def is_modified?(first, second) do
+  def modified?(first, second) do
     with {:ok, first_val} <- modified_value(first),
          {:ok, second_val} <- modified_value(second) do
       first_val > second_val

apps/api_web/lib/api_web/swagger_helpers.ex

@@ -80,7 +80,7 @@ defmodule ApiWeb.SwaggerHelpers do
   @spec carriages_description() :: String.t()
   def carriages_description do
     """
-    Carriage-level crowding details. See [GTFS-realtime multi_carriage_details](https://gtfs.org/realtime/reference/#message-CarriageDetails).
+    Carriage-level crowding details. See [GTFS-realtime multi_carriage_details](https://gtfs.org/documentation/realtime/reference/#message-carriagedetails).
     """
   end
 
@@ -141,7 +141,7 @@ defmodule ApiWeb.SwaggerHelpers do
       :query,
       :string,
       """
-      Filter by route_type: https://developers.google.com/transit/gtfs/reference/routes-file.
+      Filter by route_type: https://gtfs.org/documentation/schedule/reference/#routestxt.
 
       Multiple `route_type` #{comma_separated_list()}.
 

apps/api_web/mix.exs

@@ -81,7 +81,7 @@ defmodule ApiWeb.Mixfile do
       {:jason, "~> 1.4"},
       {:stream_data, "~> 0.5", only: :test},
       {:sobelow, "~> 0.11", only: :dev, runtime: false},
-      {:recaptcha, git: "https://github.com/samueljseay/recaptcha.git", tag: "71cd746"},
+      {:recaptcha, git: "https://github.com/samueljseay/recaptcha.git", ref: "71cd746be987f6834c1a933f5d2f934350e55060"},
       {:sentry, "~> 8.0"},
       {:qr_code, "~> 3.0"},
       {:nimble_totp, "~> 1.0"}

apps/api_web/test/api_web/canary_test.exs

@@ -42,7 +42,5 @@ defmodule ApiWeb.CanaryTest do
 
     assert {:error, "expect function/0 for notify_fn, got nil"} =
              Canary.start_link(notify_fn: nil)
-
-    assert_receive {:EXIT, _, "expect function/0 for notify_fn, got nil"}
   end
 end

apps/api_web/test/api_web/controllers/alert_controller_test.exs

@@ -50,9 +50,6 @@ defmodule ApiWeb.AlertControllerTest do
 
   setup tags do
     State.Stop.new_state([%Model.Stop{}])
-    State.Trip.new_state([])
-    State.Route.new_state([])
-    State.Schedule.new_state([])
     State.RoutesPatternsAtStop.update!()
 
     Facility.new_state([

apps/api_web/test/api_web/controllers/health_controller_test.exs

@@ -6,8 +6,6 @@ defmodule ApiWeb.HealthControllerTest do
   end
 
   test "defaults to 503", %{conn: conn} do
-    State.Alert.new_state([])
-    State.Schedule.new_state([])
     State.StopsOnRoute.update!()
     conn = get(conn, health_path(conn, :index))
     assert json_response(conn, 503)

apps/api_web/test/api_web/controllers/prediction_controller/sort_by_arrival_time_test.exs

@@ -61,16 +61,11 @@ defmodule ApiWeb.PredictionController.SortByArrivalTimeTest do
     }
   ]
 
-  setup_all do
+  setup %{conn: conn} do
     # stop is needed since we look up parent stops
     State.Stop.new_state([@stop, @parent_stop])
-    State.Trip.new_state([])
     State.Route.new_state([@route1, @route2, @route3])
     State.Prediction.new_state(Enum.shuffle(@cr_predictions))
-    :ok
-  end
-
-  setup %{conn: conn} do
     {:ok, conn: put_req_header(conn, "accept", "application/json")}
   end
 

apps/api_web/test/api_web/controllers/prediction_controller_test.exs

@@ -44,7 +44,6 @@ defmodule ApiWeb.PredictionControllerTest do
   @cr_prediction hd(@cr_predictions)
 
   setup %{conn: conn} do
-    State.Trip.new_state([])
     # stop is needed since we look up parent stops
     State.Stop.new_state([@stop, @parent_stop, %Stop{id: "2"}])
     State.Prediction.new_state(@cr_predictions)
@@ -584,7 +583,6 @@ defmodule ApiWeb.PredictionControllerTest do
 
     test "does not return alerts when no alerts exist", %{conn: conn} do
       different_route_prediction = %{@cr_prediction | route_id: "red", trip_id: "trip2"}
-      State.Alert.new_state([])
       State.Prediction.new_state([different_route_prediction, @cr_prediction])
 
       include_nothing_conn =
@@ -626,7 +624,6 @@ defmodule ApiWeb.PredictionControllerTest do
        %{conn: conn} do
     # run it 100 times since it's a race condition between State.Prediction and State.Trip.Added
     for _ <- 0..100 do
-      State.Prediction.new_state([])
       # wait for State,Trip.Added to clear
       State.Trip.Added.last_updated()
       # need a stop ID to generate an Added trip

apps/api_web/test/api_web/controllers/route_pattern_controller_test.exs

@@ -261,42 +261,48 @@ defmodule ApiWeb.RoutePatternControllerTest do
           route_id: "route1",
           direction_id: 0,
           canonical: true,
-          typicality: 5
+          typicality: 5,
+          sort_order: 1
         },
         %RoutePattern{
           id: "rp2",
           route_id: "route1",
           direction_id: 1,
           canonical: true,
-          typicality: 5
+          typicality: 5,
+          sort_order: 2
         },
         %RoutePattern{
           id: "rp3",
           route_id: "route2",
           direction_id: 0,
           canonical: false,
-          typicality: 5
+          typicality: 5,
+          sort_order: 3
         },
         %RoutePattern{
           id: "rp4",
           route_id: "route2",
           direction_id: 1,
           canonical: false,
-          typicality: 5
+          typicality: 5,
+          sort_order: 4
         },
         %RoutePattern{
           id: "rp5",
           route_id: "route3",
           direction_id: 0,
           canonical: false,
-          typicality: 5
+          typicality: 5,
+          sort_order: 5
         },
         %RoutePattern{
           id: "rp6",
           route_id: "route3",
           direction_id: 1,
           canonical: false,
-          typicality: 5
+          typicality: 5,
+          sort_order: 6
         }
       ]
     end
@@ -336,6 +342,10 @@ defmodule ApiWeb.RoutePatternControllerTest do
         )
 
       assert [
+               %{
+                 "id" => "rp3",
+                 "attributes" => %{"direction_id" => 0, "canonical" => false}
+               },
                %{
                  "id" => "rp4",
                  "attributes" => %{"direction_id" => 1, "canonical" => false}
@@ -344,10 +354,6 @@ defmodule ApiWeb.RoutePatternControllerTest do
                  "id" => "rp5",
                  "attributes" => %{"direction_id" => 0, "canonical" => false}
                },
-               %{
-                 "id" => "rp3",
-                 "attributes" => %{"direction_id" => 0, "canonical" => false}
-               },
                %{
                  "id" => "rp6",
                  "attributes" => %{"direction_id" => 1, "canonical" => false}
@@ -368,28 +374,28 @@ defmodule ApiWeb.RoutePatternControllerTest do
 
       assert [
                %{
-                 "id" => "rp4",
-                 "attributes" => %{"direction_id" => 1, "canonical" => false}
+                 "id" => "rp1",
+                 "attributes" => %{"direction_id" => 0, "canonical" => true}
                },
                %{
-                 "id" => "rp5",
+                 "id" => "rp2",
+                 "attributes" => %{"direction_id" => 1, "canonical" => true}
+               },
+               %{
+                 "id" => "rp3",
                  "attributes" => %{"direction_id" => 0, "canonical" => false}
                },
                %{
-                 "id" => "rp1",
-                 "attributes" => %{"direction_id" => 0, "canonical" => true}
+                 "id" => "rp4",
+                 "attributes" => %{"direction_id" => 1, "canonical" => false}
                },
                %{
-                 "id" => "rp3",
+                 "id" => "rp5",
                  "attributes" => %{"direction_id" => 0, "canonical" => false}
                },
                %{
                  "id" => "rp6",
                  "attributes" => %{"direction_id" => 1, "canonical" => false}
-               },
-               %{
-                 "id" => "rp2",
-                 "attributes" => %{"direction_id" => 1, "canonical" => true}
                }
              ] = json_response(conn, 200)["data"]
     end

apps/api_web/test/api_web/controllers/stop_controller_test.exs

@@ -3,7 +3,6 @@ defmodule ApiWeb.StopControllerTest do
   alias Model.{Facility, Schedule, Stop, Trip}
 
   setup %{conn: conn} do
-    State.Stop.new_state([])
     {:ok, conn: put_req_header(conn, "accept", "application/json")}
   end
 

apps/api_web/test/api_web/controllers/trip_controller_test.exs

@@ -4,8 +4,6 @@ defmodule ApiWeb.TripControllerTest do
   alias Model.Trip
 
   setup %{conn: conn} do
-    State.Trip.new_state([])
-
     {:ok, conn: put_req_header(conn, "accept", "application/json")}
   end