commit 852caece26e655dece501ba3a2621ca8603ea479
parent 700919107d38375c31dc2ffc19ccd3c6e278fde5
Author: srfsh <dev@srf.sh>
Date: Wed, 7 Dec 2022 13:45:39 +0300
Zenflows.Vf.EconomicResource: rename trace_dpp_tree to trace_dpp
Diffstat:
3 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/src/zenflows/vf/economic_resource/domain.ex b/src/zenflows/vf/economic_resource/domain.ex
@@ -275,18 +275,18 @@ end
@max_depth 100000000
-@spec trace_dpp_tree_er_before(EconomicResource.t(), MapSet.t(), integer()) :: {MapSet.t(), map()}
-def trace_dpp_tree_er_before(_item, visited, depth) when depth >= @max_depth do
+@spec trace_dpp_er_before(EconomicResource.t(), MapSet.t(), integer()) :: {MapSet.t(), map()}
+def trace_dpp_er_before(_item, visited, depth) when depth >= @max_depth do
{visited, %{}}
end
-def trace_dpp_tree_er_before(item = %EconomicResource{}, visited, depth) do
+def trace_dpp_er_before(item = %EconomicResource{}, visited, depth) do
a_dpp_item = %{node: item}
{visited2, children} = EconomicResource.Domain.previous(item) |> Enum.reduce({visited, []},
fn ee, {visited, children} ->
if MapSet.member?(visited, {ee.__struct__, ee.id}) do
{visited, children}
else
- {visited2, child} = trace_dpp_tree_ee_before(ee, visited, depth+1)
+ {visited2, child} = trace_dpp_ee_before(ee, visited, depth+1)
{MapSet.put(visited2, {ee.__struct__, ee.id}), [ child | children ]}
end
end
@@ -294,24 +294,24 @@ def trace_dpp_tree_er_before(item = %EconomicResource{}, visited, depth) do
{visited2, Map.put(a_dpp_item, :children, children)}
end
-@spec trace_dpp_tree_ee_before_recurse(
+@spec trace_dpp_ee_before_recurse(
EconomicEvent.t() | EconomicResource.t() | Process.t(),
MapSet.t(), pos_integer() ) :: {MapSet.t(), map()}
-def trace_dpp_tree_ee_before_recurse(item = %EconomicResource{}, visited, depth) do
- trace_dpp_tree_er_before(item, visited, depth)
+def trace_dpp_ee_before_recurse(item = %EconomicResource{}, visited, depth) do
+ trace_dpp_er_before(item, visited, depth)
end
-def trace_dpp_tree_ee_before_recurse(item = %EconomicEvent{}, visited, depth) do
- trace_dpp_tree_ee_before(item, visited, depth)
+def trace_dpp_ee_before_recurse(item = %EconomicEvent{}, visited, depth) do
+ trace_dpp_ee_before(item, visited, depth)
end
-def trace_dpp_tree_ee_before_recurse(item = %Process{}, visited, depth) do
- trace_dpp_tree_pr_before(item, MapSet.put(visited, {item.__struct__, item.id}), depth)
+def trace_dpp_ee_before_recurse(item = %Process{}, visited, depth) do
+ trace_dpp_pr_before(item, MapSet.put(visited, {item.__struct__, item.id}), depth)
end
-@spec trace_dpp_tree_ee_before(EconomicEvent.t(), MapSet.t(), pos_integer()) :: {MapSet.t(), map()}
-def trace_dpp_tree_ee_before(_item, visited, depth) when depth >= @max_depth do
+@spec trace_dpp_ee_before(EconomicEvent.t(), MapSet.t(), pos_integer()) :: {MapSet.t(), map()}
+def trace_dpp_ee_before(_item, visited, depth) when depth >= @max_depth do
{visited, %{}}
end
-def trace_dpp_tree_ee_before(item = %EconomicEvent{}, visited, depth) do
+def trace_dpp_ee_before(item = %EconomicEvent{}, visited, depth) do
a_dpp_item = %{node: item}
pr_item = EconomicEvent.Domain.previous(item)
if pr_item == nil do
@@ -322,7 +322,7 @@ def trace_dpp_tree_ee_before(item = %EconomicEvent{}, visited, depth) do
if MapSet.member?(visited, {pf.__struct__, pf.id}) do
{visited, children}
else
- {visited2, child} = trace_dpp_tree_ee_before_recurse(pf, visited, depth+1)
+ {visited2, child} = trace_dpp_ee_before_recurse(pf, visited, depth+1)
{ MapSet.put(visited2, {pf.__struct__, pf.id}), [ child | children ]}
end
end
@@ -331,18 +331,18 @@ def trace_dpp_tree_ee_before(item = %EconomicEvent{}, visited, depth) do
end
end
-@spec trace_dpp_tree_pr_before(Process.t(), MapSet.t(), integer()) :: {MapSet.t(), map()}
-def trace_dpp_tree_pr_before(_item, visited, depth) when depth >= @max_depth do
+@spec trace_dpp_pr_before(Process.t(), MapSet.t(), integer()) :: {MapSet.t(), map()}
+def trace_dpp_pr_before(_item, visited, depth) when depth >= @max_depth do
{visited, %{}}
end
-def trace_dpp_tree_pr_before(item, visited, depth) do
+def trace_dpp_pr_before(item, visited, depth) do
a_dpp_item = %{node: item}
{visited2, children} = Process.Domain.previous(item) |> Enum.reduce({visited, []},
fn ee, {visited, children} ->
if MapSet.member?(visited, ee.id) do
{visited, children}
else
- {visited2, child} = trace_dpp_tree_ee_before(ee, visited, depth+1)
+ {visited2, child} = trace_dpp_ee_before(ee, visited, depth+1)
{MapSet.put(visited2, ee.id), [ child | children ]}
end
end
@@ -350,9 +350,9 @@ def trace_dpp_tree_pr_before(item, visited, depth) do
{visited2, Map.put(a_dpp_item, :children, children)}
end
-@spec trace_dpp_tree(EconomicResource.t(), Page.t()) :: map()
-def trace_dpp_tree(item, _page \\ Page.new()) do
- {visited, dpp} = trace_dpp_tree_er_before(item, MapSet.new(), 0)
+@spec trace_dpp(EconomicResource.t(), Page.t()) :: map()
+def trace_dpp(item, _page \\ Page.new()) do
+ {_, dpp} = trace_dpp_er_before(item, MapSet.new(), 0)
dpp.children |> IO.inspect
dpp
end
diff --git a/src/zenflows/vf/economic_resource/resolv.ex b/src/zenflows/vf/economic_resource/resolv.ex
@@ -118,7 +118,7 @@ def trace(eco_res, _, _) do
{:ok, Domain.trace(eco_res)}
end
-def trace_dpp_tree(eco_res, _, _) do
- {:ok, Domain.trace_dpp_tree(eco_res)}
+def trace_dpp(eco_res, _, _) do
+ {:ok, Domain.trace_dpp(eco_res)}
end
end
diff --git a/src/zenflows/vf/economic_resource/type.ex b/src/zenflows/vf/economic_resource/type.ex
@@ -184,8 +184,7 @@ object :economic_resource do
field :trace, list_of(non_null(:track_trace_item)),
resolve: &Resolv.trace/3
- field :trace_dpp_tree, non_null(:json),
- resolve: &Resolv.trace_dpp_tree/3
+ field :trace_dpp, non_null(:json), resolve: &Resolv.trace_dpp/3
end
input_object :economic_resource_create_params do
