Tests: use code interface for Member create/update (actor propagation)

test/mv_web/helpers/membership_fee_helpers_test.exs

@@ -80,21 +80,20 @@ defmodule MvWeb.Helpers.MembershipFeeHelpersTest do
         |> Ash.create!(actor: actor)
 
       # Create member without fee type first to avoid auto-generation
-      member =
-        Mv.Membership.Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "Test",
-          last_name: "Member",
-          email: "test#{System.unique_integer([:positive])}@example.com",
-          join_date: ~D[2022-01-01]
-        })
-        |> Ash.create!(actor: actor)
+      {:ok, member} =
+        Mv.Membership.create_member(
+          %{
+            first_name: "Test",
+            last_name: "Member",
+            email: "test#{System.unique_integer([:positive])}@example.com",
+            join_date: ~D[2022-01-01]
+          },
+          actor: actor
+        )
 
       # Assign fee type after member creation (this may generate cycles, but we'll create our own)
-      member =
-        member
-        |> Ash.Changeset.for_update(:update_member, %{membership_fee_type_id: fee_type.id})
-        |> Ash.update!(actor: actor)
+      {:ok, member} =
+        Mv.Membership.update_member(member, %{membership_fee_type_id: fee_type.id}, actor: actor)
 
       # Delete any auto-generated cycles first
       cycles =
@@ -151,20 +150,19 @@ defmodule MvWeb.Helpers.MembershipFeeHelpersTest do
         |> Ash.create!(actor: actor)
 
       # Create member without fee type first
-      member =
-        Mv.Membership.Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "Test",
-          last_name: "Member",
-          email: "test#{System.unique_integer([:positive])}@example.com"
-        })
-        |> Ash.create!(actor: actor)
+      {:ok, member} =
+        Mv.Membership.create_member(
+          %{
+            first_name: "Test",
+            last_name: "Member",
+            email: "test#{System.unique_integer([:positive])}@example.com"
+          },
+          actor: actor
+        )
 
       # Assign fee type
-      member =
-        member
-        |> Ash.Changeset.for_update(:update_member, %{membership_fee_type_id: fee_type.id})
-        |> Ash.update!(actor: actor)
+      {:ok, member} =
+        Mv.Membership.update_member(member, %{membership_fee_type_id: fee_type.id}, actor: actor)
 
       # Delete any auto-generated cycles
       cycles =
@@ -197,21 +195,20 @@ defmodule MvWeb.Helpers.MembershipFeeHelpersTest do
         |> Ash.create!(actor: actor)
 
       # Create member without fee type first
-      member =
-        Mv.Membership.Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "Test",
-          last_name: "Member",
-          email: "test#{System.unique_integer([:positive])}@example.com",
-          join_date: ~D[2023-01-01]
-        })
-        |> Ash.create!(actor: actor)
+      {:ok, member} =
+        Mv.Membership.create_member(
+          %{
+            first_name: "Test",
+            last_name: "Member",
+            email: "test#{System.unique_integer([:positive])}@example.com",
+            join_date: ~D[2023-01-01]
+          },
+          actor: actor
+        )
 
       # Assign fee type
-      member =
-        member
-        |> Ash.Changeset.for_update(:update_member, %{membership_fee_type_id: fee_type.id})
-        |> Ash.update!(actor: actor)
+      {:ok, member} =
+        Mv.Membership.update_member(member, %{membership_fee_type_id: fee_type.id}, actor: actor)
 
       # Delete any auto-generated cycles
       cycles =

test/mv_web/live/custom_field_live/deletion_test.exs

@@ -41,7 +41,8 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
     user_with_role = Ash.load!(user, :role, domain: Mv.Accounts, actor: system_actor)
     conn = log_in_user(build_conn(), user_with_role)
     # Use English locale so "Delete" link text matches in assertions
-    conn = Plug.Test.init_test_session(conn, Map.put(conn.private.plug_session, "locale", "en"))
+    session = conn.private[:plug_session] || %{}
+    conn = Plug.Test.init_test_session(conn, Map.put(session, "locale", "en"))
     %{conn: conn, user: user_with_role}
   end
 
@@ -271,17 +272,18 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
     end
   end
 
-  # Helper functions
+  # Helper functions (use code interface so actor is in validation context)
   defp create_member do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()
 
-    Member
-    |> Ash.Changeset.for_create(:create_member, %{
-      first_name: "Test",
-      last_name: "User#{System.unique_integer([:positive])}",
-      email: "test#{System.unique_integer([:positive])}@example.com"
-    })
-    |> Ash.create(actor: system_actor)
+    Mv.Membership.create_member(
+      %{
+        first_name: "Test",
+        last_name: "User#{System.unique_integer([:positive])}",
+        email: "test#{System.unique_integer([:positive])}@example.com"
+      },
+      actor: system_actor
+    )
   end
 
   defp create_custom_field(name, value_type) do

test/mv_web/live/membership_fee_type_live/form_test.exs

@@ -7,7 +7,6 @@ defmodule MvWeb.MembershipFeeTypeLive.FormTest do
   import Phoenix.LiveViewTest
 
   alias Mv.MembershipFees.MembershipFeeType
