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

fix: check changeset.valid? properly on destroys

Browse source
This commit is contained in:
Zach Daniel 2023-01-30 13:23:35 -05:00
parent dbb9dd4c98
commit c9d63d2936
1 changed files with 37 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
lib/ash/actions/destroy.ex
View file

@ -280,42 +280,46 @@ defmodule Ash.Actions.Destroy do
changeset
|> Ash.Changeset.put_context(:private, %{actor: actor, authorize?: authorize?})
|> Ash.Changeset.with_hooks(fn changeset ->
cond do
action.manual ->
{mod, opts} = action.manual
|> Ash.Changeset.with_hooks(fn
%{valid?: false} = changeset ->
{:error, changeset}
if result = changeset.context[:private][:action_result] do
result
else
mod.destroy(changeset, opts, %{
actor: actor,
tenant: changeset.tenant,
authorize?: authorize?,
api: changeset.api
})
end
changeset ->
cond do
action.manual ->
{mod, opts} = action.manual
action.manual? ->
{:ok, record}
true ->
if result = changeset.context[:private][:action_result] do
result
else
case Ash.DataLayer.destroy(resource, changeset) do
:ok ->
{:ok,
Ash.Resource.set_meta(record, %Ecto.Schema.Metadata{
state: :deleted,
schema: resource
})}
{:error, error} ->
{:error, Ash.Changeset.add_error(changeset, error)}
if result = changeset.context[:private][:action_result] do
result
else
mod.destroy(changeset, opts, %{
actor: actor,
tenant: changeset.tenant,
authorize?: authorize?,
api: changeset.api
})
end
end
end
action.manual? ->
{:ok, record}
true ->
if result = changeset.context[:private][:action_result] do
result
else
case Ash.DataLayer.destroy(resource, changeset) do
:ok ->
{:ok,
Ash.Resource.set_meta(record, %Ecto.Schema.Metadata{
state: :deleted,
schema: resource
})}
{:error, error} ->
{:error, Ash.Changeset.add_error(changeset, error)}
end
end
end
end)
|> case do
{:ok, result, changeset, instructions} ->