refactor(subed-communities): add sort index support

Author: mydearxym

config/config.exs

@@ -59,7 +59,8 @@ config :mastani_server, :customization,
   contents_layout: "digest",
   content_divider: false,
   mark_viewed: true,
-  display_density: "20"
+  display_density: "20",
+  sidebar_communities_index: %{}
 
 config :mastani_server, MastaniServerWeb.Gettext, default_locale: "zh_CN", locales: ~w(en zh_CN)
 

lib/mastani_server/accounts/customization.ex

@@ -8,14 +8,16 @@ defmodule MastaniServer.Accounts.Customization do
   alias MastaniServer.Accounts.User
 
   @required_fields ~w(user_id)a
-  @optional_fields ~w(theme sidebar_layout community_chart brainwash_free banner_layout contents_layout content_divider mark_viewed display_density)a
+  @optional_fields ~w(theme sidebar_layout sidebar_communities_index community_chart brainwash_free banner_layout contents_layout content_divider mark_viewed display_density)a
 
   @type t :: %Customization{}
   schema "customizations" do
     belongs_to(:user, User)
 
     field(:theme, :boolean)
     field(:sidebar_layout, :map)
+    field(:sidebar_communities_index, :map)
+
     field(:community_chart, :boolean)
     field(:brainwash_free, :boolean)
 

lib/mastani_server/accounts/delegates/customization.ex