-  alias Mv.Membership.Member
 
   require Ash.Query
 
@@ -55,10 +54,8 @@ defmodule MvWeb.MembershipFeeTypeLive.FormTest do
     }
 
     attrs = Map.merge(default_attrs, attrs)
-
-    Member
-    |> Ash.Changeset.for_create(:create_member, attrs)
-    |> Ash.create!(actor: system_actor)
+    {:ok, member} = Mv.Membership.create_member(attrs, actor: system_actor)
+    member
   end
 
   describe "create form" do

test/mv_web/live/membership_fee_type_live/index_test.exs

@@ -7,7 +7,6 @@ defmodule MvWeb.MembershipFeeTypeLive.IndexTest do
   import Phoenix.LiveViewTest
 
   alias Mv.MembershipFees.MembershipFeeType
-  alias Mv.Membership.Member
 
   require Ash.Query
 
@@ -31,7 +30,7 @@ defmodule MvWeb.MembershipFeeTypeLive.IndexTest do
   end
 
   # Helper to create a member
-  # Uses admin actor from global setup to ensure authorization
+  # Uses admin actor from global setup to ensure authorization; falls back to system_actor when nil
   defp create_member(attrs, actor) do
     default_attrs = %{
       first_name: "Test",
@@ -40,12 +39,9 @@ defmodule MvWeb.MembershipFeeTypeLive.IndexTest do
     }
 
     attrs = Map.merge(default_attrs, attrs)
-
-    opts = if actor, do: [actor: actor], else: []
-
-    Member
-    |> Ash.Changeset.for_create(:create_member, attrs)
-    |> Ash.create!(opts)
+    effective_actor = actor || Mv.Helpers.SystemActor.get_system_actor()
+    {:ok, member} = Mv.Membership.create_member(attrs, actor: effective_actor)
+    member
   end
 
   describe "list display" do

test/mv_web/live/user_live/show_test.exs

@@ -64,13 +64,10 @@ defmodule MvWeb.UserLive.ShowTest do
 
       # Create member
       {:ok, member} =
-        Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "Alice",
-          last_name: "Smith",
-          email: "alice@example.com"
-        })
-        |> Ash.create(actor: system_actor)
+        Mv.Membership.create_member(
+          %{first_name: "Alice", last_name: "Smith", email: "alice@example.com"},
+          actor: system_actor
+        )
 
       # Create user and link to member
       user = create_test_user(%{email: "user@example.com"})

test/mv_web/member_live/form_error_handling_test.exs

@@ -6,8 +6,6 @@ defmodule MvWeb.MemberLive.FormErrorHandlingTest do
 
   import Phoenix.LiveViewTest
 
-  alias Mv.Membership.Member
-
   require Ash.Query
 
   describe "error handling - flash messages" do
@@ -16,13 +14,14 @@ defmodule MvWeb.MemberLive.FormErrorHandlingTest do
 
       # Create a member with the same email to trigger uniqueness error
       {:ok, _existing_member} =
-        Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "Existing",
-          last_name: "Member",
-          email: "duplicate@example.com"
-        })
-        |> Ash.create(actor: system_actor)
+        Mv.Membership.create_member(
+          %{
+            first_name: "Existing",
+            last_name: "Member",
+            email: "duplicate@example.com"
+          },
+          actor: system_actor
+        )
 
       conn = conn_with_oidc_user(conn)
       {:ok, view, _html} = live(conn, "/members/new")
@@ -79,23 +78,21 @@ defmodule MvWeb.MemberLive.FormErrorHandlingTest do
 
       # Create a member to edit
       {:ok, member} =
-        Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "Original",
-          last_name: "Member",
-          email: "original@example.com"
-        })
-        |> Ash.create(actor: system_actor)
+        Mv.Membership.create_member(
+          %{
+            first_name: "Original",
+            last_name: "Member",
+            email: "original@example.com"
+          },
+          actor: system_actor
+        )
 
       # Create another member with different email
       {:ok, _other_member} =
-        Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "Other",
-          last_name: "Member",
-          email: "other@example.com"
-        })
-        |> Ash.create(actor: system_actor)
+        Mv.Membership.create_member(
+          %{first_name: "Other", last_name: "Member", email: "other@example.com"},
+          actor: system_actor
+        )
 
       conn = conn_with_oidc_user(conn)
       {:ok, view, _html} = live(conn, "/members/#{member.id}/edit")

test/mv_web/member_live/form_membership_fee_type_test.exs

@@ -6,7 +6,6 @@ defmodule MvWeb.MemberLive.FormMembershipFeeTypeTest do
 
   import Phoenix.LiveViewTest
 
-  alias Mv.Membership.Member
   alias Mv.MembershipFees.MembershipFeeType
 
   require Ash.Query
@@ -37,10 +36,8 @@ defmodule MvWeb.MemberLive.FormMembershipFeeTypeTest do
     }
 
     attrs = Map.merge(default_attrs, attrs)
