ash-project/ash
1
0
Fork 0
mirror of https://github.com/ash-project/ash.git synced 2024-09-20 13:33:20 +12:00
Code Issues Projects Releases Packages Wiki Activity

fix: handle calculation deps w/ multiple nested relationship paths

Browse source
This commit is contained in:
Zach Daniel 2023-04-20 07:46:42 -06:00
parent 84a426c53e
commit d5074a1dd4
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lib/ash/actions/read.ex
View file

@ -2511,20 +2511,21 @@ defmodule Ash.Actions.Read do
end) do end) do
{[], rest} -> {[], rest} ->
rest rest
|> Enum.reduce(results, fn {%{ |> Enum.reduce(results, fn
type: :calculation, {%{
path: path, type: :calculation,
calculation: calculation path: path,
}, config}, calculation: calculation
results -> }, config},
resource = Ash.Resource.Info.related(query.resource, Enum.map(path, &elem(&1, 0))) results ->
resource = Ash.Resource.Info.related(query.resource, Enum.map(path, &elem(&1, 0)))
do_add_calculation_values(resource, results, %{ do_add_calculation_values(resource, results, %{
{calculation.name, calculation.load} => config {calculation.name, calculation.load} => config
}) })
end) end)
{[{%{relationship: relationship, query: query}, rel_config}], rest} -> {[{%{relationship: relationship, query: query, path: path}, rel_config}], rest} ->
relationship_data = relationship_data =
rest rest
|> Enum.reduce(rel_config[:data], fn |> Enum.reduce(rel_config[:data], fn
@ -2543,8 +2544,13 @@ defmodule Ash.Actions.Read do
results results
end) end)
rel_path =
path
|> Enum.map(&elem(&1, 0))
|> Enum.concat([relationship])
Ash.Actions.Load.attach_loads(results, %{ Ash.Actions.Load.attach_loads(results, %{
[relationship] => %{data: relationship_data} rel_path => %{data: relationship_data}
}) })
end end
end end