shibao/cannery
shibao/cannery
1
2
Fork 1
Code Issues 16 Pull Requests Projects 1 Releases 36 Wiki Activity

harden tags context

Browse Source
This commit is contained in:
shibao 2022-02-09 23:21:42 -05:00
parent 462fd2882b
commit aa17240c83
8 changed files with 96 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
lib/cannery/tags.ex
View File

@ -12,13 +12,12 @@ defmodule Cannery.Tags do
## Examples ## Examples
iex> list_tags() iex> list_tags(%User{id: 123})
[%Tag{}, ...] [%Tag{}, ...]
""" """
@spec list_tags(User.t() | User.id()) :: [Tag.t()] @spec list_tags(User.t()) :: [Tag.t()]
def list_tags(%{id: user_id}), do: list_tags(user_id) def list_tags(%{id: user_id}), do: Repo.all(from t in Tag, where: t.user_id == ^user_id)
def list_tags(user_id), do: Repo.all(from t in Tag, where: t.user_id == ^user_id)
@doc """ @doc """
Gets a single tag. Gets a single tag.
@ -27,72 +26,77 @@ defmodule Cannery.Tags do
## Examples ## Examples
iex> get_tag!(123) iex> get_tag!(123, %User{id: 123})
%Tag{} %Tag{}
iex> get_tag!(456) iex> get_tag!(456, %User{id: 123})
** (Ecto.NoResultsError) ** (Ecto.NoResultsError)
""" """
@spec get_tag!(Tag.id()) :: Tag.t() @spec get_tag!(Tag.id(), User.t()) :: Tag.t()
def get_tag!(id), do: Repo.get!(Tag, id) def get_tag!(id, %User{id: user_id}),
do: Repo.one!(from t in Tag, where: t.id == ^id and t.user_id == ^user_id)
@doc """ @doc """
Creates a tag. Creates a tag.
## Examples ## Examples
iex> create_tag(%{field: value}) iex> create_tag(%{field: value}, %User{id: 123})
{:ok, %Tag{}} {:ok, %Tag{}}
iex> create_tag(%{field: bad_value}) iex> create_tag(%{field: bad_value}, %User{id: 123})
{:error, %Changeset{}} {:error, %Changeset{}}
""" """
@spec create_tag(attrs :: map()) :: {:ok, Tag.t()} | {:error, Changeset.t(Tag.new_tag())} @spec create_tag(attrs :: map(), User.t()) ::
def create_tag(attrs), do: %Tag{} |> Tag.changeset(attrs) |> Repo.insert() {:ok, Tag.t()} | {:error, Changeset.t(Tag.new_tag())}
def create_tag(attrs, %User{id: user_id}),
do: %Tag{} |> Tag.create_changeset(attrs |> Map.put("user_id", user_id)) |> Repo.insert()
@doc """ @doc """
Updates a tag. Updates a tag.
## Examples ## Examples
iex> update_tag(tag, %{field: new_value}) iex> update_tag(tag, %{field: new_value}, %User{id: 123})
{:ok, %Tag{}} {:ok, %Tag{}}
iex> update_tag(tag, %{field: bad_value}) iex> update_tag(tag, %{field: bad_value}, %User{id: 123})
{:error, %Changeset{}} {:error, %Changeset{}}
""" """
@spec update_tag(Tag.t(), attrs :: map()) :: {:ok, Tag.t()} | {:error, Changeset.t(Tag.t())} @spec update_tag(Tag.t(), attrs :: map(), User.t()) ::
def update_tag(tag, attrs), do: tag |> Tag.changeset(attrs) |> Repo.update() {:ok, Tag.t()} | {:error, Changeset.t(Tag.t())}
def update_tag(%Tag{user_id: user_id} = tag, attrs, %User{id: user_id}),
do: tag |> Tag.update_changeset(attrs) |> Repo.update()
@doc """ @doc """
Deletes a tag. Deletes a tag.
## Examples ## Examples
iex> delete_tag(tag) iex> delete_tag(tag, %User{id: 123})
{:ok, %Tag{}} {:ok, %Tag{}}
iex> delete_tag(tag) iex> delete_tag(tag, %User{id: 123})
{:error, %Changeset{}} {:error, %Changeset{}}
""" """
@spec delete_tag(Tag.t()) :: {:ok, Tag.t()} | {:error, Changeset.t(Tag.t())} @spec delete_tag(Tag.t(), User.t()) :: {:ok, Tag.t()} | {:error, Changeset.t(Tag.t())}
def delete_tag(tag), do: tag |> Repo.delete() def delete_tag(%Tag{user_id: user_id} = tag, %User{id: user_id}), do: tag |> Repo.delete()
@doc """ @doc """
Deletes a tag. Deletes a tag.
## Examples ## Examples
iex> delete_tag!(tag) iex> delete_tag!(tag, %User{id: 123})
%Tag{} %Tag{}
""" """
@spec delete_tag!(Tag.t()) :: Tag.t() @spec delete_tag!(Tag.t(), User.t()) :: Tag.t()
def delete_tag!(tag), do: tag |> Repo.delete!() def delete_tag!(%Tag{user_id: user_id} = tag, %User{id: user_id}), do: tag |> Repo.delete!()
@doc """ @doc """
Returns an `%Changeset{}` for tracking tag changes. Returns an `%Changeset{}` for tracking tag changes.
@ -106,7 +110,7 @@ defmodule Cannery.Tags do
@spec change_tag(Tag.t() | Tag.new_tag()) :: Changeset.t(Tag.t() | Tag.new_tag()) @spec change_tag(Tag.t() | Tag.new_tag()) :: Changeset.t(Tag.t() | Tag.new_tag())
@spec change_tag(Tag.t() | Tag.new_tag(), attrs :: map()) :: @spec change_tag(Tag.t() | Tag.new_tag(), attrs :: map()) ::
Changeset.t(Tag.t() | Tag.new_tag()) Changeset.t(Tag.t() | Tag.new_tag())
def change_tag(tag, attrs \\ %{}), do: Tag.changeset(tag, attrs) def change_tag(tag, attrs \\ %{}), do: Tag.update_changeset(tag, attrs)
@doc """ @doc """
Get a random tag bg_color in `#ffffff` hex format Get a random tag bg_color in `#ffffff` hex format

