Merge branch 'main' into issue/mitgliederverwaltung-533

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

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()