Review: handle sorting in live view not in context

bikebrigade · Apr 26, 2024 · 39635a2 · 39635a2
1 parent 62c8228
commit 39635a2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/lib/bike_brigade/delivery.ex b/lib/bike_brigade/delivery.ex
@@ -458,9 +458,7 @@ defmodule BikeBrigade.Delivery do
       |> Repo.preload(:location)
 
     # Does a nested preload to get tasks' assigned riders without doing an extra db query
-    tasks =
-      Repo.preload(all_tasks, assigned_rider: fn _ -> all_riders end)
-    |> Enum.sort_by(fn t -> t.dropoff_location.neighborhood.name end)
+    tasks = Repo.preload(all_tasks, assigned_rider: fn _ -> all_riders end)
 
     riders = Repo.preload(all_riders, assigned_tasks: fn _ -> all_tasks end)
 

diff --git a/lib/bike_brigade_web/live/campaign_signup_live/show.ex b/lib/bike_brigade_web/live/campaign_signup_live/show.ex
@@ -113,7 +113,6 @@ defmodule BikeBrigadeWeb.CampaignSignupLive.Show do
 
   def handle_event("signup_rider", %{"rider_id" => rider_id, "task_id" => task_id}, socket) do
     %{campaign: campaign, tasks: tasks} = socket.assigns
-
     task = Enum.find(tasks, fn task -> task.id == task_id end)
 
     attrs = %{
@@ -173,6 +172,7 @@ defmodule BikeBrigadeWeb.CampaignSignupLive.Show do
 
   defp assign_campaign(socket, campaign) do
     {riders, tasks} = Delivery.campaign_riders_and_tasks(campaign)
+    tasks = Enum.sort_by(tasks, fn t -> t.dropoff_location.neighborhood.name end)
 
     socket
     |> assign(:campaign, campaign)

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
@@ -21,7 +21,7 @@
     </:col>
     <:col :let={task} label="Recipient"><%= first_initial(task.dropoff_name) %></:col>
     <:col :let={task} label="Dropoff Neighbourhood">
-      <%= task.dropoff_location.neighborhood.name %>
+      <%= Locations.neighborhood(task.dropoff_location) %>
     </:col>
     <:col :let={task} label="Notes"><%= task.delivery_status_notes %>
       <.truncated_riders_notes note={task.rider_notes || "--"} /></:col>