fix(c11n): overwrite other settings when set single c11n key

Author: mydearxym

lib/mastani_server/accounts/customization.ex

@@ -14,7 +14,7 @@ defmodule MastaniServer.Accounts.Customization do
   schema "customizations" do
     belongs_to(:user, User)
 
-    field(:theme, :boolean)
+    field(:theme, :string)
     field(:sidebar_layout, :map)
     field(:sidebar_communities_index, :map)
 

lib/mastani_server/accounts/delegates/customization.ex

@@ -4,6 +4,7 @@ defmodule MastaniServer.Accounts.Delegate.Customization do
   """
   import Ecto.Query, warn: false
   import Helper.Utils, only: [get_config: 2, map_atom_value: 2]
+  import ShortMaps
 
   alias Helper.ORM
   alias MastaniServer.Accounts
@@ -54,7 +55,9 @@ defmodule MastaniServer.Accounts.Delegate.Customization do
   end
 
   def set_customization(%User{id: user_id} = user, map) when is_map(map) do
-    with {:ok, %{achievement: achievement}} <- ORM.find(User, user_id, preload: :achievement) do
+    with {:ok, ~m(achievement customization)a} <-
+           ORM.find(User, user_id, preload: [:achievement, :customization]) do
+      cur_c11n = extract_cur_c11n(customization)
       map = map |> map_atom_value(:string)
 
       valid? =
@@ -64,6 +67,7 @@ defmodule MastaniServer.Accounts.Delegate.Customization do
 
       case valid? do
         true ->
+          map = Map.merge(cur_c11n, map)
           attrs = Map.merge(%{user_id: user.id}, map)
           Customization |> ORM.upsert_by([user_id: user.id], attrs)
 
@@ -86,6 +90,14 @@ defmodule MastaniServer.Accounts.Delegate.Customization do
     end
   end
 
+  defp extract_cur_c11n(nil), do: @default_customization
+
+  defp extract_cur_c11n(%Customization{} = customization) do
+    customization = customization |> Map.from_struct() |> filter_nil_value
+
+    Map.merge(@default_customization, customization)
+  end
+
   defp c11n_item_require?(:theme, %{
          donate_member: donate_member,
          senior_member: senior_member,

lib/mastani_server_web/schema/account/account_misc.ex

@@ -67,12 +67,11 @@ defmodule MastaniServerWeb.Schema.Account.Misc do
     field(:community_chart, :boolean)
     field(:brainwash_free, :boolean)
 
-    field(:banner_layout, :cus_banner_layout_num, default_value: :digest)
-    field(:contents_layout, :cus_contents_layout_num, default_value: :digest)
+    field(:banner_layout, :cus_banner_layout_num)
+    field(:contents_layout, :cus_contents_layout_num)
     field(:content_divider, :boolean)
     field(:mark_viewed, :boolean)
-    field(:display_density, :string, default_value: "20")
-    # field(:sidebar_communities_index, list_of(:community_index))
+    field(:display_density, :string)
   end
 
   input_object :community_index do

priv/repo/migrations/20190116145140_alter_c11n_theme.exs

@@ -0,0 +1,10 @@
+defmodule MastaniServer.Repo.Migrations.AlterC11nTheme do
+  use Ecto.Migration
+
+  def change do
+    alter table(:customizations) do
+      remove(:theme)
+      add(:theme, :string)
+    end
+  end
+end

test/mastani_server_web/mutation/accounts/customization_test.exs

@@ -20,7 +20,7 @@ defmodule MastaniServer.Test.Mutation.Account.Customization do
       $customization: CustomizationInput!,
       $sidebarCommunitiesIndex: [CommunityIndex]
       ) {
-      setCustomization(
+    setCustomization(
       userId: $userId,
       customization: $customization,
       sidebarCommunitiesIndex: $sidebarCommunitiesIndex
@@ -55,6 +55,27 @@ defmodule MastaniServer.Test.Mutation.Account.Customization do
       assert result["customization"]["displayDensity"] == "25"
     end
 
+    test "set single customization should merge not overwright other settings", ~m(user_conn)a do
+      variables = %{
+        customization: %{
+          bannerLayout: "BRIEF"
+        }
+      }
+
+      result = user_conn |> mutation_result(@query, variables, "setCustomization")
+      assert result["customization"]["bannerLayout"] == "brief"
+
+      variables = %{
+        customization: %{
+          displayDensity: "25"
+        }
+      }
+
+      result = user_conn |> mutation_result(@query, variables, "setCustomization")
+      assert result["customization"]["bannerLayout"] == "brief"
+      assert result["customization"]["displayDensity"] == "25"
+    end
+
     test "user set customization with invalid attr fails", ~m(user_conn)a do
       variables1 = %{
         customization: %{