refactor(cite): naming adjust

Author: mydearxym

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

@@ -21,6 +21,11 @@ defmodule GroupherServer.CMS.Delegate.Hooks.Cite do
   cited_type: thread or comment
   artiment: article or comment
   # cited_article_comment_id, [xxx_article]_id, [block_id, block2_id, ...],
+
+  注意 cited_by_type 不能命名为 cited_by_thread
+
+  因为 cited_by_thread 无法表示这样的语义:
+  # 某评论被 post 以 comment link 的方式引用了
   """
 
   import Ecto.Query, warn: false

test/groupher_server/cms/hooks/cite_blog_test.exs

@@ -31,9 +31,9 @@ defmodule GroupherServer.Test.CMS.Hooks.CiteBlog do
     test "cited multi blog should work", ~m(user community blog2 blog3 blog4 blog5 blog_attrs)a do
       body =
         mock_rich_text(
-          ~s(the <a href=#{@site_host}/blog/#{blog2.id} /> and <a href=#{@site_host}/blog/#{
-            blog2.id
-          }>same la</a> is awesome, the <a href=#{@site_host}/blog/#{blog3.id}></a> is awesome too.),
+          ~s(the <a href=#{@site_host}/blog/#{blog2.id} /> and <a href=#{@site_host}/blog/#{blog2.id}>same la</a> is awesome, the <a href=#{
+            @site_host
+          }/blog/#{blog3.id}></a> is awesome too.),
           # second paragraph
           ~s(the paragraph 2 <a href=#{@site_host}/blog/#{blog2.id} class=#{blog2.title}> again</a>, the paragraph 2 <a href=#{
             @site_host
@@ -90,6 +90,7 @@ defmodule GroupherServer.Test.CMS.Hooks.CiteBlog do
       assert cited_comment.meta.citing_count == 0
     end
 
+    @tag :wip
     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)
 
@@ -104,9 +105,11 @@ defmodule GroupherServer.Test.CMS.Hooks.CiteBlog do
       {:ok, comment} = ORM.find(Comment, comment.id)
       assert comment.meta.citing_count == 1
 
-      {:ok, cite_content} = ORM.find_by(CitedArtiment, %{cited_by_id: comment.id})
-      assert blog.id == cite_content.blog_id
-      assert cite_content.cited_by_type == "COMMENT"
+      {:ok, cited_content} = ORM.find_by(CitedArtiment, %{cited_by_id: comment.id})
+
+      # 被 blog 以 comment link 的方式引用了
+      assert cited_content.blog_id == blog.id
+      assert cited_content.cited_by_type == "COMMENT"
     end
 
     test "can cite a comment in a comment", ~m(user blog)a do
@@ -124,18 +127,18 @@ defmodule GroupherServer.Test.CMS.Hooks.CiteBlog do
       {:ok, cited_comment} = ORM.find(Comment, cited_comment.id)
       assert cited_comment.meta.citing_count == 1
 
-      {:ok, cite_content} = ORM.find_by(CitedArtiment, %{cited_by_id: cited_comment.id})
-      assert comment.id == cite_content.comment_id
-      assert cited_comment.id == cite_content.cited_by_id
-      assert cite_content.cited_by_type == "COMMENT"
+      {:ok, cited_content} = ORM.find_by(CitedArtiment, %{cited_by_id: cited_comment.id})
+      assert comment.id == cited_content.comment_id
+      assert cited_comment.id == cited_content.cited_by_id
+      assert cited_content.cited_by_type == "COMMENT"
     end
 
     test "can cited blog inside a comment", ~m(user blog blog2 blog3 blog4 blog5)a do
       comment_body =
         mock_rich_text(
-          ~s(the <a href=#{@site_host}/blog/#{blog2.id} /> and <a href=#{@site_host}/blog/#{
-            blog2.id
-          }>same la</a> is awesome, the <a href=#{@site_host}/blog/#{blog3.id}></a> is awesome too.),
+          ~s(the <a href=#{@site_host}/blog/#{blog2.id} /> and <a href=#{@site_host}/blog/#{blog2.id}>same la</a> is awesome, the <a href=#{
+            @site_host
+          }/blog/#{blog3.id}></a> is awesome too.),
           # second paragraph
           ~s(the paragraph 2 <a href=#{@site_host}/blog/#{blog2.id} class=#{blog2.title}> again</a>, the paragraph 2 <a href=#{
             @site_host
@@ -218,4 +221,60 @@ defmodule GroupherServer.Test.CMS.Hooks.CiteBlog do
       assert result.total_count == 3
     end
   end
+
+  describe "[cross cite]" do
+    test "can citing multi type thread and comment in one time", ~m(user community blog2)a do
+      blog_attrs = mock_attrs(:blog, %{community_id: community.id})
+      blog_attrs = mock_attrs(:blog, %{community_id: community.id})
+      blog_attrs = mock_attrs(:blog, %{community_id: community.id})
+
+      body = mock_rich_text(~s(the <a href=#{@site_host}/blog/#{blog2.id} />))
+
+      {:ok, blog} = CMS.create_article(community, :blog, Map.merge(blog_attrs, %{body: body}), user)
+
+      Hooks.Cite.handle(blog)
+
+      Process.sleep(1000)
+
+      {:ok, blog} = CMS.create_article(community, :blog, Map.merge(blog_attrs, %{body: body}), user)
+      Hooks.Cite.handle(blog)
+
+      Process.sleep(1000)
+
+      comment_body = mock_comment(~s(the <a href=#{@site_host}/blog/#{blog2.id} />))
+      {:ok, comment} = CMS.create_comment(:blog, blog.id, comment_body, user)
+
+      Hooks.Cite.handle(comment)
+
+      Process.sleep(1000)
+
+      {:ok, blog} =
+        CMS.create_article(community, :blog, Map.merge(blog_attrs, %{body: body}), user)
+
+      Hooks.Cite.handle(blog)
+
+      {:ok, result} = CMS.paged_citing_contents("BLOG", blog2.id, %{page: 1, size: 10})
+      # IO.inspect(result, label: "the result")
+
+      assert result.total_count == 4
+
+      result_blog = result.entries |> List.first()
+      result_blog = result.entries |> Enum.at(1)
+      result_comment = result.entries |> Enum.at(2)
+      result_blog = result.entries |> List.last()
+
+      assert result_blog.id == blog.id
+      assert result_blog.thread == :blog
+
+      assert result_blog.id == blog.id
+      assert result_blog.thread == :blog
+
+      assert result_comment.id == blog.id
+      assert result_comment.thread == :blog
+      assert result_comment.comment_id == comment.id
+
+      assert result_blog.id == blog.id
+      assert result_blog.thread == :blog
+    end
+  end
 end

test/groupher_server/cms/hooks/cite_job_test.exs

@@ -90,6 +90,7 @@ defmodule GroupherServer.Test.CMS.Hooks.CiteJob do
       assert cited_comment.meta.citing_count == 0
     end
 
+    @tag :wip
     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)
 
@@ -104,9 +105,11 @@ defmodule GroupherServer.Test.CMS.Hooks.CiteJob do
       {:ok, comment} = ORM.find(Comment, comment.id)
       assert comment.meta.citing_count == 1
 
-      {:ok, cite_content} = ORM.find_by(CitedArtiment, %{cited_by_id: comment.id})
-      assert job.id == cite_content.job_id
-      assert cite_content.cited_by_type == "COMMENT"
+      {:ok, cited_content} = ORM.find_by(CitedArtiment, %{cited_by_id: comment.id})
+
+      # 被 job 以 comment link 的方式引用了
+      assert cited_content.job_id == job.id
+      assert cited_content.cited_by_type == "COMMENT"
     end
 
     test "can cite a comment in a comment", ~m(user job)a do
@@ -124,10 +127,10 @@ defmodule GroupherServer.Test.CMS.Hooks.CiteJob do
       {:ok, cited_comment} = ORM.find(Comment, cited_comment.id)
       assert cited_comment.meta.citing_count == 1
 
-      {:ok, cite_content} = ORM.find_by(CitedArtiment, %{cited_by_id: cited_comment.id})
-      assert comment.id == cite_content.comment_id
-      assert cited_comment.id == cite_content.cited_by_id
-      assert cite_content.cited_by_type == "COMMENT"
+      {:ok, cited_content} = ORM.find_by(CitedArtiment, %{cited_by_id: cited_comment.id})
+      assert comment.id == cited_content.comment_id
+      assert cited_comment.id == cited_content.cited_by_id
+      assert cited_content.cited_by_type == "COMMENT"
     end
 
     test "can cited job inside a comment", ~m(user job job2 job3 job4 job5)a do
@@ -182,6 +185,7 @@ defmodule GroupherServer.Test.CMS.Hooks.CiteJob do
 
       job_attrs = job_attrs |> Map.merge(%{body: body})
       {:ok, job_x} = CMS.create_article(community, :job, job_attrs, user)
+
       Process.sleep(1000)
       body = mock_rich_text(~s(the <a href=#{@site_host}/job/#{job2.id} />))
       job_attrs = job_attrs |> Map.merge(%{body: body})
@@ -217,4 +221,60 @@ defmodule GroupherServer.Test.CMS.Hooks.CiteJob do
       assert result.total_count == 3
     end
   end
+
+  describe "[cross cite]" do
+    test "can citing multi type thread and comment in one time", ~m(user community job2)a do
+      job_attrs = mock_attrs(:job, %{community_id: community.id})
+      job_attrs = mock_attrs(:job, %{community_id: community.id})
+      blog_attrs = mock_attrs(:blog, %{community_id: community.id})
+
+      body = mock_rich_text(~s(the <a href=#{@site_host}/job/#{job2.id} />))
+
+      {:ok, job} = CMS.create_article(community, :job, Map.merge(job_attrs, %{body: body}), user)
+
+      Hooks.Cite.handle(job)
+
+      Process.sleep(1000)
+
+      {:ok, job} = CMS.create_article(community, :job, Map.merge(job_attrs, %{body: body}), user)
+      Hooks.Cite.handle(job)
+
+      Process.sleep(1000)
+
+      comment_body = mock_comment(~s(the <a href=#{@site_host}/job/#{job2.id} />))
+      {:ok, comment} = CMS.create_comment(:job, job.id, comment_body, user)
+
+      Hooks.Cite.handle(comment)
+
+      Process.sleep(1000)
+
+      {:ok, blog} =
+        CMS.create_article(community, :blog, Map.merge(blog_attrs, %{body: body}), user)
+
+      Hooks.Cite.handle(blog)
+
+      {:ok, result} = CMS.paged_citing_contents("JOB", job2.id, %{page: 1, size: 10})
+      # IO.inspect(result, label: "the result")
+
+      assert result.total_count == 4
+
+      result_job = result.entries |> List.first()
+      result_job = result.entries |> Enum.at(1)
+      result_comment = result.entries |> Enum.at(2)
+      result_blog = result.entries |> List.last()
+
+      assert result_job.id == job.id
+      assert result_job.thread == :job
+
+      assert result_job.id == job.id
+      assert result_job.thread == :job
+
+      assert result_comment.id == job.id
+      assert result_comment.thread == :job
+      assert result_comment.comment_id == comment.id
+
+      assert result_blog.id == blog.id
+      assert result_blog.thread == :blog
+    end
+  end
 end

test/groupher_server/cms/hooks/cite_post_test.exs

@@ -90,6 +90,7 @@ defmodule GroupherServer.Test.CMS.Hooks.CitePost do
       assert cited_comment.meta.citing_count == 0
     end
 
+    @tag :wip
     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)
 
@@ -104,9 +105,11 @@ defmodule GroupherServer.Test.CMS.Hooks.CitePost do
       {:ok, comment} = ORM.find(Comment, comment.id)
       assert comment.meta.citing_count == 1
 
-      {:ok, cite_content} = ORM.find_by(CitedArtiment, %{cited_by_id: comment.id})
-      assert post.id == cite_content.post_id
-      assert cite_content.cited_by_type == "COMMENT"
+      {:ok, cited_content} = ORM.find_by(CitedArtiment, %{cited_by_id: comment.id})
+
+      # 被 post 以 comment link 的方式引用了
+      assert cited_content.post_id == post.id
+      assert cited_content.cited_by_type == "COMMENT"
     end
 
     test "can cite a comment in a comment", ~m(user post)a do
@@ -124,10 +127,10 @@ defmodule GroupherServer.Test.CMS.Hooks.CitePost do
       {:ok, cited_comment} = ORM.find(Comment, cited_comment.id)
       assert cited_comment.meta.citing_count == 1
 
-      {:ok, cite_content} = ORM.find_by(CitedArtiment, %{cited_by_id: cited_comment.id})
-      assert comment.id == cite_content.comment_id
-      assert cited_comment.id == cite_content.cited_by_id
-      assert cite_content.cited_by_type == "COMMENT"
+      {:ok, cited_content} = ORM.find_by(CitedArtiment, %{cited_by_id: cited_comment.id})
+      assert comment.id == cited_content.comment_id
+      assert cited_comment.id == cited_content.cited_by_id
+      assert cited_content.cited_by_type == "COMMENT"
     end
 
     test "can cited post inside a comment", ~m(user post post2 post3 post4 post5)a do

test/groupher_server/cms/hooks/notify_blog_test.exs

@@ -135,7 +135,7 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyBlog do
   end
 
   describe "[comment notify]" do
-    @tag :wip
+    @tag :wip2
     test "blog author should get notify after some one comment on it", ~m(user2 blog)a do
       {:ok, blog} = preload_author(blog)
 
@@ -155,7 +155,7 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyBlog do
       assert user_exist_in?(user2, notify.from_users)
     end
 
-    @tag :wip
+    @tag :wip2
     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

@@ -135,7 +135,7 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyJob do
   end
 
   describe "[comment notify]" do
-    @tag :wip
+    @tag :wip2
     test "job author should get notify after some one comment on it", ~m(user2 job)a do
       {:ok, job} = preload_author(job)
 
@@ -155,7 +155,7 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyJob do
       assert user_exist_in?(user2, notify.from_users)
     end
 
-    @tag :wip
+    @tag :wip2
     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

@@ -135,7 +135,7 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyPost do
   end
 
   describe "[comment notify]" do
-    @tag :wip
+    @tag :wip2
     test "post author should get notify after some one comment on it", ~m(user2 post)a do
       {:ok, post} = preload_author(post)
 
@@ -155,7 +155,7 @@ defmodule GroupherServer.Test.CMS.Hooks.NotifyPost do
       assert user_exist_in?(user2, notify.from_users)
     end
 
-    @tag :wip
+    @tag :wip2
     test "post comment author should get notify after some one reply it", ~m(user2 user3 post)a do
       {:ok, post} = preload_author(post)
 

test/groupher_server/delivery/notification_test.exs

@@ -172,7 +172,7 @@ defmodule GroupherServer.Test.Delivery.Notification do
   end
 
   describe "basic thread support" do
-    @tag :wip
+    @tag :wip2
     test "support upvote", ~m(post user user2 notify_attrs)a do
       notify_attrs
       |> Map.merge(%{