Merge branch 'main' into issue/mitgliederverwaltung-533

# Conflicts:
#	test/mv_web/member_live/index_test.exs

test/mv_web/components/member_filter_component_test.exs

@@ -14,9 +14,10 @@ defmodule MvWeb.Components.MemberFilterComponentTest do
   # is not trivially async-safe; resolving that is a separate follow-up.
   use MvWeb.ConnCase, async: false
 
-  import Phoenix.LiveViewTest
   use Gettext, backend: MvWeb.Gettext
 
+  import Phoenix.LiveViewTest
+
   alias Mv.Membership.CustomField
 
   # Helper to create a boolean custom field (uses system_actor - only admin can create)

test/mv_web/helpers/membership_fee_helpers_test.exs

@@ -4,11 +4,11 @@ defmodule MvWeb.Helpers.MembershipFeeHelpersTest do
   """
   use Mv.DataCase, async: true
 
-  require Ash.Query
-
   alias Mv.MembershipFees.CalendarCycles
   alias MvWeb.Helpers.MembershipFeeHelpers
 
+  require Ash.Query
+
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()
     %{actor: system_actor}

test/mv_web/live/custom_field_live/deletion_test.exs

@@ -15,10 +15,11 @@ defmodule MvWeb.CustomFieldLive.DeletionTest do
   use MvWeb.ConnCase, async: true
 
   import Phoenix.LiveViewTest
-  require Ash.Query
 
   alias Mv.Membership.{CustomField, CustomFieldValue, Member}
 
+  require Ash.Query
+
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()
     admin_role = Mv.Fixtures.role_fixture("admin")

test/mv_web/live/custom_field_live/form_test.exs

@@ -8,10 +8,11 @@ defmodule MvWeb.CustomFieldLive.FormTest do
   use MvWeb.ConnCase, async: true
 
   import Phoenix.LiveViewTest
-  require Ash.Query
 
   alias Mv.Membership.CustomField
 
+  require Ash.Query
+
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()
     admin_role = Mv.Fixtures.role_fixture("admin")

test/mv_web/live/group_live/form_test.exs

@@ -10,9 +10,10 @@ defmodule MvWeb.GroupLive.FormTest do
   - Security
   """
   use MvWeb.ConnCase, async: false
-  import Phoenix.LiveViewTest
   use Gettext, backend: MvWeb.Gettext
 
+  import Phoenix.LiveViewTest
+
   alias Mv.Fixtures
 
   describe "create form" do

test/mv_web/live/group_live/index_test.exs

@@ -10,9 +10,10 @@ defmodule MvWeb.GroupLive.IndexTest do
   - Edge cases
   """
   use MvWeb.ConnCase, async: false
-  import Phoenix.LiveViewTest
   use Gettext, backend: MvWeb.Gettext
 
+  import Phoenix.LiveViewTest
+
   alias Mv.Fixtures
   alias Mv.Membership
 

test/mv_web/live/group_live/integration_test.exs

@@ -9,14 +9,16 @@ defmodule MvWeb.GroupLive.IntegrationTest do
   - URL persistence
   """
   use MvWeb.ConnCase, async: false
-  import Phoenix.LiveViewTest
-  require Ash.Query
-  import Ash.Expr
   use Gettext, backend: MvWeb.Gettext
 
+  import Ash.Expr
+  import Phoenix.LiveViewTest
+
   alias Mv.Fixtures
   alias Mv.Membership
 
