chore: merge branch 'dev'

Author: mydearxym

lib/helper/patchs/accounts_social_migrater.exs

@@ -0,0 +1,44 @@
+# migrate old social fields in account table to user_socials table
+alias Helper.ORM
+
+alias MastaniServer.Accounts.{User, Social}
+alias Helper.Patch.SocialMigrater
+
+defmodule Helper.Patch.SocialMigrater do
+  def insert_social_records(id, map) when map_size(map) == 0, do: IO.puts("pass robot user")
+
+  def insert_social_records(id, attrs) do
+    IO.inspect(id, label: "user id")
+    IO.inspect(attrs, label: "attrs ")
+
+    Social |> ORM.upsert_by([user_id: id], attrs)
+  end
+end
+
+filter = %{page: 1, size: 320}
+{:ok, accounts} = User |> ORM.find_all(filter)
+
+social_keys = [
+  :qq,
+  :weibo,
+  :weichat,
+  :github,
+  :zhihu,
+  :douban,
+  :twitter,
+  :facebook,
+  :dribble,
+  :instagram,
+  :pinterest,
+  :huaban
+]
+
+Enum.each(accounts.entries, fn user ->
+  social_attrs =
+    user
+    |> Map.take(social_keys)
+    |> Enum.reject(fn {k, v} -> is_nil(v) end)
+    |> Map.new()
+
+  SocialMigrater.insert_social_records(user.id, social_attrs)
+end)

lib/mastani_server/accounts/delegates/profile.ex

@@ -8,7 +8,7 @@ defmodule MastaniServer.Accounts.Delegate.Profile do
 
   alias MastaniServer.Accounts
   alias Helper.{Guardian, ORM, QueryBuilder, RadarSearch}
-  alias MastaniServer.Accounts.{Achievement, GithubUser, User}
+  alias MastaniServer.Accounts.{Achievement, GithubUser, User, Social}
   alias MastaniServer.{CMS, Repo}
 
   alias Ecto.Multi
@@ -23,25 +23,11 @@ defmodule MastaniServer.Accounts.Delegate.Profile do
       user
       |> Ecto.Changeset.change(attrs)
 
