From f4838fcc2cf68c10effaef5ee3c21cde6dd13ac2 Mon Sep 17 00:00:00 2001
From: Max Veytsman <maxim@ontoillogical.com>
Date: Fri, 26 Apr 2024 11:33:06 -0400
Subject: [PATCH] Show initials for riders including last name

---
 lib/bike_brigade_web/live/campaign_signup_live/show.ex    | 8 ++++++--
 .../live/campaign_signup_live/show.html.heex              | 4 ++--
 test/bike_brigade_web/live/campaign_signup_live_test.exs  | 8 +++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/bike_brigade_web/live/campaign_signup_live/show.ex b/lib/bike_brigade_web/live/campaign_signup_live/show.ex
index 2ecaed4c..b29e8f94 100644
--- a/lib/bike_brigade_web/live/campaign_signup_live/show.ex
+++ b/lib/bike_brigade_web/live/campaign_signup_live/show.ex
@@ -284,7 +284,11 @@ defmodule BikeBrigadeWeb.CampaignSignupLive.Show do
     task.assigned_rider.id == current_rider_id && !campaign_in_past(campaign)
   end
 
-  defp first_initial(name) do
-    name |> String.first() |> String.upcase()
+  defp initials(name) do
+    name
+    |> String.split(~r/[\s+|-]/)
+    |> Enum.map(&String.first/1)
+    |> Enum.map(&String.upcase/1)
+    |> Enum.join()
   end
 end
diff --git a/lib/bike_brigade_web/live/campaign_signup_live/show.html.heex b/lib/bike_brigade_web/live/campaign_signup_live/show.html.heex
index 6d7d0c43..82167f74 100644
--- a/lib/bike_brigade_web/live/campaign_signup_live/show.html.heex
+++ b/lib/bike_brigade_web/live/campaign_signup_live/show.html.heex
@@ -19,7 +19,7 @@
     <:col :let={task} label="Delivery Size">
       <.get_delivery_size task={task} />
     </:col>
-    <:col :let={task} label="Recipient"><%= first_initial(task.dropoff_name) %></:col>
+    <:col :let={task} label="Recipient"><%= initials(task.dropoff_name) %></:col>
     <:col :let={task} label="Dropoff Neighbourhood">
       <%= Locations.neighborhood(task.dropoff_location) %>
     </:col>
@@ -39,7 +39,7 @@
 <ul class="flex flex-col text-xs md:hidden">
   <li :for={t <- @tasks} class="w-full mb-8">
     <div class="flex justify-between px-4 py-3 font-bold bg-slate-200">
-      <span data-test-id={"dropoff-name-#{t.id}"}><%= first_initial(t.dropoff_name) %></span>
+      <span data-test-id={"dropoff-name-#{t.id}"}><%= initials(t.dropoff_name) %></span>
       <span>Pickup: <%= pickup_window(@campaign) %></span>
     </div>
     <div class="flex flex-col bg-white shadow">
diff --git a/test/bike_brigade_web/live/campaign_signup_live_test.exs b/test/bike_brigade_web/live/campaign_signup_live_test.exs
index b0869409..ed194469 100644
--- a/test/bike_brigade_web/live/campaign_signup_live_test.exs
+++ b/test/bike_brigade_web/live/campaign_signup_live_test.exs
@@ -162,7 +162,7 @@ defmodule BikeBrigadeWeb.CampaignSignupLiveTest do
       res = login_as_rider(ctx)
       campaign = fixture(:campaign, %{program_id: program.id})
 
-      task = fixture(:task, %{campaign: campaign, rider: nil})
+      task = fixture(:task, %{campaign: campaign, rider: nil, dropoff_name: "Carl Jo-Hanssen"})
 
       Map.merge(res, %{program: program, campaign: campaign, task: task})
     end
@@ -195,12 +195,10 @@ defmodule BikeBrigadeWeb.CampaignSignupLiveTest do
     test "we see pertinent task information", ctx do
       {:ok, live, html} = live(ctx.conn, ~p"/campaigns/signup/#{ctx.campaign.id}/")
 
-      # we only show the first initial of the dropoff name
+      # we only show the first initials of the dropoff name, which is Carl Jo-Hansen -> CJH
       refute html =~ ctx.task.dropoff_name
 
-      assert live |> element("[data-test-id=dropoff-name-#{ctx.task.id}]") |> render =~
-               ctx.task.dropoff_name |> String.first() |> String.upcase()
-
+      assert live |> element("[data-test-id=dropoff-name-#{ctx.task.id}]") |> render =~ "CJH"
       assert html =~ BikeBrigade.Locations.neighborhood(ctx.task.dropoff_location)
     end