14
lib/cannery/tags/tag.ex
View File

@ -26,7 +26,7 @@ defmodule Cannery.Tags.Tag do
name: String.t(), name: String.t(),
bg_color: String.t(), bg_color: String.t(),
text_color: String.t(), text_color: String.t(),
user: User.t(), user: User.t() | nil,
user_id: User.id(), user_id: User.id(),
inserted_at: NaiveDateTime.t(), inserted_at: NaiveDateTime.t(),
updated_at: NaiveDateTime.t() updated_at: NaiveDateTime.t()
@ -35,10 +35,18 @@ defmodule Cannery.Tags.Tag do
@type id() :: UUID.t() @type id() :: UUID.t()
@doc false @doc false
@spec changeset(t() | new_tag(), attrs :: map()) :: Changeset.t(t() | new_tag()) @spec create_changeset(t() | new_tag(), attrs :: map()) :: Changeset.t(t() | new_tag())
def changeset(tag, attrs) do def create_changeset(tag, attrs) do
tag tag
|> cast(attrs, [:name, :bg_color, :text_color, :user_id]) |> cast(attrs, [:name, :bg_color, :text_color, :user_id])
|> validate_required([:name, :bg_color, :text_color, :user_id]) |> validate_required([:name, :bg_color, :text_color, :user_id])
end end
@doc false
@spec update_changeset(t() | new_tag(), attrs :: map()) :: Changeset.t(t() | new_tag())
def update_changeset(tag, attrs) do
tag
|> cast(attrs, [:name, :bg_color, :text_color])
|> validate_required([:name, :bg_color, :text_color, :user_id])
end
end end

4
lib/cannery_web/live/live_helpers.ex
View File

@ -29,9 +29,7 @@ defmodule CanneryWeb.LiveHelpers do
def assign_defaults(socket, %{"user_token" => user_token} = _session) do def assign_defaults(socket, %{"user_token" => user_token} = _session) do
socket socket
|> assign_new(:current_user, fn -> |> assign_new(:current_user, fn -> Accounts.get_user_by_session_token(user_token) end)
Accounts.get_user_by_session_token(user_token)
end)
end end
def assign_defaults(socket, _session) do def assign_defaults(socket, _session) do

73
lib/cannery_web/live/tag_live/form_component.ex
View File

