mirror of
https://github.com/TheRealOwenRees/chess-endgame-trainer.git
synced 2026-11-18 03:32:06 +00:00
Rename Tag to Theme across code and schema
Rename the endgame-label concept from Tag to Theme to match the glossary: the context becomes Chesstrainer.Themes, the schema Chesstrainer.Themes.Theme, and the Endgame association is :themes. The category enum (endgame/opening/tactic) is preserved. Rewrite the original migrations in place so themes / endgames_themes (with theme_id) are created directly, instead of adding a transition migration. Closes #12
This commit is contained in:
@@ -3,7 +3,7 @@ defmodule Chesstrainer.EndgamesTest do
|
||||
|
||||
alias Chesstrainer.Endgames
|
||||
alias Chesstrainer.Endgames.Endgame
|
||||
alias Chesstrainer.Tags
|
||||
alias Chesstrainer.Themes
|
||||
|
||||
describe "create_endgame/1 FEN validation" do
|
||||
test "accepts a standard valid FEN" do
|
||||
@@ -87,9 +87,9 @@ defmodule Chesstrainer.EndgamesTest do
|
||||
end
|
||||
end
|
||||
|
||||
describe "tags" do
|
||||
describe "themes" do
|
||||
test "create_endgame/2 associates themes" do
|
||||
{:ok, tag} = Tags.create_tag(%{name: "Lucena", category: :endgame})
|
||||
{:ok, theme} = Themes.create_theme(%{name: "Lucena", category: :endgame})
|
||||
|
||||
attrs = %{
|
||||
fen: "8/8/3k4/8/8/3K1R2/8/8 w - - 0 1",
|
||||
@@ -99,13 +99,13 @@ defmodule Chesstrainer.EndgamesTest do
|
||||
rating: 1500
|
||||
}
|
||||
|
||||
assert {:ok, endgame} = Endgames.create_endgame(attrs, [tag])
|
||||
assert Enum.map(endgame.tags, & &1.id) == [tag.id]
|
||||
assert {:ok, endgame} = Endgames.create_endgame(attrs, [theme])
|
||||
assert Enum.map(endgame.themes, & &1.id) == [theme.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})
|
||||
{:ok, lucena} = Themes.create_theme(%{name: "Lucena", category: :endgame})
|
||||
{:ok, philidor} = Themes.create_theme(%{name: "Philidor", category: :endgame})
|
||||
|
||||
attrs = %{
|
||||
fen: "6k1/5p2/6p1/8/7p/8/6PP/6K1 b - - 0 1",
|
||||
@@ -117,7 +117,7 @@ defmodule Chesstrainer.EndgamesTest do
|
||||
|
||||
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]
|
||||
assert Enum.map(updated.themes, & &1.id) == [philidor.id]
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,79 +0,0 @@
|
||||
defmodule Chesstrainer.TagsTest do
|
||||
use Chesstrainer.DataCase
|
||||
|
||||
alias Chesstrainer.Tags
|
||||
|
||||
describe "tags" do
|
||||
alias Chesstrainer.Tags.Tag
|
||||
|
||||
import Chesstrainer.TagsFixtures
|
||||
|
||||
@invalid_attrs %{name: nil, category: nil}
|
||||
|
||||
test "list_tags/0 returns all tags" do
|
||||
tag = tag_fixture()
|
||||
assert Tags.list_tags() == [tag]
|
||||
end
|
||||
|
||||
test "get_tag!/1 returns the tag with given id" do
|
||||
tag = tag_fixture()
|
||||
assert Tags.get_tag!(tag.id) == tag
|
||||
end
|
||||
|
||||
test "create_tag/1 with valid data creates a tag" do
|
||||
valid_attrs = %{name: "some name", category: :endgame}
|
||||
|
||||
assert {:ok, %Tag{} = tag} = Tags.create_tag(valid_attrs)
|
||||
assert tag.name == "some name"
|
||||
assert tag.category == :endgame
|
||||
end
|
||||
|
||||
test "create_tag/1 with invalid data returns error changeset" do
|
||||
assert {:error, %Ecto.Changeset{}} = Tags.create_tag(@invalid_attrs)
|
||||
end
|
||||
|
||||
test "update_tag/2 with valid data updates the tag" do
|
||||
tag = tag_fixture()
|
||||
update_attrs = %{name: "some updated name", category: :opening}
|
||||
|
||||
assert {:ok, %Tag{} = tag} = Tags.update_tag(tag, update_attrs)
|
||||
assert tag.name == "some updated name"
|
||||
assert tag.category == :opening
|
||||
end
|
||||
|
||||
test "update_tag/2 with invalid data returns error changeset" do
|
||||
tag = tag_fixture()
|
||||
assert {:error, %Ecto.Changeset{}} = Tags.update_tag(tag, @invalid_attrs)
|
||||
assert tag == Tags.get_tag!(tag.id)
|
||||
end
|
||||
|
||||
test "delete_tag/1 deletes the tag" do
|
||||
tag = tag_fixture()
|
||||
assert {:ok, %Tag{}} = Tags.delete_tag(tag)
|
||||
assert_raise Ecto.NoResultsError, fn -> Tags.get_tag!(tag.id) end
|
||||
end
|
||||
|
||||
test "change_tag/1 returns a tag changeset" do
|
||||
tag = tag_fixture()
|
||||
assert %Ecto.Changeset{} = Tags.change_tag(tag)
|
||||
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
|
||||
@@ -0,0 +1,79 @@
|
||||
defmodule Chesstrainer.ThemesTest do
|
||||
use Chesstrainer.DataCase
|
||||
|
||||
alias Chesstrainer.Themes
|
||||
|
||||
describe "themes" do
|
||||
alias Chesstrainer.Themes.Theme
|
||||
|
||||
import Chesstrainer.ThemesFixtures
|
||||
|
||||
@invalid_attrs %{name: nil, category: nil}
|
||||
|
||||
test "list_themes/0 returns all themes" do
|
||||
theme = theme_fixture()
|
||||
assert Themes.list_themes() == [theme]
|
||||
end
|
||||
|
||||
test "get_theme!/1 returns the theme with given id" do
|
||||
theme = theme_fixture()
|
||||
assert Themes.get_theme!(theme.id) == theme
|
||||
end
|
||||
|
||||
test "create_theme/1 with valid data creates a theme" do
|
||||
valid_attrs = %{name: "some name", category: :endgame}
|
||||
|
||||
assert {:ok, %Theme{} = theme} = Themes.create_theme(valid_attrs)
|
||||
assert theme.name == "some name"
|
||||
assert theme.category == :endgame
|
||||
end
|
||||
|
||||
test "create_theme/1 with invalid data returns error changeset" do
|
||||
assert {:error, %Ecto.Changeset{}} = Themes.create_theme(@invalid_attrs)
|
||||
end
|
||||
|
||||
test "update_theme/2 with valid data updates the theme" do
|
||||
theme = theme_fixture()
|
||||
update_attrs = %{name: "some updated name", category: :opening}
|
||||
|
||||
assert {:ok, %Theme{} = theme} = Themes.update_theme(theme, update_attrs)
|
||||
assert theme.name == "some updated name"
|
||||
assert theme.category == :opening
|
||||
end
|
||||
|
||||
test "update_theme/2 with invalid data returns error changeset" do
|
||||
theme = theme_fixture()
|
||||
assert {:error, %Ecto.Changeset{}} = Themes.update_theme(theme, @invalid_attrs)
|
||||
assert theme == Themes.get_theme!(theme.id)
|
||||
end
|
||||
|
||||
test "delete_theme/1 deletes the theme" do
|
||||
theme = theme_fixture()
|
||||
assert {:ok, %Theme{}} = Themes.delete_theme(theme)
|
||||
assert_raise Ecto.NoResultsError, fn -> Themes.get_theme!(theme.id) end
|
||||
end
|
||||
|
||||
test "change_theme/1 returns a theme changeset" do
|
||||
theme = theme_fixture()
|
||||
assert %Ecto.Changeset{} = Themes.change_theme(theme)
|
||||
end
|
||||
|
||||
test "get_or_create/2 matches case-insensitively and trims" do
|
||||
assert {:ok, theme} = Themes.get_or_create("Lucena", "endgame")
|
||||
|
||||
assert {:ok, found} = Themes.get_or_create(" lucena ", "endgame")
|
||||
assert found.id == theme.id
|
||||
assert length(Themes.list_themes()) == 1
|
||||
end
|
||||
|
||||
test "get_or_create/2 rejects a blank name" do
|
||||
assert {:error, :blank_name} = Themes.get_or_create(" ", "endgame")
|
||||
end
|
||||
|
||||
test "create_theme/1 rejects a case-insensitive duplicate" do
|
||||
assert {:ok, _theme} = Themes.create_theme(%{name: "Lucena", category: :endgame})
|
||||
assert {:error, changeset} = Themes.create_theme(%{name: "lucena", category: :endgame})
|
||||
assert changeset.errors[:name]
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -2,20 +2,20 @@ defmodule ChesstrainerWeb.EndgameLive.FormTest do
|
||||
use ChesstrainerWeb.ConnCase
|
||||
|
||||
import Phoenix.LiveViewTest
|
||||
import Chesstrainer.TagsFixtures
|
||||
import Chesstrainer.ThemesFixtures
|
||||
|
||||
alias Chesstrainer.Endgames
|
||||
alias Chesstrainer.Repo
|
||||
alias Chesstrainer.Tags
|
||||
alias Chesstrainer.Themes
|
||||
|
||||
@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"})
|
||||
theme = theme_fixture(%{name: "Lucena"})
|
||||
|
||||
{:ok, view, _html} = live(conn, ~p"/admin/endgames/new")
|
||||
|
||||
view |> form("#theme-form", %{tag_search: "Luc"}) |> render_change()
|
||||
view |> form("#theme-form", %{theme_search: "Luc"}) |> render_change()
|
||||
view |> element("button", "Lucena") |> render_click()
|
||||
|
||||
view
|
||||
@@ -29,21 +29,21 @@ defmodule ChesstrainerWeb.EndgameLive.FormTest do
|
||||
endgame =
|
||||
Endgames.list_endgames()
|
||||
|> Enum.find(&(&1.fen == @fen))
|
||||
|> Repo.preload(:tags)
|
||||
|> Repo.preload(:themes)
|
||||
|
||||
assert Enum.map(endgame.tags, & &1.id) == [tag.id]
|
||||
assert Enum.map(endgame.themes, & &1.id) == [theme.id]
|
||||
end
|
||||
|
||||
test "attaches multiple themes", %{conn: conn} do
|
||||
tag_fixture(%{name: "Lucena"})
|
||||
tag_fixture(%{name: "Philidor"})
|
||||
theme_fixture(%{name: "Lucena"})
|
||||
theme_fixture(%{name: "Philidor"})
|
||||
|
||||
{:ok, view, _html} = live(conn, ~p"/admin/endgames/new")
|
||||
|
||||
view |> form("#theme-form", %{tag_search: "Luc"}) |> render_change()
|
||||
view |> form("#theme-form", %{theme_search: "Luc"}) |> render_change()
|
||||
view |> element("button", "Lucena") |> render_click()
|
||||
|
||||
view |> form("#theme-form", %{tag_search: "Phil"}) |> render_change()
|
||||
view |> form("#theme-form", %{theme_search: "Phil"}) |> render_change()
|
||||
view |> element("button", "Philidor") |> render_click()
|
||||
|
||||
html = render(view)
|
||||
@@ -54,16 +54,16 @@ defmodule ChesstrainerWeb.EndgameLive.FormTest do
|
||||
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()
|
||||
view |> form("#theme-form", %{theme_search: "Lucerne"}) |> render_submit()
|
||||
|
||||
assert render(view) =~ "Lucerne"
|
||||
assert [%{name: "Lucerne"}] = Tags.search("Lucerne", "endgame")
|
||||
assert [%{name: "Lucerne"}] = Themes.search("Lucerne", "endgame")
|
||||
end
|
||||
|
||||
test "removes a theme from an existing endgame", %{conn: conn} do
|
||||
tag = tag_fixture(%{name: "Lucena"})
|
||||
theme = theme_fixture(%{name: "Lucena"})
|
||||
attrs = %{fen: @fen, color: :white, key: "KR v K", result: :win, rating: 1500}
|
||||
{:ok, endgame} = Endgames.create_endgame(attrs, [tag])
|
||||
{:ok, endgame} = Endgames.create_endgame(attrs, [theme])
|
||||
|
||||
{:ok, view, _html} = live(conn, ~p"/admin/endgames/#{endgame}/edit")
|
||||
|
||||
@@ -77,7 +77,7 @@ defmodule ChesstrainerWeb.EndgameLive.FormTest do
|
||||
|
||||
assert_redirect(view, ~p"/admin/endgames")
|
||||
|
||||
updated = Endgames.get_endgame!(endgame.id) |> Repo.preload(:tags)
|
||||
assert updated.tags == []
|
||||
updated = Endgames.get_endgame!(endgame.id) |> Repo.preload(:themes)
|
||||
assert updated.themes == []
|
||||
end
|
||||
end
|
||||
|
||||
@@ -3,14 +3,14 @@ defmodule ChesstrainerWeb.EndgameLive.IndexTest do
|
||||
|
||||
import Phoenix.LiveViewTest
|
||||
import Chesstrainer.EndgamesFixtures
|
||||
import Chesstrainer.TagsFixtures
|
||||
import Chesstrainer.ThemesFixtures
|
||||
|
||||
alias Chesstrainer.Endgames
|
||||
|
||||
test "lists an endgame's themes", %{conn: conn} do
|
||||
tag = tag_fixture(%{name: "Lucena"})
|
||||
theme = theme_fixture(%{name: "Lucena"})
|
||||
endgame = endgame_fixture()
|
||||
{:ok, _endgame} = Endgames.update_endgame(endgame, %{}, [tag])
|
||||
{:ok, _endgame} = Endgames.update_endgame(endgame, %{}, [theme])
|
||||
|
||||
{:ok, _view, html} = live(conn, ~p"/admin/endgames")
|
||||
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
defmodule Chesstrainer.TagsFixtures do
|
||||
@moduledoc """
|
||||
This module defines test helpers for creating
|
||||
entities via the `Chesstrainer.Tags` context.
|
||||
"""
|
||||
|
||||
@doc """
|
||||
Generate a unique tag name.
|
||||
"""
|
||||
def unique_tag_name, do: "some name#{System.unique_integer([:positive])}"
|
||||
|
||||
@doc """
|
||||
Generate a tag.
|
||||
"""
|
||||
def tag_fixture(attrs \\ %{}) do
|
||||
{:ok, tag} =
|
||||
attrs
|
||||
|> Enum.into(%{
|
||||
category: :endgame,
|
||||
name: unique_tag_name()
|
||||
})
|
||||
|> Chesstrainer.Tags.create_tag()
|
||||
|
||||
tag
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,26 @@
|
||||
defmodule Chesstrainer.ThemesFixtures do
|
||||
@moduledoc """
|
||||
This module defines test helpers for creating
|
||||
entities via the `Chesstrainer.Themes` context.
|
||||
"""
|
||||
|
||||
@doc """
|
||||
Generate a unique theme name.
|
||||
"""
|
||||
def unique_theme_name, do: "some name#{System.unique_integer([:positive])}"
|
||||
|
||||
@doc """
|
||||
Generate a theme.
|
||||
"""
|
||||
def theme_fixture(attrs \\ %{}) do
|
||||
{:ok, theme} =
|
||||
attrs
|
||||
|> Enum.into(%{
|
||||
category: :endgame,
|
||||
name: unique_theme_name()
|
||||
})
|
||||
|> Chesstrainer.Themes.create_theme()
|
||||
|
||||
theme
|
||||
end
|
||||
end
|
||||
Reference in New Issue
Block a user