fix: apply destroy loads on initial query (#346)

Author: DGollings

lib/graphql/resolver.ex

@@ -1792,6 +1792,7 @@ defmodule AshGraphql.Graphql.Resolver do
                 |> Ash.Query.set_context(get_context(context))
                 |> set_query_arguments(read_action, read_action_input)
                 |> Ash.Query.limit(1)
+                |> pre_load_for_mutation(domain, resource, resolution, context, mutation_name)
 
               {result, modify_args} =
                 query
@@ -1811,23 +1812,7 @@ defmodule AshGraphql.Graphql.Resolver do
                   select:
                     get_select(resource, resolution, mutation_result_type(mutation_name), [
                       "result"
-                    ]),
-                  load:
-                    get_loads(
-                      [
-                        domain: domain,
-                        tenant: Map.get(context, :tenant),
-                        authorize?: AshGraphql.Domain.Info.authorize?(domain),
-                        tracer: AshGraphql.Domain.Info.tracer(domain),
-                        actor: Map.get(context, :actor)
-                      ],
-                      resource,
-                      resolution,
-                      resolution.path,
-                      context,
-                      mutation_result_type(mutation_name),
-                      ["result"]
-                    )
+                    ])
                 )
                 |> case do
                   %Ash.BulkResult{status: :success, records: [value]} ->
@@ -2068,6 +2053,29 @@ defmodule AshGraphql.Graphql.Resolver do
     end
   end
 
+  # Pre-load aggregates and calculations on the query before destruction
+  # to ensure they are available in the returned record for GraphQL serialization
+  defp pre_load_for_mutation(query, domain, resource, resolution, context, mutation_name) do
+    load_opts = [
+      domain: domain,
+      tenant: Map.get(context, :tenant),
+      authorize?: AshGraphql.Domain.Info.authorize?(domain),
+      tracer: AshGraphql.Domain.Info.tracer(domain),
+      actor: Map.get(context, :actor)
+    ]
+
+    load_fields(
+      query,
+      load_opts,
+      resource,
+      resolution,
+      resolution.path,
+      context,
+      mutation_result_type(mutation_name),
+      ["result"]
+    )
+  end
+
   @doc false
   def get_loads(
         load_opts,

test/destroy_test.exs

@@ -9,6 +9,24 @@ defmodule AshGraphql.DestroyTest do
     end)
   end
 
+  defp create_post_with_comments(comment_count) do
+    post =
+      AshGraphql.Test.Post
+      |> Ash.Changeset.for_create(:create, text: "test post")
+      |> Ash.create!()
+
+    if comment_count > 0 do
+      for i <- 1..comment_count do
+        AshGraphql.Test.Comment
+        |> Ash.Changeset.for_create(:create, text: "comment #{i}", post_id: post.id)
+        |> Ash.create!()
+      end
+    end
+
+    AshGraphql.Test.Post
+    |> Ash.get!(post.id)
+  end
+
   test "a destroy works" do
     post =
       AshGraphql.Test.Post
@@ -227,4 +245,78 @@ defmodule AshGraphql.DestroyTest do
               }
             }} = resp
   end
+
+  test "destroy mutation returns aggregates" do
+    post = create_post_with_comments(2)
+
+    resp =
+      """
+      mutation DeletePost($id: ID!) {
+        deletePost(id: $id) {
+          result {
+            text
+            commentCount
+          }
+          errors {
+            message
+          }
+        }
+      }
+      """
+      |> Absinthe.run(AshGraphql.Test.Schema,
+        variables: %{
+          "id" => post.id
+        }
+      )
+
+    assert {:ok,
+            %{
+              data: %{
+                "deletePost" => %{
+                  "result" => %{
+                    "text" => "test post",
+                    "commentCount" => 2
+                  },
+                  "errors" => []
+                }
+              }
+            }} = resp
+  end
+
+  test "destroy mutation returns zero aggregates" do
+    post = create_post_with_comments(0)
+
+    resp =
+      """
+      mutation DeletePost($id: ID!) {
+        deletePost(id: $id) {
+          result {
+            text
+            commentCount
+          }
+          errors {
+            message
+          }
+        }
+      }
+      """
+      |> Absinthe.run(AshGraphql.Test.Schema,
+        variables: %{
+          "id" => post.id
+        }
+      )
+
+    assert {:ok,
+            %{
+              data: %{
+                "deletePost" => %{
+                  "result" => %{
+                    "text" => "test post",
+                    "commentCount" => 0
+                  },
+                  "errors" => []
+                }
+              }
+            }} = resp
+  end
 end