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