Merge branch 'customization' into dev

Author: mydearxym

lib/mastani_server/accounts/delegates/customization.ex

@@ -16,8 +16,12 @@ defmodule MastaniServer.Accounts.Delegate.Customization do
   """
   def get_customization(%User{id: user_id}) do
     case ORM.find_by(Customization, user_id: user_id) do
-      {:ok, customization} -> {:ok, Map.merge(@default_customization, customization)}
-      {:error, _} -> {:ok, @default_customization}
+      {:ok, customization} ->
+        customization = customization |> Map.from_struct() |> filter_nil_value
+        {:ok, Map.merge(@default_customization, customization)}
+
+      {:error, _} ->
+        {:ok, @default_customization}
     end
   end
 
@@ -99,4 +103,8 @@ defmodule MastaniServer.Accounts.Delegate.Customization do
     # use brainwash to avoid brower-block-plugins
     [:theme, :brainwash_free, :community_chart]
   end
+
+  defp filter_nil_value(map) do
+    for {k, v} <- map, !is_nil(v), into: %{}, do: {k, v}
+  end
 end

test/mastani_server/accounts/customization_test.exs

@@ -12,29 +12,25 @@ defmodule MastaniServer.Test.Accounts.Customization do
   end
 
   describe "[user customization]" do
-    @tag :wip
     test "user can have default customization without payment", ~m(user)a do
       {:ok, result} = Accounts.set_customization(user, :banner_layout, "digest")
       assert result.banner_layout == "digest"
 
       {:error, _result} = Accounts.set_customization(user, :non_exsit, true)
     end
 
-    @tag :wip
     test "user set advance customization without payment fails", ~m(user)a do
       {:error, _result} = Accounts.set_customization(user, :non_exsit, true)
       {:error, _result} = Accounts.set_customization(user, :brainwash_free, true)
     end
 
-    @tag :wip
     test "user can set advance customization after pay for it", ~m(user)a do
       {:error, _result} = Accounts.set_customization(user, :brainwash_free, true)
       {:ok, _result} = Accounts.purchase_service(user, :brainwash_free)
 
       {: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, %{
@@ -51,7 +47,6 @@ defmodule MastaniServer.Test.Accounts.Customization do
       assert {:error, _result} = Accounts.set_customization(user, %{})
     end
 
-    @tag :wip
     test "user can purchase multiable items at once", ~m(user)a do
       {:ok, result} =
         Accounts.purchase_service(user, %{brainwash_free: true, community_chart: true})

test/mastani_server_web/mutation/accounts/customization_test.exs

@@ -27,7 +27,6 @@ defmodule MastaniServer.Test.Mutation.Account.Customization do
       }
     }
     """
-    @tag :wip2
     test "user can set customization", ~m(user_conn user)a do
       ownd_conn = simu_conn(:user, user)
 
@@ -48,7 +47,6 @@ defmodule MastaniServer.Test.Mutation.Account.Customization do
       assert result["customization"]["displayDensity"] == "25"
     end
 
-    @tag :wip2
     test "user set customization with invalid attr fails", ~m(user_conn user)a do
       ownd_conn = simu_conn(:user, user)
 
@@ -68,7 +66,6 @@ defmodule MastaniServer.Test.Mutation.Account.Customization do
       assert user_conn |> mutation_get_error?(@query, variables2)
     end
 
-    @tag :wip2
     test "unlogin user set customization fails", ~m(guest_conn)a do
       variables = %{
         customization: %{

test/mastani_server_web/query/accounts/customization_test.exs

@@ -34,7 +34,6 @@ defmodule MastaniServer.Test.Query.Account.Customization do
       }
     }
     """
-    @tag :wip
     test "user can have default customization configs", ~m(user_conn user)a do
       results = user_conn |> query_result(@query, %{}, "user")