use strict context boundaries and remove all n+1 queries

lib/cannery_web/components/container_table_component.ex

@@ -3,7 +3,7 @@ defmodule CanneryWeb.Components.ContainerTableComponent do
   A component that displays a list of containers
   """
   use CanneryWeb, :live_component
-  alias Cannery.{Accounts.User, Containers, Containers.Container, Repo}
+  alias Cannery.{Accounts.User, Ammo, Containers.Container}
   alias Ecto.UUID
   alias Phoenix.LiveView.{Rendered, Socket}
 
@@ -45,11 +45,7 @@ defmodule CanneryWeb.Components.ContainerTableComponent do
         %{label: gettext("Name"), key: :name, type: :string},
         %{label: gettext("Description"), key: :desc, type: :string},
         %{label: gettext("Location"), key: :location, type: :string},
-        %{label: gettext("Type"), key: :type, type: :string},
-        %{label: gettext("Packs"), key: :packs, type: :integer},
-        %{label: gettext("Rounds"), key: :rounds, type: :string},
-        %{label: gettext("Tags"), key: :tags, type: :tags},
-        %{label: nil, key: :actions, sortable: false, type: :actions}
+        %{label: gettext("Type"), key: :type, type: :string}
       ]
       |> Enum.filter(fn %{key: key, type: type} ->
         # remove columns if all values match defaults
@@ -64,11 +60,19 @@ defmodule CanneryWeb.Components.ContainerTableComponent do
           type in [:tags, :actions] or not (container |> Map.get(key) == default_value)
         end)
       end)
+      |> Enum.concat([
+        %{label: gettext("Packs"), key: :packs, type: :integer},
+        %{label: gettext("Rounds"), key: :rounds, type: :integer},
+        %{label: gettext("Tags"), key: :tags, type: :tags},
+        %{label: nil, key: :actions, sortable: false, type: :actions}
+      ])
 
     extra_data = %{
       current_user: current_user,
       tag_actions: tag_actions,
-      actions: actions
+      actions: actions,
+      pack_count: Ammo.get_ammo_groups_count_for_containers(containers, current_user),
+      round_count: Ammo.get_round_count_for_containers(containers, current_user)
     }
 
     rows =
@@ -100,8 +104,6 @@ defmodule CanneryWeb.Components.ContainerTableComponent do
 
   @spec get_row_data_for_container(Container.t(), columns :: [map()], extra_data :: map) :: map()
   defp get_row_data_for_container(container, columns, extra_data) do
-    container = container |> Repo.preload([:ammo_groups, :tags])
-
     columns
     |> Map.new(fn %{key: key} -> {key, get_value_for_key(key, container, extra_data)} end)
   end
@@ -120,18 +122,24 @@ defmodule CanneryWeb.Components.ContainerTableComponent do
      """}
   end
 
-  defp get_value_for_key(:packs, container, _extra_data) do
-    container |> Containers.get_container_ammo_group_count!()
+  defp get_value_for_key(:packs, %{id: container_id}, %{pack_count: pack_count}) do
+    pack_count |> Map.get(container_id, 0)
   end
 
-  defp get_value_for_key(:rounds, container, _extra_data) do
-    container |> Containers.get_container_rounds!()
+  defp get_value_for_key(:rounds, %{id: container_id}, %{round_count: round_count}) do
+    round_count |> Map.get(container_id, 0)
   end
 
   defp get_value_for_key(:tags, container, %{tag_actions: tag_actions}) do
     assigns = %{tag_actions: tag_actions, container: container}
 
-    {container.tags |> Enum.map(fn %{name: name} -> name end),
+    tag_names =
+      container.tags
+      |> Enum.map(fn %{name: name} -> name end)
+      |> Enum.sort()
+      |> Enum.join(" ")
+
+    {tag_names,
      ~H"""
      <div class="flex flex-wrap justify-center items-center">
        <.simple_tag_card :for={tag <- @container.tags} :if={@container.tags} tag={tag} />