improvement: use bulk_metadata ref added to changesets

Author: DGollings

lib/ash/actions/bulk_manual_action_helpers.ex

@@ -87,21 +87,29 @@ defmodule Ash.Actions.BulkManualActionHelpers do
     case result do
       {:ok, record} ->
         record =
-          Ash.Resource.put_metadata(
-            record,
+          record
+          |> Ash.Resource.put_metadata(
             metadata_index_name,
             changeset.context[bulk_action_type].index
           )
+          |> Ash.Resource.put_metadata(
+            :bulk_action_ref,
+            changeset.context[bulk_action_type].ref
+          )
 
         {:ok, record}
 
       {:ok, record, notifications} ->
         record =
-          Ash.Resource.put_metadata(
-            record,
+          record
+          |> Ash.Resource.put_metadata(
             metadata_index_name,
             changeset.context[bulk_action_type].index
           )
+          |> Ash.Resource.put_metadata(
+            :bulk_action_ref,
+            changeset.context[bulk_action_type].ref
+          )
 
         {:ok, record, notifications}
 

lib/ash/actions/update/bulk.ex

@@ -660,7 +660,11 @@ defmodule Ash.Actions.Update.Bulk do
             case results do
               [result] ->
                 if atomic_changeset.context[:data_layer][:use_atomic_update_data?] do
-                  Map.put(result, :__metadata__, atomic_changeset.data.__metadata__)
+                  Map.put(
+                    result,
+                    :__metadata__,
+                    Map.merge(atomic_changeset.data.__metadata__, result.__metadata__)
+                  )
                 else
                   [result]
                 end
@@ -2594,7 +2598,6 @@ defmodule Ash.Actions.Update.Bulk do
                     ref,
                     opts
                   )
-                  |> add_metadata_to_results(batch, metadata_key, ref_metadata_key, context_key)
 
                 _ ->
                   Enum.reduce_while(
@@ -2730,8 +2733,16 @@ defmodule Ash.Actions.Update.Bulk do
                 store_error(ref, error, opts)
                 []
 
-              {:ok, result, _changeset, %{notifications: more_new_notifications}} ->
+              {:ok, result_after_action, _changeset, %{notifications: more_new_notifications}} ->
                 store_notification(ref, more_new_notifications, opts)
+
+                result =
+                  Map.put(
+                    result_after_action,
+                    :__metadata__,
+                    Map.merge(result_after_action.__metadata__, result.__metadata__)
+                  )
+
                 [result]
             end
 
@@ -3547,23 +3558,6 @@ defmodule Ash.Actions.Update.Bulk do
     find_changeset_by_ref(result, changesets_by_ref, metadata_key)
   end
 
-  defp add_metadata_to_results({:ok, results}, batch, metadata_key, ref_metadata_key, context_key) do
-    results_with_metadata =
-      results
-      |> Enum.zip(batch)
-      |> Enum.map(fn {result, changeset} ->
-        result
-        |> Ash.Resource.put_metadata(metadata_key, changeset.context[context_key].index)
-        |> Ash.Resource.put_metadata(ref_metadata_key, changeset.context[context_key].ref)
-      end)
-
-    {:ok, results_with_metadata}
-  end
-
-  defp add_metadata_to_results(other, _batch, _metadata_key, _ref_metadata_key, _context_key) do
-    other
-  end
-
   defp ensure_changeset!(nil, _result, _metadata_key, ref_metadata_key) do
     raise "Missing ref metadata for record. The record should have had metadata key #{inspect(ref_metadata_key)} set during bulk update."
   end
@@ -3576,15 +3570,11 @@ defmodule Ash.Actions.Update.Bulk do
     if ref_metadata_key do
       ref_key = result.__metadata__[ref_metadata_key]
 
-      if ref_key do
-        ref_key in List.wrap(changes)
-      else
-        # Fallback: find if this record ID has a changeset with ref in changes
-        Enum.any?(changesets_by_ref, fn {changeset_ref, changeset} ->
-          Map.get(changeset.data, :id) == result.id and
-            changeset_ref in List.wrap(changes)
-        end)
-      end
+      changesets_by_ref
+      |> Map.get(ref_key)
+      |> ensure_changeset!(result, metadata_key, ref_metadata_key)
+
+      ref_key in List.wrap(changes)
     else
       result.__metadata__[metadata_key] in List.wrap(changes)
     end

lib/ash/data_layer/ets/ets.ex

@@ -1874,8 +1874,25 @@ defmodule Ash.DataLayer.Ets do
     |> case do
       {:ok, results} ->
         Enum.reduce_while(results, acc, fn result, acc ->
-          case update(query.resource, %{changeset | data: result}, nil, true) do
+          result_changeset = %{changeset | data: result}
+
+          case update(query.resource, result_changeset, nil, true) do
             {:ok, result} ->
+              result =
+                if result_changeset.context[:bulk_update] do
+                  result
+                  |> Ash.Resource.put_metadata(
+                    :bulk_update_index,
+                    result_changeset.context.bulk_update.index
+                  )
+                  |> Ash.Resource.put_metadata(
+                    :bulk_action_ref,
+                    result_changeset.context.bulk_update.ref
+                  )
+                else
+                  result
+                end
+
               case acc do
                 :ok ->
                   {:cont, :ok}

test/actions/bulk/bulk_update_manual_test.exs

@@ -36,21 +36,29 @@ defmodule Ash.Test.Actions.BulkUpdateManualTest do
         |> case do
           {:ok, record} ->
             record =
-              Ash.Resource.put_metadata(
-                record,
+              record
+              |> Ash.Resource.put_metadata(
                 :bulk_update_index,
                 changeset.context.bulk_update.index
               )
+              |> Ash.Resource.put_metadata(
+                :bulk_action_ref,
+                changeset.context.bulk_update.ref
+              )
 
             [{:ok, record} | results]
 
           {:ok, record, notifications} ->
             record =
-              Ash.Resource.put_metadata(
-                record,
+              record
+              |> Ash.Resource.put_metadata(
                 :bulk_update_index,
                 changeset.context.bulk_update.index
               )
+              |> Ash.Resource.put_metadata(
+                :bulk_action_ref,
+                changeset.context.bulk_update.ref
+              )
 
             [{:ok, record, notifications} | results]
 
@@ -80,21 +88,29 @@ defmodule Ash.Test.Actions.BulkUpdateManualTest do
         |> case do
           {:ok, record} ->
             record =
-              Ash.Resource.put_metadata(
-                record,
+              record
+              |> Ash.Resource.put_metadata(
                 :bulk_update_index,
                 changeset.context.bulk_update.index
               )
+              |> Ash.Resource.put_metadata(
+                :bulk_action_ref,
+                changeset.context.bulk_update.ref
+              )
 
             [{:ok, record} | results]
 
           {:ok, record, notifications} ->
             record =
-              Ash.Resource.put_metadata(
-                record,
+              record
+              |> Ash.Resource.put_metadata(
                 :bulk_update_index,
                 changeset.context.bulk_update.index
               )
+              |> Ash.Resource.put_metadata(
+                :bulk_action_ref,
+                changeset.context.bulk_update.ref
+              )
 
             [{:ok, record, %{notifications: notifications}} | results]
 
@@ -124,21 +140,29 @@ defmodule Ash.Test.Actions.BulkUpdateManualTest do
         |> case do
           {:ok, record} ->
             record =
-              Ash.Resource.put_metadata(
-                record,
+              record
+              |> Ash.Resource.put_metadata(
                 :bulk_update_index,
                 changeset.context.bulk_update.index
               )
+              |> Ash.Resource.put_metadata(
+                :bulk_action_ref,
+                changeset.context.bulk_update.ref
+              )
 
             [{:ok, record} | results]
 
           {:ok, record, _notifications} ->
             record =
-              Ash.Resource.put_metadata(
-                record,
+              record
+              |> Ash.Resource.put_metadata(
                 :bulk_update_index,
                 changeset.context.bulk_update.index
               )
+              |> Ash.Resource.put_metadata(
+                :bulk_action_ref,
+                changeset.context.bulk_update.ref
+              )
 
             [{:ok, record} | results]