Merge branch 'main' into feature/335_csv_import_ui

lib/mv/membership/import/member_csv.ex

@@ -310,20 +310,10 @@ defmodule Mv.Membership.Import.MemberCSV do
 
         case process_row(row_map, line_number, custom_field_lookup, actor) do
           {:ok, _member} ->
-            {acc_inserted + 1, acc_failed, acc_errors, acc_error_count, acc_truncated?}
+            update_inserted(acc)
 
           {:error, error} ->
-            new_acc_failed = acc_failed + 1
-
-            # Only collect errors if under limit
-            {new_acc_errors, new_error_count, new_truncated?} =
-              if current_error_count < max_errors do
-                {[error | acc_errors], acc_error_count + 1, acc_truncated?}
-              else
-                {acc_errors, acc_error_count, true}
-              end
-
-            {acc_inserted, new_acc_failed, new_acc_errors, new_error_count, new_truncated?}
+            handle_row_error(acc, error, current_error_count, max_errors)
         end
       end)
 
@@ -397,11 +387,9 @@ defmodule Mv.Membership.Import.MemberCSV do
 
   # Extracts the first error from a changeset and converts it to a MemberCSV.Error struct
   defp extract_changeset_error(changeset, csv_line_number) do
-    case Ecto.Changeset.traverse_errors(changeset, fn {msg, opts} ->
-           Enum.reduce(opts, msg, fn {key, value}, acc ->
-             String.replace(acc, "%{#{key}}", to_string(value))
-           end)
-         end) do
+    errors = Ecto.Changeset.traverse_errors(changeset, &format_error_message/1)
+
+    case errors do
       %{email: [message | _]} ->
         # Email-specific error
         %Error{
@@ -430,6 +418,56 @@ defmodule Mv.Membership.Import.MemberCSV do
     end
   end
 
+  # Helper function to update accumulator when row is successfully inserted
+  defp update_inserted({acc_inserted, acc_failed, acc_errors, acc_error_count, acc_truncated?}) do
+    {acc_inserted + 1, acc_failed, acc_errors, acc_error_count, acc_truncated?}
+  end
+
+  # Helper function to handle row error with error count limit checking
+  defp handle_row_error(
+         {acc_inserted, acc_failed, acc_errors, acc_error_count, acc_truncated?},
+         error,
+         current_error_count,
+         max_errors
+       ) do
+    new_acc_failed = acc_failed + 1
+
+    {new_acc_errors, new_error_count, new_truncated?} =
+      collect_error_if_under_limit(
+        error,
+        acc_errors,
+        acc_error_count,
+        acc_truncated?,
+        current_error_count,
+        max_errors
+      )
+
+    {acc_inserted, new_acc_failed, new_acc_errors, new_error_count, new_truncated?}
+  end
+
+  # Helper function to collect error only if under limit
+  defp collect_error_if_under_limit(
+         error,
+         acc_errors,
+         acc_error_count,
+         acc_truncated?,
+         current_error_count,
+         max_errors
+       ) do
+    if current_error_count < max_errors do
+      {[error | acc_errors], acc_error_count + 1, acc_truncated?}
+    else
+      {acc_errors, acc_error_count, true}
+    end
+  end
+
+  # Formats error message by replacing placeholders
+  defp format_error_message({msg, opts}) do
+    Enum.reduce(opts, msg, fn {key, value}, acc ->
+      String.replace(acc, "%{#{key}}", to_string(value))
+    end)
+  end
+
   # Maps changeset error messages to appropriate Gettext messages
   defp gettext_error_message(message) when is_binary(message) do
     cond do

lib/mv/membership/member/validations/email_not_used_by_other_user.ex

@@ -10,6 +10,8 @@ defmodule Mv.Membership.Member.Validations.EmailNotUsedByOtherUser do
   use Ash.Resource.Validation
   alias Mv.Helpers
 
+  require Logger
+
   @doc """
   Validates email uniqueness across linked Member-User pairs.
 
@@ -30,8 +32,7 @@ defmodule Mv.Membership.Member.Validations.EmailNotUsedByOtherUser do
   def validate(changeset, _opts, _context) do
     email_changing? = Ash.Changeset.changing_attribute?(changeset, :email)
 
-    actor = Map.get(changeset.context || %{}, :actor)
-    linked_user_id = get_linked_user_id(changeset.data, actor)
+    linked_user_id = get_linked_user_id(changeset.data)
     is_linked? = not is_nil(linked_user_id)
 
     # Only validate if member is already linked AND email is changing
@@ -40,19 +41,22 @@ defmodule Mv.Membership.Member.Validations.EmailNotUsedByOtherUser do
 
     if should_validate? do
       new_email = Ash.Changeset.get_attribute(changeset, :email)
-      check_email_uniqueness(new_email, linked_user_id, actor)
+      check_email_uniqueness(new_email, linked_user_id)
     else
       :ok
     end
   end
 
-  defp check_email_uniqueness(email, exclude_user_id, actor) do
+  defp check_email_uniqueness(email, exclude_user_id) do
+    alias Mv.Helpers.SystemActor
+
     query =
       Mv.Accounts.User
       |> Ash.Query.filter(email == ^email)
       |> maybe_exclude_id(exclude_user_id)
 
-    opts = Helpers.ash_actor_opts(actor)
+    system_actor = SystemActor.get_system_actor()
+    opts = Helpers.ash_actor_opts(system_actor)
 
     case Ash.read(query, opts) do
       {:ok, []} ->
@@ -61,7 +65,11 @@ defmodule Mv.Membership.Member.Validations.EmailNotUsedByOtherUser do
       {:ok, _} ->
         {:error, field: :email, message: "is already used by another user", value: email}
 
-      {:error, _} ->
+      {:error, reason} ->
+        Logger.warning(
+          "Email uniqueness validation query failed for member email '#{email}': #{inspect(reason)}. Allowing operation to proceed (fail-open)."
+        )
+
         :ok
     end
   end
@@ -69,8 +77,11 @@ defmodule Mv.Membership.Member.Validations.EmailNotUsedByOtherUser do
   defp maybe_exclude_id(query, nil), do: query
   defp maybe_exclude_id(query, id), do: Ash.Query.filter(query, id != ^id)
 
-  defp get_linked_user_id(member_data, actor) do
-    opts = Helpers.ash_actor_opts(actor)
+  defp get_linked_user_id(member_data) do
+    alias Mv.Helpers.SystemActor
+
+    system_actor = SystemActor.get_system_actor()
+    opts = Helpers.ash_actor_opts(system_actor)
 
     case Ash.load(member_data, :user, opts) do
       {:ok, %{user: %{id: id}}} -> id