refactor(article-comment): wip

Author: mydearxym

lib/groupher_server/cms/delegates/article_comment.ex

@@ -14,8 +14,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
   alias GroupherServer.{Accounts, CMS, Repo}
 
   alias Accounts.User
-  # TODO: why Post?
-  alias CMS.{ArticleComment, ArticlePinedComment, Embeds, Post}
+  alias CMS.{ArticleComment, ArticlePinedComment, Embeds}
   alias Ecto.Multi
 
   @max_participator_count ArticleComment.max_participator_count()
@@ -141,6 +140,68 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
     |> upsert_comment_result()
   end
 
+  # add participator to article-like content (Post, Job ...) and update count
+  def add_participator_to_article(
+        %{article_comments_participators: article_comments_participators} = article,
+        %User{} = user
+      ) do
+    total_participators = article_comments_participators |> List.insert_at(0, user) |> Enum.uniq()
+    new_comment_participators = total_participators |> Enum.slice(0, @max_participator_count)
+    total_participators_count = length(total_participators)
+
+    article
+    |> Ecto.Changeset.change()
+    |> Ecto.Changeset.put_change(:article_comments_participators_count, total_participators_count)
+    |> Ecto.Changeset.put_embed(:article_comments_participators, new_comment_participators)
+    |> Repo.update()
+  end
+
+  def add_participator_to_article(_, _), do: {:ok, :pass}
+
+  # update comment's parent article's comments total count
+  @spec update_article_comments_count(ArticleComment.t(), :inc | :dec) :: ArticleComment.t()
+  def update_article_comments_count(%ArticleComment{} = comment, opt) do
+    with {:ok, article_info} <- match(:comment_article, comment),
+         {:ok, article} <- ORM.find(article_info.model, article_info.id) do
+      count_query =
+        from(c in ArticleComment, where: field(c, ^article_info.foreign_key) == ^article_info.id)
+
+      cur_count = Repo.aggregate(count_query, :count)
+
+      # dec 是 comment 还没有删除的时候的操作，和 inc 不同
+      # 因为 dec 操作如果放在 delete 后面，那么 update 会失败
+      case opt do
+        :inc -> ORM.update(article, %{article_comments_count: cur_count})
+        :dec -> ORM.update(article, %{article_comments_count: Enum.max([1, cur_count]) - 1})
+      end
+    end
+  end
+
+  # creat article comment for parent or reply
+  # set floor
+  # TODO: parse editor-json
+  # set default emotions
+  def do_create_comment(content, foreign_key, article, %User{id: user_id}) do
+    count_query = from(c in ArticleComment, where: field(c, ^foreign_key) == ^article.id)
+    floor = Repo.aggregate(count_query, :count) + 1
+
+    ArticleComment
+    |> ORM.create(
+      Map.put(
+        %{
+          author_id: user_id,
+          body_html: content,
+          emotions: @default_emotions,
+          floor: floor,
+          is_article_author: user_id == article.author.user.id,
+          meta: @default_comment_meta
+        },
+        foreign_key,
+        article.id
+      )
+    )
+  end
+
   defp do_list_article_comment(thread, article_id, filters, where_query, user) do
     %{page: page, size: size} = filters
 
@@ -210,69 +271,6 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
 
   defp add_pined_comments_ifneed(paged_comments, _thread, _article_id, _), do: paged_comments
 
-  # update comment's parent article's comments total count
-  @spec update_article_comments_count(ArticleComment.t(), :inc | :dec) :: ArticleComment.t()
-  defp update_article_comments_count(%ArticleComment{} = comment, opt) do
-    with {:ok, article_info} <- match(:comment_article, comment),
-         {:ok, article} <- ORM.find(article_info.model, article_info.id) do
-      count_query =
-        from(c in ArticleComment, where: field(c, ^article_info.foreign_key) == ^article_info.id)
-
-      cur_count = Repo.aggregate(count_query, :count)
-
-      # dec 是 comment 还没有删除的时候的操作，和 inc 不同
-      # 因为 dec 操作如果放在 delete 后面，那么 update 会失败
-      case opt do
-        :inc -> ORM.update(article, %{article_comments_count: cur_count})
-        :dec -> ORM.update(article, %{article_comments_count: Enum.max([1, cur_count]) - 1})
-      end
-    end
-  end
-
-  # creat article comment for parent or reply
-  # set floor
-  # TODO: parse editor-json
-  # set default emotions
-  defp do_create_comment(content, foreign_key, article, %User{id: user_id}) do
-    count_query = from(c in ArticleComment, where: field(c, ^foreign_key) == ^article.id)
-    floor = Repo.aggregate(count_query, :count) + 1
-
-    ArticleComment
-    |> ORM.create(
-      Map.put(
-        %{
-          author_id: user_id,
-          body_html: content,
-          emotions: @default_emotions,
-          floor: floor,
-          is_article_author: user_id == article.author.user.id,
-          meta: @default_comment_meta
-        },
-        foreign_key,
-        article.id
-      )
-    )
-  end
-
-  # add participator to article-like content (Post, Job ...) and update count
-  defp add_participator_to_article(%Post{} = article, %User{} = user) do
-    total_participators =
-      article.article_comments_participators
-      |> List.insert_at(0, user)
-      |> Enum.uniq()
-
-    new_comment_participators = total_participators |> Enum.slice(0, @max_participator_count)
-    total_participators_count = length(total_participators)
-
-    article
-    |> Ecto.Changeset.change()
-    |> Ecto.Changeset.put_change(:article_comments_participators_count, total_participators_count)
-    |> Ecto.Changeset.put_embed(:article_comments_participators, new_comment_participators)
-    |> Repo.update()
-  end
-
-  defp add_participator_to_article(_, _), do: {:ok, :pass}
-
   defp user_in_logins?([], _), do: false
   defp user_in_logins?(ids_list, %User{login: login}), do: Enum.member?(ids_list, login)
 

