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

2026-01-29 15:30:14 +01:00 · 2026-01-29 15:30:14 +01:00 · 4473cfd372
commit 4473cfd372
parent 5a2f035ecc
32 changed files with 733 additions and 818 deletions
--- a/test/membership/custom_field_deletion_test.exs
+++ b/test/membership/custom_field_deletion_test.exs
@ -239,13 +239,14 @@ defmodule Mv.Membership.CustomFieldDeletionTest do

  # Helper functions
  defp create_member(actor) do
-    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: actor)
+    Mv.Membership.create_member(
+      %{
+        first_name: "Test",
+        last_name: "User#{System.unique_integer([:positive])}",
+        email: "test#{System.unique_integer([:positive])}@example.com"
+      },
+      actor: actor
+    )
  end

  defp create_custom_field(name, value_type, actor) do
--- a/test/membership/custom_field_value_validation_test.exs
+++ b/test/membership/custom_field_value_validation_test.exs
@ -17,13 +17,14 @@ defmodule Mv.Membership.CustomFieldValueValidationTest do

    # Create a test member
    {:ok, member} =
-      Member
-      |> Ash.Changeset.for_create(:create_member, %{
-        first_name: "Test",
-        last_name: "User",
-        email: "test.validation@example.com"
-      })
-      |> Ash.create(actor: system_actor)
+      Mv.Membership.create_member(
+        %{
+          first_name: "Test",
+          last_name: "User",
+          email: "test.validation@example.com"
+        },
+        actor: system_actor
+      )

    # Create custom fields for different types
    {:ok, string_field} =
--- a/test/membership/member_cycle_calculations_test.exs
+++ b/test/membership/member_cycle_calculations_test.exs
@ -38,10 +38,8 @@ defmodule Mv.Membership.MemberCycleCalculationsTest do
    }

    attrs = Map.merge(default_attrs, attrs)
-
-    Member
-    |> Ash.Changeset.for_create(:create_member, attrs)
-    |> Ash.create!(actor: actor)
+    {:ok, member} = Mv.Membership.create_member(attrs, actor: actor)
+    member
  end

  # Helper to create a cycle
--- a/test/membership/member_search_with_custom_fields_test.exs
+++ b/test/membership/member_search_with_custom_fields_test.exs
@ -14,31 +14,22 @@ defmodule Mv.Membership.MemberSearchWithCustomFieldsTest do

    # 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 fields for different types
    {:ok, string_field} =
@ -112,9 +103,7 @@ defmodule Mv.Membership.MemberSearchWithCustomFieldsTest do

      # Force search_vector update by reloading member
      {:ok, _updated_member} =
-        member1
-        |> Ash.Changeset.for_update(:update_member, %{})
-        |> Ash.update(actor: system_actor)
+        Mv.Membership.update_member(member1, %{}, actor: system_actor)

      # Search for the custom field value
      results =
@ -143,9 +132,7 @@ defmodule Mv.Membership.MemberSearchWithCustomFieldsTest do

      # Force search_vector update
      {:ok, _updated_member} =
-        member1
-        |> Ash.Changeset.for_update(:update_member, %{})
-        |> Ash.update(actor: system_actor)
+        Mv.Membership.update_member(member1, %{}, actor: system_actor)

      # Search for the custom field value
      results =
@ -174,9 +161,7 @@ defmodule Mv.Membership.MemberSearchWithCustomFieldsTest do

      # Force search_vector update
      {:ok, _updated_member} =
-        member1
-        |> Ash.Changeset.for_update(:update_member, %{})
-        |> Ash.update(actor: system_actor)
+        Mv.Membership.update_member(member1, %{}, actor: system_actor)

      # Search for partial custom field value (should work via FTS or custom field filter)
      results =
@ -225,9 +210,7 @@ defmodule Mv.Membership.MemberSearchWithCustomFieldsTest do

      # Force search_vector update
      {:ok, _updated_member} =
-        member1
-        |> Ash.Changeset.for_update(:update_member, %{})
-        |> Ash.update(actor: system_actor)
+        Mv.Membership.update_member(member1, %{}, actor: system_actor)

      # Search for the custom field value (date is stored as text in search_vector)
      results =
@ -256,9 +239,7 @@ defmodule Mv.Membership.MemberSearchWithCustomFieldsTest do

      # Force search_vector update
      {:ok, _updated_member} =
-        member1
-        |> Ash.Changeset.for_update(:update_member, %{})
-        |> Ash.update(actor: system_actor)
+        Mv.Membership.update_member(member1, %{}, actor: system_actor)

      # Search for the custom field value (boolean is stored as "true" or "false" text)
      results =