@@ -86,6 +86,7 @@ defmodule MastaniServer.Accounts.Delegate.Customization do
   def valid_custom_items(:free) do
     [
       :sidebar_layout,
+      :sidebar_communities_index,
       :banner_layout,
       :contents_layout,
       :content_divider,

lib/mastani_server/accounts/delegates/profile.ex

@@ -6,6 +6,7 @@ defmodule MastaniServer.Accounts.Delegate.Profile do
   import Helper.Utils, only: [done: 1, get_config: 2]
   import ShortMaps
 
+  alias MastaniServer.Accounts
   alias Helper.{Guardian, ORM, QueryBuilder, RadarSearch}
   alias MastaniServer.Accounts.{Achievement, GithubUser, User}
   alias MastaniServer.{CMS, Repo}
@@ -47,9 +48,6 @@ defmodule MastaniServer.Accounts.Delegate.Profile do
   update geo info for user, include geo_city & remote ip
   """
   def update_geo(%User{geo_city: geo_city} = user, remote_ip) when is_nil(geo_city) do
-    IO.inspect(geo_city, label: "update_geo geo_city nil")
-    IO.inspect(remote_ip, label: "update_geo remote_ip")
-
     case RadarSearch.locate_city(remote_ip) do
       {:ok, city} ->
         update_profile(user, %{geo_city: city, remote_ip: remote_ip})
@@ -60,15 +58,8 @@ defmodule MastaniServer.Accounts.Delegate.Profile do
     end
   end
 
-  def update_geo(%User{} = user, remote_ip) do
-    IO.inspect(user, label: "update_geo geo_city not nil")
-    IO.inspect(remote_ip, label: "update_geo geo_city not nil remote_ip")
-    update_profile(user, %{remote_ip: remote_ip})
-  end
-
-  def update_geo(_user, _remote_ip) do
-    {:ok, "pass"}
-  end
+  def update_geo(%User{} = user, remote_ip), do: update_profile(user, %{remote_ip: remote_ip})
+  def update_geo(_user, _remote_ip), do: {:ok, "pass"}
 
   @doc """
   github_signin steps:
@@ -101,18 +92,38 @@ defmodule MastaniServer.Accounts.Delegate.Profile do
   @doc """
   get users subscribed communities
   """
-  def subscribed_communities(%User{id: id}, %{page: page, size: size} = filter) do
+  def subscribed_communities(%User{id: id} = user, %{page: page, size: size} = filter) do
     filter = filter |> Map.delete(:first)
-
+    # TODO: merge customed index
     CMS.CommunitySubscriber
     |> where([c], c.user_id == ^id)
     |> join(:inner, [c], cc in assoc(c, :community))
     |> select([c, cc], cc)
     |> QueryBuilder.filter_pack(filter)
     |> ORM.paginater(~m(page size)a)
+    |> sort_communities(user)
     |> done()
   end
 
+  # sort by users sort customization
+  defp sort_communities(paged_communities, user) do
+    with {:ok, customization} <- Accounts.get_customization(user) do
+      case Enum.empty?(customization.sidebar_communities_index) do
+        true ->
+          paged_communities
+
+        false ->
+          entries =
+            Enum.map(paged_communities.entries, fn c ->
+              index = Map.get(customization.sidebar_communities_index, c.raw, 100_000)
+              %{c | index: index}
+            end)
+
+          %{paged_communities | entries: entries}
+      end
+    end
+  end
+
   defp register_github_user(github_profile) do
     Multi.new()
     |> Multi.run(:create_user, fn _ ->

lib/mastani_server_web/resolvers/accounts_resolver.ex

@@ -63,7 +63,20 @@ defmodule MastaniServerWeb.Resolvers.Accounts do
   # Accounts.set_customization(%User{id: user_id}, customization)
   # end
 
-  def set_customization(_root, ~m(customization)a, %{context: %{cur_user: cur_user}}) do
+  def set_customization(_root, ~m(customization)a = args, %{context: %{cur_user: cur_user}}) do
+    sidebar_communities_index =
+      try do
+        args
+        |> Map.get(:sidebar_communities_index, [])
+        |> Enum.map(fn %{community: c, index: i} -> {c, i} end)
+        |> Map.new()
+      rescue
+        _ -> %{}
+      end
+
+    customization =
+      Map.merge(customization, %{sidebar_communities_index: sidebar_communities_index})
+
     Accounts.set_customization(cur_user, customization)
   end
 

lib/mastani_server_web/schema/account/account_misc.ex

@@ -72,6 +72,12 @@ defmodule MastaniServerWeb.Schema.Account.Misc do
     field(:content_divider, :boolean)
     field(:mark_viewed, :boolean)
     field(:display_density, :string, default_value: "20")
+    # field(:sidebar_communities_index, list_of(:community_index))
+  end
+
+  input_object :community_index do
+    field(:community, :string)
+    field(:index, :integer)
   end
 
   # see: https://github.com/absinthe-graphql/absinthe/issues/206

lib/mastani_server_web/schema/account/account_mutations.ex

@@ -101,6 +101,7 @@ defmodule MastaniServerWeb.Schema.Account.Mutations do
     field :set_customization, :user do
       arg(:user_id, :id)
       arg(:customization, non_null(:customization_input))
+      arg(:sidebar_communities_index, list_of(:community_index))
 
       resolve(&R.Accounts.set_customization/3)
     end

priv/repo/migrations/20181203055656_add_communities_index_to_c11n.exs

@@ -0,0 +1,9 @@
+defmodule MastaniServer.Repo.Migrations.AddCommunitiesIndexToC11n do
+  use Ecto.Migration
+
+  def change do
+    alter table(:customizations) do
+      add(:sidebar_communities_index, :map)
+    end
+  end
+end

test/mastani_server/accounts/customization_test.exs

@@ -31,15 +31,18 @@ defmodule MastaniServer.Test.Accounts.Customization do
       {:ok, _result} = Accounts.set_customization(user, :brainwash_free, true)
     end
 
+    @tag :wip
     test "user can set multiable customization at once", ~m(user)a do
       {:ok, result} =
         Accounts.set_customization(user, %{
           content_divider: true,
-          sidebar_layout: %{hello: :world}
+          sidebar_layout: %{hello: :world},
+          sidebar_communities_index: %{javascript: 1, elixir: 2}
         })
 
       assert result.content_divider == true
       assert result.sidebar_layout == %{hello: :world}
+      assert result.sidebar_communities_index == %{javascript: 1, elixir: 2}
 
       assert {:error, _result} =
                Accounts.set_customization(user, %{content_divider: true, no_exsit: true})

test/mastani_server_web/mutation/accounts/customization_test.exs

@@ -15,8 +15,16 @@ defmodule MastaniServer.Test.Mutation.Account.Customization do
 
   describe "[account customization mutation]" do
     @query """
-    mutation($userId: ID, $customization: CustomizationInput!) {
-      setCustomization( userId: $userId, customization: $customization) {
+    mutation(
+      $userId: ID,
+      $customization: CustomizationInput!,
+      $sidebarCommunitiesIndex: [CommunityIndex]
+      ) {
+      setCustomization(
+      userId: $userId,
+      customization: $customization,
+      sidebarCommunitiesIndex: $sidebarCommunitiesIndex
+      ) {
         id
         customization {
           bannerLayout
@@ -27,6 +35,7 @@ defmodule MastaniServer.Test.Mutation.Account.Customization do
       }
     }
     """
+    @tag :wip
     test "user can set customization", ~m(user_conn)a do
       # ownd_conn = simu_conn(:user, user)
       variables = %{
@@ -35,7 +44,8 @@ defmodule MastaniServer.Test.Mutation.Account.Customization do
           contentDivider: true,
           markViewed: false,
           displayDensity: "25"
-        }
+        },
+        sidebarCommunitiesIndex: [%{community: "javascript", index: 1}]
       }
 
       result = user_conn |> mutation_result(@query, variables, "setCustomization")