Allow to filter user memberships and group memberships (contacts=) on
backend side Closes #981 #969 Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user