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

fix: properly clean calculation dependency values, and don't unload them with lazy?

Browse source
This commit is contained in:
Zach Daniel 2024-08-31 15:32:54 -04:00
parent 926762cf38
commit 8ba9eeb3b4
2 changed files with 53 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
lib/ash/actions/read/calculations.ex
View file

@ -508,10 +508,21 @@ defmodule Ash.Actions.Read.Calculations do
if to_load do
Enum.map(records, fn record ->
case record do
%Ash.NotLoaded{} -> record
%Ash.ForbiddenField{} -> record
nil -> record
record -> Map.put(record, to_load, Map.get(record.calculations, source))
%Ash.NotLoaded{} ->
record
%Ash.ForbiddenField{} ->
record
nil ->
record
record ->
{new_val, calculations} = Map.pop(record.calculations, source)
record
|> Map.put(to_load, new_val)
|> Map.put(:calculations, calculations)
end
end)
else
@ -527,11 +538,11 @@ defmodule Ash.Actions.Read.Calculations do
record
record ->
Map.update!(
record,
:calculations,
&Map.put(&1, to_name, Map.get(record.calculations, source))
)
{new_val, calculations} = Map.pop(record.calculations, source)
record
|> Map.update!(:calculations, &Map.put(&1, to_name, new_val))
|> Map.put(:calculations, calculations)
end
end)
end
@ -540,10 +551,21 @@ defmodule Ash.Actions.Read.Calculations do
if to_load do
Enum.map(records, fn record ->
case record do
%Ash.NotLoaded{} -> record
%Ash.ForbiddenField{} -> record
nil -> record
record -> Map.put(record, to_load, Map.get(record.aggregates, source))
%Ash.NotLoaded{} ->
record
%Ash.ForbiddenField{} ->
record
nil ->
record
record ->
{new_val, aggregates} = Map.pop(record.aggregates, source)
record
|> Map.put(to_load, new_val)
|> Map.put(:aggregates, aggregates)
end
end)
else
@ -559,18 +581,23 @@ defmodule Ash.Actions.Read.Calculations do
record
record ->
Map.update!(
record,
:aggregates,
&Map.put(&1, to_name, Map.get(record.calculations, source))
)
{new_val, aggregates} = Map.pop(record.aggregates, source)
record
|> Map.update!(:aggregates, &Map.put(&1, to_name, new_val))
|> Map.put(:aggregates, aggregates)
end
end)
end
{{path, {:rel, rel_name}, _, _}, source}, records ->
update_at_path(records, path, fn record ->
Map.put(record, rel_name, Map.get(record.calculations, source))
records
|> update_at_path(path, fn record ->
{new_val, calculations} = Map.pop(record.calculations, source)
record
|> Map.put(rel_name, new_val)
|> Map.put(:calculations, calculations)
end)
end)
end

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

@ -1279,8 +1279,12 @@ defmodule Ash.Actions.Read do
|> Map.update!(:calculations, fn calculations ->
loaded_keys =
calculations
|> Enum.filter(fn {_key, calc} ->
Ash.Resource.loaded?(initial_data, calc)
|> Enum.filter(fn
{{:__calc_dep__, _}, _} ->
false
{_key, calc} ->
Ash.Resource.loaded?(initial_data, calc)
end)
|> Enum.map(&elem(&1, 0))