@ -287,9 +268,7 @@ defmodule Mv.Membership.MemberSearchWithCustomFieldsTest do

      # Force search_vector update
      {:ok, _updated_member} =
-        member1
-        |> Ash.Changeset.for_update(:update_member, %{})
-        |> Ash.update(actor: system_actor)
+        Mv.Membership.update_member(member1, %{}, actor: system_actor)

      # Update custom field value
      {:ok, _updated_cfv} =
@ -334,9 +313,7 @@ defmodule Mv.Membership.MemberSearchWithCustomFieldsTest do

      # Force search_vector update
      {:ok, _updated_member} =
-        member1
-        |> Ash.Changeset.for_update(:update_member, %{})
-        |> Ash.update(actor: system_actor)
+        Mv.Membership.update_member(member1, %{}, actor: system_actor)

      # Verify it's searchable
      results =
@ -401,9 +378,7 @@ defmodule Mv.Membership.MemberSearchWithCustomFieldsTest do

      # Update member (should trigger search_vector update including custom fields)
      {:ok, _updated_member} =
-        member1
-        |> Ash.Changeset.for_update(:update_member, %{notes: "Updated notes"})
-        |> Ash.update(actor: system_actor)
+        Mv.Membership.update_member(member1, %{notes: "Updated notes"}, actor: system_actor)

      # Search should find the custom field value
      results =
@ -452,9 +427,7 @@ defmodule Mv.Membership.MemberSearchWithCustomFieldsTest do

      # Force search_vector update
      {:ok, _updated_member} =
-        member1
-        |> Ash.Changeset.for_update(:update_member, %{})
-        |> Ash.update(actor: system_actor)
+        Mv.Membership.update_member(member1, %{}, actor: system_actor)

      # All values should be searchable
      results1 =
@ -496,9 +469,7 @@ defmodule Mv.Membership.MemberSearchWithCustomFieldsTest do

      # Force search_vector update
      {:ok, _updated_member} =
-        member1
-        |> Ash.Changeset.for_update(:update_member, %{})
-        |> Ash.update(actor: system_actor)
+        Mv.Membership.update_member(member1, %{}, actor: system_actor)

      # Search for full value (should work via search_vector)
      results_full =
@ -541,9 +512,7 @@ defmodule Mv.Membership.MemberSearchWithCustomFieldsTest do

      # Force search_vector update
      {:ok, _updated_member} =
-        member1
-        |> Ash.Changeset.for_update(:update_member, %{})
-        |> Ash.update(actor: system_actor)
+        Mv.Membership.update_member(member1, %{}, actor: system_actor)

      # Search for full phone number (should work via search_vector)
      results_full =
--- a/test/membership/member_type_change_integration_test.exs
+++ b/test/membership/member_type_change_integration_test.exs
@ -41,10 +41,8 @@ defmodule Mv.Membership.MemberTypeChangeIntegrationTest do
    }

    attrs = Map.merge(default_attrs, attrs)
-
-    Member
-    |> Ash.Changeset.for_create(:create_member, attrs)
-    |> Ash.create!(actor: actor)
+    {:ok, member} = Mv.Membership.create_member(attrs, actor: actor)
+    member
  end

  # Helper to create a cycle
@ -76,10 +74,14 @@ defmodule Mv.Membership.MemberTypeChangeIntegrationTest do
      # Manually assign fee type (this will trigger cycle generation)
      member =
        member
-        |> Ash.Changeset.for_update(:update_member, %{
-          membership_fee_type_id: yearly_type1.id
-        })
-        |> Ash.update!(actor: actor)
+        |> then(fn m ->
+          {:ok, updated} =
+            Mv.Membership.update_member(m, %{membership_fee_type_id: yearly_type1.id},
+              actor: actor
+            )
+
+          updated
+        end)

      # Cycle generation runs synchronously in the same transaction
      # No need to wait for async completion
@ -140,11 +142,9 @@ defmodule Mv.Membership.MemberTypeChangeIntegrationTest do

      # Change membership fee type (same interval, different amount)
      assert {:ok, _updated_member} =
-               member
-               |> Ash.Changeset.for_update(:update_member, %{
-                 membership_fee_type_id: yearly_type2.id
-               })
-               |> Ash.update(actor: actor)
+               Mv.Membership.update_member(member, %{membership_fee_type_id: yearly_type2.id},
+                 actor: actor
+               )

      # Cycle regeneration runs synchronously in the same transaction
      # No need to wait for async completion
@ -194,10 +194,14 @@ defmodule Mv.Membership.MemberTypeChangeIntegrationTest do
      # Manually assign fee type (this will trigger cycle generation)
      member =
        member
