refactor(user): wip

Author: mydearxym

lib/groupher_server_web/resolvers/accounts_resolver.ex

@@ -263,7 +263,7 @@ defmodule GroupherServerWeb.Resolvers.Accounts do
     end
   end
 
-  def subscribed_communities(_root, %{filter: filter}, _info) do
+  def subscribed_communities(_root, %{filter: filter} = args, _info) do
     Accounts.default_subscribed_communities(filter)
   end
 

lib/groupher_server_web/schema/account/account_types.ex

@@ -61,20 +61,6 @@ defmodule GroupherServerWeb.Schema.Account.Types do
       resolve(&R.Accounts.get_passport/3)
     end
 
-    # field :subscribed_communities, list_of(:community) do
-    # arg(:filter, :members_filter)
-
-    # middleware(M.PageSizeProof)
-    # resolve(dataloader(Accounts, :subscribed_communities))
-    # end
-    @desc "paged communities subscribed by this user"
-    field :subscribed_communities, :paged_communities do
-      arg(:filter, :paged_filter)
-
-      middleware(M.PageSizeProof)
-      resolve(&R.Accounts.subscribed_communities/3)
-    end
-
     field(:subscribed_communities_count, :integer)
 
     @desc "paged communities which the user it's the editor"

test/groupher_server_web/mutation/cms/cms_test.exs

@@ -497,7 +497,6 @@ defmodule GroupherServer.Test.Mutation.CMS.Basic do
       assert created["id"] == to_string(community.id)
     end
 
-    @tag :wip2
     test "subscribe should update user's subscribed count", ~m(user community)a do
       login_conn = simu_conn(:user, user)
 
@@ -569,7 +568,6 @@ defmodule GroupherServer.Test.Mutation.CMS.Basic do
       assert false == cur_subscribers.entries |> Enum.any?(&(&1.id == user.id))
     end
 
-    @tag :wip2
     test "unsubscribe should update user's subscribed count", ~m(user community)a do
       login_conn = simu_conn(:user, user)
 

test/groupher_server_web/query/accounts/account_test.exs

@@ -203,102 +203,6 @@ defmodule GroupherServer.Test.Query.Account.Basic do
   end
 
   describe "[account subscrube]" do
-    alias CMS.Community
-
-    @query """
-    query($login: String!) {
-      user(login: $login) {
-        id
-        nickname
-        subscribedCommunitiesCount
-        subscribedCommunities {
-          entries {
-            id
-            title
-            raw
-            index
-          }
-          pageSize
-          totalCount
-        }
-      }
-    }
-    """
-    test "guest user can get subscrubed communities list and count", ~m(guest_conn user)a do
-      variables = %{login: user.login}
-      {:ok, communities} = db_insert_multi(:community, assert_v(:page_size))
-
-      Enum.each(
-        communities,
-        &CMS.subscribe_community(%Community{id: &1.id}, user)
-      )
-
-      results = guest_conn |> query_result(@query, variables, "user")
-      subscribed_communities = results["subscribedCommunities"]["entries"]
-
-      subscribed_communities_count = results["subscribedCommunitiesCount"]
-      [community_1, community_2, community_3, community_x] = communities |> firstn_and_last(3)
-
-      assert subscribed_communities |> Enum.any?(&(&1["id"] == to_string(community_1.id)))
-      assert subscribed_communities |> Enum.any?(&(&1["id"] == to_string(community_2.id)))
-      assert subscribed_communities |> Enum.any?(&(&1["id"] == to_string(community_3.id)))
-      assert subscribed_communities |> Enum.any?(&(&1["id"] == to_string(community_x.id)))
-      assert subscribed_communities_count == assert_v(:page_size)
-    end
-
-    test "guest user can get subscrubed community list by index", ~m(guest_conn user)a do
-      variables = %{login: user.login}
-      {:ok, communities} = db_insert_multi(:community, assert_v(:page_size))
-
-      Enum.each(
-        communities,
-        &CMS.subscribe_community(%Community{id: &1.id}, user)
-      )
-
-      [community_1, community_2, community_3, _community_x] = communities |> firstn_and_last(3)
-
-      {:ok, _} =
-        Accounts.set_customization(user, %{
-          sidebar_communities_index: %{
-            community_1.raw => 3,
-            community_2.raw => 2,
-            community_3.raw => 1
-          }
-        })
-
-      results = guest_conn |> query_result(@query, variables, "user")
-      subscribed_communities = results["subscribedCommunities"]["entries"]
-
-      found_community_1 =
-        Enum.find(subscribed_communities, fn c -> c["raw"] == community_1.raw end)
-
-      found_community_2 =
-        Enum.find(subscribed_communities, fn c -> c["raw"] == community_2.raw end)
-
-      found_community_3 =
-        Enum.find(subscribed_communities, fn c -> c["raw"] == community_3.raw end)
-
-      assert found_community_1["index"] == 3
-      assert found_community_2["index"] == 2
-      assert found_community_3["index"] == 1
-    end
-
-    test "guest user can get subscrubed communities count of 20 at most", ~m(guest_conn user)a do
-      variables = %{login: user.login}
-      {:ok, communities} = db_insert_multi(:community, assert_v(:page_size) + 1)
-
-      Enum.each(
-        communities,
-        &CMS.subscribe_community(%Community{id: &1.id}, user)
-      )
-
-      results = guest_conn |> query_result(@query, variables, "user")
-      subscribed_communities = results["subscribedCommunities"]
-
-      assert subscribed_communities["totalCount"] == assert_v(:page_size) + 1
-      assert subscribed_communities["pageSize"] == assert_v(:page_size)
-    end
-
     @query """
     query($filter: PagedFilter!) {
       subscribedCommunities(filter: $filter) {
@@ -313,7 +217,6 @@ defmodule GroupherServer.Test.Query.Account.Basic do
       }
     }
     """
-
     test "guest user can get paged default subscrubed communities", ~m(guest_conn)a do
       {:ok, _} = db_insert_multi(:community, 25)
       {:ok, _} = db_insert(:community, %{raw: "home"})