refactor(mention): rename type -> thread

Author: mydearxym

lib/groupher_server/cms/delegates/comment_action.ex

@@ -141,6 +141,7 @@ defmodule GroupherServer.CMS.Delegate.CommentAction do
       end)
       |> Multi.run(:after_hooks, fn _, %{create_reply_comment: replyed_comment} ->
         Later.run({Hooks.Notify, :handle, [:reply, replyed_comment, user]})
+        Later.run({Hooks.Mention, :handle, [replyed_comment]})
       end)
       |> Repo.transaction()
       |> result()

lib/groupher_server/cms/delegates/comment_curd.ex

@@ -117,6 +117,7 @@ defmodule GroupherServer.CMS.Delegate.CommentCurd do
       |> Multi.run(:after_hooks, fn _, %{create_comment: comment} ->
         Later.run({Hooks.Cite, :handle, [comment]})
         Later.run({Hooks.Notify, :handle, [:comment, comment, user]})
+        Later.run({Hooks.Mention, :handle, [comment]})
       end)
       |> Repo.transaction()
       |> result()

lib/groupher_server/cms/delegates/hooks/mention.ex

@@ -5,7 +5,7 @@ defmodule GroupherServer.CMS.Delegate.Hooks.Mention do
   parse and fmt(see shape function) mentions to Delivery module
   """
   import Ecto.Query, warn: false
-  import Helper.Utils, only: [get_config: 2, thread_of_article: 2]
+  import Helper.Utils, only: [get_config: 2, thread_of_article: 1]
 
   import GroupherServer.CMS.Delegate.Helper, only: [preload_author: 1, author_of: 1]
   import GroupherServer.CMS.Delegate.Hooks.Helper, only: [merge_same_block_linker: 2]
@@ -71,7 +71,7 @@ defmodule GroupherServer.CMS.Delegate.Hooks.Mention do
     parent_article = comment |> Map.get(article_thread)
 
     %{
-      type: "COMMENT",
+      thread: article_thread,
       title: parent_article.title,
       article_id: parent_article.id,
       comment_id: comment.id,
@@ -85,10 +85,10 @@ defmodule GroupherServer.CMS.Delegate.Hooks.Mention do
   end
 
   defp shape(article, to_user_id, block_id) do
-    {:ok, thread} = thread_of_article(article, :upcase)
+    {:ok, thread} = thread_of_article(article)
 
     %{
-      type: thread,
+      thread: thread,
       title: article.title,
       article_id: article.id,
       block_linker: [block_id],

lib/groupher_server/delivery/delegates/mention.ex

@@ -3,7 +3,7 @@ defmodule GroupherServer.Delivery.Delegate.Mention do
   The Delivery context.
   """
   import Ecto.Query, warn: false
-  import Helper.Utils, only: [done: 1, thread_of_article: 1]
+  import Helper.Utils, only: [done: 1, thread_of_article: 2, atom_values_to_upcase: 1]
   import ShortMaps
 
   alias GroupherServer.{Accounts, CMS, Delivery, Repo}
@@ -30,7 +30,7 @@ defmodule GroupherServer.Delivery.Delegate.Mention do
       batch_delete_mentions(comment, from_user)
     end)
     |> Multi.run(:batch_insert_mentions, fn _, _ ->
-      case {0, nil} !== Repo.insert_all(Mention, mentions) do
+      case {0, nil} !== Repo.insert_all(Mention, atom_values_to_upcase(mentions)) do
         true -> {:ok, :pass}
         false -> {:error, "insert mentions error"}
       end
@@ -45,7 +45,7 @@ defmodule GroupherServer.Delivery.Delegate.Mention do
       batch_delete_mentions(article, from_user)
     end)
     |> Multi.run(:batch_insert_mentions, fn _, _ ->
-      case {0, nil} !== Repo.insert_all(Mention, mentions) do
+      case {0, nil} !== Repo.insert_all(Mention, atom_values_to_upcase(mentions)) do
         true -> {:ok, :pass}
         false -> {:error, "insert mentions error"}
       end
@@ -74,12 +74,10 @@ defmodule GroupherServer.Delivery.Delegate.Mention do
   end
 
   defp batch_delete_mentions(article, %User{} = from_user) do
-    with {:ok, thread} <- thread_of_article(article) do
-      thread = thread |> to_string |> String.upcase()
-
+    with {:ok, thread} <- thread_of_article(article, :upcase) do
       from(m in Mention,
         where: m.article_id == ^article.id,
-        where: m.type == ^thread,
+        where: m.thread == ^thread,
         where: m.from_user_id == ^from_user.id
       )
       |> ORM.delete_all(:if_exist)
@@ -98,7 +96,7 @@ defmodule GroupherServer.Delivery.Delegate.Mention do
 
     mention
     |> Map.take([
-      :type,
+      :thread,
       :article_id,
       :comment_id,
       :title,

lib/groupher_server/delivery/models/mention.ex

@@ -7,12 +7,12 @@ defmodule GroupherServer.Delivery.Model.Mention do
 
   alias GroupherServer.Accounts.Model.User
 
-  @required_fields ~w(from_user_id to_user_id title article_id type)a
+  @required_fields ~w(from_user_id to_user_id title article_id thread)a
   @optional_fields ~w(comment_id read)a
 
   @type t :: %Mention{}
   schema "mentions" do
-    field(:type, :string)
+    field(:thread, :string)
     field(:article_id, :id)
     field(:title, :string)
     field(:comment_id, :id)

priv/repo/migrations/20210620131328_rename_mentions_type_to_thread.exs

@@ -0,0 +1,7 @@
+defmodule GroupherServer.Repo.Migrations.RenameMentionsTypeToThread do
+  use Ecto.Migration
+
+  def change do
+    rename(table(:mentions), :type, to: :thread)
+  end
+end