-
-    Member
-    |> Ash.Changeset.for_create(:create_member, attrs)
-    |> Ash.create!(actor: admin_user)
+    {:ok, member} = Mv.Membership.create_member(attrs, actor: admin_user)
+    member
   end
 
   describe "membership fee type dropdown" do
@@ -129,7 +126,7 @@ defmodule MvWeb.MemberLive.FormMembershipFeeTypeTest do
 
       # Verify member was created with fee type - use admin_user to test permissions
       member =
-        Member
+        Mv.Membership.Member
         |> Ash.Query.filter(email == ^form_data["member[email]"])
         |> Ash.read_one!(actor: admin_user)
 
@@ -177,14 +174,15 @@ defmodule MvWeb.MemberLive.FormMembershipFeeTypeTest do
 
       # Create member with fee type 1 and custom field value
       member =
-        Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "Test",
-          last_name: "Member",
-          email: "test#{System.unique_integer([:positive])}@example.com",
-          membership_fee_type_id: fee_type1.id
-        })
-        |> Ash.create!(actor: admin_user)
+        create_member(
+          %{
+            first_name: "Test",
+            last_name: "Member",
+            email: "test#{System.unique_integer([:positive])}@example.com",
+            membership_fee_type_id: fee_type1.id
+          },
+          admin_user
+        )
 
       # Add custom field value
       Mv.Membership.CustomFieldValue
@@ -222,14 +220,15 @@ defmodule MvWeb.MemberLive.FormMembershipFeeTypeTest do
 
       # Create member with date custom field value
       member =
-        Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "Test",
-          last_name: "Member",
-          email: "test#{System.unique_integer([:positive])}@example.com",
-          membership_fee_type_id: fee_type.id
-        })
-        |> Ash.create!(actor: admin_user)
+        create_member(
+          %{
+            first_name: "Test",
+            last_name: "Member",
+            email: "test#{System.unique_integer([:positive])}@example.com",
+            membership_fee_type_id: fee_type.id
+          },
+          admin_user
+        )
 
       test_date = ~D[2024-01-15]
 
@@ -269,14 +268,15 @@ defmodule MvWeb.MemberLive.FormMembershipFeeTypeTest do
 
       # Create member with custom field value
       member =
-        Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "Test",
-          last_name: "Member",
-          email: "test#{System.unique_integer([:positive])}@example.com",
-          membership_fee_type_id: fee_type.id
-        })
-        |> Ash.create!(actor: admin_user)
+        create_member(
+          %{
+            first_name: "Test",
+            last_name: "Member",
+            email: "test#{System.unique_integer([:positive])}@example.com",
+            membership_fee_type_id: fee_type.id
+          },
+          admin_user
+        )
 
       # Add custom field value
       _cfv =

test/mv_web/member_live/index/membership_fee_status_test.exs

@@ -39,10 +39,8 @@ defmodule MvWeb.MemberLive.Index.MembershipFeeStatusTest do
     }
 
     attrs = Map.merge(default_attrs, attrs)
-
-    Member
-    |> Ash.Changeset.for_create(:create_member, attrs)
-    |> Ash.create!(actor: system_actor)
+    {:ok, member} = Mv.Membership.create_member(attrs, actor: system_actor)
+    member
   end
 
   # Helper to create a cycle
@@ -106,8 +104,14 @@ defmodule MvWeb.MemberLive.Index.MembershipFeeStatusTest do
       # Assign fee type
       member =
         member
-        |> Ash.Changeset.for_update(:update_member, %{membership_fee_type_id: fee_type.id})
-        |> Ash.update!(actor: system_actor)
+        |> then(fn m ->
+          {:ok, updated} =
+            Mv.Membership.update_member(m, %{membership_fee_type_id: fee_type.id},
+              actor: system_actor
+            )
+
+          updated
+        end)
 
       # Delete any auto-generated cycles
       cycles =
@@ -151,8 +155,14 @@ defmodule MvWeb.MemberLive.Index.MembershipFeeStatusTest do
       # Assign fee type
       member =
         member
-        |> Ash.Changeset.for_update(:update_member, %{membership_fee_type_id: fee_type.id})
-        |> Ash.update!(actor: system_actor)
+        |> then(fn m ->
+          {:ok, updated} =
+            Mv.Membership.update_member(m, %{membership_fee_type_id: fee_type.id},
+              actor: system_actor
+            )
+
+          updated
+        end)
 
       # Delete any auto-generated cycles
       cycles =
@@ -192,8 +202,14 @@ defmodule MvWeb.MemberLive.Index.MembershipFeeStatusTest do
       # Assign fee type
       member =
         member
-        |> Ash.Changeset.for_update(:update_member, %{membership_fee_type_id: fee_type.id})
-        |> Ash.update!(actor: system_actor)
+        |> then(fn m ->
+          {:ok, updated} =
+            Mv.Membership.update_member(m, %{membership_fee_type_id: fee_type.id},
+              actor: system_actor
+            )
+
+          updated
+        end)
 
       # Delete any auto-generated cycles
       cycles =

test/mv_web/member_live/index_custom_fields_accessibility_test.exs

@@ -11,20 +11,17 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsAccessibilityTest do
   import Phoenix.LiveViewTest
   require Ash.Query
 
