Turn on ferry realtime in SF 2.0

lib/dotcom/schedule_finder/trip_details.ex

@@ -53,7 +53,8 @@ defmodule Dotcom.ScheduleFinder.TripDetails do
       :status,
       :stop_id,
       :stop_name,
-      :stop_sequence
+      :stop_sequence,
+      :vehicle_name
     ]
 
     @type trip_vehicle_status_t() ::
@@ -67,7 +68,8 @@ defmodule Dotcom.ScheduleFinder.TripDetails do
             status: trip_vehicle_status_t(),
             stop_id: Stops.Stop.id_t(),
             stop_name: String.t(),
-            stop_sequence: non_neg_integer()
+            stop_sequence: non_neg_integer(),
+            vehicle_name: nil | String.t()
           }
   end
 
@@ -77,14 +79,15 @@ defmodule Dotcom.ScheduleFinder.TripDetails do
   alias Schedules.{Schedule, Trip}
   alias Vehicles.Vehicle
 
+  @routes_repo Application.compile_env!(:dotcom, :repo_modules)[:routes]
   @stops_repo Application.compile_env!(:dotcom, :repo_modules)[:stops]
 
   @spec trip_details(%{
           predicted_schedules: [PredictedSchedule.t()],
           trip_vehicle: Vehicles.Vehicle.t() | nil
         }) :: __MODULE__.t()
   def trip_details(%{predicted_schedules: predicted_schedules, trip_vehicle: vehicle}) do
-    vehicle_info = vehicle_info(vehicle, predicted_schedules)
+    vehicle_info = vehicle_info(vehicle, predicted_schedules) |> add_vehicle_name(vehicle)
 
     stops =
       predicted_schedules
@@ -110,6 +113,28 @@ defmodule Dotcom.ScheduleFinder.TripDetails do
     }
   end
 
+  defp add_vehicle_name(vehicle_info, nil), do: vehicle_info
+
+  defp add_vehicle_name(vehicle_info, vehicle) do
+    vehicle_id = Map.get(vehicle, :id, nil)
+
+    mode =
+      if is_nil(vehicle.route_id) do
+        nil
+      else
+        vehicle.route_id |> @routes_repo.get() |> Route.type_atom()
+      end
+
+    # Only add vehicle names for ferries (for now?) Turns out busses have vehicle IDs too.
+    # While it is cool to see that "The Y1795" is approaching, I'm not sure that's what we want
+    if mode == :ferry do
+      vehicle_info
+      |> Map.put(:vehicle_name, boat_name(vehicle_id))
+    else
+      vehicle_info
+    end
+  end
+
   defp trip_stop_time(predicted_schedule) do
     %Route{type: route_type} = PredictedSchedule.route(predicted_schedule)
     status = PredictedSchedule.status(predicted_schedule)
@@ -238,4 +263,17 @@ defmodule Dotcom.ScheduleFinder.TripDetails do
   defp vehicle_at_stop?(stop, vehicle) do
     stop.stop_id == vehicle.stop_id && stop.stop_sequence == vehicle.stop_sequence
   end
+
+  defp boat_name(nil = _name) do
+    nil
+  end
+
+  defp boat_name(name) do
+    ("The " <> name)
+    |> String.split(" ")
+    |> Enum.map_join(
+      " ",
+      &String.capitalize/1
+    )
+  end
 end

lib/dotcom_web/live/schedule_finder_live.ex

@@ -75,7 +75,7 @@ defmodule DotcomWeb.ScheduleFinderLive do
       <.stop_banner stop={@stop} />
       <div class="px-3 py-xl flex flex-col gap-y-xl">
         <.alert_banner alerts={@alerts} />
-        <section :if={show_upcoming_departures?(@route)}>
+        <section>
           <h2 class="mt-0 mb-md">{~t"Upcoming Departures"}</h2>
           <%= if ServicePatterns.has_service?(route: @route.id) do %>
             <.upcoming_departures_section
@@ -500,7 +500,7 @@ defmodule DotcomWeb.ScheduleFinderLive do
   attr :route, Route, required: true
 
   slot :headsign, required: true
-  slot :track_info
+  slot :additional_info
   slot :time, required: true
 
   defp departure_heading(assigns) do
@@ -513,13 +513,13 @@ defmodule DotcomWeb.ScheduleFinderLive do
           <span>{render_slot(@headsign)}</span>
         </div>
 
-        <div :if={@track_info} class="flex items-center gap-2">
+        <div :if={@additional_info} class="flex items-center gap-2">
           <div class="h-0 invisible shrink-0">
             <RouteComponents.route_icon size="small" route={@route} />
           </div>
 
           <div class="leading-none text-sm">
-            {render_slot(@track_info)}
+            {render_slot(@additional_info)}
           </div>
         </div>
       </div>
@@ -559,9 +559,9 @@ defmodule DotcomWeb.ScheduleFinderLive do
               </div>
             </:headsign>
 
-            <:track_info :if={departure.route.type == 2 && departure.trip_name}>
+            <:additional_info :if={departure.route.type == 2 && departure.trip_name}>
               {~t(Train)} {departure.trip_name}
-            </:track_info>
+            </:additional_info>
 
             <:time><.formatted_time time={departure.time} /></:time>
           </.departure_heading>