-        |> Ash.Changeset.for_update(:update_member, %{
-          membership_fee_type_id: yearly_type1.id
-        })
-        |> Ash.update!(actor: actor)
+        |> then(fn m ->
+          {:ok, updated} =
+            Mv.Membership.update_member(m, %{membership_fee_type_id: yearly_type1.id},
+              actor: actor
+            )
+
+          updated
+        end)

      # Cycle generation runs synchronously in the same transaction
      # No need to wait for async completion
@ -215,11 +219,9 @@ defmodule Mv.Membership.MemberTypeChangeIntegrationTest do

      # Change membership fee type
      assert {:ok, _updated_member} =
-               member
-               |> Ash.Changeset.for_update(:update_member, %{
-                 membership_fee_type_id: yearly_type2.id
-               })
-               |> Ash.update(actor: actor)
+               Mv.Membership.update_member(member, %{membership_fee_type_id: yearly_type2.id},
+                 actor: actor
+               )

      # Cycle regeneration runs synchronously in the same transaction
      # No need to wait for async completion
@ -242,10 +244,14 @@ defmodule Mv.Membership.MemberTypeChangeIntegrationTest do
      # Manually assign fee type (this will trigger cycle generation)
      member =
        member
-        |> Ash.Changeset.for_update(:update_member, %{
-          membership_fee_type_id: yearly_type1.id
-        })
-        |> Ash.update!(actor: actor)
+        |> then(fn m ->
+          {:ok, updated} =
+            Mv.Membership.update_member(m, %{membership_fee_type_id: yearly_type1.id},
+              actor: actor
+            )
+
+          updated
+        end)

      # Cycle generation runs synchronously in the same transaction
      # No need to wait for async completion
@ -263,11 +269,9 @@ defmodule Mv.Membership.MemberTypeChangeIntegrationTest do

      # Change membership fee type
      assert {:ok, _updated_member} =
-               member
-               |> Ash.Changeset.for_update(:update_member, %{
-                 membership_fee_type_id: yearly_type2.id
-               })
-               |> Ash.update(actor: actor)
+               Mv.Membership.update_member(member, %{membership_fee_type_id: yearly_type2.id},
+                 actor: actor
+               )

      # Cycle regeneration runs synchronously in the same transaction
      # No need to wait for async completion
@ -290,10 +294,14 @@ defmodule Mv.Membership.MemberTypeChangeIntegrationTest do
      # Manually assign fee type (this will trigger cycle generation)
      member =
        member
-        |> Ash.Changeset.for_update(:update_member, %{
-          membership_fee_type_id: yearly_type1.id
-        })
-        |> Ash.update!(actor: actor)
+        |> then(fn m ->
+          {:ok, updated} =
+            Mv.Membership.update_member(m, %{membership_fee_type_id: yearly_type1.id},
+              actor: actor
+            )
+
+          updated
+        end)

      # Cycle generation runs synchronously in the same transaction
      # No need to wait for async completion
@ -357,11 +365,9 @@ defmodule Mv.Membership.MemberTypeChangeIntegrationTest do

      # Change membership fee type
      assert {:ok, _updated_member} =
-               member
-               |> Ash.Changeset.for_update(:update_member, %{
-                 membership_fee_type_id: yearly_type2.id
-               })
-               |> Ash.update(actor: actor)
+               Mv.Membership.update_member(member, %{membership_fee_type_id: yearly_type2.id},
+                 actor: actor
+               )

      # Cycle regeneration runs synchronously in the same transaction
      # No need to wait for async completion
@ -406,10 +412,14 @@ defmodule Mv.Membership.MemberTypeChangeIntegrationTest do
      # Manually assign fee type (this will trigger cycle generation)
      member =
        member
-        |> Ash.Changeset.for_update(:update_member, %{
-          membership_fee_type_id: yearly_type1.id
-        })
-        |> Ash.update!(actor: actor)
+        |> then(fn m ->
+          {:ok, updated} =
+            Mv.Membership.update_member(m, %{membership_fee_type_id: yearly_type1.id},
+              actor: actor
+            )
+
+          updated
+        end)

      # Cycle generation runs synchronously in the same transaction
      # No need to wait for async completion
@ -463,11 +473,9 @@ defmodule Mv.Membership.MemberTypeChangeIntegrationTest do

      # Change membership fee type
      assert {:ok, updated_member} =
-               member
-               |> Ash.Changeset.for_update(:update_member, %{
-                 membership_fee_type_id: yearly_type2.id
-               })
-               |> Ash.update(actor: actor)
+               Mv.Membership.update_member(member, %{membership_fee_type_id: yearly_type2.id},
+                 actor: actor
+               )

      # Cycle regeneration runs synchronously in the same transaction
      # No need to wait for async completion