+  require Ash.Query
+
   describe "complete workflow" do
     test "create → view via slug → edit → view via slug (slug unchanged)", %{
       conn: conn,

test/mv_web/live/group_live/show_accessibility_test.exs

@@ -5,9 +5,10 @@ defmodule MvWeb.GroupLive.ShowAccessibilityTest do
   """
 
   use MvWeb.ConnCase, async: false
-  import Phoenix.LiveViewTest
   use Gettext, backend: MvWeb.Gettext
 
+  import Phoenix.LiveViewTest
+
   alias Mv.Fixtures
   alias Mv.Membership
 

test/mv_web/live/group_live/show_add_member_test.exs

@@ -5,10 +5,11 @@ defmodule MvWeb.GroupLive.ShowAddMemberTest do
   """
 
   use MvWeb.ConnCase, async: false
-  import Phoenix.LiveViewTest
-  import MvWeb.GroupLiveHelpers
   use Gettext, backend: MvWeb.Gettext
 
+  import MvWeb.GroupLiveHelpers
+  import Phoenix.LiveViewTest
+
   alias Mv.Fixtures
   alias Mv.Membership
 

test/mv_web/live/group_live/show_add_remove_members_test.exs

@@ -5,9 +5,10 @@ defmodule MvWeb.GroupLive.ShowAddRemoveMembersTest do
   """
 
   use MvWeb.ConnCase, async: false
-  import Phoenix.LiveViewTest
   use Gettext, backend: MvWeb.Gettext
 
+  import Phoenix.LiveViewTest
+
   alias Mv.Fixtures
   alias Mv.Membership
 

test/mv_web/live/group_live/show_authorization_test.exs

@@ -5,9 +5,10 @@ defmodule MvWeb.GroupLive.ShowAuthorizationTest do
   """
 
   use MvWeb.ConnCase, async: false
-  import Phoenix.LiveViewTest
   use Gettext, backend: MvWeb.Gettext
 
+  import Phoenix.LiveViewTest
+
   alias Mv.Fixtures
   alias Mv.Membership
 

test/mv_web/live/group_live/show_integration_test.exs

@@ -5,9 +5,10 @@ defmodule MvWeb.GroupLive.ShowIntegrationTest do
   """
 
   use MvWeb.ConnCase, async: false
-  import Phoenix.LiveViewTest
   use Gettext, backend: MvWeb.Gettext
 
+  import Phoenix.LiveViewTest
+
   alias Mv.Fixtures
   alias Mv.Membership
 

test/mv_web/live/group_live/show_member_search_test.exs

@@ -5,9 +5,10 @@ defmodule MvWeb.GroupLive.ShowMemberSearchTest do
   """
 
   use MvWeb.ConnCase, async: false
-  import Phoenix.LiveViewTest
   use Gettext, backend: MvWeb.Gettext
 
+  import Phoenix.LiveViewTest
+
   alias Mv.Fixtures
   alias Mv.Membership
 

test/mv_web/live/group_live/show_remove_member_test.exs

@@ -5,9 +5,10 @@ defmodule MvWeb.GroupLive.ShowRemoveMemberTest do
   """
 
   use MvWeb.ConnCase, async: false
-  import Phoenix.LiveViewTest
   use Gettext, backend: MvWeb.Gettext
 
+  import Phoenix.LiveViewTest
+
   alias Mv.Fixtures
   alias Mv.Membership
 

test/mv_web/live/group_live/show_test.exs

@@ -11,13 +11,15 @@ defmodule MvWeb.GroupLive.ShowTest do
   - Delete functionality
   """
   use MvWeb.ConnCase, async: false
-  import Phoenix.LiveViewTest
-  require Ash.Query
   use Gettext, backend: MvWeb.Gettext
 
+  import Phoenix.LiveViewTest
+
   alias Mv.Fixtures
   alias Mv.Membership
 
+  require Ash.Query
+
   describe "mount and display" do
     test "page renders successfully", %{conn: conn} do
       group = Fixtures.group_fixture()

test/mv_web/live/member_live/deactivate_test.exs

@@ -4,9 +4,10 @@ defmodule MvWeb.MemberLive.DeactivateTest do
   driven through the parent LiveView (the DeactivateComponent is stateful).
   """
   use MvWeb.ConnCase, async: true
-  import Phoenix.LiveViewTest
   use Gettext, backend: MvWeb.Gettext
 
+  import Phoenix.LiveViewTest
+
   alias Mv.Fixtures
 
   defp reload_member(member) do

test/mv_web/live/role_live/show_test.exs

@@ -11,13 +11,15 @@ defmodule MvWeb.RoleLive.ShowTest do
   - Delete functionality
   """
   use MvWeb.ConnCase, async: false
-  import Phoenix.LiveViewTest
-  require Ash.Query
   use Gettext, backend: MvWeb.Gettext
 
+  import Phoenix.LiveViewTest
+
   alias Mv.Authorization
   alias Mv.Authorization.Role
 
+  require Ash.Query
+
   # Helper to create a role (authorize?: false for test data setup)
   defp create_role(attrs \\ %{}) do
     default_attrs = %{

test/mv_web/live/user_live/show_test.exs

@@ -10,10 +10,12 @@ defmodule MvWeb.UserLive.ShowTest do
   - Error handling
   """
   use MvWeb.ConnCase, async: true
-  import Phoenix.LiveViewTest
-  require Ash.Query
   use Gettext, backend: MvWeb.Gettext
 
+  import Phoenix.LiveViewTest
+
+  require Ash.Query
+
   setup do
     # Create test user
     user = create_test_user(%{email: "test@example.com", oidc_id: "test123"})

test/mv_web/member_live/index_custom_fields_accessibility_test.exs

@@ -9,10 +9,11 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsAccessibilityTest do
   """
   use MvWeb.ConnCase, async: true
   import Phoenix.LiveViewTest
-  require Ash.Query
 
   alias Mv.Membership.{CustomField, CustomFieldValue}
 
+  require Ash.Query
+
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()
 

test/mv_web/member_live/index_custom_fields_display_test.exs

@@ -15,10 +15,11 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsDisplayTest do
   # rather than part of the original change.
   use MvWeb.ConnCase, async: false
   import Phoenix.LiveViewTest
-  require Ash.Query
 
   alias Mv.Membership.{CustomField, CustomFieldValue}
 
+  require Ash.Query
+
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()
 

test/mv_web/member_live/index_custom_fields_edge_cases_test.exs

@@ -8,10 +8,11 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsEdgeCasesTest do
   """
   use MvWeb.ConnCase, async: true
   import Phoenix.LiveViewTest
-  require Ash.Query
 
   alias Mv.Membership.CustomField
 
+  require Ash.Query
+
   @tag :slow
   test "displays custom field column even when no members have values", %{conn: conn} do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()

test/mv_web/member_live/index_custom_fields_sorting_test.exs

@@ -11,10 +11,11 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsSortingTest do
   """
   use MvWeb.ConnCase, async: true
   import Phoenix.LiveViewTest
-  require Ash.Query
 
   alias Mv.Membership.{CustomField, CustomFieldValue}
 
+  require Ash.Query
+
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()
 

test/mv_web/member_live/index_field_visibility_test.exs

@@ -17,10 +17,11 @@ defmodule MvWeb.MemberLive.IndexFieldVisibilityTest do
   use MvWeb.ConnCase, async: false
 
   import Phoenix.LiveViewTest
-  require Ash.Query
 
   alias Mv.Membership.{CustomField, CustomFieldValue}
 
+  require Ash.Query
+
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()
 

test/mv_web/member_live/index_groups_accessibility_test.exs

@@ -14,10 +14,11 @@ defmodule MvWeb.MemberLive.IndexGroupsAccessibilityTest do
   # than part of the original change.
   use MvWeb.ConnCase, async: false
   import Phoenix.LiveViewTest
-  require Ash.Query
 
   alias Mv.Membership.{Group, MemberGroup}
 
+  require Ash.Query
+
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()
 

test/mv_web/member_live/index_groups_display_test.exs

@@ -14,10 +14,11 @@ defmodule MvWeb.MemberLive.IndexGroupsDisplayTest do
   # than part of the original change.
   use MvWeb.ConnCase, async: false
   import Phoenix.LiveViewTest
-  require Ash.Query
 
   alias Mv.Membership.{Group, MemberGroup}
 
+  require Ash.Query
+
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()
 

test/mv_web/member_live/index_groups_filter_test.exs

@@ -12,10 +12,11 @@ defmodule MvWeb.MemberLive.IndexGroupsFilterTest do
   # than part of the original change.
   use MvWeb.ConnCase, async: false
   import Phoenix.LiveViewTest
-  require Ash.Query
 
   alias Mv.Membership.{Group, MemberGroup}
 
+  require Ash.Query
+
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()
 

test/mv_web/member_live/index_groups_integration_test.exs

@@ -16,12 +16,13 @@ defmodule MvWeb.MemberLive.IndexGroupsIntegrationTest do
   # than part of the original change.
   use MvWeb.ConnCase, async: false
   import Phoenix.LiveViewTest
-  require Ash.Query
 
   alias Mv.Helpers.SystemActor
   alias Mv.Membership.{CustomField, CustomFieldValue, Group, MemberGroup}
   alias Mv.MembershipFees.{MembershipFeeCycle, MembershipFeeType}
 
+  require Ash.Query
+
   setup do
     system_actor = SystemActor.get_system_actor()
 

test/mv_web/member_live/index_groups_performance_test.exs

@@ -14,10 +14,11 @@ defmodule MvWeb.MemberLive.IndexGroupsPerformanceTest do
   # than part of the original change.
   use MvWeb.ConnCase, async: false
   import Phoenix.LiveViewTest
-  require Ash.Query
 
   alias Mv.Membership.{Group, MemberGroup}
 
+  require Ash.Query
+
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()
 

test/mv_web/member_live/index_groups_sorting_test.exs

@@ -8,10 +8,11 @@ defmodule MvWeb.MemberLive.IndexGroupsSortingTest do
   # than part of the original change.
   use MvWeb.ConnCase, async: false
   import Phoenix.LiveViewTest
-  require Ash.Query
 
   alias Mv.Membership.{Group, MemberGroup}
 
+  require Ash.Query
+
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()
 

test/mv_web/member_live/index_groups_url_params_test.exs

@@ -15,10 +15,11 @@ defmodule MvWeb.MemberLive.IndexGroupsUrlParamsTest do
   # is not trivially async-safe; resolving that is a separate follow-up.
   use MvWeb.ConnCase, async: false
   import Phoenix.LiveViewTest
-  require Ash.Query
 
   alias Mv.Membership.{Group, MemberGroup}
 
+  require Ash.Query
+
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()
 

test/mv_web/member_live/index_test.exs

@@ -5,7 +5,7 @@ defmodule MvWeb.MemberLive.IndexTest do
   # the timing assertion flaky, so this module stays synchronous.
   use MvWeb.ConnCase, async: false
   import Phoenix.LiveViewTest
-  require Ash.Query
+  import Mv.Fixtures, only: [create_fee_type: 2, create_cycle: 4]
 
   alias Mv.Helpers.SystemActor
   alias Mv.Membership
@@ -13,8 +13,6 @@ defmodule MvWeb.MemberLive.IndexTest do
   alias Mv.Membership.CustomFieldValue
   alias MvWeb.MemberLive.Index, as: MemberIndex
 
-  import Mv.Fixtures, only: [create_fee_type: 2, create_cycle: 4]
-
   describe "desktop layout: scroll container and sticky table header" do
     @describetag :ui
 

test/mv_web/member_live/show_groups_display_test.exs

@@ -16,12 +16,14 @@ defmodule MvWeb.MemberLive.ShowGroupsDisplayTest do
   than part of the original change.
   """
   use MvWeb.ConnCase, async: false
-  import Phoenix.LiveViewTest
-  require Ash.Query
   use Gettext, backend: MvWeb.Gettext
 
+  import Phoenix.LiveViewTest
+
   alias Mv.Membership.{Group, MemberGroup}
 
+  require Ash.Query
+
   describe "groups section" do
     setup do
       actor = Mv.Helpers.SystemActor.get_system_actor()

test/mv_web/member_live/show_test.exs

@@ -14,12 +14,14 @@ defmodule MvWeb.MemberLive.ShowTest do
   - Custom field cleanup in tests ensures no interference between tests
   """
   use MvWeb.ConnCase, async: true
-  import Phoenix.LiveViewTest
-  require Ash.Query
   use Gettext, backend: MvWeb.Gettext
 
+  import Phoenix.LiveViewTest
+
   alias Mv.Membership.{CustomField, CustomFieldValue}
 
+  require Ash.Query
+
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()