@@ -764,13 +764,20 @@ defmodule DotcomWeb.ScheduleFinderLive do
     <.departure_heading route={@upcoming_departure.route}>
       <:headsign>{@upcoming_departure.headsign}</:headsign>
 
-      <:track_info :if={@upcoming_departure.trip_name}>
+      <:additional_info :if={@upcoming_departure.trip_name}>
         {gettext("Train %{trip_name}", trip_name: @upcoming_departure.trip_name)}
         <span aria-hidden="true">
           &bull;
         </span>
         {@upcoming_departure.platform_name || ~t"Track TBA"}
-      </:track_info>
+      </:additional_info>
+
+      <:additional_info :if={
+        @upcoming_departure.trip_details.vehicle_info.vehicle_name &&
+          @upcoming_departure.route.type == 4
+      }>
+        <i>{@upcoming_departure.trip_details.vehicle_info.vehicle_name}</i>
+      </:additional_info>
 
       <:time>
         <div class="flex flex-col items-end">
@@ -1115,7 +1122,4 @@ defmodule DotcomWeb.ScheduleFinderLive do
     </div>
     """
   end
-
-  defp show_upcoming_departures?(%Route{} = route), do: Route.type_atom(route) != :ferry
-  defp show_upcoming_departures?(_), do: false
 end

test/dotcom/schedule_finder/trip_details_test.exs

@@ -830,4 +830,101 @@ defmodule Dotcom.ScheduleFinder.TripDetailsTest do
              current_stop.name | Enum.map(future_stops, & &1.name)
            ]
   end
+
+  test "shows vehicle names for ferries if available" do
+    platform_name = Faker.Pizza.sauce()
+    stop = Factories.Stops.Stop.build(:stop, parent_id: nil, platform_name: platform_name)
+    stop_id = stop.id
+    trip = Factories.Schedules.Trip.build(:trip)
+
+    stub(Routes.Repo.Mock, :get, fn id ->
+      Factories.Routes.Route.ferry_route_factory(%{id: id})
+    end)
+
+    stub(Stops.Repo.Mock, :get, fn
+      ^stop_id -> stop
+      _ -> Factories.Stops.Stop.build(:stop)
+    end)
+
+    first_predicted_schedule = %PredictedSchedule{
+      prediction:
+        Factories.Predictions.Prediction.build(:prediction,
+          trip: trip,
+          platform_stop_id: stop_id
+        ),
+      schedule: Factories.Schedules.Schedule.build(:schedule, trip: trip)
+    }
+
+    predicted_schedules = [first_predicted_schedule]
+
+    route_id = Faker.Util.pick(["Boat-F1", "Boat-F2H"])
+    vehicle_id = Faker.Pokemon.name() <> " " <> Faker.Pokemon.name()
+
+    vehicle =
+      Factories.Vehicles.Vehicle.build(:vehicle,
+        stop_id: stop_id,
+        trip_id: trip.id,
+        id: vehicle_id |> String.upcase(),
+        route_id: route_id
+      )
+
+    trip_details =
+      TripDetails.trip_details(%{
+        predicted_schedules: predicted_schedules,
+        trip_vehicle: vehicle
+      })
+
+    vehicle_info = trip_details.vehicle_info
+    assert vehicle_info.vehicle_name == "The " <> vehicle_id
+  end
+
+  test "does not show vehicle names for busses and such" do
+    platform_name = Faker.Pizza.sauce()
+    stop = Factories.Stops.Stop.build(:stop, parent_id: nil, platform_name: platform_name)
+    stop_id = stop.id
+    trip = Factories.Schedules.Trip.build(:trip)
+
+    stub(Routes.Repo.Mock, :get, fn id ->
+      Factories.Routes.Route.build(
+        Faker.Util.pick([:subway_route, :bus_route, :commuter_rail_route]),
+        id: id
+      )
+    end)
+
+    stub(Stops.Repo.Mock, :get, fn
+      ^stop_id -> stop
+      _ -> Factories.Stops.Stop.build(:stop)
+    end)
+
+    first_predicted_schedule = %PredictedSchedule{
+      prediction:
+        Factories.Predictions.Prediction.build(:prediction,
+          trip: trip,
+          platform_stop_id: stop_id
+        ),
+      schedule: Factories.Schedules.Schedule.build(:schedule, trip: trip)
+    }
+
+    predicted_schedules = [first_predicted_schedule]
+
+    route_id = Faker.Util.pick(["1", "2", "Red", "Green-B"])
+    vehicle_id = Faker.Pokemon.name()
+
+    vehicle =
+      Factories.Vehicles.Vehicle.build(:vehicle,
+        stop_id: stop_id,
+        trip_id: trip.id,
+        id: vehicle_id
+      )
+      |> Map.put(:route_id, route_id)
+
+    trip_details =
+      TripDetails.trip_details(%{
+        predicted_schedules: predicted_schedules,
+        trip_vehicle: vehicle
+      })
+
+    vehicle_info = trip_details.vehicle_info
+    assert vehicle_info.vehicle_name == nil
+  end
 end

test/support/factories/routes/route.ex

@@ -30,6 +30,9 @@ defmodule Test.Support.Factories.Routes.Route do
   def commuter_rail_route_factory(attrs),
     do: build(:route, attrs |> Map.put(:type, 2))
 
+  def ferry_route_factory(attrs),
+    do: build(:route, attrs |> Map.put(:type, 4))
+
   def logan_express_route_factory(attrs) do
     %{
       description: nil,