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

WIP

Browse source
This commit is contained in:
Zach Daniel 2020-05-15 01:03:43 -04:00
parent 26cd1c4af9
commit ccf30bafac
No known key found for this signature in database
GPG key ID: C377365383138D4B
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
lib/ash/actions/side_load.ex
View file

@ -237,11 +237,13 @@ defmodule Ash.Actions.SideLoad do
[[:include, Enum.map(path, &Map.get(&1, :name)), :data]]
end
request_path = [:include, Enum.reverse(Enum.map([relationship | path], &Map.get(&1, :name)))]
dependencies =
if use_data_for_filter? do
[[:data, :data] | dependencies]
else
dependencies
[request_path ++ [:query] | dependencies]
end
dependencies =
@ -257,8 +259,6 @@ defmodule Ash.Actions.SideLoad do
|> Enum.reverse()
|> Enum.map_join(".", &Map.get(&1, :name))
request_path = [:include, Enum.reverse(Enum.map([relationship | path], &Map.get(&1, :name)))]
Ash.Engine.Request.new(
action_type: :read,
resource: relationship.destination,
@ -294,13 +294,7 @@ defmodule Ash.Actions.SideLoad do
path
)
else
side_load_query(
relationship,
related_query,
path,
root_query,
use_data_for_filter?
)
Map.get(data, request_path).query
end
with {:ok, query} <- new_query,
@ -348,6 +342,13 @@ defmodule Ash.Actions.SideLoad do
[[:include, Enum.map(path, &Map.get(&1, :name)), :data]]
end
dependencies =
if use_data_for_filter? do
[[:data, :data] | dependencies]
else
[[:include, join_relationship_path, :query] | dependencies]
end
related_query = related_query.api.query(join_relationship.destination)
Ash.Engine.Request.new(
@ -379,13 +380,7 @@ defmodule Ash.Actions.SideLoad do
path
)
else
side_load_query(
join_relationship,
related_query,
join_relationship_path,
root_query,
use_data_for_filter?
)
Map.get(data, [:include, join_relationship_path]).query
end
with {:ok, query} <- new_query,