commit 79debdb875d3ab255895a236d4472bfd950ee68a
parent 639dce9780608bd01b764d6fb09094f70a0d499c
Author: srfsh <dev@srf.sh>
Date: Tue, 16 Aug 2022 17:31:44 +0300
Zenflows{Test,}.VF.Unit: refactor
To add support for optional repo to create/1 (now /2).
Diffstat:
3 files changed, 50 insertions(+), 41 deletions(-)
diff --git a/src/zenflows/vf/unit/domain.ex b/src/zenflows/vf/unit/domain.ex
@@ -24,22 +24,31 @@ alias Zenflows.VF.Unit
@typep repo() :: Ecto.Repo.t()
@typep chgset() :: Ecto.Changeset.t()
-@typep changes() :: Ecto.Multi.changes()
@typep id() :: Zenflows.DB.Schema.id()
@typep params() :: Zenflows.DB.Schema.params()
-@spec by_id(repo(), id()) :: Unit.t() | nil
-def by_id(repo \\ Repo, id) do
- repo.get(Unit, id)
+@spec one(repo(), id()) :: {:ok, Unit.t()} | {:error, String.t()}
+def one(repo \\ Repo, id) do
+ one_by(repo, id: id)
end
-@spec create(params()) :: {:ok, Unit.t()} | {:error, chgset()}
-def create(params) do
+@spec one_by(repo(), map() | Keyword.t())
+ :: {:ok, Unit.t()} | {:error, String.t()}
+def one_by(repo \\ Repo, clauses) do
+ case repo.get_by(Unit, clauses) do
+ nil -> {:error, "not found"}
+ found -> {:ok, found}
+ end
+end
+
+# `repo` is needed since we use that in a migration script.
+@spec create(repo(), params()) :: {:ok, Unit.t()} | {:error, chgset()}
+def create(repo \\ Repo, params) do
Multi.new()
- |> Multi.insert(:unit, Unit.chgset(params))
- |> Repo.transaction()
+ |> Multi.insert(:insert, Unit.chgset(params))
+ |> repo.transaction()
|> case do
- {:ok, %{unit: u}} -> {:ok, u}
+ {:ok, %{insert: u}} -> {:ok, u}
{:error, _, cset, _} -> {:error, cset}
end
end
@@ -47,8 +56,9 @@ end
@spec update(id(), params()) :: {:ok, Unit.t()} | {:error, chgset()}
def update(id, params) do
Multi.new()
- |> Multi.run(:get, multi_get(id))
- |> Multi.update(:update, &Unit.chgset(&1.get, params))
+ |> Multi.put(:id, id)
+ |> Multi.run(:one, &one_by/2)
+ |> Multi.update(:update, &Unit.chgset(&1.one, params))
|> Repo.transaction()
|> case do
{:ok, %{update: u}} -> {:ok, u}
@@ -59,24 +69,13 @@ end
@spec delete(id()) :: {:ok, Unit.t()} | {:error, chgset()}
def delete(id) do
Multi.new()
- |> Multi.run(:get, multi_get(id))
- |> Multi.delete(:delete, &(&1.get))
+ |> Multi.put(:id, id)
+ |> Multi.run(:one, &one_by/2)
+ |> Multi.delete(:delete, &(&1.one))
|> Repo.transaction()
|> case do
{:ok, %{delete: u}} -> {:ok, u}
{:error, _, msg_or_cset, _} -> {:error, msg_or_cset}
end
end
-
-# Returns a Unit in ok-err tuple from given ID. Used inside
-# Ecto.Multi.run/5 to get a record in transaction.
-@spec multi_get(id()) :: (repo(), changes() -> {:ok, Unit.t()} | {:error, String.t()})
-defp multi_get(id) do
- fn repo, _ ->
- case by_id(repo, id) do
- nil -> {:error, "not found"}
- u -> {:ok, u}
- end
- end
-end
end
diff --git a/src/zenflows/vf/unit/resolv.ex b/src/zenflows/vf/unit/resolv.ex
@@ -21,7 +21,7 @@ defmodule Zenflows.VF.Unit.Resolv do
alias Zenflows.VF.Unit.Domain
def unit(%{id: id}, _info) do
- {:ok, Domain.by_id(id)}
+ Domain.one(id)
end
def create_unit(%{unit: params}, _info) do
diff --git a/test/vf/unit/domain.test.exs b/test/vf/unit/domain.test.exs
@@ -24,48 +24,58 @@ alias Zenflows.VF.{Unit, Unit.Domain}
setup do
%{
params: %{
- label: Factory.uniq("label"),
- symbol: Factory.uniq("symbol"),
+ label: Factory.str("label"),
+ symbol: Factory.str("symbol"),
},
- unit: Factory.insert!(:unit),
+ inserted: Factory.insert!(:unit),
+ id: Factory.id(),
}
end
-test "by_id/1 returns a Unit", %{unit: unit} do
- assert %Unit{} = Domain.by_id(unit.id)
+describe "one/1" do
+ test "with good id: finds the Unit", %{inserted: %{id: id}} do
+ assert {:ok, %Unit{}} = Domain.one(id)
+ end
+
+ test "with bad id: doesn't find the Unit", %{id: id} do
+ assert {:error, "not found"} = Domain.one(id)
+ end
end
describe "create/1" do
- test "creates a Unit with valid params", %{params: params} do
+ test "with good params: creates a Unit", %{params: params} do
assert {:ok, %Unit{} = unit} = Domain.create(params)
-
assert unit.label == params.label
assert unit.symbol == params.symbol
end
- test "doesn't create a Unit with invalid params" do
+ test "with bad params: doesn't create a Unit" do
assert {:error, %Changeset{}} = Domain.create(%{})
end
end
describe "update/2" do
- test "updates a Unit with valid params", %{params: params, unit: old} do
+ test "with good params: updates the Unit", %{params: params, inserted: old} do
assert {:ok, %Unit{} = new} = Domain.update(old.id, params)
-
assert new.label == params.label
assert new.symbol == params.symbol
end
- test "doesn't update a Unit", %{unit: old} do
+ test "with bad params: doesn't update the Unit", %{inserted: old} do
assert {:ok, %Unit{} = new} = Domain.update(old.id, %{})
-
assert new.label == old.label
assert new.symbol == old.symbol
end
end
-test "delete/1 deletes a Unit", %{unit: %{id: id}} do
- assert {:ok, %Unit{id: ^id}} = Domain.delete(id)
- assert Domain.by_id(id) == nil
+describe "delete/1" do
+ test "with good id: deletes the Unit", %{inserted: %{id: id}} do
+ assert {:ok, %Unit{id: ^id}} = Domain.delete(id)
+ assert {:error, "not found"} = Domain.one(id)
+ end
+
+ test "with bad id: doesn't delete the Unit", %{id: id} do
+ assert {:error, "not found"} = Domain.delete(id)
+ end
end
end
