commit d3158f6dffc659538955faf0254575a3f144951a
parent 4988a98469d04b113a26b02f98841bf839523d32
Author: srfsh <dev@srf.sh>
Date: Sun, 14 Aug 2022 13:10:34 +0300
Zenflows{Test,}.VF.Agreement.{Domain,Resolv}: refactor
I think it is easier to read the code this way.
Diffstat:
4 files changed, 108 insertions(+), 83 deletions(-)
diff --git a/src/zenflows/vf/agreement/domain.ex b/src/zenflows/vf/agreement/domain.ex
@@ -24,31 +24,41 @@ alias Zenflows.VF.Agreement
@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()) :: Agreement.t() | nil
-def by_id(repo \\ Repo, id) do
- repo.get(Agreement, id)
+@spec one(repo(), id()) :: {:ok, Agreement.t()} | {:error, String.t()}
+def one(repo \\ Repo, id) do
+ one_by(repo, id: id)
+end
+
+@spec one_by(repo(), map() | Keyword.t())
+ :: {:ok, Agreement.t()} | {:error, String.t()}
+def one_by(repo \\ Repo, clauses) do
+ case repo.get_by(Agreement, clauses) do
+ nil -> {:error, "not found"}
+ found -> {:ok, found}
+ end
end
@spec create(params()) :: {:ok, Agreement.t()} | {:error, chgset()}
def create(params) do
Multi.new()
- |> Multi.insert(:agreem, Agreement.chgset(params))
+ |> Multi.insert(:insert, Agreement.chgset(params))
|> Repo.transaction()
|> case do
- {:ok, %{agreem: a}} -> {:ok, a}
+ {:ok, %{insert: a}} -> {:ok, a}
{:error, _, cset, _} -> {:error, cset}
end
end
-@spec update(id(), params()) :: {:ok, Agreement.t()} | {:error, chgset()}
+@spec update(id(), params())
+ :: {:ok, Agreement.t()} | {:error, String.t() | chgset()}
def update(id, params) do
Multi.new()
- |> Multi.run(:get, multi_get(id))
- |> Multi.update(:update, &Agreement.chgset(&1.get, params))
+ |> Multi.put(:id, id)
+ |> Multi.run(:one, &one_by/2)
+ |> Multi.update(:update, &Agreement.chgset(&1.one, params))
|> Repo.transaction()
|> case do
{:ok, %{update: a}} -> {:ok, a}
@@ -56,27 +66,16 @@ def update(id, params) do
end
end
-@spec delete(id()) :: {:ok, Agreement.t()} | {:error, chgset()}
+@spec delete(id()) :: {:ok, Agreement.t()} | {:error, String.t() | 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: a}} -> {:ok, a}
{:error, _, msg_or_cset, _} -> {:error, msg_or_cset}
end
end
-
-# Returns a Agreement 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, Agreement.t()} | {:error, String.t()})
-defp multi_get(id) do
- fn repo, _ ->
- case by_id(repo, id) do
- nil -> {:error, "not found"}
- a -> {:ok, a}
- end
- end
-end
end
diff --git a/src/zenflows/vf/agreement/resolv.ex b/src/zenflows/vf/agreement/resolv.ex
@@ -21,7 +21,7 @@ defmodule Zenflows.VF.Agreement.Resolv do
alias Zenflows.VF.Agreement.Domain
def agreement(%{id: id}, _info) do
- {:ok, Domain.by_id(id)}
+ Domain.one(id)
end
def create_agreement(%{agreement: params}, _info) do
diff --git a/test/vf/agreement/domain.test.exs b/test/vf/agreement/domain.test.exs
@@ -24,48 +24,58 @@ alias Zenflows.VF.{Agreement, Agreement.Domain}
setup do
%{
params: %{
- name: Factory.uniq("name"),
- note: Factory.uniq("note"),
+ name: Factory.str("name"),
+ note: Factory.str("note"),
},
inserted: Factory.insert!(:agreement),
+ id: Factory.id(),
}
end
-test "by_id/1 returns a Agreement", %{inserted: agreem} do
- assert %Agreement{} = Domain.by_id(agreem.id)
+describe "one/1" do
+ test "with good id: finds the Agreement", %{inserted: %{id: id}} do
+ assert {:ok, %Agreement{}} = Domain.one(id)
+ end
+
+ test "with bad id: doesn't find the Agreement", %{id: id} do
+ assert {:error, "not found"} = Domain.one(id)
+ end
end
describe "create/1" do
- test "creates a Agreement with valid params", %{params: params} do
+ test "with good params: creates an Agreement", %{params: params} do
assert {:ok, %Agreement{} = agreem} = Domain.create(params)
-
assert agreem.name == params.name
assert agreem.note == params.note
end
- test "doesn't create a Agreement with invalid params" do
+ test "with bad params: doesn't create an" do
assert {:error, %Changeset{}} = Domain.create(%{})
end
end
describe "update/2" do
- test "updates a Agreement with valid params", %{params: params, inserted: old} do
+ test "with good params: updates the Agreement", %{params: params, inserted: old} do
assert {:ok, %Agreement{} = new} = Domain.update(old.id, params)
-
assert new.name == params.name
assert new.note == params.note
end
- test "doesn't update a Agreement", %{inserted: old} do
+ test "with bad params: doesn't update the Agreement", %{inserted: old} do
assert {:ok, %Agreement{} = new} = Domain.update(old.id, %{})
-
assert new.name == old.name
assert new.note == old.note
end
end
-test "delete/1 deletes a Agreement", %{inserted: %{id: id}} do
- assert {:ok, %Agreement{id: ^id}} = Domain.delete(id)
- assert Domain.by_id(id) == nil
+describe "delete/1" do
+ test "with good id: deletes the Agreement", %{inserted: %{id: id}} do
+ assert {:ok, %Agreement{id: ^id}} = Domain.delete(id)
+ assert {:error, "not found"} = Domain.one(id)
+ end
+
+ test "with bad id: doesn't delete the Agreement", %{id: id} do
+ assert {:error, "not found"} = Domain.delete(id)
+ end
end
end
diff --git a/test/vf/agreement/type.test.exs b/test/vf/agreement/type.test.exs
@@ -21,80 +21,96 @@ use ZenflowsTest.Help.AbsinCase, async: true
setup do
%{
params: %{
- name: Factory.uniq("name"),
- note: Factory.uniq("note"),
+ "name" => Factory.str("name"),
+ "note" => Factory.str("note"),
},
- agreement: Factory.insert!(:agreement),
+ inserted: Factory.insert!(:agreement),
}
end
describe "Query" do
- test "agreement()", %{agreement: agreem} do
+ test "agreement", %{inserted: agreem} do
assert %{data: %{"agreement" => data}} =
- query!("""
- agreement(id: "#{agreem.id}") {
- id
- name
- note
- created
+ run!("""
+ query ($id: ID!) {
+ agreement(id: $id) {
+ id
+ name
+ note
+ created
+ }
}
- """)
+ """, vars: %{"id" => agreem.id})
assert data["id"] == agreem.id
assert data["name"] == agreem.name
assert data["note"] == agreem.note
+ assert {:ok, created, 0} = DateTime.from_iso8601(data["created"])
+ assert DateTime.compare(DateTime.utc_now(), created) != :lt
end
end
describe "Mutation" do
- test "createAgreement()", %{params: params} do
+ test "createAgreement", %{params: params} do
assert %{data: %{"createAgreement" => %{"agreement" => data}}} =
- mutation!("""
- createAgreement(agreement: {
- name: "#{params.name}"
- note: "#{params.note}"
- }) {
- agreement {
- id
- name
- note
- created
+ run!("""
+ mutation ($name: String! $note: String!) {
+ createAgreement(agreement: {
+ name: $name
+ note: $note
+ }) {
+ agreement {
+ id
+ name
+ note
+ created
+ }
}
}
- """)
+ """, vars: params)
assert {:ok, _} = Zenflows.DB.ID.cast(data["id"])
- assert data["name"] == params.name
- assert data["note"] == params.note
+ assert Map.take(data, ~w[name note]) == params
+ assert {:ok, created, 0} = DateTime.from_iso8601(data["created"])
+ assert DateTime.compare(DateTime.utc_now(), created) != :lt
end
- test "updateAgreement()", %{params: params, agreement: agreem} do
+ test "updateAgreement", %{params: params, inserted: agreem} do
assert %{data: %{"updateAgreement" => %{"agreement" => data}}} =
- mutation!("""
- updateAgreement(agreement: {
- id: "#{agreem.id}"
- name: "#{params.name}"
- note: "#{params.note}"
- }) {
- agreement {
- id
- name
- note
- created
+ run!("""
+ mutation (
+ $id: ID!
+ $name: String!
+ $note: String!
+ ) {
+ updateAgreement(agreement: {
+ id: $id
+ name: $name
+ note: $note
+ }) {
+ agreement {
+ id
+ name
+ note
+ created
+ }
}
}
- """)
+ """, vars: params |> Map.put("id", agreem.id))
assert data["id"] == agreem.id
- assert data["name"] == params.name
- assert data["note"] == params.note
+ assert Map.take(data, ~w[name note]) == params
+ assert {:ok, created, 0} = DateTime.from_iso8601(data["created"])
+ assert DateTime.compare(DateTime.utc_now(), created) != :lt
end
- test "deleteAgreement()", %{agreement: %{id: id}} do
+ test "deleteAgreement", %{inserted: %{id: id}} do
assert %{data: %{"deleteAgreement" => true}} =
- mutation!("""
- deleteAgreement(id: "#{id}")
- """)
+ run!("""
+ mutation ($id: ID!) {
+ deleteAgreement(id: $id)
+ }
+ """, vars: %{"id" => id})
end
end
end