@ -4,29 +4,21 @@ defmodule CanneryWeb.TagLive.FormComponent do
""" """
use CanneryWeb, :live_component use CanneryWeb, :live_component
alias Cannery.Tags alias Cannery.Tags
alias Ecto.Changeset alias Ecto.Changeset
@impl true @impl true
def update(%{tag: tag} = assigns, socket) do def update(%{tag: tag} = assigns, socket) do
changeset = Tags.change_tag(tag) {:ok, socket |> assign(assigns) |> assign(:changeset, Tags.change_tag(tag))}
{:ok,
socket
|> assign(assigns)
|> assign(:changeset, changeset)}
end end
@impl true @impl true
def handle_event("validate", %{"tag" => tag_params}, socket) do def handle_event("validate", %{"tag" => tag_params}, %{assigns: %{tag: tag}} = socket) do
tag_params = tag_params |> Map.put("user_id", socket.assigns.current_user.id) {:noreply, socket |> assign(:changeset, tag |> Tags.change_tag(tag_params))}
changeset = socket.assigns.tag |> Tags.change_tag(tag_params)
{:noreply, socket |> assign(:changeset, changeset)}
end end
def handle_event("save", %{"tag" => tag_params}, socket) do def handle_event("save", %{"tag" => tag_params}, %{assigns: %{action: action}} = socket) do
save_tag(socket, socket.assigns.action, tag_params) save_tag(socket, action, tag_params)
end end
@impl true @impl true
@ -76,32 +68,39 @@ defmodule CanneryWeb.TagLive.FormComponent do
""" """
end end
defp save_tag(socket, :edit, tag_params) do defp save_tag(
case Tags.update_tag(socket.assigns.tag, tag_params) do %{assigns: %{tag: tag, current_user: current_user, return_to: return_to}} = socket,
{:ok, _tag} -> :edit,
{:noreply,
socket
|> put_flash(:info, dgettext("prompts", "Tag updated successfully"))
|> push_redirect(to: socket.assigns.return_to)}
{:error, %Changeset{} = changeset} ->
{:noreply, socket |> assign(:changeset, changeset)}
end
end
defp save_tag(socket, :new, tag_params) do
tag_params tag_params
|> Map.put("user_id", socket.assigns.current_user.id) ) do
|> Tags.create_tag() socket =
|> case do case Tags.update_tag(tag, tag_params, current_user) do
{:ok, _tag} -> {:ok, %{name: tag_name}} ->
{:noreply, prompt = dgettext("prompts", "%{name} updated successfully", name: tag_name)
socket socket |> put_flash(:info, prompt) |> push_redirect(to: return_to)
|> put_flash(:info, dgettext("prompts", "Tag created successfully"))
|> push_redirect(to: socket.assigns.return_to)}
{:error, %Changeset{} = changeset} -> {:error, %Changeset{} = changeset} ->
{:noreply, socket |> assign(changeset: changeset)} socket |> assign(:changeset, changeset)
end end
{:noreply, socket}
end
defp save_tag(
%{assigns: %{current_user: current_user, return_to: return_to}} = socket,
:new,
tag_params
) do
socket =
case Tags.create_tag(tag_params, current_user) do
{:ok, %{name: tag_name}} ->
prompt = dgettext("prompts", "%{name} created successfully", name: tag_name)
socket |> put_flash(:info, prompt) |> push_redirect(to: return_to)
{:error, %Changeset{} = changeset} ->
socket |> assign(changeset: changeset)
end
{:noreply, socket}
end end
end end

28
lib/cannery_web/live/tag_live/index.ex
View File

@ -14,14 +14,14 @@ defmodule CanneryWeb.TagLive.Index do
end end
@impl true @impl true
def handle_params(params, _url, socket) do def handle_params(params, _url, %{assigns: %{live_action: live_action}} = socket) do
{:noreply, apply_action(socket, socket.assigns.live_action, params)} {:noreply, apply_action(socket, live_action, params)}
end end
defp apply_action(socket, :edit, %{"id" => id}) do defp apply_action(%{assigns: %{current_user: current_user}} = socket, :edit, %{"id" => id}) do
socket socket
|> assign(:page_title, gettext("Edit Tag")) |> assign(:page_title, gettext("Edit Tag"))
|> assign(:tag, Tags.get_tag!(id)) |> assign(:tag, Tags.get_tag!(id, current_user))
end end
defp apply_action(socket, :new, _params) do defp apply_action(socket, :new, _params) do
@ -31,21 +31,19 @@ defmodule CanneryWeb.TagLive.Index do
end end
defp apply_action(socket, :index, _params) do defp apply_action(socket, :index, _params) do
socket socket |> assign(:page_title, gettext("Listing Tags")) |> assign(:tag, nil)
|> assign(:page_title, gettext("Listing Tags"))
|> assign(:tag, nil)
end end
@impl true @impl true
def handle_event("delete", %{"id" => id}, socket) do def handle_event("delete", %{"id" => id}, %{assigns: %{current_user: current_user}} = socket) do
tag = Tags.get_tag!(id) %{name: tag_name} = Tags.get_tag!(id, current_user) |> Tags.delete_tag!(current_user)
{:ok, _} = Tags.delete_tag(tag)
socket = socket |> put_flash(:info, dgettext("prompts", "Tag deleted succesfully")) prompt = dgettext("prompts", "%{name} deleted succesfully", name: tag_name)
{:noreply, socket |> display_tags()}
{:noreply, socket |> put_flash(:info, prompt) |> display_tags()}
end end
defp display_tags(socket) do defp display_tags(%{assigns: %{current_user: current_user}} = socket) do
tags = Tags.list_tags(socket.assigns.current_user) socket |> assign(tags: Tags.list_tags(current_user))
socket |> assign(tags: tags)
end end
end end

