refactor: user/works page debug (#438)

* refactor(user-model): add/remove social fields

* refactor(user): user profile & works cover staff

* fix(account): unused embeds dir

* chore: workss -> works

* fix: import error

* fix(community-meta): plural errror

Author: mydearxym

lib/groupher_server/accounts/delegates/profile.ex

@@ -8,18 +8,20 @@ defmodule GroupherServer.Accounts.Delegate.Profile do
 
   alias GroupherServer.{Accounts, CMS, Email, Repo, Statistics}
 
-  alias Accounts.Model.{Achievement, GithubUser, User, Social}
+  alias Accounts.Model.{Achievement, GithubUser, User, Social, Embeds}
   alias CMS.Model.{Community, CommunitySubscriber}
 
   alias GroupherServer.Accounts.Delegate.Fans
 
   alias Helper.{Guardian, ORM, QueryBuilder, RadarSearch}
   alias Ecto.Multi
 
+  @default_user_meta Embeds.UserMeta.default_meta()
   @default_subscribed_communities get_config(:general, :default_subscribed_communities)
 
   def read_user(login) when is_binary(login) do
-    with {:ok, user} <- ORM.read_by(User, %{login: login}, inc: :views) do
+    with {:ok, user} <- ORM.read_by(User, %{login: login}, inc: :views),
+         {:ok, user} <- assign_meta_ifneed(user) do
       case user.contributes do
         nil -> assign_default_contributes(user)
         _ -> {:ok, user}
@@ -46,6 +48,14 @@ defmodule GroupherServer.Accounts.Delegate.Profile do
     end
   end
 
+  defp assign_meta_ifneed(%User{meta: nil} = user) do
+    {:ok, Map.merge(user, %{meta: @default_user_meta})}
+  end
+
+  defp assign_meta_ifneed(user) do
+    {:ok, user}
+  end
+
   def paged_users(filter, %User{} = user) do
     ORM.find_all(User, filter) |> Fans.mark_viewer_follow_status(user) |> done
   end

lib/groupher_server/accounts/delegates/publish.ex

@@ -3,7 +3,7 @@ defmodule GroupherServer.Accounts.Delegate.Publish do
   user followers / following related
   """
   import Ecto.Query, warn: false
-  import Helper.Utils, only: [ensure: 2]
+  import Helper.Utils, only: [ensure: 2, plural: 1]
 
   alias GroupherServer.{Accounts, CMS}
   alias Accounts.Model.{Embeds, User}
@@ -29,7 +29,7 @@ defmodule GroupherServer.Accounts.Delegate.Publish do
          {:ok, paged_articles} <- CMS.paged_published_articles(thread, filter, user_id) do
       #
       user_meta = ensure(user.meta, @default_meta)
-      meta = Map.put(user_meta, :"published_#{thread}s_count", paged_articles.total_count)
+      meta = Map.put(user_meta, :"published_#{plural(thread)}_count", paged_articles.total_count)
 
       ORM.update_meta(user, meta)
     end

lib/groupher_server/accounts/embeds/collect_folder_meta.ex

@@ -6,7 +6,7 @@ defmodule GroupherServer.Accounts.Model.Embeds.UserContribute do
   use Accessible
   import Ecto.Changeset
 
-  alias GroupherServer.Accounts.Embeds
+  alias GroupherServer.Accounts.Model.Embeds
 
   @optional_fields ~w(reported_count)a
 

lib/groupher_server/accounts/embeds/user_contribute.ex

@@ -1,15 +1,15 @@
 defmodule GroupherServer.Accounts.Model.Embeds.UserMeta.Macro do
   @moduledoc false
 
-  import Helper.Utils, only: [get_config: 2]
+  import Helper.Utils, only: [get_config: 2, plural: 1]
 
   @article_threads get_config(:article, :threads)
 
   defmacro published_article_count_fields() do
     @article_threads
     |> Enum.map(fn thread ->
       quote do
-        field(unquote(:"published_#{thread}s_count"), :integer, default: 0)
+        field(unquote(:"published_#{plural(thread)}_count"), :integer, default: 0)
       end
     end)
   end
@@ -23,8 +23,8 @@ defmodule GroupherServer.Accounts.Model.Embeds.UserMeta do
   use Accessible
 
   import Ecto.Changeset
-  import GroupherServer.Accounts.Embeds.UserMeta.Macro
-  import Helper.Utils, only: [get_config: 2]
+  import GroupherServer.Accounts.Model.Embeds.UserMeta.Macro
+  import Helper.Utils, only: [get_config: 2, plural: 1]
 
   @article_threads get_config(:article, :threads)
 
@@ -36,12 +36,12 @@ defmodule GroupherServer.Accounts.Model.Embeds.UserMeta do
   }
 
   @optional_fields Map.keys(@general_options) ++
-                     Enum.map(@article_threads, &:"published_#{&1}s_count")
+                     Enum.map(@article_threads, &:"published_#{plural(&1)}_count")
 
   def default_meta() do
     published_article_counts =
       @article_threads
-      |> Enum.reduce([], &(&2 ++ ["published_#{&1}s_count": 0]))
+      |> Enum.reduce([], &(&2 ++ ["published_#{plural(&1)}_count": 0]))
       |> Enum.into(%{})
 
     @general_options |> Map.merge(published_article_counts)

lib/groupher_server/accounts/embeds/user_contribute_record.ex

@@ -8,27 +8,22 @@ defmodule GroupherServer.Accounts.Model.Social do
   alias GroupherServer.Accounts.Model.User
 
   @required_fields ~w(user_id)a
-  @optional_fields ~w(github twitter facebook zhihu dribble huaban douban pinterest instagram qq weichat weibo)a
+  @optional_fields ~w(github twitter blog company zhihu dribble huaban douban pinterest)a
 
   @type t :: %Social{}
   schema "user_socials" do
     belongs_to(:user, User)
 
     field(:github, :string)
     field(:twitter, :string)
-    field(:facebook, :string)
+    field(:blog, :string)
+    field(:company, :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
 

lib/groupher_server/accounts/embeds/user_meta.ex

@@ -25,7 +25,7 @@ defmodule GroupherServer.Accounts.Model.User do
   alias GroupherServer.CMS.Model.{Passport, CommunitySubscriber}
 
   @required_fields ~w(nickname avatar)a
-  @optional_fields ~w(login nickname bio remote_ip sex location email subscribed_communities_count)a
+  @optional_fields ~w(login nickname bio shortbio remote_ip sex location email subscribed_communities_count)a
 
   @type t :: %User{}
   schema "users" do
@@ -34,6 +34,7 @@ defmodule GroupherServer.Accounts.Model.User do
     field(:avatar, :string)
     field(:sex, :string)
     field(:bio, :string)
+    field(:shortbio, :string)
     field(:email, :string)
     field(:location, :string)
     field(:from_github, :boolean)
@@ -104,9 +105,5 @@ defmodule GroupherServer.Accounts.Model.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)
   end
 end

lib/groupher_server/accounts/models/embeds/user_contribute.ex

@@ -3,7 +3,7 @@ defmodule GroupherServer.CMS.Delegate.CommunityCURD do
   community curd
   """
   import Ecto.Query, warn: false
-  import Helper.Utils, only: [done: 1, strip_struct: 1, get_config: 2]
+  import Helper.Utils, only: [done: 1, strip_struct: 1, get_config: 2, plural: 1]
   import GroupherServer.CMS.Delegate.ArticleCURD, only: [ensure_author_exists: 1]
   import GroupherServer.CMS.Helper.Matcher
   import ShortMaps
@@ -130,15 +130,15 @@ defmodule GroupherServer.CMS.Delegate.CommunityCURD do
         |> ORM.count()
 
       community_meta = if is_nil(community.meta), do: @default_meta, else: community.meta
-      meta = Map.put(community_meta, :"#{thread}s_count", thread_article_count)
+      meta = Map.put(community_meta, :"#{plural(thread)}_count", thread_article_count)
 
       community
       |> ORM.update_meta(meta, changes: %{articles_count: recount_articles_count(meta)})
     end
   end
 
   defp recount_articles_count(meta) do
-    @article_threads |> Enum.reduce(0, &(&2 + Map.get(meta, :"#{&1}s_count")))
+    @article_threads |> Enum.reduce(0, &(&2 + Map.get(meta, :"#{plural(&1)}_count")))
   end
 
   @doc """

lib/groupher_server/accounts/models/embeds/user_meta.ex

@@ -50,6 +50,7 @@ defmodule GroupherServer.CMS.Delegate.WorksCURD do
   defp update_works_fields(%Works{} = works, attrs) do
     works = Repo.preload(works, [:techstacks, :cities])
 
+    cover = Map.get(attrs, :cover, works.cover)
     desc = Map.get(attrs, :desc, works.desc)
     home_link = Map.get(attrs, :home_link, works.home_link)
     techstacks = Map.get(attrs, :techstacks, works.techstacks)
@@ -60,7 +61,7 @@ defmodule GroupherServer.CMS.Delegate.WorksCURD do
     with {:ok, techstacks} <- get_or_create_techstacks(techstacks),
          {:ok, cities} <- get_or_create_cities(cities) do
       works
-      |> Ecto.Changeset.change(%{desc: desc, home_link: home_link})
+      |> Ecto.Changeset.change(%{cover: cover, desc: desc, home_link: home_link})
       |> Ecto.Changeset.put_assoc(:techstacks, uniq_by_raw(techstacks))
       |> Ecto.Changeset.put_assoc(:cities, uniq_by_raw(cities))
       |> Ecto.Changeset.put_embed(:social_info, social_info)

lib/groupher_server/accounts/models/social.ex

@@ -17,7 +17,7 @@ defmodule GroupherServer.CMS.Helper.Matcher do
        model: User,
        foreign_key: :account_id,
        preload: :account,
-       default_meta: Accounts.Embeds.UserMeta.default_meta()
+       default_meta: Accounts.Model.Embeds.UserMeta.default_meta()
      }}
   end