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: only depend on calcs in runtime calcs

Browse source
This commit is contained in:
Zach Daniel 2023-07-18 13:02:29 -04:00
parent 0b734c8bcb
commit bae2aa2ad2
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1120,6 +1120,7 @@ defmodule Ash.Actions.Read do
calculation_dependency_requests(
ash_query,
calculation_dependencies,
calculations_at_runtime,
request_opts,
path,
error_path,
@ -1640,6 +1641,7 @@ defmodule Ash.Actions.Read do
defp calculation_dependency_requests(
query,
calculation_deps,
runtime_calculations,
request_opts,
path,
error_path,
@ -1679,12 +1681,12 @@ defmodule Ash.Actions.Read do
[]
:calculation ->
if dep.path == [] && calculation_in_runtime_calcs?(dep, runtime_calculations) do
relationship_path = Enum.map(dep.path, &elem(&1, 0))
actual_data_path =
path ++ [:calculation_results, {dep.calculation.name, dep.calculation.load}]
if dep.path == [] do
[
Request.new(
resource: query.resource,
@ -1934,6 +1936,16 @@ defmodule Ash.Actions.Read do
end)
end
def calculation_in_runtime_calcs?(dep, runtime_calculations) do
Enum.any?(runtime_calculations, fn runtime_calc ->
dep.calculation.load == runtime_calc.load and
dep.calculation.module == runtime_calc.module and
dep.calculation.name == runtime_calc.name and
clean_calc_context(dep.calculation) ==
clean_calc_context(runtime_calc)
end)
end
defp calc_dep_path(path, dep) do
path ++ [:calc_dep, dep, :data]
end

4
lib/ash/code_interface.ex
View file

@ -550,7 +550,7 @@ defmodule Ash.CodeInterface do
:update ->
subject = quote do: changeset
subject_args = quote do: [record]
subject_args = quote do: [%{__struct__: unquote(resource)} = record]
resolve_subject =
quote do
@ -569,7 +569,7 @@ defmodule Ash.CodeInterface do
:destroy ->
subject = quote do: changeset
subject_args = quote do: [record]
subject_args = quote do: [%{__struct__: unquote(resource)} = record]
resolve_subject =
quote do