Allow to filter user memberships and group memberships (contacts=) on

backend side

Closes #981 #969

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

lib/graphql/resolvers/member.ex

@@ -21,7 +21,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Member do
           {:ok, Page.t(Member.t())}
   def find_members_for_group(
         %Actor{id: group_id} = group,
-        %{page: page, limit: limit, roles: roles},
+        %{page: page, limit: limit, roles: roles} = args,
         %{
           context: %{current_user: %User{role: user_role}, current_actor: %Actor{id: actor_id}}
         } = _resolution
@@ -39,7 +39,9 @@ defmodule Mobilizon.GraphQL.Resolvers.Member do
             |> Enum.map(&String.to_existing_atom/1)
         end
 
-      %Page{} = page = Actors.list_members_for_group(group, roles, page, limit)
+      %Page{} =
+        page = Actors.list_members_for_group(group, Map.get(args, :name), roles, page, limit)
+
       {:ok, page}
     else
       # Actor is not member of group, fallback to public

lib/graphql/resolvers/user.ex

@@ -376,13 +376,14 @@ defmodule Mobilizon.GraphQL.Resolvers.User do
   """
   def user_memberships(
         %User{id: user_id},
-        %{page: page, limit: limit} = _args,
+        %{page: page, limit: limit} = args,
         %{context: %{current_user: %User{id: logged_user_id}}}
       ) do
     with true <- user_id == logged_user_id,
          memberships <-
            Actors.list_memberships_for_user(
              user_id,
+             Map.get(args, :name),
              page,
              limit
            ) do

lib/graphql/schema/actors/group.ex

@@ -103,6 +103,7 @@ defmodule Mobilizon.GraphQL.Schema.Actors.GroupType do
     )
 
     field :members, :paginated_member_list do
+      arg(:name, :string, description: "A name to filter members by")
       arg(:page, :integer, default_value: 1, description: "The page in the paginated member list")
       arg(:limit, :integer, default_value: 10, description: "The limit of members per page")
       arg(:roles, :string, default_value: "", description: "Filter members by their role")

lib/graphql/schema/user.ex

@@ -85,6 +85,8 @@ defmodule Mobilizon.GraphQL.Schema.UserType do
     field(:memberships, :paginated_member_list,
       description: "The list of memberships for this user"
     ) do
+      arg(:name, :string, description: "A name to filter members by")
+
       arg(:page, :integer,
         default_value: 1,
         description: "The page in the paginated memberships list"

lib/mobilizon/actors/actors.ex

@@ -794,12 +794,14 @@ defmodule Mobilizon.Actors do
   """
   @spec list_memberships_for_user(
           integer,
+          String.t() | nil,
           integer | nil,
           integer | nil
-        ) :: Page.t()
-  def list_memberships_for_user(user_id, page, limit) do
+        ) :: Page.t(Member.t())
+  def list_memberships_for_user(user_id, name, page, limit) do
     user_id
     |> list_members_for_user_query()
+    |> filter_members_by_group_name(name)
     |> Page.build_page(page, limit)
   end
 
@@ -827,12 +829,15 @@ defmodule Mobilizon.Actors do
           Page.t(Member.t())
   def list_members_for_group(
         %Actor{id: group_id, type: :Group},
+        name \\ nil,
         roles \\ [],
         page \\ nil,
         limit \\ nil
       ) do
     group_id
     |> members_for_group_query()
+    |> join_members_actor()
+    |> filter_members_by_actor_name(name)
     |> filter_member_role(roles)
     |> Page.build_page(page, limit)
   end
@@ -1380,13 +1385,10 @@ defmodule Mobilizon.Actors do
 
   @spec list_members_for_user_query(integer()) :: Ecto.Query.t()
   defp list_members_for_user_query(user_id) do
-    from(
-      m in Member,
-      join: a in Actor,
-      on: m.actor_id == a.id,
-      where: a.user_id == ^user_id and m.role != ^:not_approved,
-      preload: [:parent, :actor, :invited_by]
-    )
+    Member
+    |> join_members_actor()
+    |> where([m, a], a.user_id == ^user_id and m.role != ^:not_approved)
+    |> preload([:parent, :actor, :invited_by])
   end
 
   @spec members_for_actor_query(integer | String.t()) :: Ecto.Query.t()
@@ -1446,6 +1448,28 @@ defmodule Mobilizon.Actors do
     from(m in query, where: m.role == ^role)
   end
 
+  @spec filter_members_by_actor_name(Ecto.Query.t(), String.t() | nil) :: Ecto.Query.t()
+  defp filter_members_by_actor_name(query, nil), do: query
+  defp filter_members_by_actor_name(query, ""), do: query
+
+  defp filter_members_by_actor_name(query, name) when is_binary(name) do
+    where(query, [_q, a], like(a.name, ^"%#{name}%") or like(a.preferred_username, ^"%#{name}%"))
+  end
+
+  defp filter_members_by_group_name(query, nil), do: query
+  defp filter_members_by_group_name(query, ""), do: query
+
+  defp filter_members_by_group_name(query, name) when is_binary(name) do
+    query
+    |> join(:inner, [q], a in Actor, on: q.parent_id == a.id)
+    |> where([_q, ..., a], like(a.name, ^"%#{name}%") or like(a.preferred_username, ^"%#{name}%"))
+  end
+
+  @spec join_members_actor(Ecto.Query.t()) :: Ecto.Query.t()
+  defp join_members_actor(query) do
+    join(query, :inner, [q], a in Actor, on: q.actor_id == a.id)
+  end
+
   @spec administrator_members_for_group_query(integer | String.t()) :: Ecto.Query.t()
   defp administrator_members_for_group_query(group_id) do
     from(

lib/web/views/activity_pub/actor_view.ex

@@ -100,7 +100,7 @@ defmodule Mobilizon.Web.ActivityPub.ActorView do
   end
 
   defp fetch_collection(:members, actor, page) do
-    Actors.list_members_for_group(actor, @selected_member_roles, page)
+    Actors.list_members_for_group(actor, nil, @selected_member_roles, page)
   end
 
   defp fetch_collection(:resources, actor, page) do