-  alias Mv.Membership.{CustomField, CustomFieldValue, Member}
+  alias Mv.Membership.{CustomField, CustomFieldValue}
 
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()
 
     # Create test member
     {:ok, member} =
-      Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "Alice",
-        last_name: "Anderson",
-        email: "alice@example.com"
-      })
-      |> Ash.create(actor: system_actor)
+      Mv.Membership.create_member(
+        %{first_name: "Alice", last_name: "Anderson", email: "alice@example.com"},
+        actor: system_actor
+      )
 
     # Create custom field with show_in_overview: true
     {:ok, field} =

test/mv_web/member_live/index_custom_fields_display_test.exs

@@ -14,29 +14,23 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsDisplayTest do
   import Phoenix.LiveViewTest
   require Ash.Query
 
-  alias Mv.Membership.{CustomField, CustomFieldValue, Member}
+  alias Mv.Membership.{CustomField, CustomFieldValue}
 
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()
 
     # Create test members
     {:ok, member1} =
-      Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "Alice",
-        last_name: "Anderson",
-        email: "alice@example.com"
-      })
-      |> Ash.create(actor: system_actor)
+      Mv.Membership.create_member(
+        %{first_name: "Alice", last_name: "Anderson", email: "alice@example.com"},
+        actor: system_actor
+      )
 
     {:ok, member2} =
-      Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "Bob",
-        last_name: "Brown",
-        email: "bob@example.com"
-      })
-      |> Ash.create(actor: system_actor)
+      Mv.Membership.create_member(
+        %{first_name: "Bob", last_name: "Brown", email: "bob@example.com"},
+        actor: system_actor
+      )
 
     # Create custom fields
     {:ok, field_show_string} =

test/mv_web/member_live/index_custom_fields_edge_cases_test.exs

@@ -10,7 +10,7 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsEdgeCasesTest do
   import Phoenix.LiveViewTest
   require Ash.Query
 
-  alias Mv.Membership.{CustomField, Member}
+  alias Mv.Membership.CustomField
 
   @tag :slow
   test "displays custom field column even when no members have values", %{conn: conn} do
@@ -18,22 +18,16 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsEdgeCasesTest do
 
     # Create test members without custom field values
     {:ok, _member1} =
-      Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "Alice",
-        last_name: "Anderson",
-        email: "alice@example.com"
-      })
-      |> Ash.create(actor: system_actor)
+      Mv.Membership.create_member(
+        %{first_name: "Alice", last_name: "Anderson", email: "alice@example.com"},
+        actor: system_actor
+      )
 
     {:ok, _member2} =
-      Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "Bob",
-        last_name: "Brown",
-        email: "bob@example.com"
-      })
-      |> Ash.create(actor: system_actor)
+      Mv.Membership.create_member(
+        %{first_name: "Bob", last_name: "Brown", email: "bob@example.com"},
+        actor: system_actor
+      )
 
     # Create custom field with show_in_overview: true but no values
     {:ok, field} =
@@ -58,13 +52,10 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsEdgeCasesTest do
 
     # Create test member
     {:ok, member} =
-      Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "Alice",
-        last_name: "Anderson",
-        email: "alice@example.com"
-      })
-      |> Ash.create(actor: system_actor)
+      Mv.Membership.create_member(
+        %{first_name: "Alice", last_name: "Anderson", email: "alice@example.com"},
+        actor: system_actor
+      )
 
     # Create custom field
     {:ok, field} =
@@ -102,13 +93,10 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsEdgeCasesTest do
 
     # Create test member
     {:ok, member} =
-      Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "Alice",
-        last_name: "Anderson",
-        email: "alice@example.com"
-      })
-      |> Ash.create(actor: system_actor)
+      Mv.Membership.create_member(
+        %{first_name: "Alice", last_name: "Anderson", email: "alice@example.com"},
+        actor: system_actor
+      )
 
     # Create multiple custom fields with show_in_overview: true
     {:ok, field1} =

test/mv_web/member_live/index_custom_fields_sorting_test.exs

@@ -13,38 +13,29 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsSortingTest do
   import Phoenix.LiveViewTest
   require Ash.Query
 
-  alias Mv.Membership.{CustomField, CustomFieldValue, Member}
+  alias Mv.Membership.{CustomField, CustomFieldValue}
 
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()
 
     # Create test members
     {:ok, member1} =
-      Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "Alice",
-        last_name: "Anderson",
-        email: "alice@example.com"
-      })
-      |> Ash.create(actor: system_actor)
+      Mv.Membership.create_member(
+        %{first_name: "Alice", last_name: "Anderson", email: "alice@example.com"},
+        actor: system_actor
+      )
 
     {:ok, member2} =
-      Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "Bob",
-        last_name: "Brown",
-        email: "bob@example.com"
-      })
-      |> Ash.create(actor: system_actor)
+      Mv.Membership.create_member(
+        %{first_name: "Bob", last_name: "Brown", email: "bob@example.com"},
+        actor: system_actor
+      )
 
     {:ok, member3} =
