mirror of
https://github.com/ash-project/ash.git
synced 2024-09-20 13:33:20 +12:00
improvement: handle the case where managed relationship input is an embed
This commit is contained in:
parent
a18f91bd59
commit
80833c3f58
2 changed files with 52 additions and 21 deletions
|
@ -166,7 +166,7 @@ defmodule Ash.Actions.ManagedRelationships do
|
|||
)
|
||||
|
||||
{_key, _create_or_update, read} ->
|
||||
if is_struct(input) do
|
||||
if is_struct(input, relationship.destination) do
|
||||
changeset =
|
||||
changeset
|
||||
|> Ash.Changeset.set_context(%{
|
||||
|
@ -839,7 +839,7 @@ defmodule Ash.Actions.ManagedRelationships do
|
|||
|
||||
case Ash.Filter.get_filter(relationship.destination, input) do
|
||||
{:ok, keys} ->
|
||||
if is_struct(input) do
|
||||
if is_struct(input, relationship.destination) do
|
||||
{:ok, input}
|
||||
else
|
||||
relationship.destination
|
||||
|
@ -986,9 +986,14 @@ defmodule Ash.Actions.ManagedRelationships do
|
|||
|
||||
type when type in [:has_many, :has_one] ->
|
||||
{found, input} =
|
||||
if is_struct(input) do
|
||||
cond do
|
||||
is_struct(input, relationship.destination) ->
|
||||
{input, %{}}
|
||||
else
|
||||
|
||||
is_struct(input) ->
|
||||
{found, Map.from_struct(input)}
|
||||
|
||||
true ->
|
||||
{found, input}
|
||||
end
|
||||
|
||||
|
@ -1041,9 +1046,16 @@ defmodule Ash.Actions.ManagedRelationships do
|
|||
case changeset.context[:private][:belongs_to_manage_created][relationship.name][index] do
|
||||
nil ->
|
||||
created =
|
||||
if is_struct(input) do
|
||||
if is_struct(input, relationship.destination) do
|
||||
{:ok, input, []}
|
||||
else
|
||||
input =
|
||||
if is_struct(input) do
|
||||
Map.from_struct(input)
|
||||
else
|
||||
input
|
||||
end
|
||||
|
||||
relationship.destination
|
||||
|> Ash.Changeset.new()
|
||||
|> Ash.Changeset.for_create(action_name, input,
|
||||
|
@ -1078,16 +1090,21 @@ defmodule Ash.Actions.ManagedRelationships do
|
|||
join_keys = params ++ Enum.map(params, &to_string/1)
|
||||
|
||||
input =
|
||||
if is_map(input) do
|
||||
cond do
|
||||
is_struct(input, relationship.destination) ->
|
||||
input
|
||||
|
||||
is_struct(input) ->
|
||||
Map.from_struct(input)
|
||||
|
||||
true ->
|
||||
input
|
||||
else
|
||||
Enum.into(input, %{})
|
||||
end
|
||||
|
||||
{join_params, regular_params} = split_join_keys(input, join_keys)
|
||||
|
||||
created =
|
||||
if is_struct(input) do
|
||||
if is_struct(input, relationship.destination) do
|
||||
{:ok, input, [], [input]}
|
||||
else
|
||||
relationship.destination
|
||||
|
@ -1213,9 +1230,14 @@ defmodule Ash.Actions.ManagedRelationships do
|
|||
|
||||
{:update, action_name} ->
|
||||
{match, input} =
|
||||
if is_struct(input) do
|
||||
cond do
|
||||
is_struct(input, relationship.destination) ->
|
||||
{input, %{}}
|
||||
else
|
||||
|
||||
is_struct(input) ->
|
||||
Map.from_struct(input)
|
||||
|
||||
true ->
|
||||
{match, input}
|
||||
end
|
||||
|
||||
|
@ -1242,9 +1264,14 @@ defmodule Ash.Actions.ManagedRelationships do
|
|||
{join_params, regular_params} = split_join_keys(input, join_keys)
|
||||
|
||||
{match, regular_params} =
|
||||
if is_struct(regular_params) do
|
||||
cond do
|
||||
is_struct(regular_params, relationship.destination) ->
|
||||
{regular_params, %{}}
|
||||
else
|
||||
|
||||
is_struct(regular_params) ->
|
||||
Map.from_struct(regular_params)
|
||||
|
||||
true ->
|
||||
{match, regular_params}
|
||||
end
|
||||
|
||||
|
|
|
@ -15,3 +15,7 @@ end
|
|||
### Primary Actions
|
||||
|
||||
Primary actions have been simplified for 2.0.0. If there was a single action of a given type before, it would have been marked as `primary?` automatically. Now, `primary?` actions are fully optional, although you may still want to configure them. Certain things like [managing relationships](managing_relationships.md) can be much simpler when paired with primary actions. For a fully explicit experience everywhere, however, you may want to skip primary actions altogether. To make sure your application behaves the same, go to each of your resources and check to see if they only have one action of each type. If they do, mark that single action as `primary?`. Additionally, the `primary_actions?` option has been removed now that all primary actions are explicit.
|
||||
|
||||
### Ash.Error.Query.NotFound
|
||||
|
||||
We used to return/raise this error directly when something wasn't found, but it was the only place in the framework not using an Error Class. So if you had anything matching on `%Ash.Error.Query.NotFound{}` it should instead now match on `%Ash.Error.Invalid{errors: [%Ash.Error.Query.NotFound{}]}`.
|
Loading…
Reference in a new issue