lib/groupher_server/cms/delegates/article_comment_action.ex

@@ -6,6 +6,9 @@ defmodule GroupherServer.CMS.Delegate.ArticleCommentAction do
   import Helper.Utils, only: [done: 1, strip_struct: 1]
   import Helper.ErrorCode
 
+  import GroupherServer.CMS.Delegate.ArticleComment,
+    only: [add_participator_to_article: 2, do_create_comment: 4, update_article_comments_count: 2]
+
   import GroupherServer.CMS.Utils.Matcher2
 
   alias Helper.Types, as: T
@@ -26,12 +29,8 @@ defmodule GroupherServer.CMS.Delegate.ArticleCommentAction do
 
   alias Ecto.Multi
 
-  @max_participator_count ArticleComment.max_participator_count()
   @max_parent_replies_count ArticleComment.max_parent_replies_count()
-  @default_emotions Embeds.ArticleCommentEmotion.default_emotions()
   @report_threshold_for_fold ArticleComment.report_threshold_for_fold()
-
-  @default_comment_meta Embeds.ArticleCommentMeta.default_meta()
   @pined_comment_limit ArticleComment.pined_comment_limit()
 
   @spec pin_article_comment(Integer.t()) :: {:ok, ArticleComment.t()}
@@ -241,50 +240,6 @@ defmodule GroupherServer.CMS.Delegate.ArticleCommentAction do
     end
   end
 
-  # update comment's parent article's comments total count
-  @spec update_article_comments_count(ArticleComment.t(), :inc | :dec) :: ArticleComment.t()
-  defp update_article_comments_count(%ArticleComment{} = comment, opt) do
-    with {:ok, article_info} <- match(:comment_article, comment),
-         {:ok, article} <- ORM.find(article_info.model, article_info.id) do
-      count_query =
-        from(c in ArticleComment, where: field(c, ^article_info.foreign_key) == ^article_info.id)
-
-      cur_count = Repo.aggregate(count_query, :count)
-
-      # dec 是 comment 还没有删除的时候的操作，和 inc 不同
-      # 因为 dec 操作如果放在 delete 后面，那么 update 会失败
-      case opt do
-        :inc -> ORM.update(article, %{article_comments_count: cur_count})
-        :dec -> ORM.update(article, %{article_comments_count: Enum.max([1, cur_count]) - 1})
-      end
-    end
-  end
-
-  # creat article comment for parent or reply
-  # set floor
-  # TODO: parse editor-json
-  # set default emotions
-  defp do_create_comment(content, foreign_key, article, %User{id: user_id}) do
-    count_query = from(c in ArticleComment, where: field(c, ^foreign_key) == ^article.id)
-    floor = Repo.aggregate(count_query, :count) + 1
-
-    ArticleComment
-    |> ORM.create(
-      Map.put(
-        %{
-          author_id: user_id,
-          body_html: content,
-          emotions: @default_emotions,
-          floor: floor,
-          is_article_author: user_id == article.author.user.id,
-          meta: @default_comment_meta
-        },
-        foreign_key,
-        article.id
-      )
-    )
-  end
-
   # 设计盖楼只保留一个层级，回复楼中的评论都会被放到顶楼的 replies 中
   defp get_parent_comment(%ArticleComment{reply_to_id: nil} = comment) do
     comment
@@ -318,26 +273,6 @@ defmodule GroupherServer.CMS.Delegate.ArticleCommentAction do
     {:ok, parent_comment}
   end
 
-  # add participator to article-like content (Post, Job ...) and update count
-  defp add_participator_to_article(%Post{} = article, %User{} = user) do
-    total_participators =
-      article.article_comments_participators
-      |> List.insert_at(0, user)
-      |> Enum.uniq()
-
-    new_comment_participators = total_participators |> Enum.slice(0, @max_participator_count)
-
-    total_participators_count = length(total_participators)
-
-    article
-    |> Ecto.Changeset.change()
-    |> Ecto.Changeset.put_change(:article_comments_participators_count, total_participators_count)
-    |> Ecto.Changeset.put_embed(:article_comments_participators, new_comment_participators)
-    |> Repo.update()
-  end
-
-  defp add_participator_to_article(_, _), do: {:ok, :pass}
-
   defp get_article(%ArticleComment{post_id: post_id} = comment) when not is_nil(post_id) do
     with {:ok, article} <- ORM.find(Post, comment.post_id, preload: [author: :user]) do
       {:post, article}

lib/groupher_server/cms/job.ex

@@ -7,7 +7,7 @@ defmodule GroupherServer.CMS.Job do
 
   import Ecto.Changeset
 
-  alias GroupherServer.CMS
+  alias GroupherServer.{CMS, Accounts}
 
   alias CMS.{
     Author,
@@ -67,6 +67,8 @@ defmodule GroupherServer.CMS.Job do
     has_many(:article_comments, {"articles_comments", ArticleComment})
     field(:article_comments_count, :integer, default: 0)
     field(:article_comments_participators_count, :integer, default: 0)
+    # 评论参与者，只保留最近 5 个
+    embeds_many(:article_comments_participators, Accounts.User, on_replace: :delete)
 
     many_to_many(
       :tags,

priv/repo/migrations/20210508072209_add_article_comments_participators_to_job.exs

@@ -0,0 +1,9 @@
+defmodule GroupherServer.Repo.Migrations.AddArticleCommentsParticipatorsToJob do
+  use Ecto.Migration
+
+  def change do
+    alter table(:cms_jobs) do
+      add(:article_comments_participators, :map)
+    end
+  end
+end