2
priv/gettext/actions.pot
View File

@ -95,7 +95,7 @@ msgstr ""
#: lib/cannery_web/live/ammo_type_live/form_component.ex:155 #: lib/cannery_web/live/ammo_type_live/form_component.ex:155
#: lib/cannery_web/live/container_live/form_component.ex:79 #: lib/cannery_web/live/container_live/form_component.ex:79
#: lib/cannery_web/live/invite_live/form_component.ex:61 #: lib/cannery_web/live/invite_live/form_component.ex:61
#: lib/cannery_web/live/tag_live/form_component.ex:70 #: lib/cannery_web/live/tag_live/form_component.ex:69
msgid "Save" msgid "Save"
msgstr "" msgstr ""

6
priv/gettext/default.pot
View File

@ -305,7 +305,7 @@ msgstr ""
#: lib/cannery_web/live/ammo_type_live/index.html.heex:26 #: lib/cannery_web/live/ammo_type_live/index.html.heex:26
#: lib/cannery_web/live/container_live/form_component.ex:49 #: lib/cannery_web/live/container_live/form_component.ex:49
#: lib/cannery_web/live/invite_live/form_component.ex:53 #: lib/cannery_web/live/invite_live/form_component.ex:53
#: lib/cannery_web/live/tag_live/form_component.ex:54 #: lib/cannery_web/live/tag_live/form_component.ex:53
msgid "Name" msgid "Name"
msgstr "" msgstr ""
@ -451,7 +451,7 @@ msgid "Type:"
msgstr "" msgstr ""
#, elixir-format, ex-autogen #, elixir-format, ex-autogen
#: lib/cannery_web/live/tag_live/form_component.ex:58 #: lib/cannery_web/live/tag_live/form_component.ex:57
msgid "Background color" msgid "Background color"
msgstr "" msgstr ""
@ -523,7 +523,7 @@ msgid "Tags can be added to your containers to help you organize"
msgstr "" msgstr ""
#, elixir-format, ex-autogen #, elixir-format, ex-autogen
#: lib/cannery_web/live/tag_live/form_component.ex:64 #: lib/cannery_web/live/tag_live/form_component.ex:63
msgid "Text color" msgid "Text color"
msgstr "" msgstr ""

8
priv/gettext/prompts.pot
View File

@ -98,7 +98,7 @@ msgstr ""
#: lib/cannery_web/live/ammo_type_live/form_component.ex:156 #: lib/cannery_web/live/ammo_type_live/form_component.ex:156
#: lib/cannery_web/live/container_live/form_component.ex:81 #: lib/cannery_web/live/container_live/form_component.ex:81
#: lib/cannery_web/live/invite_live/form_component.ex:63 #: lib/cannery_web/live/invite_live/form_component.ex:63
#: lib/cannery_web/live/tag_live/form_component.ex:72 #: lib/cannery_web/live/tag_live/form_component.ex:71
msgid "Saving..." msgid "Saving..."
msgstr "" msgstr ""
@ -152,16 +152,16 @@ msgid "Invite updated successfully"
msgstr "" msgstr ""
#, elixir-format, ex-autogen #, elixir-format, ex-autogen
#: lib/cannery_web/live/tag_live/form_component.ex:100 #: lib/cannery_web/live/tag_live/form_component.ex:98
msgid "Tag created successfully" msgid "Tag created successfully"
msgstr "" msgstr ""
#, elixir-format, ex-autogen #, elixir-format, ex-autogen
#: lib/cannery_web/live/tag_live/index.ex:43 #: lib/cannery_web/live/tag_live/index.ex:45
msgid "Tag deleted succesfully" msgid "Tag deleted succesfully"
msgstr "" msgstr ""
#, elixir-format, ex-autogen #, elixir-format, ex-autogen
#: lib/cannery_web/live/tag_live/form_component.ex:84 #: lib/cannery_web/live/tag_live/form_component.ex:83
msgid "Tag updated successfully" msgid "Tag updated successfully"
msgstr "" msgstr ""