refactor(profile): rm unnecessary social fields & emhance update

Author: mydearxym

lib/mastani_server/accounts/delegates/profile.ex

@@ -221,8 +221,15 @@ defmodule MastaniServer.Accounts.Delegate.Profile do
   end
 
   defp update_social_ifneed(changeset, %User{} = user, %{social: attrs}) do
-    Social |> ORM.upsert_by([user_id: user.id], attrs)
-    Ecto.Changeset.put_change(changeset, :social, nil)
+    case ORM.find_by(Social, user_id: user.id) do
+      {:ok, _} ->
+        ORM.update_by(Social, [user_id: user.id], attrs)
+        Ecto.Changeset.put_change(changeset, :social, nil)
+
+      {:error, _} ->
+        ORM.create(Social, attrs)
+        changeset
+    end
   end
 
   defp update_social_ifneed(changeset, _user, _attrs), do: changeset

lib/mastani_server/accounts/user.ex

@@ -4,7 +4,7 @@ defmodule MastaniServer.Accounts.User do
 
   use Ecto.Schema
 
-  import MastaniServerWeb.Schema.Utils.Helper
+  # import MastaniServerWeb.Schema.Utils.Helper
   import Ecto.Changeset
 
   alias MastaniServer.Accounts.{
@@ -44,7 +44,6 @@ defmodule MastaniServer.Accounts.User do
     embeds_many(:work_backgrounds, WorkBackground)
 
     has_one(:social, Social)
-    social_fields()
 
     has_one(:achievement, Achievement)
     has_one(:github_profile, GithubUser)

lib/mastani_server_web/schema/account/account_types.ex

@@ -27,8 +27,6 @@ defmodule MastaniServerWeb.Schema.Account.Types do
     field(:geo_city, :string)
 
     field(:views, :integer)
-
-    social_fields()
     field(:social, :social_map, resolve: dataloader(Accounts, :social))
 
     field(:inserted_at, :datetime)

test/mastani_server/accounts/accounts_test.exs

@@ -34,6 +34,7 @@ defmodule MastaniServer.Test.Accounts do
       {:ok, user} = db_insert(:user)
 
       attrs = %{
+        location: "new name",
         social: %{
           github: "github addr",
           weibo: "weibo addr"
@@ -42,6 +43,8 @@ defmodule MastaniServer.Test.Accounts do
 
       {:ok, updated} = Accounts.update_profile(%User{id: user.id}, attrs)
 
+      assert updated.location == "new name"
+
       assert updated.social.github == attrs.social.github
       assert updated.social.weibo == attrs.social.weibo
     end

test/mastani_server_web/mutation/accounts/account_test.exs

@@ -31,6 +31,8 @@ defmodule MastaniServer.Test.Mutation.Account.Basic do
         nickname
         social {
           zhihu
+          github
+          twitter
         }
         education_backgrounds {
           school
@@ -48,17 +50,24 @@ defmodule MastaniServer.Test.Mutation.Account.Basic do
 
       variables = %{
         profile: %{
-          nickname: "new nickname"
+          nickname: "new nickname",
+          bio: "everyday is the opportunity you don't get back,  so live life to the fullest",
+          location: "china |> chengDu (成都).",
+          sex: "dude"
         },
         social: %{
-          zhihu: "xieyiming-75"
+          zhihu: "xieyiming-75",
+          github: "mydearxym",
+          twitter: "fe2"
         }
       }
 
       updated = ownd_conn |> mutation_result(@update_query, variables, "updateProfile")
 
       assert updated["nickname"] == "new nickname"
       assert updated["social"]["zhihu"] == variables.social.zhihu
+      assert updated["social"]["github"] == variables.social.github
+      assert updated["social"]["twitter"] == variables.social.twitter
     end
 
     test "user can update it's own backgrounds", ~m(user)a do