commit 4b2e4a280fedb6eb64731e794549f48337aa2fb9
parent 308fcdf722d3ae8bfacfedf0e4573927da975672
Author: srfsh <dev@srf.sh>
Date: Tue, 23 Aug 2022 11:46:41 +0300
Zenflows{Test,}.VF.ScenarioDefinition: add paging support and small improvements
Diffstat:
5 files changed, 148 insertions(+), 136 deletions(-)
diff --git a/src/zenflows/vf/scenario_definition/domain.ex b/src/zenflows/vf/scenario_definition/domain.ex
@@ -20,35 +20,48 @@ defmodule Zenflows.VF.ScenarioDefinition.Domain do
alias Ecto.Multi
alias Zenflows.DB.Repo
+alias Zenflows.GQL.Paging
alias Zenflows.VF.{Duration, ScenarioDefinition}
@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()) :: ScenarioDefinition.t() | nil
-def by_id(repo \\ Repo, id) do
- repo.get(ScenarioDefinition, id)
+@spec one(repo(), id() | map() | Keyword.t())
+ :: {:ok, ScenarioDefinition.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(ScenarioDefinition, clauses) do
+ nil -> {:error, "not found"}
+ found -> {:ok, found}
+ end
+end
+
+@spec all(Paging.params()) :: Paging.result(ScenarioDefinition.t())
+def all(params) do
+ Paging.page(ScenarioDefinition, params)
end
@spec create(params()) :: {:ok, ScenarioDefinition.t()} | {:error, chgset()}
def create(params) do
Multi.new()
- |> Multi.insert(:scen_def, ScenarioDefinition.chgset(params))
+ |> Multi.insert(:insert, ScenarioDefinition.chgset(params))
|> Repo.transaction()
|> case do
- {:ok, %{scen_def: sd}} -> {:ok, sd}
+ {:ok, %{insert: sd}} -> {:ok, sd}
{:error, _, cset, _} -> {:error, cset}
end
end
-@spec update(id(), params()) :: {:ok, ScenarioDefinition.t()} | {:error, chgset()}
+@spec update(id(), params())
+ :: {:ok, ScenarioDefinition.t()} | {:error, String.t() | chgset()}
def update(id, params) do
Multi.new()
- |> Multi.run(:get, multi_get(id))
- |> Multi.update(:update, &ScenarioDefinition.chgset(&1.get, params))
+ |> Multi.put(:id, id)
+ |> Multi.run(:one, &one/2)
+ |> Multi.update(:update, &ScenarioDefinition.chgset(&1.one, params))
|> Repo.transaction()
|> case do
{:ok, %{update: sd}} -> {:ok, sd}
@@ -56,11 +69,13 @@ def update(id, params) do
end
end
-@spec delete(id()) :: {:ok, ScenarioDefinition.t()} | {:error, chgset()}
+@spec delete(id())
+ :: {:ok, ScenarioDefinition.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: sd}} -> {:ok, sd}
@@ -72,17 +87,4 @@ end
def preload(scen_def, :has_duration) do
Duration.preload(scen_def, :has_duration)
end
-
-# Returns a ScenarioDefinition 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, ScenarioDefinition.t()} | {:error, String.t()})
-defp multi_get(id) do
- fn repo, _ ->
- case by_id(repo, id) do
- nil -> {:error, "not found"}
- sd -> {:ok, sd}
- end
- end
-end
end
diff --git a/src/zenflows/vf/scenario_definition/resolv.ex b/src/zenflows/vf/scenario_definition/resolv.ex
@@ -20,31 +20,35 @@ defmodule Zenflows.VF.ScenarioDefinition.Resolv do
use Absinthe.Schema.Notation
-alias Zenflows.VF.{ScenarioDefinition, ScenarioDefinition.Domain}
+alias Zenflows.VF.ScenarioDefinition.Domain
-def scenario_definition(%{id: id}, _info) do
- {:ok, Domain.by_id(id)}
+def scenario_definition(params, _) do
+ Domain.one(params)
end
-def create_scenario_definition(%{scenario_definition: params}, _info) do
+def scenario_definitions(params, _) do
+ Domain.all(params)
+end
+
+def create_scenario_definition(%{scenario_definition: params}, _) do
with {:ok, scen_def} <- Domain.create(params) do
{:ok, %{scenario_definition: scen_def}}
end
end
-def update_scenario_definition(%{scenario_definition: %{id: id} = params}, _info) do
+def update_scenario_definition(%{scenario_definition: %{id: id} = params}, _) do
with {:ok, scen_def} <- Domain.update(id, params) do
{:ok, %{scenario_definition: scen_def}}
end
end
-def delete_scenario_definition(%{id: id}, _info) do
+def delete_scenario_definition(%{id: id}, _) do
with {:ok, _} <- Domain.delete(id) do
{:ok, true}
end
end
-def has_duration(%ScenarioDefinition{} = scen_def, _args, _info) do
+def has_duration(scen_def, _, _) do
scen_def = Domain.preload(scen_def, :has_duration)
{:ok, scen_def.has_duration}
end
diff --git a/src/zenflows/vf/scenario_definition/type.ex b/src/zenflows/vf/scenario_definition/type.ex
@@ -46,10 +46,6 @@ object :scenario_definition do
field :note, :string
end
-object :scenario_definition_response do
- field :scenario_definition, non_null(:scenario_definition)
-end
-
input_object :scenario_definition_create_params do
@desc @name
field :name, non_null(:string)
@@ -74,13 +70,33 @@ input_object :scenario_definition_update_params do
field :has_duration, :iduration
end
+object :scenario_definition_response do
+ field :scenario_definition, non_null(:scenario_definition)
+end
+
+object :scenario_definition_edge do
+ field :cursor, non_null(:id)
+ field :node, non_null(:scenario_definition)
+end
+
+object :scenario_definition_connection do
+ field :page_info, non_null(:page_info)
+ field :edges, non_null(list_of(non_null(:scenario_definition_edge)))
+end
+
object :query_scenario_definition do
field :scenario_definition, :scenario_definition do
arg :id, non_null(:id)
resolve &Resolv.scenario_definition/2
end
- #scenarioDefinitions(start: ID, limit: Int): [ScenarioDefinition!]
+ field :scenario_definitions, :scenario_definition_connection do
+ arg :first, :integer
+ arg :after, :id
+ arg :last, :integer
+ arg :before, :id
+ resolve &Resolv.scenario_definitions/2
+ end
end
object :mutation_scenario_definition do
diff --git a/test/vf/scenario_definition/domain.test.exs b/test/vf/scenario_definition/domain.test.exs
@@ -25,53 +25,52 @@ alias Zenflows.VF.{
ScenarioDefinition.Domain,
}
-setup ctx do
- params = %{
- name: Factory.uniq("name"),
- note: Factory.uniq("note"),
- has_duration: Factory.build(:iduration),
- }
+setup do
+ %{
+ params: %{
+ name: Factory.uniq("name"),
+ note: Factory.uniq("note"),
+ has_duration: Factory.build(:iduration),
+ },
+ inserted: Factory.insert!(:scenario_definition),
+ }
+end
- if ctx[:no_insert] do
- %{params: params}
- else
- %{params: params, inserted: Factory.insert!(:scenario_definition)}
+describe "one/1" do
+ test "with good id: finds the ScenarioDefinition", %{inserted: %{id: id}} do
+ assert {:ok, %ScenarioDefinition{}} = Domain.one(id)
end
-end
-test "by_id/1 returns a ScenarioDefinition", %{inserted: scen_def} do
- assert %ScenarioDefinition{} = Domain.by_id(scen_def.id)
+ test "with bad id: doesn't find the ScenarioDefinition" do
+ assert {:error, "not found"} = Domain.one(Factory.id())
+ end
end
describe "create/1" do
- @tag :no_insert
- test "creates a ScenarioDefinition with valid params", %{params: params} do
- assert {:ok, %ScenarioDefinition{} = scen_def} = Domain.create(params)
-
- assert scen_def.name == params.name
- assert scen_def.note == params.note
- assert scen_def.has_duration_unit_type == params.has_duration.unit_type
- assert scen_def.has_duration_numeric_duration == params.has_duration.numeric_duration
+ test "with good params: creates a ScenarioDefinition", %{params: params} do
+ assert {:ok, %ScenarioDefinition{} = new} = Domain.create(params)
+ assert new.name == params.name
+ assert new.note == params.note
+ assert new.has_duration_unit_type == params.has_duration.unit_type
+ assert new.has_duration_numeric_duration == params.has_duration.numeric_duration
end
- test "doesn't create a ScenarioDefinition with invalid params" do
+ test "with bad params: doesn't create a ScenarioDefinition" do
assert {:error, %Changeset{}} = Domain.create(%{})
end
end
describe "update/2" do
- test "updates a ScenarioDefinition with valid params", %{params: params, inserted: old} do
+ test "with good params: updates the ScenarioDefinition", %{params: params, inserted: old} do
assert {:ok, %ScenarioDefinition{} = new} = Domain.update(old.id, params)
-
assert new.name == params.name
assert new.note == params.note
assert new.has_duration_unit_type == params.has_duration.unit_type
assert new.has_duration_numeric_duration == params.has_duration.numeric_duration
end
- test "doesn't update a ScenarioDefinition", %{inserted: old} do
+ test "with bad params: doesn't update the ScenarioDefinition", %{inserted: old} do
assert {:ok, %ScenarioDefinition{} = new} = Domain.update(old.id, %{})
-
assert new.name == old.name
assert new.note == old.note
assert new.has_duration_unit_type == old.has_duration_unit_type
@@ -79,9 +78,15 @@ describe "update/2" do
end
end
-test "delete/1 deletes a ScenarioDefinition", %{inserted: %{id: id}} do
- assert {:ok, %ScenarioDefinition{id: ^id}} = Domain.delete(id)
- assert Domain.by_id(id) == nil
+describe "delete/1" do
+ test "with good id: deletes the ScenarioDefinition", %{inserted: %{id: id}} do
+ assert {:ok, %ScenarioDefinition{id: ^id}} = Domain.delete(id)
+ assert {:error, "not found"} = Domain.one(id)
+ end
+
+ test "with bad id: doesn't delete the ScenarioDefinition" do
+ assert {:error, "not found"} = Domain.delete(Factory.id())
+ end
end
describe "preload/2" do
diff --git a/test/vf/scenario_definition/type.test.exs b/test/vf/scenario_definition/type.test.exs
@@ -21,104 +21,89 @@ use ZenflowsTest.Help.AbsinCase, async: true
setup do
%{
params: %{
- name: Factory.uniq("name"),
- note: Factory.uniq("note"),
- has_duration: Factory.build(:iduration),
+ "name" => Factory.str("name"),
+ "note" => Factory.str("note"),
+ "hasDuration" => %{
+ "unitType" => Factory.build(:time_unit) |> to_string(),
+ "numericDuration" => Factory.float(),
+ },
},
inserted: Factory.insert!(:scenario_definition),
}
end
+@frag """
+fragment scenarioDefinition on ScenarioDefinition {
+ id
+ name
+ note
+ hasDuration {
+ unitType
+ numericDuration
+ }
+}
+"""
+
describe "Query" do
- test "scenarioDefinition()", %{inserted: scen_def} do
+ test "scenarioDefinition", %{inserted: new} do
assert %{data: %{"scenarioDefinition" => data}} =
- query!("""
- scenarioDefinition(id: "#{scen_def.id}") {
- id
- name
- note
- hasDuration {
- unitType
- numericDuration
- }
+ run!("""
+ #{@frag}
+ query ($id: ID!) {
+ scenarioDefinition(id: $id) {...scenarioDefinition}
}
- """)
+ """, vars: %{"id" => new.id})
- assert data["id"] == scen_def.id
- assert data["name"] == scen_def.name
- assert data["note"] == scen_def.note
- assert data["hasDuration"]["unitType"] == to_string(scen_def.has_duration_unit_type)
- assert data["hasDuration"]["numericDuration"] == scen_def.has_duration_numeric_duration
+ assert data["id"] == new.id
+ assert data["name"] == new.name
+ assert data["note"] == new.note
+ assert data["hasDuration"]["unitType"] == to_string(new.has_duration_unit_type)
+ assert data["hasDuration"]["numericDuration"] == new.has_duration_numeric_duration
end
end
describe "Mutation" do
- test "createScenarioDefinition()", %{params: params} do
+ test "createScenarioDefinition", %{params: params} do
assert %{data: %{"createScenarioDefinition" => %{"scenarioDefinition" => data}}} =
- mutation!("""
- createScenarioDefinition(scenarioDefinition: {
- name: "#{params.name}"
- note: "#{params.note}"
- hasDuration: {
- unitType: #{params.has_duration.unit_type}
- numericDuration: #{params.has_duration.numeric_duration}
- }
- }) {
- scenarioDefinition {
- id
- name
- note
- hasDuration {
- unitType
- numericDuration
- }
+ run!("""
+ #{@frag}
+ mutation ($scenarioDefinition: ScenarioDefinitionCreateParams!) {
+ createScenarioDefinition(scenarioDefinition: $scenarioDefinition) {
+ scenarioDefinition {...scenarioDefinition}
}
}
- """)
+ """, vars: %{"scenarioDefinition" => params})
assert {:ok, _} = Zenflows.DB.ID.cast(data["id"])
- assert data["name"] == params.name
- assert data["note"] == params.note
- assert data["hasDuration"]["unitType"] == to_string(params.has_duration.unit_type)
- assert data["hasDuration"]["numericDuration"] == params.has_duration.numeric_duration
+ assert data["name"] == params["name"]
+ assert data["note"] == params["note"]
+ assert data["hasDuration"] == params["hasDuration"]
end
- test "updateScenarioDefinition()", %{params: params, inserted: scen_def} do
+ test "updateScenarioDefinition", %{params: params, inserted: old} do
assert %{data: %{"updateScenarioDefinition" => %{"scenarioDefinition" => data}}} =
- mutation!("""
- updateScenarioDefinition(scenarioDefinition: {
- id: "#{scen_def.id}"
- name: "#{params.name}"
- note: "#{params.note}"
- hasDuration: {
- unitType: #{params.has_duration.unit_type}
- numericDuration: #{params.has_duration.numeric_duration}
- }
- }) {
- scenarioDefinition {
- id
- name
- note
- hasDuration {
- unitType
- numericDuration
- }
+ run!("""
+ #{@frag}
+ mutation ($scenarioDefinition: ScenarioDefinitionUpdateParams!) {
+ updateScenarioDefinition(scenarioDefinition: $scenarioDefinition) {
+ scenarioDefinition {...scenarioDefinition}
}
}
- """)
+ """, vars: %{"scenarioDefinition" => Map.put(params, "id", old.id)})
- assert data["id"] == scen_def.id
- assert data["name"] == params.name
- assert data["note"] == params.note
- assert data["hasDuration"]["unitType"] == to_string(params.has_duration.unit_type)
- assert data["hasDuration"]["numericDuration"] == params.has_duration.numeric_duration
+ assert data["id"] == old.id
+ assert data["name"] == params["name"]
+ assert data["note"] == params["note"]
+ assert data["hasDuration"] == params["hasDuration"]
end
test "deleteScenarioDefinition()", %{inserted: %{id: id}} do
assert %{data: %{"deleteScenarioDefinition" => true}} =
- mutation!("""
- deleteScenarioDefinition(id: "#{id}")
- """)
+ run!("""
+ mutation ($id: ID!) {
+ deleteScenarioDefinition(id: $id)
+ }
+ """, vars: %{"id" => id})
end
end
end