-      Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "Charlie",
-        last_name: "Clark",
-        email: "charlie@example.com"
-      })
-      |> Ash.create(actor: system_actor)
+      Mv.Membership.create_member(
+        %{first_name: "Charlie", last_name: "Clark", email: "charlie@example.com"},
+        actor: system_actor
+      )
 
     # Create custom field with show_in_overview: true
     {:ok, field_string} =
@@ -242,40 +233,28 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsSortingTest do
 
     # Create additional members with NULL and empty string values
     {:ok, member_with_value} =
-      Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "WithValue",
-        last_name: "Test",
-        email: "withvalue@example.com"
-      })
-      |> Ash.create(actor: system_actor)
+      Mv.Membership.create_member(
+        %{first_name: "WithValue", last_name: "Test", email: "withvalue@example.com"},
+        actor: system_actor
+      )
 
     {:ok, member_with_empty} =
-      Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "WithEmpty",
-        last_name: "Test",
-        email: "withempty@example.com"
-      })
-      |> Ash.create(actor: system_actor)
+      Mv.Membership.create_member(
+        %{first_name: "WithEmpty", last_name: "Test", email: "withempty@example.com"},
+        actor: system_actor
+      )
 
     {:ok, member_with_null} =
-      Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "WithNull",
-        last_name: "Test",
-        email: "withnull@example.com"
-      })
-      |> Ash.create(actor: system_actor)
+      Mv.Membership.create_member(
+        %{first_name: "WithNull", last_name: "Test", email: "withnull@example.com"},
+        actor: system_actor
+      )
 
     {:ok, member_with_another_value} =
-      Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "AnotherValue",
-        last_name: "Test",
-        email: "another@example.com"
-      })
-      |> Ash.create(actor: system_actor)
+      Mv.Membership.create_member(
+        %{first_name: "AnotherValue", last_name: "Test", email: "another@example.com"},
+        actor: system_actor
+      )
 
     # Create custom field
     {:ok, field} =
@@ -355,40 +334,28 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsSortingTest do
 
     # Create additional members with NULL and empty string values
     {:ok, member_with_value} =
-      Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "WithValue",
-        last_name: "Test",
-        email: "withvalue@example.com"
-      })
-      |> Ash.create(actor: system_actor)
+      Mv.Membership.create_member(
+        %{first_name: "WithValue", last_name: "Test", email: "withvalue@example.com"},
+        actor: system_actor
+      )
 
     {:ok, member_with_empty} =
-      Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "WithEmpty",
-        last_name: "Test",
-        email: "withempty@example.com"
-      })
-      |> Ash.create(actor: system_actor)
+      Mv.Membership.create_member(
+        %{first_name: "WithEmpty", last_name: "Test", email: "withempty@example.com"},
+        actor: system_actor
+      )
 
     {:ok, member_with_null} =
-      Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "WithNull",
-        last_name: "Test",
-        email: "withnull@example.com"
-      })
-      |> Ash.create(actor: system_actor)
+      Mv.Membership.create_member(
+        %{first_name: "WithNull", last_name: "Test", email: "withnull@example.com"},
+        actor: system_actor
+      )
 
     {:ok, member_with_another_value} =
-      Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "AnotherValue",
-        last_name: "Test",
-        email: "another@example.com"
-      })
-      |> Ash.create(actor: system_actor)
+      Mv.Membership.create_member(
+        %{first_name: "AnotherValue", last_name: "Test", email: "another@example.com"},
+        actor: system_actor
+      )
 
     # Create custom field
     {:ok, field} =

test/mv_web/member_live/index_field_visibility_test.exs

@@ -16,33 +16,35 @@ defmodule MvWeb.MemberLive.IndexFieldVisibilityTest do
   import Phoenix.LiveViewTest
   require Ash.Query
 
-  alias Mv.Membership.{CustomField, CustomFieldValue, Member}
+  alias Mv.Membership.{CustomField, CustomFieldValue}
 
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()
 
     # Create test members
     {:ok, member1} =
-      Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "Alice",
-        last_name: "Anderson",
-        email: "alice@example.com",
-        street: "Main St",
-        city: "Berlin"
-      })
-      |> Ash.create(actor: system_actor)
+      Mv.Membership.create_member(
+        %{
+          first_name: "Alice",
+          last_name: "Anderson",
+          email: "alice@example.com",
+          street: "Main St",
+          city: "Berlin"
+        },
+        actor: system_actor
+      )
 
     {:ok, member2} =
-      Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "Bob",
-        last_name: "Brown",
-        email: "bob@example.com",
-        street: "Second St",
-        city: "Hamburg"
-      })
-      |> Ash.create(actor: system_actor)
+      Mv.Membership.create_member(
+        %{
+          first_name: "Bob",
+          last_name: "Brown",
+          email: "bob@example.com",
+          street: "Second St",
+          city: "Hamburg"
+        },
+        actor: system_actor
+      )
 
     # Create custom field
     {:ok, custom_field} =

test/mv_web/member_live/index_member_fields_display_test.exs

@@ -3,33 +3,29 @@ defmodule MvWeb.MemberLive.IndexMemberFieldsDisplayTest do
   import Phoenix.LiveViewTest
   require Ash.Query
 