-    changeset =
-      cond do
-        Map.has_key?(attrs, :education_backgrounds) ->
-          changeset
-          |> Ecto.Changeset.put_embed(:education_backgrounds, attrs.education_backgrounds)
-
-        Map.has_key?(attrs, :work_backgrounds) ->
-          changeset
-          |> Ecto.Changeset.put_embed(:work_backgrounds, attrs.work_backgrounds)
-
-        Map.has_key?(attrs, :other_embeds) ->
-          changeset
-          |> Ecto.Changeset.put_embed(:other_embeds, attrs.other_embeds)
-
-        true ->
-          changeset
-      end
-
-    changeset |> User.update_changeset(attrs) |> Repo.update()
+    changeset
+    |> update_social_ifneed(user, attrs)
+    |> embed_background_ifneed(changeset)
+    |> User.update_changeset(attrs)
+    |> Repo.update()
   end
 
   @doc """
@@ -153,6 +139,9 @@ defmodule MastaniServer.Accounts.Delegate.Profile do
     |> Multi.run(:create_profile, fn _, %{create_user: user} ->
       create_profile(user, github_profile, :github)
     end)
+    |> Multi.run(:update_profile_social, fn _, %{create_user: user} ->
+      update_profile_social(user, github_profile, :github)
+    end)
     |> Multi.run(:init_achievement, fn _, %{create_user: user} ->
       Achievement |> ORM.upsert_by([user_id: user.id], %{user_id: user.id})
     end)
@@ -171,6 +160,9 @@ defmodule MastaniServer.Accounts.Delegate.Profile do
   defp register_github_result({:error, :create_profile, _result, _steps}),
     do: {:error, "Accounts create_profile internal error"}
 
+  defp register_github_result({:error, :update_profile_social, _result, _steps}),
+    do: {:error, "Accounts update_profile_social error"}
+
   defp gen_token(%User{} = user) do
     with {:ok, token, _info} <- Guardian.jwt_encode(user) do
       {:ok, %{token: token, user: user}}
@@ -181,7 +173,6 @@ defmodule MastaniServer.Accounts.Delegate.Profile do
     attrs = %{
       login: String.downcase(profile["login"]),
       nickname: profile["login"],
-      github: "https://github.com/#{profile["login"]}",
       avatar: profile["avatar_url"],
       bio: profile["bio"],
       location: profile["location"],
@@ -203,6 +194,14 @@ defmodule MastaniServer.Accounts.Delegate.Profile do
     Repo.insert(changeset)
   end
 
+  def update_profile_social(user, profile, :github) do
+    update_social_ifneed(user, %{
+      social: %{
+        github: "https://github.com/#{profile["login"]}"
+      }
+    })
+  end
+
   defp create_profile(user, github_profile, :github) do
     # attrs = github_user |> Map.merge(%{github_id: github_user.id, user_id: 1}) |> Map.delete(:id)
     attrs =
@@ -215,4 +214,31 @@ defmodule MastaniServer.Accounts.Delegate.Profile do
     |> GithubUser.changeset(attrs)
     |> Repo.insert()
   end
+
+  defp update_social_ifneed(%User{} = user, %{social: attrs}) do
+    attrs = Map.merge(%{user_id: user.id}, attrs)
+    Social |> ORM.upsert_by([user_id: user.id], attrs)
+  end
+
+  defp update_social_ifneed(changeset, %User{} = user, %{social: attrs}) do
+    Social |> ORM.upsert_by([user_id: user.id], attrs)
+    changeset
+  end
+
+  defp update_social_ifneed(changeset, _user, _attrs), do: changeset
+
+  defp embed_background_ifneed(%Ecto.Changeset{} = changeset, attrs) do
+    cond do
+      Map.has_key?(attrs, :education_backgrounds) ->
+        changeset
+        |> Ecto.Changeset.put_embed(:education_backgrounds, attrs.education_backgrounds)
+
+      Map.has_key?(attrs, :work_backgrounds) ->
+        changeset
+        |> Ecto.Changeset.put_embed(:work_backgrounds, attrs.work_backgrounds)
+
+      true ->
+        changeset
+    end
+  end
 end

lib/mastani_server/accounts/social.ex

@@ -0,0 +1,49 @@
+defmodule MastaniServer.Accounts.Social do
+  @moduledoc false
+  alias __MODULE__
+
+  use Ecto.Schema
+  import Ecto.Changeset
+
+  alias MastaniServer.Accounts.User
+
+  @required_fields ~w(user_id)a
+  @optional_fields ~w(github twitter facebook zhihu dribble huaban douban pinterest instagram qq weichat weibo)a
+
+  @type t :: %Social{}
+  schema "user_socials" do
+    belongs_to(:user, User)
+
+    field(:github, :string)
+    field(:twitter, :string)
+    field(:facebook, :string)
+    field(:zhihu, :string)
+    field(:dribble, :string)
+    field(:huaban, :string)
+    field(:douban, :string)
+
+    field(:pinterest, :string)
+    field(:instagram, :string)
+
+    field(:qq, :string)
+    field(:weichat, :string)
+    field(:weibo, :string)
+
+    # timestamps(type: :utc_datetime)
+  end
+
+  @doc false
+  def changeset(%Social{} = social, attrs) do
+    social
+    |> cast(attrs, @optional_fields ++ @required_fields)
+    |> validate_required(@required_fields)
+    |> foreign_key_constraint(:user_id)
+  end
+
+  @doc false
+  def update_changeset(%Social{} = social, attrs) do
+    social
+    |> cast(attrs, @optional_fields ++ @required_fields)
+    |> foreign_key_constraint(:user_id)
+  end
+end

lib/mastani_server/accounts/user.ex

@@ -16,13 +16,14 @@ defmodule MastaniServer.Accounts.User do
     Purchase,
     UserFollower,
     UserFollowing,
-    WorkBackground
+    WorkBackground,
+    Social
   }
 
   alias MastaniServer.CMS
 
   @required_fields ~w(nickname avatar)a
-  @optional_fields ~w(login nickname bio remote_ip sex location douban dribble email facebook pinterest pinterest github huaban qq  weibo weichat twitter zhihu)a
+  @optional_fields ~w(login nickname bio remote_ip sex location email)a
 
   @type t :: %User{}
   schema "users" do
@@ -39,11 +40,12 @@ defmodule MastaniServer.Accounts.User do
 
     field(:views, :integer, default: 0)
 
-    sscial_fields()
-
     embeds_many(:education_backgrounds, EducationBackground)
     embeds_many(:work_backgrounds, WorkBackground)
 
+    has_one(:social, Social)
+    social_fields()
+
     has_one(:achievement, Achievement)
     has_one(:github_profile, GithubUser)
     has_one(:cms_passport, CMS.Passport)
@@ -95,8 +97,9 @@ defmodule MastaniServer.Accounts.User do
     |> validate_inclusion(:sex, ["dude", "girl"])
     |> validate_format(:email, ~r/@/)
     |> validate_length(:location, min: 2, max: 30)
-    |> validate_length(:qq, min: 8, max: 15)
-    |> validate_length(:weichat, min: 3, max: 30)
-    |> validate_length(:weibo, min: 3, max: 30)
+
+    # |> validate_length(:qq, min: 8, max: 15)
+    # |> validate_length(:weichat, min: 3, max: 30)
+    # |> validate_length(:weibo, min: 3, max: 30)
   end
 end

lib/mastani_server_web/resolvers/accounts_resolver.ex

@@ -46,6 +46,11 @@ defmodule MastaniServerWeb.Resolvers.Accounts do
         do: Map.merge(profile, %{work_backgrounds: args.work_backgrounds}),
         else: profile
 
+    profile =
+      if Map.has_key?(args, :social),
+        do: Map.merge(profile, %{social: args.social}),
+        else: profile
+
     Accounts.update_profile(%User{id: cur_user.id}, profile)
   end
 

lib/mastani_server_web/schema/account/account_misc.ex

@@ -48,8 +48,10 @@ defmodule MastaniServerWeb.Schema.Account.Misc do
     field(:sex, :string)
     field(:location, :string)
     field(:email, :string)
-    # social
-    sscial_fields()
+  end
+
+  input_object :social_input do
+    social_fields()
   end
 
   enum :cus_banner_layout_num do

lib/mastani_server_web/schema/account/account_mutations.ex

@@ -18,6 +18,7 @@ defmodule MastaniServerWeb.Schema.Account.Mutations do
     @desc "update user's profile"
     field :update_profile, :user do
       arg(:profile, non_null(:user_profile_input))
+      arg(:social, :social_input)
       arg(:work_backgrounds, list_of(:work_background_input))
       arg(:education_backgrounds, list_of(:edu_background_input))
 

lib/mastani_server_web/schema/account/account_types.ex

@@ -14,16 +14,6 @@ defmodule MastaniServerWeb.Schema.Account.Types do
     field(:is_valid, :boolean)
   end
 
-  object :education_background do
-    field(:school, :string)
-    field(:major, :string)
-  end
-
-  object :work_background do
-    field(:company, :string)
-    field(:title, :string)
-  end
-
   object :user do
     meta(:cache, max_age: 30)
     field(:id, :id)
@@ -38,7 +28,8 @@ defmodule MastaniServerWeb.Schema.Account.Types do
 
     field(:views, :integer)
 
-    sscial_fields()
+    social_fields()
+    field(:social, :social_map, resolve: dataloader(Accounts, :social))
 
     field(:inserted_at, :datetime)
     field(:updated_at, :datetime)
@@ -326,6 +317,20 @@ defmodule MastaniServerWeb.Schema.Account.Types do
     field(:public_gists, :integer)
   end
 
+  object :education_background do
+    field(:school, :string)
+    field(:major, :string)
+  end
+
+  object :work_background do
+    field(:company, :string)
+    field(:title, :string)
+  end
+
+  object :social_map do
+    social_fields()
+  end
+
   object :favorites_category do
     field(:id, :id)
     field(:title, :string)

lib/mastani_server_web/schema/utils/helper.ex

@@ -40,7 +40,7 @@ defmodule MastaniServerWeb.Schema.Utils.Helper do
     end
   end
 
-  defmacro sscial_fields do
+  defmacro social_fields do
     quote do
       field(:qq, :string)
       field(:weibo, :string)

priv/repo/migrations/20190303102430_add_user_socials.exs

@@ -0,0 +1,26 @@
+defmodule MastaniServer.Repo.Migrations.AddUserSocials do
+  use Ecto.Migration
+
+  def change do
+    create table(:user_socials) do
+      add(:user_id, references(:users, on_delete: :delete_all), null: false)
+
+      add(:github, :string)
+      add(:twitter, :string)
+      add(:facebook, :string)
+      add(:zhihu, :string)
+      add(:dribble, :string)
+      add(:huaban, :string)
+      add(:douban, :string)
+
+      add(:pinterest, :string)
+      add(:instagram, :string)
+
+      add(:qq, :string)
+      add(:weichat, :string)
+      add(:weibo, :string)
+    end
+
+    create(unique_index(:user_socials, [:user_id]))
+  end
+end