improve containers context

lib/cannery/containers.ex

@@ -44,17 +44,18 @@ defmodule Cannery.Containers do
 
   ## Examples
 
-      iex> create_container(%{field: value})
+      iex> create_container(%{field: value}, user)
       {:ok, %Container{}}
 
-      iex> create_container(%{field: bad_value})
+      iex> create_container(%{field: bad_value}, user)
       {:error, %Changeset{}}
 
   """
-  @spec create_container(attrs :: map()) ::
+  @spec create_container(attrs :: map(), User.t()) ::
           {:ok, Container.t()} | {:error, Changeset.t(Container.new_container())}
-  def create_container(attrs) do
-    %Container{} |> Container.changeset(attrs) |> Repo.insert()
+  def create_container(attrs, %User{id: user_id}) do
+    attrs = attrs |> Map.put("user_id", user_id)
+    %Container{} |> Container.create_changeset(attrs) |> Repo.insert()
   end
 
   @doc """
@@ -62,17 +63,17 @@ defmodule Cannery.Containers do
 
   ## Examples
 
-      iex> update_container(container, %{field: new_value})
+      iex> update_container(container, user, %{field: new_value})
       {:ok, %Container{}}
 
-      iex> update_container(container, %{field: bad_value})
+      iex> update_container(container, user, %{field: bad_value})
       {:error, %Changeset{}}
 
   """
-  @spec update_container(Container.t(), attrs :: map()) ::
+  @spec update_container(Container.t(), User.t(), attrs :: map()) ::
           {:ok, Container.t()} | {:error, Changeset.t(Container.t())}
-  def update_container(container, attrs) do
-    container |> Container.changeset(attrs) |> Repo.update()
+  def update_container(%Container{user_id: user_id} = container, %User{id: user_id}, attrs) do
+    container |> Container.update_changeset(attrs) |> Repo.update()
   end
 
   @doc """
@@ -80,16 +81,16 @@ defmodule Cannery.Containers do
 
   ## Examples
 
-      iex> delete_container(container)
+      iex> delete_container(container, user)
       {:ok, %Container{}}
 
-      iex> delete_container(container)
+      iex> delete_container(container, user)
       {:error, %Changeset{}}
 
   """
-  @spec delete_container(Container.t()) ::
+  @spec delete_container(Container.t(), User.t()) ::
           {:ok, Container.t()} | {:error, Changeset.t(Container.t())}
-  def delete_container(container) do
+  def delete_container(%Container{user_id: user_id} = container, %User{id: user_id}) do
     Repo.one(
       from ag in AmmoGroup,
         where: ag.container_id == ^container.id,
@@ -125,13 +126,13 @@ defmodule Cannery.Containers do
 
   ## Examples
 
-      iex> delete_container(container)
+      iex> delete_container(container, user)
       %Container{}
 
   """
-  @spec delete_container!(Container.t()) :: Container.t()
-  def delete_container!(container) do
-    {:ok, container} = container |> delete_container()
+  @spec delete_container!(Container.t(), User.t()) :: Container.t()
+  def delete_container!(container, user) do
+    {:ok, container} = container |> delete_container(user)
     container
   end
 
@@ -151,7 +152,8 @@ defmodule Cannery.Containers do
           Changeset.t(Container.t() | Container.new_container())
   @spec change_container(Container.t() | Container.new_container(), attrs :: map()) ::
           Changeset.t(Container.t() | Container.new_container())
-  def change_container(container, attrs \\ %{}), do: container |> Container.changeset(attrs)
+  def change_container(container, attrs \\ %{}),
+    do: container |> Container.update_changeset(attrs)
 
   @doc """
   Adds a tag to a container

lib/cannery/containers/container.ex

@@ -39,10 +39,20 @@ defmodule Cannery.Containers.Container do
   @type id :: UUID.t()
 
   @doc false
-  @spec changeset(t() | new_container(), attrs :: map()) :: Changeset.t(t() | new_container())
-  def changeset(container, attrs) do
+  @spec create_changeset(t() | new_container(), attrs :: map()) ::
+          Changeset.t(t() | new_container())
+  def create_changeset(container, attrs) do
     container
     |> cast(attrs, [:name, :desc, :type, :location, :user_id])
     |> validate_required([:name, :type, :user_id])
   end
+
+  @doc false
+  @spec update_changeset(t() | new_container(), attrs :: map()) ::
+          Changeset.t(t() | new_container())
+  def update_changeset(container, attrs) do
+    container
+    |> cast(attrs, [:name, :desc, :type, :location])
+    |> validate_required([:name, :type])
+  end
 end

lib/cannery_web/live/container_live/form_component.ex

@@ -22,7 +22,6 @@ defmodule CanneryWeb.ContainerLive.FormComponent do
   end
 
   def handle_event("save", %{"container" => container_params}, socket) do
-    container_params = container_params |> Map.put("user_id", socket.assigns.current_user.id)
     save_container(socket, socket.assigns.action, container_params)
   end
 
@@ -88,7 +87,12 @@ defmodule CanneryWeb.ContainerLive.FormComponent do
   end
 
   defp save_container(socket, :edit, container_params) do
-    case Containers.update_container(socket.assigns.container, container_params) do
+    Containers.update_container(
+      socket.assigns.container,
+      socket.assigns.current_user,
+      container_params
+    )
+    |> case do
       {:ok, _container} ->
         {:noreply,
          socket
@@ -101,7 +105,9 @@ defmodule CanneryWeb.ContainerLive.FormComponent do
   end
 
   defp save_container(socket, :new, container_params) do
-    case Containers.create_container(container_params) do
+    container_params
+    |> Containers.create_container(socket.assigns.current_user)
+    |> case do
       {:ok, _container} ->
         {:noreply,
          socket

lib/cannery_web/live/container_live/index.ex

@@ -46,7 +46,7 @@ defmodule CanneryWeb.ContainerLive.Index do
 
         container ->
           container
-          |> Containers.delete_container()
+          |> Containers.delete_container(socket.assigns.current_user)
           |> case do
             {:ok, container} ->
               socket

lib/cannery_web/live/container_live/show.ex

@@ -28,7 +28,7 @@ defmodule CanneryWeb.ContainerLive.Show do
   def handle_event("delete", _, socket) do
     socket =
       socket.assigns.container
-      |> Containers.delete_container()
+      |> Containers.delete_container(socket.assigns.current_user)
       |> case do
         {:ok, container} ->
           socket