refactor(mention): mention thread clean up

Author: mydearxym

lib/groupher_server/delivery/delegates/mention.ex

@@ -30,7 +30,9 @@ 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, atom_values_to_upcase(mentions)) do
+      mentions = Enum.map(mentions, &atom_values_to_upcase(&1))
+
+      case {0, nil} !== Repo.insert_all(Mention, mentions) do
         true -> {:ok, :pass}
         false -> {:error, "insert mentions error"}
       end
@@ -45,7 +47,9 @@ 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, atom_values_to_upcase(mentions)) do
+      mentions = Enum.map(mentions, &atom_values_to_upcase(&1))
+
+      case {0, nil} !== Repo.insert_all(Mention, mentions) do
         true -> {:ok, :pass}
         false -> {:error, "insert mentions error"}
       end

test/groupher_server/cms/hooks/cite_blog_test.exs

@@ -90,7 +90,6 @@ defmodule GroupherServer.Test.CMS.Hooks.CiteBlog do
       assert cited_comment.meta.citing_count == 0
     end
 
-    @tag :wip2
     test "can cite blog's comment in blog", ~m(community user blog blog2 blog_attrs)a do
       {:ok, comment} = CMS.create_comment(:blog, blog.id, mock_rich_text("hello"), user)
 

test/groupher_server/cms/hooks/cite_job_test.exs

@@ -90,7 +90,6 @@ defmodule GroupherServer.Test.CMS.Hooks.CiteJob do
       assert cited_comment.meta.citing_count == 0
     end
 
-    @tag :wip2
     test "can cite job's comment in job", ~m(community user job job2 job_attrs)a do
       {:ok, comment} = CMS.create_comment(:job, job.id, mock_rich_text("hello"), user)
 

test/groupher_server/cms/hooks/cite_post_test.exs

@@ -90,7 +90,6 @@ defmodule GroupherServer.Test.CMS.Hooks.CitePost do
       assert cited_comment.meta.citing_count == 0
     end
 
-    @tag :wip2
     test "can cite post's comment in post", ~m(community user post post2 post_attrs)a do
       {:ok, comment} = CMS.create_comment(:post, post.id, mock_rich_text("hello"), user)
 

test/groupher_server/cms/hooks/mention_in_blog_test.exs

@@ -40,7 +40,7 @@ defmodule GroupherServer.Test.CMS.Hooks.MentionInBlog do
       {:ok, result} = Delivery.fetch(:mention, user2, %{page: 1, size: 10})
 
       mention = result.entries |> List.first()
-      assert mention.type == "BLOG"
+      assert mention.thread == "BLOG"
       assert mention.block_linker |> length == 2
       assert mention.article_id == blog.id
       assert mention.title == blog.title
@@ -49,7 +49,7 @@ defmodule GroupherServer.Test.CMS.Hooks.MentionInBlog do
       {:ok, result} = Delivery.fetch(:mention, user3, %{page: 1, size: 10})
 
       mention = result.entries |> List.first()
-      assert mention.type == "BLOG"
+      assert mention.thread == "BLOG"
       assert mention.block_linker |> length == 1
       assert mention.article_id == blog.id
       assert mention.title == blog.title
@@ -67,7 +67,7 @@ defmodule GroupherServer.Test.CMS.Hooks.MentionInBlog do
       {:ok, result} = Delivery.fetch(:mention, user2, %{page: 1, size: 10})
 
       mention = result.entries |> List.first()
-      assert mention.type == "COMMENT"
+      assert mention.thread == "BLOG"
       assert mention.comment_id == comment.id
       assert mention.block_linker |> length == 1
       assert mention.article_id == blog.id

test/groupher_server/cms/hooks/mention_in_job_test.exs

@@ -40,7 +40,7 @@ defmodule GroupherServer.Test.CMS.Hooks.MentionInJob do
       {:ok, result} = Delivery.fetch(:mention, user2, %{page: 1, size: 10})
 
       mention = result.entries |> List.first()
-      assert mention.type == "JOB"
+      assert mention.thread == "JOB"
       assert mention.block_linker |> length == 2
       assert mention.article_id == job.id
       assert mention.title == job.title
@@ -49,7 +49,7 @@ defmodule GroupherServer.Test.CMS.Hooks.MentionInJob do
       {:ok, result} = Delivery.fetch(:mention, user3, %{page: 1, size: 10})
 
       mention = result.entries |> List.first()
