mirror of
https://github.com/TheRealOwenRees/chess-endgame-trainer.git
synced 2026-11-18 11:42:07 +00:00
Add multi-theme tagging to endgames in the admin
#11: endgames can carry multiple themes (endgame tags) chosen from a searchable, autocompleting picker with inline creation. Tags are staged in the form and saved atomically, so they work on both New and Edit. Tag names are trimmed and case-insensitively unique per category. Admin Show and Index display themes, and the seeds ship a starter vocabulary. The theme picker has its own form: LiveView requires phx-change inputs to live inside a form, and a separate theme form keeps Enter from submitting the endgame form.
This commit is contained in:
@@ -19,6 +19,11 @@ _Avoid_: Endgame (the stored record), exercise
|
|||||||
One playthrough of a puzzle by a user, ending solved or failed.
|
One playthrough of a puzzle by a user, ending solved or failed.
|
||||||
_Avoid_: Run, session, game
|
_Avoid_: Run, session, game
|
||||||
|
|
||||||
|
**Theme**:
|
||||||
|
A label describing an endgame's technique or goal, such as "mate in 2", "Lucena" or
|
||||||
|
"opposition"; an endgame can carry several.
|
||||||
|
_Avoid_: Tag, label, category
|
||||||
|
|
||||||
## Play
|
## Play
|
||||||
|
|
||||||
**Winning side**:
|
**Winning side**:
|
||||||
|
|||||||
@@ -49,9 +49,10 @@ defmodule Chesstrainer.Endgames do
|
|||||||
{:error, %Ecto.Changeset{}}
|
{:error, %Ecto.Changeset{}}
|
||||||
|
|
||||||
"""
|
"""
|
||||||
def create_endgame(attrs) do
|
def create_endgame(attrs, tags \\ []) do
|
||||||
%Endgame{}
|
%Endgame{}
|
||||||
|> Endgame.changeset(attrs)
|
|> Endgame.changeset(attrs)
|
||||||
|
|> Ecto.Changeset.put_assoc(:tags, tags)
|
||||||
|> Repo.insert()
|
|> Repo.insert()
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -67,12 +68,14 @@ defmodule Chesstrainer.Endgames do
|
|||||||
{:error, %Ecto.Changeset{}}
|
{:error, %Ecto.Changeset{}}
|
||||||
|
|
||||||
"""
|
"""
|
||||||
def update_endgame(%Endgame{} = endgame, attrs) do
|
def update_endgame(%Endgame{} = endgame, attrs, tags \\ []) do
|
||||||
# ignore fen on update
|
# ignore fen on update
|
||||||
attrs = Map.delete(attrs, "fen")
|
attrs = Map.delete(attrs, "fen")
|
||||||
|
|
||||||
endgame
|
endgame
|
||||||
|
|> Repo.preload(:tags)
|
||||||
|> Endgame.changeset(attrs)
|
|> Endgame.changeset(attrs)
|
||||||
|
|> Ecto.Changeset.put_assoc(:tags, tags)
|
||||||
|> Repo.update()
|
|> Repo.update()
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -120,20 +123,4 @@ defmodule Chesstrainer.Endgames do
|
|||||||
|
|
||||||
{:ok, Repo.get!(Endgame, id)}
|
{:ok, Repo.get!(Endgame, id)}
|
||||||
end
|
end
|
||||||
|
|
||||||
def add_tag(endgame, tag) do
|
|
||||||
endgame
|
|
||||||
|> Repo.preload(:tags)
|
|
||||||
|> Ecto.Changeset.change()
|
|
||||||
|> Ecto.Changeset.put_assoc(:tags, [tag | endgame.tags])
|
|
||||||
|> Repo.update()
|
|
||||||
end
|
|
||||||
|
|
||||||
def remove_tag(endgame, tag) do
|
|
||||||
endgame
|
|
||||||
|> Repo.preload(:tags)
|
|
||||||
|> Ecto.Changeset.change()
|
|
||||||
|> Ecto.Changeset.put_assoc(:tags, endgame.tags -- [tag])
|
|
||||||
|> Repo.update()
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
+44
-11
@@ -105,19 +105,52 @@ defmodule Chesstrainer.Tags do
|
|||||||
def search("", _category), do: []
|
def search("", _category), do: []
|
||||||
|
|
||||||
def search(query, category) when is_binary(query) do
|
def search(query, category) when is_binary(query) do
|
||||||
pattern = "%#{query}%"
|
case String.trim(query) do
|
||||||
|
"" ->
|
||||||
|
[]
|
||||||
|
|
||||||
Tag
|
query ->
|
||||||
|> where([t], ilike(t.name, ^pattern) and t.category == ^category)
|
pattern = "%#{query}%"
|
||||||
|> order_by([t], asc: t.name)
|
|
||||||
|> limit(20)
|
|
||||||
|> Repo.all()
|
|
||||||
end
|
|
||||||
|
|
||||||
def get_or_create(name, category) when is_binary(name) do
|
Tag
|
||||||
case Repo.get_by(Tag, name: name, category: category) do
|
|> where([t], ilike(t.name, ^pattern) and t.category == ^category)
|
||||||
nil -> create_tag(%{name: name, category: category})
|
|> order_by([t], asc: t.name)
|
||||||
tag -> {:ok, tag}
|
|> limit(20)
|
||||||
|
|> Repo.all()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@doc """
|
||||||
|
Finds a tag by name (trimmed and case-insensitive) for a category, creating it
|
||||||
|
if it does not exist.
|
||||||
|
"""
|
||||||
|
def get_or_create(name, category) when is_binary(name) do
|
||||||
|
name = String.trim(name)
|
||||||
|
|
||||||
|
if name == "" do
|
||||||
|
{:error, :blank_name}
|
||||||
|
else
|
||||||
|
case find_by_name(name, category) do
|
||||||
|
nil -> create_tag(%{name: name, category: category})
|
||||||
|
tag -> {:ok, tag}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
defp find_by_name(name, category) do
|
||||||
|
downcased = String.downcase(name)
|
||||||
|
|
||||||
|
Repo.one(
|
||||||
|
from t in Tag,
|
||||||
|
where: t.category == ^category and fragment("lower(?)", t.name) == ^downcased,
|
||||||
|
limit: 1
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
@doc """
|
||||||
|
Returns the names of the given tags, sorted.
|
||||||
|
"""
|
||||||
|
def names(tags) when is_list(tags) do
|
||||||
|
tags |> Enum.map(& &1.name) |> Enum.sort()
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -13,7 +13,12 @@ defmodule Chesstrainer.Tags.Tag do
|
|||||||
def changeset(tag, attrs) do
|
def changeset(tag, attrs) do
|
||||||
tag
|
tag
|
||||||
|> cast(attrs, [:name, :category])
|
|> cast(attrs, [:name, :category])
|
||||||
|
|> update_change(:name, fn
|
||||||
|
name when is_binary(name) -> String.trim(name)
|
||||||
|
name -> name
|
||||||
|
end)
|
||||||
|> validate_required([:name, :category])
|
|> validate_required([:name, :category])
|
||||||
|> unique_constraint(:name)
|
|> validate_length(:name, min: 1, max: 60)
|
||||||
|
|> unique_constraint(:name, name: :tags_name_category_lower_index, message: "already exists")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -16,51 +16,65 @@ defmodule ChesstrainerWeb.EndgameLive.Form do
|
|||||||
<:subtitle>Use this form to manage endgame records in your database.</:subtitle>
|
<:subtitle>Use this form to manage endgame records in your database.</:subtitle>
|
||||||
</.header>
|
</.header>
|
||||||
|
|
||||||
|
<div class="field mb-6">
|
||||||
|
<label class="label">
|
||||||
|
<span class="label-text">Themes</span>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<div class="flex flex-wrap gap-2 mb-2">
|
||||||
|
<%= for tag <- @selected_tags do %>
|
||||||
|
<span class="badge badge-primary gap-1">
|
||||||
|
{tag.name}
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
phx-click="remove_tag"
|
||||||
|
phx-value-id={tag.id}
|
||||||
|
aria-label={"Remove #{tag.name}"}
|
||||||
|
>
|
||||||
|
×
|
||||||
|
</button>
|
||||||
|
</span>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<form
|
||||||
|
id="theme-form"
|
||||||
|
phx-change="search_tags"
|
||||||
|
phx-submit="create_tag_from_search"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
name="tag_search"
|
||||||
|
value={@tag_query}
|
||||||
|
phx-debounce="200"
|
||||||
|
autocomplete="off"
|
||||||
|
placeholder="Search or create a theme…"
|
||||||
|
class="input input-bordered w-full"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<ul class="menu bg-base-100 rounded-box mt-2">
|
||||||
|
<%= for tag <- @tag_results do %>
|
||||||
|
<li>
|
||||||
|
<button type="button" phx-click="add_tag" phx-value-id={tag.id}>{tag.name}</button>
|
||||||
|
</li>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
|
<%= if @can_create do %>
|
||||||
|
<li>
|
||||||
|
<button type="button" phx-click="create_tag" phx-value-name={@tag_query}>
|
||||||
|
Create theme "{String.trim(@tag_query)}"
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
<% end %>
|
||||||
|
</ul>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
|
||||||
<.form for={@form} id="endgame-form" phx-change="validate" phx-submit="save">
|
<.form for={@form} id="endgame-form" phx-change="validate" phx-submit="save">
|
||||||
<.input field={@form[:fen]} type="text" label="Fen" disabled={@live_action == :edit} />
|
<.input field={@form[:fen]} type="text" label="Fen" disabled={@live_action == :edit} />
|
||||||
<.input field={@form[:color]} type="text" label="Color" disabled />
|
<.input field={@form[:color]} type="text" label="Color" disabled />
|
||||||
<.input field={@form[:key]} type="text" label="Key" />
|
<.input field={@form[:key]} type="text" label="Key" />
|
||||||
<.input field={@form[:rating]} type="number" label="Rating" />
|
<.input field={@form[:rating]} type="number" label="Rating" />
|
||||||
|
|
||||||
<!-- ✅ TAG SELECTOR -->
|
|
||||||
<div class="field">
|
|
||||||
<label>Tags</label>
|
|
||||||
|
|
||||||
<!-- Search box -->
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
name="tag_search"
|
|
||||||
value={@tag_query}
|
|
||||||
phx-change="search_tags"
|
|
||||||
autocomplete="off"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<!-- Search results -->
|
|
||||||
<ul class="tag-results">
|
|
||||||
<%= for tag <- @tag_results do %>
|
|
||||||
<li phx-click="add_tag" phx-value-id={tag.id}>
|
|
||||||
{tag.name}
|
|
||||||
</li>
|
|
||||||
<% end %>
|
|
||||||
|
|
||||||
<%= if @tag_query != "" and @tag_results == [] do %>
|
|
||||||
<li phx-click="create_tag" phx-value-name={@tag_query}>
|
|
||||||
Create tag "{@tag_query}"
|
|
||||||
</li>
|
|
||||||
<% end %>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<!-- Selected tags -->
|
|
||||||
<div class="selected-tags">
|
|
||||||
<%= for tag <- @endgame.tags do %>
|
|
||||||
<span class="tag">
|
|
||||||
{tag.name}
|
|
||||||
<button type="button" phx-click="remove_tag" phx-value-id={tag.id}>×</button>
|
|
||||||
</span>
|
|
||||||
<% end %>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<.input field={@form[:message]} type="textarea" label="Message" />
|
<.input field={@form[:message]} type="textarea" label="Message" />
|
||||||
<.input field={@form[:notes]} type="textarea" label="Notes" />
|
<.input field={@form[:notes]} type="textarea" label="Notes" />
|
||||||
<.input
|
<.input
|
||||||
@@ -94,14 +108,15 @@ defmodule ChesstrainerWeb.EndgameLive.Form do
|
|||||||
defp return_to(_), do: "index"
|
defp return_to(_), do: "index"
|
||||||
|
|
||||||
defp apply_action(socket, :edit, %{"id" => id}) do
|
defp apply_action(socket, :edit, %{"id" => id}) do
|
||||||
endgame = Endgames.get_endgame!(id)
|
endgame = Endgames.get_endgame!(id) |> Repo.preload(:tags)
|
||||||
|
|
||||||
socket
|
socket
|
||||||
|> assign(:page_title, "Edit Endgame")
|
|> assign(:page_title, "Edit Endgame")
|
||||||
|> assign(:endgame, endgame)
|
|> assign(:endgame, endgame)
|
||||||
|
|> assign(:selected_tags, endgame.tags)
|
||||||
|> assign(:tag_query, "")
|
|> assign(:tag_query, "")
|
||||||
|> assign(:tag_results, [])
|
|> assign(:tag_results, [])
|
||||||
|> assign(:endgame, Repo.preload(endgame, :tags))
|
|> assign(:can_create, false)
|
||||||
|> assign(:form, to_form(Endgames.change_endgame(endgame)))
|
|> assign(:form, to_form(Endgames.change_endgame(endgame)))
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -111,67 +126,46 @@ defmodule ChesstrainerWeb.EndgameLive.Form do
|
|||||||
socket
|
socket
|
||||||
|> assign(:page_title, "New Endgame")
|
|> assign(:page_title, "New Endgame")
|
||||||
|> assign(:endgame, endgame)
|
|> assign(:endgame, endgame)
|
||||||
|
|> assign(:selected_tags, [])
|
||||||
|> assign(:tag_query, "")
|
|> assign(:tag_query, "")
|
||||||
|> assign(:tag_results, [])
|
|> assign(:tag_results, [])
|
||||||
|> assign(:endgame, Repo.preload(endgame, :tags))
|
|> assign(:can_create, false)
|
||||||
|> assign(:form, to_form(Endgames.change_endgame(endgame)))
|
|> assign(:form, to_form(Endgames.change_endgame(endgame)))
|
||||||
end
|
end
|
||||||
|
|
||||||
@impl true
|
@impl true
|
||||||
def handle_event("search_tags", %{"tag_search" => query}, socket) do
|
def handle_event("search_tags", %{"tag_search" => query}, socket) do
|
||||||
tags = Tags.search(query, "endgame")
|
{:noreply, assign_search(socket, query)}
|
||||||
|
|
||||||
{:noreply,
|
|
||||||
socket
|
|
||||||
|> assign(:tag_query, query)
|
|
||||||
|> assign(:tag_results, tags)}
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def handle_event("add_tag", %{"id" => id}, socket) do
|
def handle_event("add_tag", %{"id" => id}, socket) do
|
||||||
tag = Tags.get_tag!(id)
|
tag = Tags.get_tag!(id)
|
||||||
{:ok, endgame} = Endgames.add_tag(socket.assigns.endgame, tag)
|
{:noreply, socket |> add_selected_tag(tag) |> clear_search()}
|
||||||
|
|
||||||
{:noreply,
|
|
||||||
socket
|
|
||||||
|> assign(:endgame, Repo.preload(endgame, :tags))
|
|
||||||
|> assign(:tag_query, "")
|
|
||||||
|> assign(:tag_results, [])}
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def handle_event("create_tag", %{"name" => name}, socket) do
|
def handle_event("create_tag", %{"name" => name}, socket) do
|
||||||
{:ok, tag} = Tags.get_or_create(name, "endgame")
|
{:noreply, create_theme(socket, name)}
|
||||||
{:ok, endgame} = Endgames.add_tag(socket.assigns.endgame, tag)
|
end
|
||||||
|
|
||||||
{:noreply,
|
def handle_event("create_tag_from_search", %{"tag_search" => name}, socket) do
|
||||||
socket
|
{:noreply, create_theme(socket, name)}
|
||||||
|> assign(:endgame, Repo.preload(endgame, :tags))
|
|
||||||
|> assign(:tag_query, "")
|
|
||||||
|> assign(:tag_results, [])}
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def handle_event("remove_tag", %{"id" => id}, socket) do
|
def handle_event("remove_tag", %{"id" => id}, socket) do
|
||||||
tag = Tags.get_tag!(id)
|
selected = Enum.reject(socket.assigns.selected_tags, &(Integer.to_string(&1.id) == id))
|
||||||
{:ok, endgame} = Endgames.remove_tag(socket.assigns.endgame, tag)
|
{:noreply, assign(socket, :selected_tags, selected)}
|
||||||
|
|
||||||
{:noreply,
|
|
||||||
socket
|
|
||||||
|> assign(:endgame, Repo.preload(endgame, :tags))}
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def handle_event("validate", %{"endgame" => endgame_params}, socket) do
|
def handle_event("validate", %{"endgame" => endgame_params}, socket) do
|
||||||
# Compute color from the incoming FEN
|
fen = endgame_params["fen"] || socket.assigns.endgame.fen
|
||||||
color = FEN.color_from_fen(endgame_params["fen"])
|
color = FEN.color_from_fen(fen)
|
||||||
|
|
||||||
# Update the struct
|
|
||||||
endgame = %{socket.assigns.endgame | color: color}
|
|
||||||
|
|
||||||
# Build the changeset *from the updated struct*
|
|
||||||
changeset =
|
changeset =
|
||||||
endgame
|
socket.assigns.endgame
|
||||||
|> Endgames.change_endgame()
|
|> Endgames.change_endgame(endgame_params)
|
||||||
|> Ecto.Changeset.put_change(:color, color)
|
|> Ecto.Changeset.put_change(:color, color)
|
||||||
|
|
||||||
{:noreply, assign(socket, endgame: endgame, form: to_form(changeset, action: :validate))}
|
{:noreply, assign(socket, form: to_form(changeset, action: :validate))}
|
||||||
end
|
end
|
||||||
|
|
||||||
def handle_event("save", %{"endgame" => endgame_params}, socket) do
|
def handle_event("save", %{"endgame" => endgame_params}, socket) do
|
||||||
@@ -179,7 +173,11 @@ defmodule ChesstrainerWeb.EndgameLive.Form do
|
|||||||
end
|
end
|
||||||
|
|
||||||
defp save_endgame(socket, :edit, endgame_params) do
|
defp save_endgame(socket, :edit, endgame_params) do
|
||||||
case Endgames.update_endgame(socket.assigns.endgame, endgame_params) do
|
case Endgames.update_endgame(
|
||||||
|
socket.assigns.endgame,
|
||||||
|
endgame_params,
|
||||||
|
socket.assigns.selected_tags
|
||||||
|
) do
|
||||||
{:ok, endgame} ->
|
{:ok, endgame} ->
|
||||||
{:noreply,
|
{:noreply,
|
||||||
socket
|
socket
|
||||||
@@ -195,7 +193,7 @@ defmodule ChesstrainerWeb.EndgameLive.Form do
|
|||||||
color = FEN.color_from_fen(endgame_params["fen"])
|
color = FEN.color_from_fen(endgame_params["fen"])
|
||||||
params = Map.put(endgame_params, "color", color)
|
params = Map.put(endgame_params, "color", color)
|
||||||
|
|
||||||
case Endgames.create_endgame(params) do
|
case Endgames.create_endgame(params, socket.assigns.selected_tags) do
|
||||||
{:ok, endgame} ->
|
{:ok, endgame} ->
|
||||||
{:noreply,
|
{:noreply,
|
||||||
socket
|
socket
|
||||||
@@ -207,6 +205,46 @@ defmodule ChesstrainerWeb.EndgameLive.Form do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
defp assign_search(socket, query) do
|
||||||
|
trimmed = String.trim(query)
|
||||||
|
results = Tags.search(query, "endgame")
|
||||||
|
|
||||||
|
can_create =
|
||||||
|
trimmed != "" and
|
||||||
|
not Enum.any?(results, &(String.downcase(&1.name) == String.downcase(trimmed)))
|
||||||
|
|
||||||
|
socket
|
||||||
|
|> assign(:tag_query, query)
|
||||||
|
|> assign(:tag_results, results)
|
||||||
|
|> assign(:can_create, can_create)
|
||||||
|
end
|
||||||
|
|
||||||
|
defp create_theme(socket, name) do
|
||||||
|
if String.trim(name) == "" do
|
||||||
|
socket
|
||||||
|
else
|
||||||
|
case Tags.get_or_create(name, "endgame") do
|
||||||
|
{:ok, tag} -> socket |> add_selected_tag(tag) |> clear_search()
|
||||||
|
{:error, _reason} -> put_flash(socket, :error, "Could not create that theme.")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
defp clear_search(socket) do
|
||||||
|
socket
|
||||||
|
|> assign(:tag_query, "")
|
||||||
|
|> assign(:tag_results, [])
|
||||||
|
|> assign(:can_create, false)
|
||||||
|
end
|
||||||
|
|
||||||
|
defp add_selected_tag(socket, tag) do
|
||||||
|
if Enum.any?(socket.assigns.selected_tags, &(&1.id == tag.id)) do
|
||||||
|
socket
|
||||||
|
else
|
||||||
|
assign(socket, :selected_tags, socket.assigns.selected_tags ++ [tag])
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
defp return_path("index", _endgame), do: ~p"/admin/endgames"
|
defp return_path("index", _endgame), do: ~p"/admin/endgames"
|
||||||
defp return_path("show", endgame), do: ~p"/admin/endgames/#{endgame}"
|
defp return_path("show", endgame), do: ~p"/admin/endgames/#{endgame}"
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ defmodule ChesstrainerWeb.EndgameLive.Index do
|
|||||||
use ChesstrainerWeb, :live_view
|
use ChesstrainerWeb, :live_view
|
||||||
|
|
||||||
alias Chesstrainer.Endgames
|
alias Chesstrainer.Endgames
|
||||||
|
alias Chesstrainer.Repo
|
||||||
|
alias Chesstrainer.Tags
|
||||||
|
|
||||||
@impl true
|
@impl true
|
||||||
def render(assigns) do
|
def render(assigns) do
|
||||||
@@ -28,6 +30,9 @@ defmodule ChesstrainerWeb.EndgameLive.Index do
|
|||||||
<:col :let={{_id, endgame}} label="Message">{endgame.message}</:col>
|
<:col :let={{_id, endgame}} label="Message">{endgame.message}</:col>
|
||||||
<:col :let={{_id, endgame}} label="Notes">{endgame.notes}</:col>
|
<:col :let={{_id, endgame}} label="Notes">{endgame.notes}</:col>
|
||||||
<:col :let={{_id, endgame}} label="Result">{endgame.result}</:col>
|
<:col :let={{_id, endgame}} label="Result">{endgame.result}</:col>
|
||||||
|
<:col :let={{_id, endgame}} label="Themes">
|
||||||
|
{Enum.join(Tags.names(endgame.tags), ", ")}
|
||||||
|
</:col>
|
||||||
<:col :let={{_id, endgame}} label="Attempted">{endgame.times_attempted}</:col>
|
<:col :let={{_id, endgame}} label="Attempted">{endgame.times_attempted}</:col>
|
||||||
<:col :let={{_id, endgame}} label="Solved">{endgame.times_solved}</:col>
|
<:col :let={{_id, endgame}} label="Solved">{endgame.times_solved}</:col>
|
||||||
<:action :let={{_id, endgame}}>
|
<:action :let={{_id, endgame}}>
|
||||||
@@ -67,6 +72,6 @@ defmodule ChesstrainerWeb.EndgameLive.Index do
|
|||||||
end
|
end
|
||||||
|
|
||||||
defp list_endgames() do
|
defp list_endgames() do
|
||||||
Endgames.list_endgames()
|
Endgames.list_endgames() |> Repo.preload(:tags)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -3,6 +3,8 @@ defmodule ChesstrainerWeb.EndgameLive.Show do
|
|||||||
|
|
||||||
alias Chesstrainer.Endgames
|
alias Chesstrainer.Endgames
|
||||||
alias Chesstrainer.Game
|
alias Chesstrainer.Game
|
||||||
|
alias Chesstrainer.Repo
|
||||||
|
alias Chesstrainer.Tags
|
||||||
|
|
||||||
import ChesstrainerWeb.Board.BoardComponent
|
import ChesstrainerWeb.Board.BoardComponent
|
||||||
|
|
||||||
@@ -50,6 +52,7 @@ defmodule ChesstrainerWeb.EndgameLive.Show do
|
|||||||
<:item title="Message">{@endgame.message}</:item>
|
<:item title="Message">{@endgame.message}</:item>
|
||||||
<:item title="Notes">{@endgame.notes}</:item>
|
<:item title="Notes">{@endgame.notes}</:item>
|
||||||
<:item title="Result">{@endgame.result}</:item>
|
<:item title="Result">{@endgame.result}</:item>
|
||||||
|
<:item title="Themes">{Enum.join(Tags.names(@endgame.tags), ", ")}</:item>
|
||||||
<:item title="Attempted">{@endgame.times_attempted}</:item>
|
<:item title="Attempted">{@endgame.times_attempted}</:item>
|
||||||
<:item title="Solved">{@endgame.times_solved}</:item>
|
<:item title="Solved">{@endgame.times_solved}</:item>
|
||||||
</.list>
|
</.list>
|
||||||
@@ -62,6 +65,6 @@ defmodule ChesstrainerWeb.EndgameLive.Show do
|
|||||||
{:ok,
|
{:ok,
|
||||||
socket
|
socket
|
||||||
|> assign(:page_title, "Show Endgame")
|
|> assign(:page_title, "Show Endgame")
|
||||||
|> assign(:endgame, Endgames.get_endgame!(id))}
|
|> assign(:endgame, Endgames.get_endgame!(id) |> Repo.preload(:tags))}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
defmodule Chesstrainer.Repo.Migrations.CaseInsensitiveTagNames do
|
||||||
|
use Ecto.Migration
|
||||||
|
|
||||||
|
def up do
|
||||||
|
drop index(:tags, [:name, :category])
|
||||||
|
|
||||||
|
create unique_index(:tags, ["lower(name)", :category], name: :tags_name_category_lower_index)
|
||||||
|
end
|
||||||
|
|
||||||
|
def down do
|
||||||
|
drop index(:tags, ["lower(name)", :category], name: :tags_name_category_lower_index)
|
||||||
|
|
||||||
|
create unique_index(:tags, [:name, :category])
|
||||||
|
end
|
||||||
|
end
|
||||||
+45
-38
@@ -18,48 +18,55 @@ now = DateTime.utc_now() |> DateTime.truncate(:second)
|
|||||||
|
|
||||||
IO.puts("🌱 Seeding basic endgames into DB...")
|
IO.puts("🌱 Seeding basic endgames into DB...")
|
||||||
|
|
||||||
Repo.insert_all(Endgame, [
|
Repo.insert_all(
|
||||||
%{
|
Endgame,
|
||||||
id: Ecto.UUID.generate(),
|
[
|
||||||
fen: "8/8/3k4/8/8/3K1R2/8/8 w - - 0 1",
|
%{
|
||||||
color: :white,
|
id: Ecto.UUID.generate(),
|
||||||
key: "KR v K",
|
fen: "8/8/3k4/8/8/3K1R2/8/8 w - - 0 1",
|
||||||
message: "Rook vs king endgame",
|
color: :white,
|
||||||
notes: "Basic rook endgame",
|
key: "KR v K",
|
||||||
result: :win,
|
message: "Rook vs king endgame",
|
||||||
inserted_at: now,
|
notes: "Basic rook endgame",
|
||||||
updated_at: now
|
result: :win,
|
||||||
},
|
inserted_at: now,
|
||||||
%{
|
updated_at: now
|
||||||
id: Ecto.UUID.generate(),
|
},
|
||||||
fen: "6k1/5p2/6p1/8/7p/8/6PP/6K1 b - - 0 1",
|
%{
|
||||||
color: :black,
|
id: Ecto.UUID.generate(),
|
||||||
key: "KPPP v KPP",
|
fen: "6k1/5p2/6p1/8/7p/8/6PP/6K1 b - - 0 1",
|
||||||
message: "3 pawns vs 2 pawns",
|
color: :black,
|
||||||
notes: "https://www.chessgames.com/perl/chessgame?gid=1017147",
|
key: "KPPP v KPP",
|
||||||
result: :win,
|
message: "3 pawns vs 2 pawns",
|
||||||
inserted_at: now,
|
notes: "https://www.chessgames.com/perl/chessgame?gid=1017147",
|
||||||
updated_at: now
|
result: :win,
|
||||||
}
|
inserted_at: now,
|
||||||
])
|
updated_at: now
|
||||||
|
}
|
||||||
|
],
|
||||||
|
on_conflict: :nothing
|
||||||
|
)
|
||||||
|
|
||||||
IO.puts("✅ Done seeding endgames.")
|
IO.puts("✅ Done seeding endgames.")
|
||||||
|
|
||||||
IO.puts("🌱 Seeding endgame tags into DB...")
|
IO.puts("🌱 Seeding endgame tags into DB...")
|
||||||
|
|
||||||
Repo.insert_all(Tag, [
|
theme_names = [
|
||||||
%{
|
"mate in 2",
|
||||||
name: "mate in 2",
|
"mate in 3",
|
||||||
category: :endgame,
|
"Lucena",
|
||||||
inserted_at: now,
|
"Philidor",
|
||||||
updated_at: now
|
"opposition",
|
||||||
},
|
"promotion",
|
||||||
%{
|
"stalemate"
|
||||||
name: "mate in 3",
|
]
|
||||||
category: :endgame,
|
|
||||||
inserted_at: now,
|
Repo.insert_all(
|
||||||
updated_at: now
|
Tag,
|
||||||
}
|
Enum.map(theme_names, fn name ->
|
||||||
])
|
%{name: name, category: :endgame, inserted_at: now, updated_at: now}
|
||||||
|
end),
|
||||||
|
on_conflict: :nothing
|
||||||
|
)
|
||||||
|
|
||||||
IO.puts("✅ Done seeding endgame tags.")
|
IO.puts("✅ Done seeding endgame tags.")
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ defmodule Chesstrainer.EndgamesTest do
|
|||||||
|
|
||||||
alias Chesstrainer.Endgames
|
alias Chesstrainer.Endgames
|
||||||
alias Chesstrainer.Endgames.Endgame
|
alias Chesstrainer.Endgames.Endgame
|
||||||
|
alias Chesstrainer.Tags
|
||||||
|
|
||||||
describe "create_endgame/1 FEN validation" do
|
describe "create_endgame/1 FEN validation" do
|
||||||
test "accepts a standard valid FEN" do
|
test "accepts a standard valid FEN" do
|
||||||
@@ -85,4 +86,38 @@ defmodule Chesstrainer.EndgamesTest do
|
|||||||
assert msg =~ "active color"
|
assert msg =~ "active color"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "tags" do
|
||||||
|
test "create_endgame/2 associates themes" do
|
||||||
|
{:ok, tag} = Tags.create_tag(%{name: "Lucena", category: :endgame})
|
||||||
|
|
||||||
|
attrs = %{
|
||||||
|
fen: "8/8/3k4/8/8/3K1R2/8/8 w - - 0 1",
|
||||||
|
color: :white,
|
||||||
|
key: "KR v K",
|
||||||
|
result: :win,
|
||||||
|
rating: 1500
|
||||||
|
}
|
||||||
|
|
||||||
|
assert {:ok, endgame} = Endgames.create_endgame(attrs, [tag])
|
||||||
|
assert Enum.map(endgame.tags, & &1.id) == [tag.id]
|
||||||
|
end
|
||||||
|
|
||||||
|
test "update_endgame/3 replaces themes" do
|
||||||
|
{:ok, lucena} = Tags.create_tag(%{name: "Lucena", category: :endgame})
|
||||||
|
{:ok, philidor} = Tags.create_tag(%{name: "Philidor", category: :endgame})
|
||||||
|
|
||||||
|
attrs = %{
|
||||||
|
fen: "6k1/5p2/6p1/8/7p/8/6PP/6K1 b - - 0 1",
|
||||||
|
color: :black,
|
||||||
|
key: "KPPP v KPP",
|
||||||
|
result: :win,
|
||||||
|
rating: 1500
|
||||||
|
}
|
||||||
|
|
||||||
|
assert {:ok, endgame} = Endgames.create_endgame(attrs, [lucena])
|
||||||
|
assert {:ok, updated} = Endgames.update_endgame(endgame, %{rating: 1600}, [philidor])
|
||||||
|
assert Enum.map(updated.tags, & &1.id) == [philidor.id]
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -57,5 +57,23 @@ defmodule Chesstrainer.TagsTest do
|
|||||||
tag = tag_fixture()
|
tag = tag_fixture()
|
||||||
assert %Ecto.Changeset{} = Tags.change_tag(tag)
|
assert %Ecto.Changeset{} = Tags.change_tag(tag)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "get_or_create/2 matches case-insensitively and trims" do
|
||||||
|
assert {:ok, tag} = Tags.get_or_create("Lucena", "endgame")
|
||||||
|
|
||||||
|
assert {:ok, found} = Tags.get_or_create(" lucena ", "endgame")
|
||||||
|
assert found.id == tag.id
|
||||||
|
assert length(Tags.list_tags()) == 1
|
||||||
|
end
|
||||||
|
|
||||||
|
test "get_or_create/2 rejects a blank name" do
|
||||||
|
assert {:error, :blank_name} = Tags.get_or_create(" ", "endgame")
|
||||||
|
end
|
||||||
|
|
||||||
|
test "create_tag/1 rejects a case-insensitive duplicate" do
|
||||||
|
assert {:ok, _tag} = Tags.create_tag(%{name: "Lucena", category: :endgame})
|
||||||
|
assert {:error, changeset} = Tags.create_tag(%{name: "lucena", category: :endgame})
|
||||||
|
assert changeset.errors[:name]
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -0,0 +1,83 @@
|
|||||||
|
defmodule ChesstrainerWeb.EndgameLive.FormTest do
|
||||||
|
use ChesstrainerWeb.ConnCase
|
||||||
|
|
||||||
|
import Phoenix.LiveViewTest
|
||||||
|
import Chesstrainer.TagsFixtures
|
||||||
|
|
||||||
|
alias Chesstrainer.Endgames
|
||||||
|
alias Chesstrainer.Repo
|
||||||
|
alias Chesstrainer.Tags
|
||||||
|
|
||||||
|
@fen "8/8/3k4/8/8/3K1R2/8/8 w - - 0 1"
|
||||||
|
|
||||||
|
test "creates an endgame with staged themes", %{conn: conn} do
|
||||||
|
tag = tag_fixture(%{name: "Lucena"})
|
||||||
|
|
||||||
|
{:ok, view, _html} = live(conn, ~p"/admin/endgames/new")
|
||||||
|
|
||||||
|
view |> form("#theme-form", %{tag_search: "Luc"}) |> render_change()
|
||||||
|
view |> element("button", "Lucena") |> render_click()
|
||||||
|
|
||||||
|
view
|
||||||
|
|> form("#endgame-form",
|
||||||
|
endgame: %{fen: @fen, key: "KR v K", rating: 1500, result: "win"}
|
||||||
|
)
|
||||||
|
|> render_submit()
|
||||||
|
|
||||||
|
assert_redirect(view, ~p"/admin/endgames")
|
||||||
|
|
||||||
|
endgame =
|
||||||
|
Endgames.list_endgames()
|
||||||
|
|> Enum.find(&(&1.fen == @fen))
|
||||||
|
|> Repo.preload(:tags)
|
||||||
|
|
||||||
|
assert Enum.map(endgame.tags, & &1.id) == [tag.id]
|
||||||
|
end
|
||||||
|
|
||||||
|
test "attaches multiple themes", %{conn: conn} do
|
||||||
|
tag_fixture(%{name: "Lucena"})
|
||||||
|
tag_fixture(%{name: "Philidor"})
|
||||||
|
|
||||||
|
{:ok, view, _html} = live(conn, ~p"/admin/endgames/new")
|
||||||
|
|
||||||
|
view |> form("#theme-form", %{tag_search: "Luc"}) |> render_change()
|
||||||
|
view |> element("button", "Lucena") |> render_click()
|
||||||
|
|
||||||
|
view |> form("#theme-form", %{tag_search: "Phil"}) |> render_change()
|
||||||
|
view |> element("button", "Philidor") |> render_click()
|
||||||
|
|
||||||
|
html = render(view)
|
||||||
|
assert html =~ "Lucena"
|
||||||
|
assert html =~ "Philidor"
|
||||||
|
end
|
||||||
|
|
||||||
|
test "creates and attaches a new theme inline", %{conn: conn} do
|
||||||
|
{:ok, view, _html} = live(conn, ~p"/admin/endgames/new")
|
||||||
|
|
||||||
|
view |> form("#theme-form", %{tag_search: "Lucerne"}) |> render_submit()
|
||||||
|
|
||||||
|
assert render(view) =~ "Lucerne"
|
||||||
|
assert [%{name: "Lucerne"}] = Tags.search("Lucerne", "endgame")
|
||||||
|
end
|
||||||
|
|
||||||
|
test "removes a theme from an existing endgame", %{conn: conn} do
|
||||||
|
tag = tag_fixture(%{name: "Lucena"})
|
||||||
|
attrs = %{fen: @fen, color: :white, key: "KR v K", result: :win, rating: 1500}
|
||||||
|
{:ok, endgame} = Endgames.create_endgame(attrs, [tag])
|
||||||
|
|
||||||
|
{:ok, view, _html} = live(conn, ~p"/admin/endgames/#{endgame}/edit")
|
||||||
|
|
||||||
|
assert render(view) =~ "Lucena"
|
||||||
|
|
||||||
|
view |> element("button[aria-label='Remove Lucena']") |> render_click()
|
||||||
|
|
||||||
|
view
|
||||||
|
|> form("#endgame-form", endgame: %{key: "KR v K", rating: 1500, result: "win"})
|
||||||
|
|> render_submit()
|
||||||
|
|
||||||
|
assert_redirect(view, ~p"/admin/endgames")
|
||||||
|
|
||||||
|
updated = Endgames.get_endgame!(endgame.id) |> Repo.preload(:tags)
|
||||||
|
assert updated.tags == []
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
defmodule ChesstrainerWeb.EndgameLive.IndexTest do
|
||||||
|
use ChesstrainerWeb.ConnCase
|
||||||
|
|
||||||
|
import Phoenix.LiveViewTest
|
||||||
|
import Chesstrainer.EndgamesFixtures
|
||||||
|
import Chesstrainer.TagsFixtures
|
||||||
|
|
||||||
|
alias Chesstrainer.Endgames
|
||||||
|
|
||||||
|
test "lists an endgame's themes", %{conn: conn} do
|
||||||
|
tag = tag_fixture(%{name: "Lucena"})
|
||||||
|
endgame = endgame_fixture()
|
||||||
|
{:ok, _endgame} = Endgames.update_endgame(endgame, %{}, [tag])
|
||||||
|
|
||||||
|
{:ok, _view, html} = live(conn, ~p"/admin/endgames")
|
||||||
|
|
||||||
|
assert html =~ "Lucena"
|
||||||
|
end
|
||||||
|
end
|
||||||
Reference in New Issue
Block a user