Merge branch 'main' into issue/mitgliederverwaltung-533

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

test/membership/group_database_constraints_test.exs

@@ -5,10 +5,11 @@ defmodule Mv.Membership.GroupDatabaseConstraintsTest do
   """
   use Mv.DataCase, async: false
 
+  import Ash.Expr
+
   alias Mv.Membership
 
   require Ash.Query
-  import Ash.Expr
 
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()

test/membership/group_test.exs

@@ -5,10 +5,11 @@ defmodule Mv.Membership.GroupTest do
   """
   use Mv.DataCase, async: true
 
+  import Ash.Expr
+
   alias Mv.Membership
 
   require Ash.Query
-  import Ash.Expr
 
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()

test/membership/join_request_approval_domain_test.exs

@@ -8,13 +8,14 @@ defmodule Mv.Membership.JoinRequestApprovalDomainTest do
   use Mv.DataCase, async: true
 
   import Ash.Expr
-  require Ash.Query
 
   alias Mv.Fixtures
   alias Mv.Helpers.SystemActor
   alias Mv.Membership
   alias Mv.Membership.Member
 
+  require Ash.Query
+
   defp member_count do
     actor = SystemActor.get_system_actor()
     {:ok, members} = Membership.list_members(actor: actor)

test/membership/join_request_test.exs

@@ -12,13 +12,14 @@ defmodule Mv.Membership.JoinRequestTest do
   """
   use Mv.DataCase, async: true
 
-  require Ash.Query
   import Ash.Expr
 
   alias Mv.Fixtures
   alias Mv.Membership
   alias Mv.Membership.JoinRequest
 
+  require Ash.Query
+
   # Valid minimal attributes for submit (email required; confirmation_token optional for tests)
   @valid_submit_attrs %{
     email: "join#{System.unique_integer([:positive])}@example.com"

test/membership/member_group_test.exs

@@ -5,10 +5,11 @@ defmodule Mv.Membership.MemberGroupTest do
   """
   use Mv.DataCase, async: true
 
+  import Ash.Expr
+
   alias Mv.Membership
 
   require Ash.Query
-  import Ash.Expr
 
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()

test/membership/member_groups_relationship_test.exs

@@ -4,10 +4,11 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do
   """
   use Mv.DataCase, async: true
 
+  import Ash.Expr
+
   alias Mv.Membership
 
   require Ash.Query
-  import Ash.Expr
 
   setup do
     system_actor = Mv.Helpers.SystemActor.get_system_actor()