-      assert mention.type == "JOB"
+      assert mention.thread == "JOB"
       assert mention.block_linker |> length == 1
       assert mention.article_id == job.id
       assert mention.title == job.title
@@ -67,7 +67,7 @@ defmodule GroupherServer.Test.CMS.Hooks.MentionInJob do
       {:ok, result} = Delivery.fetch(:mention, user2, %{page: 1, size: 10})
 
       mention = result.entries |> List.first()
-      assert mention.type == "COMMENT"
+      assert mention.thread == "JOB"
       assert mention.comment_id == comment.id
       assert mention.block_linker |> length == 1
       assert mention.article_id == job.id

test/groupher_server/cms/hooks/mention_in_post_test.exs

@@ -22,6 +22,7 @@ defmodule GroupherServer.Test.CMS.Hooks.MentionInPost do
   end
 
   describe "[mention in post basic]" do
+    @tag :wip
     test "mention multi user in post should work", ~m(user user2 user3 community  post_attrs)a do
       body =
         mock_rich_text(
@@ -40,7 +41,7 @@ defmodule GroupherServer.Test.CMS.Hooks.MentionInPost do
       {:ok, result} = Delivery.fetch(:mention, user2, %{page: 1, size: 10})
 
       mention = result.entries |> List.first()
-      assert mention.type == "POST"
+      assert mention.thread == "POST"
       assert mention.block_linker |> length == 2
       assert mention.article_id == post.id
       assert mention.title == post.title
@@ -49,7 +50,7 @@ defmodule GroupherServer.Test.CMS.Hooks.MentionInPost do
       {:ok, result} = Delivery.fetch(:mention, user3, %{page: 1, size: 10})
 
       mention = result.entries |> List.first()
-      assert mention.type == "POST"
+      assert mention.thread == "POST"
       assert mention.block_linker |> length == 1
       assert mention.article_id == post.id
       assert mention.title == post.title
@@ -67,7 +68,7 @@ defmodule GroupherServer.Test.CMS.Hooks.MentionInPost do
       {:ok, result} = Delivery.fetch(:mention, user2, %{page: 1, size: 10})
 
       mention = result.entries |> List.first()
-      assert mention.type == "COMMENT"
+      assert mention.thread == "POST"
       assert mention.comment_id == comment.id
       assert mention.block_linker |> length == 1
       assert mention.article_id == post.id

test/groupher_server/cms/hooks/notify_blog_test.exs

@@ -21,7 +21,6 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyBlog do
   end
 
   describe "[upvote notify]" do
-    @tag :wip22
     test "upvote hook should work on blog", ~m(user2 blog)a do
       {:ok, blog} = preload_author(blog)
 
@@ -41,7 +40,6 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyBlog do
       assert user_exist_in?(user2, notify.from_users)
     end
 
-    @tag :wip22
     test "upvote hook should work on blog comment", ~m(user2 blog comment)a do
       {:ok, comment} = CMS.upvote_comment(comment.id, user2)
       {:ok, comment} = preload_author(comment)
@@ -62,7 +60,6 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyBlog do
       assert user_exist_in?(user2, notify.from_users)
     end
 
-    @tag :wip22
     test "undo upvote hook should work on blog", ~m(user2 blog)a do
       {:ok, blog} = preload_author(blog)
 
@@ -78,7 +75,6 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyBlog do
       assert notifications.total_count == 0
     end
 
-    @tag :wip22
     test "undo upvote hook should work on blog comment", ~m(user2 comment)a do
       {:ok, comment} = CMS.upvote_comment(comment.id, user2)
 
@@ -97,7 +93,6 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyBlog do
   end
 
   describe "[collect notify]" do
-    @tag :wip22
     test "collect hook should work on blog", ~m(user2 blog)a do
       {:ok, blog} = preload_author(blog)
 
@@ -117,7 +112,6 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyBlog do
       assert user_exist_in?(user2, notify.from_users)
     end
 
-    @tag :wip22
     test "undo collect hook should work on blog", ~m(user2 blog)a do
       {:ok, blog} = preload_author(blog)
 
@@ -135,7 +129,6 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyBlog do
   end
 
   describe "[comment notify]" do
-    @tag :wip22
     test "blog author should get notify after some one comment on it", ~m(user2 blog)a do
       {:ok, blog} = preload_author(blog)
 
@@ -155,7 +148,6 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyBlog do
       assert user_exist_in?(user2, notify.from_users)
     end
 
-    @tag :wip22
     test "blog comment author should get notify after some one reply it", ~m(user2 user3 blog)a do
       {:ok, blog} = preload_author(blog)
 

test/groupher_server/cms/hooks/notify_job_test.exs

@@ -21,7 +21,6 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyJob do
   end
 
   describe "[upvote notify]" do
-    @tag :wip22
     test "upvote hook should work on job", ~m(user2 job)a do
       {:ok, job} = preload_author(job)
 
@@ -41,7 +40,6 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyJob do
       assert user_exist_in?(user2, notify.from_users)
     end
 
-    @tag :wip22
     test "upvote hook should work on job comment", ~m(user2 job comment)a do
       {:ok, comment} = CMS.upvote_comment(comment.id, user2)
       {:ok, comment} = preload_author(comment)
@@ -62,7 +60,6 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyJob do
       assert user_exist_in?(user2, notify.from_users)
     end
 
-    @tag :wip22
     test "undo upvote hook should work on job", ~m(user2 job)a do
       {:ok, job} = preload_author(job)
 
@@ -78,7 +75,6 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyJob do
       assert notifications.total_count == 0
     end
 
-    @tag :wip22
     test "undo upvote hook should work on job comment", ~m(user2 comment)a do
       {:ok, comment} = CMS.upvote_comment(comment.id, user2)
 
@@ -97,7 +93,6 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyJob do
   end
 
   describe "[collect notify]" do
-    @tag :wip22
     test "collect hook should work on job", ~m(user2 job)a do
       {:ok, job} = preload_author(job)
 
@@ -117,7 +112,6 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyJob do
       assert user_exist_in?(user2, notify.from_users)
     end
 
-    @tag :wip22
     test "undo collect hook should work on job", ~m(user2 job)a do
       {:ok, job} = preload_author(job)
 
@@ -135,7 +129,6 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyJob do
   end
 
   describe "[comment notify]" do
-    @tag :wip22
     test "job author should get notify after some one comment on it", ~m(user2 job)a do
       {:ok, job} = preload_author(job)
 
@@ -155,7 +148,6 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyJob do
       assert user_exist_in?(user2, notify.from_users)
     end
 
-    @tag :wip22
     test "job comment author should get notify after some one reply it", ~m(user2 user3 job)a do
       {:ok, job} = preload_author(job)
 

test/groupher_server/cms/hooks/notify_post_test.exs

@@ -21,7 +21,6 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyPost do
   end
 
   describe "[upvote notify]" do
-    @tag :wip22
     test "upvote hook should work on post", ~m(user2 post)a do
       {:ok, post} = preload_author(post)
 
@@ -41,7 +40,6 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyPost do
       assert user_exist_in?(user2, notify.from_users)
     end
 
-    @tag :wip22
     test "upvote hook should work on post comment", ~m(user2 post comment)a do
       {:ok, comment} = CMS.upvote_comment(comment.id, user2)
       {:ok, comment} = preload_author(comment)
@@ -62,7 +60,6 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyPost do
       assert user_exist_in?(user2, notify.from_users)
     end
 
-    @tag :wip22
     test "undo upvote hook should work on post", ~m(user2 post)a do
       {:ok, post} = preload_author(post)
 
@@ -78,7 +75,6 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyPost do
       assert notifications.total_count == 0
     end
 
-    @tag :wip22
     test "undo upvote hook should work on post comment", ~m(user2 comment)a do
       {:ok, comment} = CMS.upvote_comment(comment.id, user2)
 
@@ -97,7 +93,6 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyPost do
   end
 
   describe "[collect notify]" do
-    @tag :wip22
     test "collect hook should work on post", ~m(user2 post)a do
       {:ok, post} = preload_author(post)
 
@@ -117,7 +112,6 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyPost do
       assert user_exist_in?(user2, notify.from_users)
     end
 
-    @tag :wip22
     test "undo collect hook should work on post", ~m(user2 post)a do
       {:ok, post} = preload_author(post)
 
@@ -135,7 +129,6 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyPost do
   end
 
   describe "[comment notify]" do
-    @tag :wip22
     test "post author should get notify after some one comment on it", ~m(user2 post)a do
       {:ok, post} = preload_author(post)
 
@@ -155,7 +148,6 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyPost do
       assert user_exist_in?(user2, notify.from_users)
     end
 
-    @tag :wip22
     test "post comment author should get notify after some one reply it", ~m(user2 user3 post)a do
       {:ok, post} = preload_author(post)