Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cover/excoveralls.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions lib/groupher_server_web/resolvers/cms_resolver.ex
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ defmodule GroupherServerWeb.Resolvers.CMS do
CMS.update_editor(%Community{id: community_id}, title, %User{id: user_id})
end

def community_editors(_root, ~m(id filter)a, _info) do
def paged_community_editors(_root, ~m(id filter)a, _info) do
CMS.community_members(:editors, %Community{id: id}, filter)
end

Expand Down Expand Up @@ -242,15 +242,15 @@ defmodule GroupherServerWeb.Resolvers.CMS do
CMS.unsubscribe_community(%Community{id: community_id}, cur_user)
end

def community_subscribers(_root, ~m(id filter)a, _info) do
def paged_community_subscribers(_root, ~m(id filter)a, _info) do
CMS.community_members(:subscribers, %Community{id: id}, filter)
end

def community_subscribers(_root, ~m(community filter)a, _info) do
def paged_community_subscribers(_root, ~m(community filter)a, _info) do
CMS.community_members(:subscribers, %Community{raw: community}, filter)
end

def community_subscribers(_root, _args, _info), do: {:error, "invalid args"}
def paged_community_subscribers(_root, _args, _info), do: {:error, "invalid args"}

def mirror_article(_root, ~m(thread id community_id)a, _info) do
CMS.mirror_article(thread, id, community_id)
Expand Down
8 changes: 4 additions & 4 deletions lib/groupher_server_web/schema/cms/cms_queries.ex
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,22 @@ defmodule GroupherServerWeb.Schema.CMS.Queries do
end

@desc "paged subscribers of a community"
field :community_subscribers, :paged_users do
field :paged_community_subscribers, :paged_users do
arg(:id, :id)
arg(:community, :string)
arg(:filter, :paged_filter)

middleware(M.PageSizeProof)
resolve(&R.CMS.community_subscribers/3)
resolve(&R.CMS.paged_community_subscribers/3)
end

@desc "paged subscribers of a community"
field :community_editors, :paged_users do
field :paged_community_editors, :paged_users do
arg(:id, non_null(:id))
arg(:filter, :paged_filter)

middleware(M.PageSizeProof)
resolve(&R.CMS.community_editors/3)
resolve(&R.CMS.paged_community_editors/3)
end

@desc "get community geo cities info"
Expand Down
10 changes: 5 additions & 5 deletions test/groupher_server_web/query/cms/cms_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ defmodule GroupherServer.Test.Query.CMS.Basic do

@query """
query($id: ID!, $filter: PagedFilter!) {
communityEditors(id: $id, filter: $filter) {
pagedCommunityEditors(id: $id, filter: $filter) {
entries {
nickname
}
Expand All @@ -358,7 +358,7 @@ defmodule GroupherServer.Test.Query.CMS.Basic do
Enum.each(users, &CMS.set_editor(community, title, %User{id: &1.id}))

variables = %{id: community.id, filter: %{page: 1, size: 10}}
results = guest_conn |> query_result(@query, variables, "communityEditors")
results = guest_conn |> query_result(@query, variables, "pagedCommunityEditors")

assert results |> is_valid_pagination?
end
Expand Down Expand Up @@ -387,7 +387,7 @@ defmodule GroupherServer.Test.Query.CMS.Basic do

@query """
query($id: ID, $community: String, $filter: PagedFilter!) {
communitySubscribers(id: $id, community: $community, filter: $filter) {
pagedCommunitySubscribers(id: $id, community: $community, filter: $filter) {
entries {
id
nickname
Expand All @@ -409,7 +409,7 @@ defmodule GroupherServer.Test.Query.CMS.Basic do
)

variables = %{id: community.id, filter: %{page: 1, size: 10}}
results = guest_conn |> query_result(@query, variables, "communitySubscribers")
results = guest_conn |> query_result(@query, variables, "pagedCommunitySubscribers")

assert results |> is_valid_pagination?
end
Expand All @@ -423,7 +423,7 @@ defmodule GroupherServer.Test.Query.CMS.Basic do
)

variables = %{community: community.raw, filter: %{page: 1, size: 10}}
results = guest_conn |> query_result(@query, variables, "communitySubscribers")
results = guest_conn |> query_result(@query, variables, "pagedCommunitySubscribers")

assert results |> is_valid_pagination?
end
Expand Down