fix: cascade change action selection (#2193)

Author: barnabasJ

lib/ash/resource/change/cascade_destroy.ex

@@ -354,14 +354,14 @@ defmodule Ash.Resource.Change.CascadeDestroy do
   defp related_query(_records, opts, _) when opts.relationship.type == :many_to_many, do: :error
 
   defp related_query(records, opts, context_opts) do
-    read_action_name = opts.read_action || opts.relationship.read_action
+    read_action_name =
+      opts.read_action || opts.relationship.read_action || opts.action.atomic_upgrade_with
 
     read_action =
       if read_action_name do
         Ash.Resource.Info.action(opts.relationship.destination, read_action_name)
       else
-        opts.action.atomic_upgrade_with ||
-          Ash.Resource.Info.primary_action!(opts.relationship.destination, :read)
+        Ash.Resource.Info.primary_action!(opts.relationship.destination, :read)
       end
 
     related_query =

lib/ash/resource/change/cascade_update.ex

@@ -268,14 +268,14 @@ defmodule Ash.Resource.Change.CascadeUpdate do
     do: :error
 
   defp related_query(data, opts, context_opts) do
-    read_action_name = opts.read_action || opts.relationship.read_action
+    read_action_name =
+      opts.read_action || opts.relationship.read_action || opts.action.atomic_upgrade_with
 
     read_action =
       if read_action_name do
         Ash.Resource.Info.action(opts.relationship.destination, read_action_name)
       else
-        opts.action.atomic_upgrade_with ||
-          Ash.Resource.Info.primary_action!(opts.relationship.destination, :read)
+        Ash.Resource.Info.primary_action!(opts.relationship.destination, :read)
       end
 
     related_query =

test/resource/changes/cascade_destroy_test.exs

@@ -37,6 +37,13 @@ defmodule Ash.Test.Resource.Change.CascadeDestroy do
         change cascade_destroy(:posts, return_notifications?: true)
       end
 
+      destroy :destroy_with_atomic_upgrade do
+        change cascade_destroy(:posts,
+                 action: :destroy_with_atomic_upgrade,
+                 return_notifications?: true
+               )
+      end
+
       destroy :no_notification_destroy do
         change cascade_destroy(:posts,
                  return_notifications?: true,
@@ -52,6 +59,7 @@ defmodule Ash.Test.Resource.Change.CascadeDestroy do
     code_interface do
       define :create
       define :destroy
+      define :destroy_with_atomic_upgrade
       define :no_notification_destroy
       define :read
     end
@@ -68,6 +76,19 @@ defmodule Ash.Test.Resource.Change.CascadeDestroy do
     actions do
       defaults [:read, create: :*]
 
+      read :custom_read do
+        pagination keyset?: true, required?: false
+
+        prepare fn query, _ ->
+          Agent.update(
+            Test.Agent,
+            &%{&1 | custom_read_used: true}
+          )
+
+          query
+        end
+      end
+
       destroy :destroy do
         primary? true
         require_atomic? false
@@ -82,6 +103,20 @@ defmodule Ash.Test.Resource.Change.CascadeDestroy do
                end)
       end
 
+      destroy :destroy_with_atomic_upgrade do
+        atomic_upgrade_with :custom_read
+        require_atomic? false
+
+        change before_action(fn changeset, _ ->
+                 Agent.update(
+                   Test.Agent,
+                   &%{&1 | destroys: MapSet.put(&1.destroys, changeset.data.id)}
+                 )
+
+                 changeset
+               end)
+      end
+
       destroy :no_notification_destroy do
       end
     end
@@ -98,7 +133,10 @@ defmodule Ash.Test.Resource.Change.CascadeDestroy do
 
   setup do
     {:ok, pid} =
-      start_supervised({Agent, fn -> %{destroys: MapSet.new(), notifications: MapSet.new()} end})
+      start_supervised(
+        {Agent,
+         fn -> %{destroys: MapSet.new(), notifications: MapSet.new(), custom_read_used: false} end}
+      )
 
     Process.register(pid, Test.Agent)
 
@@ -173,4 +211,23 @@ defmodule Ash.Test.Resource.Change.CascadeDestroy do
     Author.destroy!(author.id)
     assert [] = Author.read!()
   end
+
+  test "uses atomic_upgrade_with action when specified" do
+    author = Author.create!(%{})
+
+    post_ids =
+      1..3
+      |> Enum.map(fn _ -> Post.create!(%{author_id: author.id}) end)
+      |> MapSet.new(& &1.id)
+
+    Author.destroy_with_atomic_upgrade!(author)
+
+    assert Agent.get(Test.Agent, & &1.custom_read_used) == true
+
+    deleted_ids = Agent.get(Test.Agent, & &1.destroys)
+    assert MapSet.equal?(post_ids, deleted_ids)
+
+    assert [] = Post.read!()
+    assert [] = Author.read!()
+  end
 end

test/resource/changes/cascade_update_test.exs

@@ -45,6 +45,17 @@ defmodule Ash.Test.Resource.Change.CascadeUpdate do
                )
       end
 