-  alias Mv.Membership.Member
-
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()
 
     {:ok, member1} =
-      Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "Alice",
-        last_name: "Anderson",
-        email: "alice@example.com",
-        street: "Main Street",
-        house_number: "123",
-        postal_code: "12345",
-        city: "Berlin",
-        join_date: ~D[2020-01-15]
-      })
-      |> Ash.create(actor: system_actor)
+      Mv.Membership.create_member(
+        %{
+          first_name: "Alice",
+          last_name: "Anderson",
+          email: "alice@example.com",
+          street: "Main Street",
+          house_number: "123",
+          postal_code: "12345",
+          city: "Berlin",
+          join_date: ~D[2020-01-15]
+        },
+        actor: system_actor
+      )
 
     {:ok, member2} =
-      Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "Bob",
-        last_name: "Brown",
-        email: "bob@example.com"
-      })
-      |> Ash.create(actor: system_actor)
+      Mv.Membership.create_member(
+        %{first_name: "Bob", last_name: "Brown", email: "bob@example.com"},
+        actor: system_actor
+      )
 
     %{
       member1: member1,

test/mv_web/member_live/index_membership_fee_status_test.exs

@@ -6,7 +6,6 @@ defmodule MvWeb.MemberLive.IndexMembershipFeeStatusTest do
 
   import Phoenix.LiveViewTest
 
-  alias Mv.Membership.Member
   alias Mv.MembershipFees.MembershipFeeType
   alias Mv.MembershipFees.MembershipFeeCycle
 
@@ -40,10 +39,8 @@ defmodule MvWeb.MemberLive.IndexMembershipFeeStatusTest do
     }
 
     attrs = Map.merge(default_attrs, attrs)
-
-    Member
-    |> Ash.Changeset.for_create(:create_member, attrs)
-    |> Ash.create!(actor: system_actor)
+    {:ok, member} = Mv.Membership.create_member(attrs, actor: system_actor)
+    member
   end
 
   # Helper to create a cycle

test/mv_web/member_live/index_test.exs

@@ -531,10 +531,8 @@ defmodule MvWeb.MemberLive.IndexTest do
       }
 
       attrs = Map.merge(default_attrs, attrs)
-
-      Mv.Membership.Member
-      |> Ash.Changeset.for_create(:create_member, attrs)
-      |> Ash.create!(actor: actor)
+      {:ok, member} = Mv.Membership.create_member(attrs, actor: actor)
+      member
     end
 
     test "filter shows only members with paid status in last cycle", %{conn: conn} do
@@ -1127,18 +1125,15 @@ defmodule MvWeb.MemberLive.IndexTest do
 
     # Helper to create a member with a boolean custom field value
     defp create_member_with_boolean_value(member_attrs, custom_field, value, actor) do
-      {:ok, member} =
-        Mv.Membership.Member
-        |> Ash.Changeset.for_create(
-          :create_member,
-          %{
-            first_name: "Test",
-            last_name: "Member",
-            email: "test.member.#{System.unique_integer([:positive])}@example.com"
-          }
-          |> Map.merge(member_attrs)
-        )
-        |> Ash.create(actor: actor)
+      attrs =
+        %{
+          first_name: "Test",
+          last_name: "Member",
+          email: "test.member.#{System.unique_integer([:positive])}@example.com"
+        }
+        |> Map.merge(member_attrs)
+
+      {:ok, member} = Mv.Membership.create_member(attrs, actor: actor)
 
       {:ok, _cfv} =
         Mv.Membership.CustomFieldValue
@@ -1182,13 +1177,14 @@ defmodule MvWeb.MemberLive.IndexTest do
       boolean_field = create_boolean_custom_field()
 
       {:ok, member} =
-        Mv.Membership.Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "Test",
-          last_name: "Member",
-          email: "test.member.#{System.unique_integer([:positive])}@example.com"
-        })
-        |> Ash.create(actor: system_actor)
+        Mv.Membership.create_member(
+          %{
+            first_name: "Test",
+            last_name: "Member",
+            email: "test.member.#{System.unique_integer([:positive])}@example.com"
+          },
+          actor: system_actor
+        )
 
       # Create CustomFieldValue with map format (Ash expects _union_type and _union_value)
       {:ok, _cfv} =
@@ -1215,13 +1211,14 @@ defmodule MvWeb.MemberLive.IndexTest do
       boolean_field = create_boolean_custom_field()
 
       {:ok, member} =
-        Mv.Membership.Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "Test",
-          last_name: "Member",
-          email: "test.member.#{System.unique_integer([:positive])}@example.com"
-        })
-        |> Ash.create(actor: system_actor)
+        Mv.Membership.create_member(
+          %{
+            first_name: "Test",
+            last_name: "Member",
+            email: "test.member.#{System.unique_integer([:positive])}@example.com"
+          },
+          actor: system_actor
+        )
 
       # Member has no custom field value for this field
       member = member |> Ash.load!(:custom_field_values, actor: system_actor)
