fixup! [SPIKE] Unavailable trips

Author: joshlarson

lib/dotcom/trip_plan/itinerary.ex

@@ -14,6 +14,7 @@ defmodule Dotcom.TripPlan.Itinerary do
   @enforce_keys [:start, :stop]
   defstruct [
     :duration,
+    :generalized_cost,
     :start,
     :stop,
     :passes,
@@ -25,6 +26,7 @@ defmodule Dotcom.TripPlan.Itinerary do
 
   @type t :: %__MODULE__{
           duration: non_neg_integer(),
+          generalized_cost: non_neg_integer(),
           start: DateTime.t(),
           stop: DateTime.t(),
           legs: [Leg.t()],

lib/dotcom/trip_plan/itinerary_group.ex

@@ -5,7 +5,13 @@ defmodule Dotcom.TripPlan.ItineraryGroup do
 
   alias Dotcom.TripPlan.Itinerary
 
-  defstruct [:itineraries, :representative_index, :representative_time_key, :summary]
+  defstruct [
+    :generalized_cost,
+    :itineraries,
+    :representative_index,
+    :representative_time_key,
+    :summary
+  ]
 
   @type summarized_leg :: %{
           routes: [Routes.Route.t()],
@@ -25,6 +31,7 @@ defmodule Dotcom.TripPlan.ItineraryGroup do
         }
 
   @type t :: %__MODULE__{
+          generalized_cost: non_neg_integer(),
           itineraries: [Itinerary.t()],
           representative_index: non_neg_integer(),
           representative_time_key: :start | :stop,

lib/dotcom/trip_plan/itinerary_groups.ex

@@ -21,14 +21,17 @@ defmodule Dotcom.TripPlan.ItineraryGroups do
   """
   @spec from_itineraries([Itinerary.t()], Keyword.t()) :: [ItineraryGroup.t()]
   def from_itineraries(itineraries, opts \\ []) do
-    ideal_itineraries =
-      (opts[:ideal_itineraries] || [])
-      |> Enum.group_by(&{&1.accessible?, unique_legs_to_hash(&1)})
-
     actual_itineraries =
       itineraries
       |> Enum.group_by(&{&1.accessible?, unique_legs_to_hash(&1)})
 
+    best_actual_cost = itineraries |> Enum.map(& &1.generalized_cost) |> Enum.min()
+
+    ideal_itineraries =
+      (opts[:ideal_itineraries] || [])
+      |> Enum.reject(&(&1.generalized_cost > best_actual_cost))
+      |> Enum.group_by(&{&1.accessible?, unique_legs_to_hash(&1)})
+
     unavailable_itineraries =
       ideal_itineraries
       |> Enum.reject(fn {hash, _} -> actual_itineraries |> Map.has_key?(hash) end)
@@ -99,6 +102,7 @@ defmodule Dotcom.TripPlan.ItineraryGroups do
       |> Map.put(:unavailable?, opts[:unavailable?])
 
     %ItineraryGroup{
+      generalized_cost: limited_itineraries |> Enum.map(& &1.generalized_cost) |> Enum.min(),
       itineraries: ItineraryTag.sort_tagged(limited_itineraries),
       representative_index: representative_index,
       representative_time_key: if(opts[:take_from_end], do: :stop, else: :start),

lib/dotcom/trip_plan/parser.ex

@@ -22,6 +22,7 @@ defmodule Dotcom.TripPlan.Parser do
         %Schema.Itinerary{
           accessibility_score: accessibility_score,
           duration: seconds,
+          generalized_cost: generalized_cost,
           legs: legs,
           walk_distance: meters
         } = itinerary
@@ -32,6 +33,7 @@ defmodule Dotcom.TripPlan.Parser do
       Itinerary,
       Map.merge(Map.from_struct(itinerary), %{
         accessible?: accessibility_score == 1 || all_mbta_buses?(legs),
+        generalized_cost: generalized_cost,
         duration: minutes(seconds),
         legs: legs_with_fares,
         stop: itinerary.end,

lib/dotcom_web/components/trip_planner/results.ex

@@ -101,6 +101,7 @@ defmodule DotcomWeb.Components.TripPlanner.Results do
           </.button>
         </div>
       </div>
+      <div>Cost: {@itinerary.generalized_cost}</div>
       <.itinerary_detail itinerary={@itinerary} />
     </div>
     """
@@ -130,6 +131,7 @@ defmodule DotcomWeb.Components.TripPlanner.Results do
         >
           Unavailable
         </div>
+        <div>Cost: {group.generalized_cost}</div>
         <.itinerary_summary summary={group.summary} />
         <div :if={!group.summary.unavailable?} class="flex justify-end items-center">
           <div :if={ItineraryGroup.options_text(group)} class="grow text-sm text-grey-dark">

mix.lock

@@ -81,7 +81,7 @@
   "nimble_ownership": {:hex, :nimble_ownership, "1.0.1", "f69fae0cdd451b1614364013544e66e4f5d25f36a2056a9698b793305c5aa3a6", [:mix], [], "hexpm", "3825e461025464f519f3f3e4a1f9b68c47dc151369611629ad08b636b73bb22d"},
   "nimble_parsec": {:hex, :nimble_parsec, "1.4.2", "8efba0122db06df95bfaa78f791344a89352ba04baedd3849593bfce4d0dc1c6", [:mix], [], "hexpm", "4b21398942dda052b403bbe1da991ccd03a053668d147d53fb8c4e0efe09c973"},
   "nimble_pool": {:hex, :nimble_pool, "1.1.0", "bf9c29fbdcba3564a8b800d1eeb5a3c58f36e1e11d7b7fb2e084a643f645f06b", [:mix], [], "hexpm", "af2e4e6b34197db81f7aad230c1118eac993acc0dae6bc83bac0126d4ae0813a"},
-  "open_trip_planner_client": {:git, "https://github.com/mbta/open_trip_planner_client.git", "f713e07f538b4ab24351809cd3a1e173032f60df", [branch: "jdl/trip-planner/unavailable-trips-spike"]},
+  "open_trip_planner_client": {:git, "https://github.com/mbta/open_trip_planner_client.git", "68580ac8abd49c0807ca97df6fcf4e10876be34a", [branch: "jdl/trip-planner/unavailable-trips-spike"]},
   "parallel_stream": {:hex, :parallel_stream, "1.1.0", "f52f73eb344bc22de335992377413138405796e0d0ad99d995d9977ac29f1ca9", [:mix], [], "hexpm", "684fd19191aedfaf387bbabbeb8ff3c752f0220c8112eb907d797f4592d6e871"},
   "parse_trans": {:hex, :parse_trans, "3.4.1", "6e6aa8167cb44cc8f39441d05193be6e6f4e7c2946cb2759f015f8c56b76e5ff", [:rebar3], [], "hexpm", "620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a"},
   "phoenix": {:hex, :phoenix, "1.7.21", "14ca4f1071a5f65121217d6b57ac5712d1857e40a0833aff7a691b7870fc9a3b", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.7", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "336dce4f86cba56fed312a7d280bf2282c720abb6074bdb1b61ec8095bdd0bc9"},