+      update :update_with_atomic_upgrade do
+        require_atomic? false
+        skip_unknown_inputs [:content]
+
+        change cascade_update(:posts,
+                 action: :update_with_atomic_upgrade,
+                 copy_inputs: [:name, :content],
+                 return_notifications?: true
+               )
+      end
+
       update :update_atomic do
         change cascade_update(:posts,
                  copy_inputs: [:name]
@@ -72,6 +83,7 @@ defmodule Ash.Test.Resource.Change.CascadeUpdate do
     code_interface do
       define :create
       define :update
+      define :update_with_atomic_upgrade
       define :no_notification_update
       define :read
     end
@@ -90,6 +102,19 @@ defmodule Ash.Test.Resource.Change.CascadeUpdate do
       default_accept :*
       defaults [:read, create: :*]
 
+      read :custom_read do
+        pagination keyset?: true, required?: false
+
+        prepare fn query, _ ->
+          Agent.update(
+            Test.Agent,
+            &%{&1 | custom_read_used: true}
+          )
+
+          query
+        end
+      end
+
       update :update do
         primary? true
         require_atomic? false
@@ -113,6 +138,12 @@ defmodule Ash.Test.Resource.Change.CascadeUpdate do
                end)
       end
 
+      update :update_with_atomic_upgrade do
+        atomic_upgrade_with :custom_read
+        require_atomic? false
+        skip_unknown_inputs [:content]
+      end
+
       update :no_notification_update do
       end
     end
@@ -191,7 +222,10 @@ defmodule Ash.Test.Resource.Change.CascadeUpdate do
 
   setup do
     {:ok, pid} =
-      start_supervised({Agent, fn -> %{updates: MapSet.new(), notifications: MapSet.new()} end})
+      start_supervised(
+        {Agent,
+         fn -> %{updates: MapSet.new(), notifications: MapSet.new(), custom_read_used: false} end}
+      )
 
     Process.register(pid, Test.Agent)
 
@@ -289,4 +323,25 @@ defmodule Ash.Test.Resource.Change.CascadeUpdate do
     a2 = Ash.get!(Author, author.id)
     assert ^name = a2.name
   end
+
+  test "uses atomic_upgrade_with action when specified" do
+    author = Author.create!(%{})
+    post1 = Post.create!(%{author_id: author.id})
+    post2 = Post.create!(%{author_id: author.id})
+
+    name = "Ash Framework"
+    content = "Is great!"
+
+    author |> Author.update_with_atomic_upgrade!(%{name: name, content: content})
+
+    assert Agent.get(Test.Agent, & &1.custom_read_used) == true
+
+    a = Ash.get!(Author, author.id)
+    p = Ash.get!(Post, post1.id)
+    p2 = Ash.get!(Post, post2.id)
+
+    assert ^name = a.name
+    assert ^name = p.name
+    assert ^name = p2.name
+  end
 end