@@ -1238,13 +1235,14 @@ defmodule MvWeb.MemberLive.IndexTest do
       boolean_field = create_boolean_custom_field()
 
       {:ok, member} =
-        Mv.Membership.Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "Test",
-          last_name: "Member",
-          email: "test.member.#{System.unique_integer([:positive])}@example.com"
-        })
-        |> Ash.create(actor: system_actor)
+        Mv.Membership.create_member(
+          %{
+            first_name: "Test",
+            last_name: "Member",
+            email: "test.member.#{System.unique_integer([:positive])}@example.com"
+          },
+          actor: system_actor
+        )
 
       # Create CustomFieldValue with nil value (edge case)
       {:ok, _cfv} =
@@ -1271,13 +1269,14 @@ defmodule MvWeb.MemberLive.IndexTest do
       boolean_field = create_boolean_custom_field()
 
       {:ok, member} =
-        Mv.Membership.Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "Test",
-          last_name: "Member",
-          email: "test.member.#{System.unique_integer([:positive])}@example.com"
-        })
-        |> Ash.create(actor: system_actor)
+        Mv.Membership.create_member(
+          %{
+            first_name: "Test",
+            last_name: "Member",
+            email: "test.member.#{System.unique_integer([:positive])}@example.com"
+          },
+          actor: system_actor
+        )
 
       # Create string custom field value (not boolean)
       {:ok, _cfv} =
@@ -1320,13 +1319,14 @@ defmodule MvWeb.MemberLive.IndexTest do
         )
 
       {:ok, member_without_value} =
-        Mv.Membership.Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "NoValue",
-          last_name: "Member",
-          email: "novalue.member.#{System.unique_integer([:positive])}@example.com"
-        })
-        |> Ash.create(actor: system_actor)
+        Mv.Membership.create_member(
+          %{
+            first_name: "NoValue",
+            last_name: "Member",
+            email: "novalue.member.#{System.unique_integer([:positive])}@example.com"
+          },
+          actor: system_actor
+        )
 
       member_without_value =
         member_without_value |> Ash.load!(:custom_field_values, actor: system_actor)
@@ -1370,13 +1370,14 @@ defmodule MvWeb.MemberLive.IndexTest do
         )
 
       {:ok, member_without_value} =
-        Mv.Membership.Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "NoValue",
-          last_name: "Member",
-          email: "novalue.member.#{System.unique_integer([:positive])}@example.com"
-        })
-        |> Ash.create(actor: system_actor)
+        Mv.Membership.create_member(
+          %{
+            first_name: "NoValue",
+            last_name: "Member",
+            email: "novalue.member.#{System.unique_integer([:positive])}@example.com"
+          },
+          actor: system_actor
+        )
 
       member_without_value =
         member_without_value |> Ash.load!(:custom_field_values, actor: system_actor)
@@ -1447,13 +1448,14 @@ defmodule MvWeb.MemberLive.IndexTest do
 
       # Member with both fields = true
       {:ok, member_both_true} =
-        Mv.Membership.Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "BothTrue",
-          last_name: "Member",
-          email: "bothtrue.member.#{System.unique_integer([:positive])}@example.com"
-        })
-        |> Ash.create(actor: system_actor)
+        Mv.Membership.create_member(
+          %{
+            first_name: "BothTrue",
+            last_name: "Member",
+            email: "bothtrue.member.#{System.unique_integer([:positive])}@example.com"
+          },
+          actor: system_actor
+        )
 
       {:ok, _cfv1} =
         Mv.Membership.CustomFieldValue
@@ -1477,13 +1479,14 @@ defmodule MvWeb.MemberLive.IndexTest do
 
       # Member with field1 = true, field2 = false
       {:ok, member_mixed} =
-        Mv.Membership.Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "Mixed",
-          last_name: "Member",
-          email: "mixed.member.#{System.unique_integer([:positive])}@example.com"
-        })
-        |> Ash.create(actor: system_actor)
+        Mv.Membership.create_member(
+          %{
+            first_name: "Mixed",
+            last_name: "Member",
+            email: "mixed.member.#{System.unique_integer([:positive])}@example.com"
+          },
+          actor: system_actor
+        )
 
       {:ok, _cfv3} =
         Mv.Membership.CustomFieldValue
@@ -1580,13 +1583,14 @@ defmodule MvWeb.MemberLive.IndexTest do
         )
 
       {:ok, _member_without_value} =
-        Mv.Membership.Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "NoValue",
-          last_name: "Member",
-          email: "novalue.member.#{System.unique_integer([:positive])}@example.com"
-        })
-        |> Ash.create(actor: system_actor)
+        Mv.Membership.create_member(
+          %{
+            first_name: "NoValue",
+            last_name: "Member",
+            email: "novalue.member.#{System.unique_integer([:positive])}@example.com"
+          },
+          actor: system_actor
+        )
 
       # Test true filter
       {:ok, _view, html_true} =
@@ -1615,14 +1619,15 @@ defmodule MvWeb.MemberLive.IndexTest do
 
       # Member with true boolean value and paid status
       {:ok, member_paid_true} =
