refactor: add macro for social-fields

Author: mydearxym

lib/mastani_server/accounts/user.ex

@@ -3,6 +3,8 @@ defmodule MastaniServer.Accounts.User do
   alias __MODULE__
 
   use Ecto.Schema
+
+  import MastaniServerWeb.Schema.Utils.Helper
   import Ecto.Changeset
 
   alias MastaniServer.Accounts.{
@@ -21,7 +23,7 @@ defmodule MastaniServer.Accounts.User do
   alias MastaniServer.CMS
 
   @required_fields ~w(nickname avatar)a
-  @optional_fields ~w(nickname bio sex location douban dribble email facebook github huaban qq  weibo weichat twitter zhihu)a
+  @optional_fields ~w(nickname bio sex location douban dribble email facebook pinterest pinterest github huaban qq  weibo weichat twitter zhihu)a
 
   @type t :: %User{}
   schema "users" do
@@ -31,25 +33,13 @@ defmodule MastaniServer.Accounts.User do
     field(:bio, :string)
     field(:email, :string)
     field(:location, :string)
+    field(:from_github, :boolean)
+
+    sscial_fields()
 
-    # TODO
     embeds_many(:education_backgrounds, EducationBackground)
     embeds_many(:work_backgrounds, WorkBackground)
 
-    # social info
-    field(:github, :string)
-    field(:twitter, :string)
-    field(:facebook, :string)
-    field(:zhihu, :string)
-    field(:dribble, :string)
-    field(:huaban, :string)
-    field(:douban, :string)
-
-    field(:qq, :string)
-    field(:weibo, :string)
-    field(:weichat, :string)
-
-    field(:from_github, :boolean)
     has_one(:achievement, Achievement)
     has_one(:github_profile, GithubUser)
     has_one(:cms_passport, CMS.Passport)

lib/mastani_server_web/schema/account/account_misc.ex

@@ -1,6 +1,7 @@
 defmodule MastaniServerWeb.Schema.Account.Misc do
-  use Absinthe.Schema.Notation
+  @moduledoc false
 
+  use Absinthe.Schema.Notation
   import MastaniServerWeb.Schema.Utils.Helper
   # import Helper.Utils, only: [get_config: 2]
   # @page_size get_config(:general, :page_size)
@@ -47,9 +48,9 @@ defmodule MastaniServerWeb.Schema.Account.Misc do
     field(:sex, :string)
     field(:location, :string)
     field(:email, :string)
-    field(:qq, :string)
-    field(:weibo, :string)
-    field(:weichat, :string)
+    # social
+    sscial_fields()
+    # backgrounds
     field(:education_backgrounds, list_of(:education_background))
     field(:work_backgrounds, list_of(:work_background))
   end

lib/mastani_server_web/schema/account/account_types.ex

@@ -32,11 +32,9 @@ defmodule MastaniServerWeb.Schema.Account.Types do
     field(:sex, :string)
     field(:email, :string)
     field(:location, :string)
-    field(:education, :string)
-    field(:company, :string)
-    field(:qq, :string)
-    field(:weibo, :string)
-    field(:weichat, :string)
+
+    sscial_fields()
+
     field(:inserted_at, :datetime)
     field(:updated_at, :datetime)
     field(:from_github, :boolean)

lib/mastani_server_web/schema/utils/helper.ex

@@ -1,22 +1,42 @@
 defmodule MastaniServerWeb.Schema.Utils.Helper do
+  @moduledoc """
+  common fields
+  """
   import Helper.Utils, only: [get_config: 2]
   @page_size get_config(:general, :page_size)
   # @default_inner_page_size 5
 
   # see: https://github.com/absinthe-graphql/absinthe/issues/363
-  defmacro pagination_args() do
+  defmacro pagination_args do
     quote do
       field(:page, :integer, default_value: 1)
       field(:size, :integer, default_value: unquote(@page_size))
     end
   end
 
-  defmacro pagination_fields() do
+  defmacro pagination_fields do
     quote do
       field(:total_count, :integer)
       field(:page_size, :integer)
       field(:total_pages, :integer)
       field(:page_number, :integer)
     end
   end
+
+  defmacro sscial_fields do
+    quote do
+      field(:qq, :string)
+      field(:weibo, :string)
+      field(:weichat, :string)
+      field(:github, :string)
+      field(:zhihu, :string)
+      field(:douban, :string)
+      field(:twitter, :string)
+      field(:facebook, :string)
+      field(:dribble, :string)
+      field(:instagram, :string)
+      field(:pinterest, :string)
+      field(:huaban, :string)
+    end
+  end
 end

priv/repo/migrations/20180830034134_add_more_social_to_users.exs

@@ -0,0 +1,10 @@
+defmodule MastaniServer.Repo.Migrations.AddMoreSocialToUsers do
+  use Ecto.Migration
+
+  def change do
+    alter table(:users) do
+      add(:pinterest, :string)
+      add(:instagram, :string)
+    end
+  end
+end