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

improvment: loading data shouldn't call before action hooks

Browse source 
by this, I mean that loading data shouldn't call before action
hooks on the root resource you're loading data on
This commit is contained in:
Zach Daniel 2023-04-01 01:35:12 -04:00
parent a9db35e79f
commit f832ab3624
2 changed files with 77 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -286,6 +286,25 @@ defmodule Ash.Actions.Read do
query = add_calculation_context(query, actor, authorize?, tenant, tracer)
if Keyword.has_key?(request_opts, :initial_data) do
query
|> Ash.Query.set_context(%{
initial_limit: query.limit,
initial_offset: query.offset,
page_opts: nil,
initial_query: query,
filter_requests: [],
query_opts: query_opts
})
|> query_with_initial_data(request_opts)
|> case do
%{valid?: true} = query ->
{:ok, query}
%{valid?: false} = query ->
{:error, query.errors, %{set: %{query: query}}}
end
else
query = %{
query
| api: api,
@ -303,9 +322,7 @@ defmodule Ash.Actions.Read do
%{limit: initial_limit, offset: initial_offset} <- query,
%{valid?: true} = query <-
handle_attribute_multitenancy(query),
:ok <- validate_multitenancy(query, initial_data),
%{valid?: true} = query <-
query_with_initial_data(query, request_opts),
:ok <- validate_multitenancy(query),
{%{valid?: true} = query, before_notifications} <-
run_before_action(query),
{:ok, initial_query, query, page_opts} <-
@ -345,6 +362,7 @@ defmodule Ash.Actions.Read do
other
end
end
end
),
authorize?: !Keyword.has_key?(request_opts, :initial_data),
data: data_field(request_opts, path, error_path),
@ -586,10 +604,9 @@ defmodule Ash.Actions.Read do
end
end
defp validate_multitenancy(query, initial_data) do
defp validate_multitenancy(query) do
if is_nil(Ash.Resource.Info.multitenancy_strategy(query.resource)) ||
Ash.Resource.Info.multitenancy_global?(query.resource) || query.tenant ||
initial_data do
Ash.Resource.Info.multitenancy_global?(query.resource) || query.tenant do
:ok
else
{:error, Ash.Error.Invalid.TenantRequired.exception(resource: query.resource)}

9
lib/ash/query/query.ex
View file

@ -385,7 +385,8 @@ defmodule Ash.Query do
end
end
defp set_actor(query, opts) do
@doc false
def set_actor(query, opts) do
if Keyword.has_key?(opts, :actor) do
put_context(query, :private, %{actor: opts[:actor]})
else
@ -393,7 +394,8 @@ defmodule Ash.Query do
end
end
defp set_authorize?(query, opts) do
@doc false
def set_authorize?(query, opts) do
if Keyword.has_key?(opts, :authorize?) do
put_context(query, :private, %{authorize?: opts[:authorize?]})
else
@ -401,7 +403,8 @@ defmodule Ash.Query do
end
end
defp set_tracer(query, opts) do
@doc false
def set_tracer(query, opts) do
if Keyword.has_key?(opts, :tracer) do
put_context(query, :private, %{tracer: opts[:tracer]})
else