-        Mv.Membership.Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "PaidTrue",
-          last_name: "Member",
-          email: "paidtrue.member.#{System.unique_integer([:positive])}@example.com",
-          membership_fee_type_id: fee_type.id
-        })
-        |> Ash.create(actor: system_actor)
+        Mv.Membership.create_member(
+          %{
+            first_name: "PaidTrue",
+            last_name: "Member",
+            email: "paidtrue.member.#{System.unique_integer([:positive])}@example.com",
+            membership_fee_type_id: fee_type.id
+          },
+          actor: system_actor
+        )
 
       {:ok, _cfv} =
         Mv.Membership.CustomFieldValue
@@ -1642,14 +1647,15 @@ defmodule MvWeb.MemberLive.IndexTest do
 
       # Member with true boolean value but unpaid status
       {:ok, member_unpaid_true} =
-        Mv.Membership.Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "UnpaidTrue",
-          last_name: "Member",
-          email: "unpaidtrue.member.#{System.unique_integer([:positive])}@example.com",
-          membership_fee_type_id: fee_type.id
-        })
-        |> Ash.create(actor: system_actor)
+        Mv.Membership.create_member(
+          %{
+            first_name: "UnpaidTrue",
+            last_name: "Member",
+            email: "unpaidtrue.member.#{System.unique_integer([:positive])}@example.com",
+            membership_fee_type_id: fee_type.id
+          },
+          actor: system_actor
+        )
 
       {:ok, _cfv2} =
         Mv.Membership.CustomFieldValue
@@ -1730,13 +1736,14 @@ defmodule MvWeb.MemberLive.IndexTest do
         )
 
       {:ok, _member_without_value} =
-        Mv.Membership.Member
-        |> Ash.Changeset.for_create(:create_member, %{
-          first_name: "NoValue",
-          last_name: "Member",
-          email: "novalue.member.#{System.unique_integer([:positive])}@example.com"
-        })
-        |> Ash.create(actor: system_actor)
+        Mv.Membership.create_member(
+          %{
+            first_name: "NoValue",
+            last_name: "Member",
+            email: "novalue.member.#{System.unique_integer([:positive])}@example.com"
+          },
+          actor: system_actor
+        )
 
       # Test that filter works even though field is not visible in overview
       {:ok, _view, html_true} =

test/mv_web/member_live/membership_fee_integration_test.exs

@@ -6,7 +6,6 @@ defmodule MvWeb.MemberLive.MembershipFeeIntegrationTest do
 
   import Phoenix.LiveViewTest
 
-  alias Mv.Membership.Member
   alias Mv.MembershipFees.MembershipFeeType
   alias Mv.MembershipFees.MembershipFeeCycle
 
@@ -40,10 +39,8 @@ defmodule MvWeb.MemberLive.MembershipFeeIntegrationTest do
     }
 
     attrs = Map.merge(default_attrs, attrs)
-
-    Member
-    |> Ash.Changeset.for_create(:create_member, attrs)
-    |> Ash.create!(actor: system_actor)
+    {:ok, member} = Mv.Membership.create_member(attrs, actor: system_actor)
+    member
   end
 
   describe "end-to-end workflows" do
@@ -152,7 +149,7 @@ defmodule MvWeb.MemberLive.MembershipFeeIntegrationTest do
       system_actor = Mv.Helpers.SystemActor.get_system_actor()
 
       member =
-        Member
+        Mv.Membership.Member
         |> Ash.Query.filter(email == ^form_data["member[email]"])
         |> Ash.read_one!(actor: system_actor)
 

test/mv_web/member_live/show_membership_fees_test.exs

@@ -6,7 +6,6 @@ defmodule MvWeb.MemberLive.ShowMembershipFeesTest do
 
   import Phoenix.LiveViewTest
 
-  alias Mv.Membership.Member
   alias Mv.MembershipFees.MembershipFeeType
   alias Mv.MembershipFees.MembershipFeeCycle
 
@@ -40,10 +39,8 @@ defmodule MvWeb.MemberLive.ShowMembershipFeesTest do
     }
 
     attrs = Map.merge(default_attrs, attrs)
-
-    Member
-    |> Ash.Changeset.for_create(:create_member, attrs)
-    |> Ash.create!(actor: system_actor)
+    {:ok, member} = Mv.Membership.create_member(attrs, actor: system_actor)
+    member
   end
 
   # Helper to create a cycle

test/mv_web/member_live/show_test.exs

@@ -18,20 +18,17 @@ defmodule MvWeb.MemberLive.ShowTest do
   require Ash.Query
   use Gettext, backend: MvWeb.Gettext
 
-  alias Mv.Membership.{CustomField, CustomFieldValue, Member}
+  alias Mv.Membership.{CustomField, CustomFieldValue}
 
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()
 
     # Create test member
     {:ok, member} =
-      Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "Alice",
-        last_name: "Anderson",
-        email: "alice@example.com"
-      })
-      |> Ash.create(actor: system_actor)
+      Mv.Membership.create_member(
+        %{first_name: "Alice", last_name: "Anderson", email: "alice@example.com"},
+        actor: system_actor
+      )
 
     %{member: member, actor: system_actor}
   end