commit c5e95583a5a6cfac6be6cb2b613ef9be7cf16c1d
parent 8d5e61e332c10118905533da5b35511976009dba
Author: srfsh <dev@srf.sh>
Date: Tue, 23 Aug 2022 08:27:34 +0300
Zenflows{Test,}.VF.ProcessSpecification: add paging support and small improvements
Diffstat:
5 files changed, 130 insertions(+), 96 deletions(-)
diff --git a/src/zenflows/vf/process_specification/domain.ex b/src/zenflows/vf/process_specification/domain.ex
@@ -20,63 +20,66 @@ defmodule Zenflows.VF.ProcessSpecification.Domain do
alias Ecto.Multi
alias Zenflows.DB.Repo
+alias Zenflows.GQL.Paging
alias Zenflows.VF.ProcessSpecification
@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()) :: ProcessSpecification.t() | nil
-def by_id(repo \\ Repo, id) do
- repo.get(ProcessSpecification, id)
+@spec one(repo(), id() | map() | Keyword.t())
+ :: {:ok, ProcessSpecification.t()} | {:error, String.t()}
+def one(repo \\ Repo, _)
+def one(repo, id) when is_binary(id), do: one(repo, id: id)
+def one(repo, clauses) do
+ case repo.get_by(ProcessSpecification, clauses) do
+ nil -> {:error, "not found"}
+ found -> {:ok, found}
+ end
+end
+
+@spec all(Paging.params()) :: Paging.result(ProcessSpecification.t())
+def all(params) do
+ Paging.page(ProcessSpecification, params)
end
@spec create(params()) :: {:ok, ProcessSpecification.t()} | {:error, chgset()}
def create(params) do
Multi.new()
- |> Multi.insert(:proc_spec, ProcessSpecification.chgset(params))
+ |> Multi.insert(:insert, ProcessSpecification.chgset(params))
|> Repo.transaction()
|> case do
- {:ok, %{proc_spec: ps}} -> {:ok, ps}
+ {:ok, %{insert: p}} -> {:ok, p}
{:error, _, cset, _} -> {:error, cset}
end
end
-@spec update(id(), params()) :: {:ok, ProcessSpecification.t()} | {:error, chgset()}
+@spec update(id(), params())
+ :: {:ok, ProcessSpecification.t()} | {:error, String.t() | chgset()}
def update(id, params) do
Multi.new()
- |> Multi.run(:get, multi_get(id))
- |> Multi.update(:update, &ProcessSpecification.chgset(&1.get, params))
+ |> Multi.put(:id, id)
+ |> Multi.run(:one, &one/2)
+ |> Multi.update(:update, &ProcessSpecification.chgset(&1.one, params))
|> Repo.transaction()
|> case do
- {:ok, %{update: ps}} -> {:ok, ps}
+ {:ok, %{update: p}} -> {:ok, p}
{:error, _, msg_or_cset, _} -> {:error, msg_or_cset}
end
end
-@spec delete(id()) :: {:ok, ProcessSpecification.t()} | {:error, chgset()}
+@spec delete(id())
+ :: {:ok, ProcessSpecification.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/2)
+ |> Multi.delete(:delete, & &1.one)
|> Repo.transaction()
|> case do
- {:ok, %{delete: ps}} -> {:ok, ps}
+ {:ok, %{delete: p}} -> {:ok, p}
{:error, _, msg_or_cset, _} -> {:error, msg_or_cset}
end
end
-
-# Returns a ProcessSpecification 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, ProcessSpecification.t()} | {:error, String.t()})
-defp multi_get(id) do
- fn repo, _ ->
- case by_id(repo, id) do
- nil -> {:error, "not found"}
- ps -> {:ok, ps}
- end
- end
-end
end
diff --git a/src/zenflows/vf/process_specification/resolv.ex b/src/zenflows/vf/process_specification/resolv.ex
@@ -20,23 +20,27 @@ defmodule Zenflows.VF.ProcessSpecification.Resolv do
alias Zenflows.VF.ProcessSpecification.Domain
-def process_specification(%{id: id}, _info) do
- {:ok, Domain.by_id(id)}
+def process_specification(params, _) do
+ Domain.one(params)
end
-def create_process_specification(%{process_specification: params}, _info) do
+def process_specifications(params, _) do
+ Domain.all(params)
+end
+
+def create_process_specification(%{process_specification: params}, _) do
with {:ok, proc_spec} <- Domain.create(params) do
{:ok, %{process_specification: proc_spec}}
end
end
-def update_process_specification(%{process_specification: %{id: id} = params}, _info) do
+def update_process_specification(%{process_specification: %{id: id} = params}, _) do
with {:ok, proc_spec} <- Domain.update(id, params) do
{:ok, %{process_specification: proc_spec}}
end
end
-def delete_process_specification(%{id: id}, _info) do
+def delete_process_specification(%{id: id}, _) do
with {:ok, _} <- Domain.delete(id) do
{:ok, true}
end
diff --git a/src/zenflows/vf/process_specification/type.ex b/src/zenflows/vf/process_specification/type.ex
@@ -39,10 +39,6 @@ object :process_specification do
field :note, :string
end
-object :process_specification_response do
- field :process_specification, non_null(:process_specification)
-end
-
input_object :process_specification_create_params do
@desc @name
field :name, non_null(:string)
@@ -61,11 +57,33 @@ input_object :process_specification_update_params do
field :note, :string
end
+object :process_specification_response do
+ field :process_specification, non_null(:process_specification)
+end
+
+object :process_specification_edge do
+ field :cursor, non_null(:id)
+ field :node, non_null(:process_specification)
+end
+
+object :process_specification_connection do
+ field :page_info, non_null(:page_info)
+ field :edges, non_null(list_of(non_null(:process_specification_edge)))
+end
+
object :query_process_specification do
field :process_specification, :process_specification do
arg :id, non_null(:id)
resolve &Resolv.process_specification/2
end
+
+ field :process_specifications, non_null(:process_specification_connection) do
+ arg :first, :integer
+ arg :after, :id
+ arg :last, :integer
+ arg :before, :id
+ resolve &Resolv.process_specifications/2
+ end
end
object :mutation_process_specification do
diff --git a/test/vf/process_specification/domain.test.exs b/test/vf/process_specification/domain.test.exs
@@ -27,45 +27,54 @@ setup do
name: Factory.uniq("name"),
note: Factory.uniq("note"),
},
- process_specification: Factory.insert!(:process_specification),
+ inserted: Factory.insert!(:process_specification),
}
end
-test "by_id/1 returns a ProcessSpecification", %{process_specification: proc_spec} do
- assert %ProcessSpecification{} = Domain.by_id(proc_spec.id)
+describe "one/1" do
+ test "with good id: finds the ProcessSpecification", %{inserted: %{id: id}} do
+ assert {:ok, %ProcessSpecification{}} = Domain.one(id)
+ end
+
+ test "with bad id: doesn't find the ProcessSpecification" do
+ assert {:error, "not found"} = Domain.one(Factory.id())
+ end
end
describe "create/1" do
- test "creates a ProcessSpecification with valid params", %{params: params} do
- assert {:ok, %ProcessSpecification{} = proc_spec} = Domain.create(params)
-
- assert proc_spec.name == params.name
- assert proc_spec.note == params.note
+ test "with good params: creates a ProcessSpecification", %{params: params} do
+ assert {:ok, %ProcessSpecification{} = new} = Domain.create(params)
+ assert new.name == params.name
+ assert new.note == params.note
end
- test "doesn't create a ProcessSpecification with invalid params" do
+ test "with bad params: doesn't create a ProcessSpecification" do
assert {:error, %Changeset{}} = Domain.create(%{})
end
end
describe "update/2" do
- test "updates a ProcessSpecification with valid params", %{params: params, process_specification: old} do
+ test "with good params: updates the ProcessSpecification", %{params: params, inserted: old} do
assert {:ok, %ProcessSpecification{} = new} = Domain.update(old.id, params)
-
assert new.name == params.name
assert new.note == params.note
end
- test "doesn't update a ProcessSpecification", %{process_specification: old} do
+ test "with bad params: doesn't update the ProcessSpecification", %{inserted: old} do
assert {:ok, %ProcessSpecification{} = new} = Domain.update(old.id, %{})
-
assert new.name == old.name
assert new.note == old.note
end
end
-test "delete/1 deletes a ProcessSpecification", %{process_specification: %{id: id}} do
- assert {:ok, %ProcessSpecification{id: ^id}} = Domain.delete(id)
- assert Domain.by_id(id) == nil
+describe "delete/1" do
+ test "with good id: deletes the ProcessSpecification", %{inserted: %{id: id}} do
+ assert {:ok, %ProcessSpecification{id: ^id}} = Domain.delete(id)
+ assert {:error, "not found"} = Domain.one(id)
+ end
+
+ test "with bad id: doesn't delete the ProcessSpecification" do
+ assert {:error, "not found"} = Domain.delete(Factory.id())
+ end
end
end
diff --git a/test/vf/process_specification/type.test.exs b/test/vf/process_specification/type.test.exs
@@ -21,77 +21,77 @@ use ZenflowsTest.Help.AbsinCase, async: true
setup do
%{
params: %{
- name: Factory.uniq("name"),
- note: Factory.uniq("note"),
+ "name" => Factory.uniq("name"),
+ "note" => Factory.uniq("note"),
},
- process_specification: Factory.insert!(:process_specification),
+ inserted: Factory.insert!(:process_specification),
}
end
+@frag """
+fragment processSpecification on ProcessSpecification {
+ id
+ name
+ note
+}
+"""
+
describe "Query" do
- test "processSpecification()", %{process_specification: proc_spec} do
+ test "processSpecification", %{inserted: new} do
assert %{data: %{"processSpecification" => data}} =
- query!("""
- processSpecification(id: "#{proc_spec.id}") {
- id
- name
- note
+ run!("""
+ #{@frag}
+ query ($id: ID!) {
+ processSpecification(id: $id) {...processSpecification}
}
- """)
+ """, vars: %{"id" => new.id})
- assert data["id"] == proc_spec.id
- assert data["name"] == proc_spec.name
- assert data["note"] == proc_spec.note
+ assert data["id"] == new.id
+ assert data["name"] == new.name
+ assert data["note"] == new.note
end
end
describe "Mutation" do
- test "createProcessSpecification()", %{params: params} do
+ test "createProcessSpecification", %{params: params} do
assert %{data: %{"createProcessSpecification" => %{"processSpecification" => data}}} =
- mutation!("""
- createProcessSpecification(processSpecification: {
- name: "#{params.name}"
- note: "#{params.note}"
- }) {
- processSpecification {
- id
- name
- note
+ run!("""
+ #{@frag}
+ mutation ($processSpecification: ProcessSpecificationCreateParams!) {
+ createProcessSpecification(processSpecification: $processSpecification) {
+ processSpecification {...processSpecification}
}
}
- """)
+ """, vars: %{"processSpecification" => params})
assert {:ok, _} = Zenflows.DB.ID.cast(data["id"])
- assert data["name"] == params.name
- assert data["note"] == params.note
+ assert data["name"] == params["name"]
+ assert data["note"] == params["note"]
end
- test "updateProcessSpecification()", %{params: params, process_specification: proc_spec} do
+ test "updateProcessSpecification", %{params: params, inserted: old} do
assert %{data: %{"updateProcessSpecification" => %{"processSpecification" => data}}} =
- mutation!("""
- updateProcessSpecification(processSpecification: {
- id: "#{proc_spec.id}"
- name: "#{params.name}"
- note: "#{params.note}"
- }) {
- processSpecification {
- id
- name
- note
+ run!("""
+ #{@frag}
+ mutation ($processSpecification: ProcessSpecificationUpdateParams!) {
+ updateProcessSpecification(processSpecification: $processSpecification) {
+ processSpecification {...processSpecification}
}
}
- """)
+ """, vars: %{"processSpecification" => Map.put(params, "id", old.id)})
- assert data["id"] == proc_spec.id
- assert data["name"] == params.name
- assert data["note"] == params.note
+ assert data["id"] == old.id
+ assert data["name"] == params["name"]
+ assert data["note"] == params["note"]
end
- test "deleteProcessSpecification()", %{process_specification: %{id: id}} do
+ test "deleteProcessSpecification", %{inserted: %{id: id}} do
assert %{data: %{"deleteProcessSpecification" => true}} =
- mutation!("""
- deleteProcessSpecification(id: "#{id}")
- """)
+ run!("""
+ mutation ($id: ID!) {
+ deleteProcessSpecification(id: $id)
+ }
+ """, vars: %{"id" => id})
end
end
end
