refactor(cite-task): support cite artilce in side comment

Author: mydearxym

lib/groupher_server/cms/delegates/article_curd.ex

@@ -164,10 +164,10 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
       |> Multi.run(:update_user_published_meta, fn _, _ ->
         Accounts.update_published_states(uid, thread)
       end)
-      |> Multi.run(:block_tasks, fn _, %{create_article: article} ->
+      |> Multi.run(:after_tasks, fn _, %{create_article: article} ->
         Later.run({CiteTasks, :handle, [article]})
+        Later.run({__MODULE__, :notify_admin_new_article, [article]})
       end)
-      # TODO: run mini tasks
       |> Multi.run(:mention_users, fn _, %{create_article: article} ->
         # article.body |> Jason.decode!() |> 各种小 task
         Delivery.mention_from_content(community.raw, thread, article, attrs, %User{id: uid})
@@ -223,6 +223,9 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
     |> Multi.run(:update_edit_status, fn _, %{update_article: update_article} ->
       ArticleCommunity.update_edit_status(update_article)
     end)
+    |> Multi.run(:after_tasks, fn _, %{update_article: update_article} ->
+      Later.run({CiteTasks, :handle, [update_article]})
+    end)
     |> Repo.transaction()
     |> result()
   end
@@ -449,7 +452,6 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
 
   # create done
   defp result({:ok, %{set_active_at_timestamp: result}}) do
-    Later.run({__MODULE__, :notify_admin_new_article, [result]})
     {:ok, result}
   end
 

lib/groupher_server/cms/delegates/cite_tasks.ex

@@ -29,7 +29,7 @@ defmodule GroupherServer.CMS.Delegate.CiteTasks do
   import Helper.ErrorCode
 
   alias GroupherServer.{CMS, Repo}
-  alias CMS.Model.CitedContent
+  alias CMS.Model.{CitedContent, Comment}
   alias Helper.ORM
 
   alias Ecto.Multi
@@ -38,16 +38,16 @@ defmodule GroupherServer.CMS.Delegate.CiteTasks do
   @article_threads get_config(:article, :threads)
   @valid_article_prefix Enum.map(@article_threads, &"#{@site_host}/#{&1}/")
 
-  def handle(%{body: body} = article) do
+  def handle(%{body: body} = content) do
     with {:ok, %{"blocks" => blocks}} <- Jason.decode(body),
-         article <- Repo.preload(article, author: :user) do
+         content <- preload_content_author(content) do
       Multi.new()
       |> Multi.run(:delete_all_cited_contents, fn _, _ ->
-        delete_all_cited_contents(article)
+        delete_all_cited_contents(content)
       end)
       |> Multi.run(:update_cited_info, fn _, _ ->
         blocks
-        |> Enum.reduce([], &(&2 ++ parse_cited_info_per_block(article, &1)))
+        |> Enum.reduce([], &(&2 ++ parse_cited_info_per_block(content, &1)))
         |> merge_same_cited_article_block
         |> update_cited_info
       end)
@@ -56,9 +56,17 @@ defmodule GroupherServer.CMS.Delegate.CiteTasks do
     end
   end
 
+  def preload_content_author(%Comment{} = comment), do: comment
+  def preload_content_author(article), do: Repo.preload(article, author: :user)
+
   # delete all records before insert_all, this will dynamiclly update
   # those cited info when update article
   # 插入引用记录之前先全部清除，这样可以在更新文章的时候自动计算引用信息
+  defp delete_all_cited_contents(%Comment{} = comment) do
+    query = from(c in CitedContent, where: c.comment_id == ^comment.id)
+    ORM.delete_all(query, :if_exist)
+  end
+
   defp delete_all_cited_contents(article) do
     with {:ok, thread} <- thread_of_article(article),
          {:ok, info} <- match(thread) do
@@ -73,6 +81,8 @@ defmodule GroupherServer.CMS.Delegate.CiteTasks do
   defp update_cited_info(cited_contents) do
     clean_cited_contents = Enum.map(cited_contents, &Map.delete(&1, :cited_article))
     # IO.inspect(clean_cited_contents, label: "clean_cited_contents")
+    # IO.inspect(cited_contents, label: "cited_contents")
+
     with true <- {0, nil} !== Repo.insert_all(CitedContent, clean_cited_contents) do
       update_citing_count(cited_contents)
     else
@@ -148,9 +158,27 @@ defmodule GroupherServer.CMS.Delegate.CiteTasks do
   ]
   """
   defp parse_cited_info_per_block(article, %{"id" => block_id, "data" => %{"text" => text}}) do
-    links_in_block = Floki.find(text, "a[href]")
+    links = Floki.find(text, "a[href]")
+
+    do_parse_cited_info(article, block_id, links)
+  end
+
+  defp do_parse_cited_info(%Comment{} = comment, block_id, links) do
+    Enum.reduce(links, [], fn link, acc ->
+      with {:ok, cited_article} <- parse_cited_article(link) do
+        List.insert_at(acc, 0, shape_cited_content(comment, cited_article, block_id))
+      else
+        _ -> acc
+      end
+    end)
+    |> Enum.uniq()
+  end
 
-    Enum.reduce(links_in_block, [], fn link, acc ->
+  # links Floki parsed fmt
+  # e.g:
+  # [{"a", [{"href", "https://coderplanets.com/post/195675"}], []},]
+  defp do_parse_cited_info(article, block_id, links) do
+    Enum.reduce(links, [], fn link, acc ->
       with {:ok, cited_article} <- parse_cited_article(link),
            # do not cite artilce itself
            true <- article.id !== cited_article.id do
@@ -162,6 +190,20 @@ defmodule GroupherServer.CMS.Delegate.CiteTasks do
     |> Enum.uniq()
   end
 
+  # 在评论中引用文章的情况
+  defp shape_cited_content(%Comment{} = comment, cited_article, block_id) do
+    %{
+      cited_by_id: cited_article.id,
+      cited_by_type: cited_article.meta.thread,
+      # used for updating citing_count, avoid load again
+      cited_article: cited_article,
+      comment_id: comment.id,
+      block_linker: [block_id],
+      user_id: comment.author_id
+    }
+  end
+
+  # 文章之间相互引用的情况
   defp shape_cited_content(article, cited_article, block_id) do
     {:ok, thread} = thread_of_article(article)
     {:ok, info} = match(thread)

lib/groupher_server/cms/delegates/comment_curd.ex

@@ -11,7 +11,7 @@ defmodule GroupherServer.CMS.Delegate.CommentCurd do
   import ShortMaps
 
   alias Helper.Types, as: T
-  alias Helper.{ORM, QueryBuilder, Converter}
+  alias Helper.{Later, ORM, QueryBuilder, Converter}
   alias GroupherServer.{Accounts, CMS, Repo}
   alias CMS.Model.Post
 
@@ -113,6 +113,9 @@ defmodule GroupherServer.CMS.Delegate.CommentCurd do
           false -> CMS.update_active_timestamp(thread, article)
         end
       end)
+      |> Multi.run(:block_tasks, fn _, %{create_comment: create_comment} ->
+        Later.run({CiteTasks, :handle, [create_comment]})
+      end)
       |> Repo.transaction()
       |> result()
     else

test/groupher_server/cms/cite_contents/cite_blog_test.exs

@@ -73,5 +73,37 @@ defmodule GroupherServer.Test.CMS.CiteContent.Blog do
       {:ok, blog} = ORM.find(Blog, blog.id)
       assert blog.meta.citing_count == 0
     end
+
+    @tag :wip
+    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.),
+          # 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
+          }/blog/#{blog4.id}> again</a>, the paragraph 2 <a href=#{@site_host}/blog/#{blog5.id}> again</a>)
+        )
+
+      {:ok, comment} = CMS.create_comment(:blog, blog.id, comment_body, user)
+      CiteTasks.handle(comment)
+
+      comment_body = mock_rich_text(~s(the <a href=#{@site_host}/blog/#{blog3.id} />))
+      {:ok, comment} = CMS.create_comment(:blog, blog.id, comment_body, user)
+
+      CiteTasks.handle(comment)
+
+      {:ok, blog2} = ORM.find(Blog, blog2.id)
+      {:ok, blog3} = ORM.find(Blog, blog3.id)
+      {:ok, blog4} = ORM.find(Blog, blog4.id)
+      {:ok, blog5} = ORM.find(Blog, blog5.id)
+
+      assert blog2.meta.citing_count == 1
+      assert blog3.meta.citing_count == 2
+      assert blog4.meta.citing_count == 1
+      assert blog5.meta.citing_count == 1
+    end
   end
 end

test/groupher_server/cms/cite_contents/cite_job_test.exs

@@ -73,5 +73,37 @@ defmodule GroupherServer.Test.CMS.CiteContent.Job do
       {:ok, job} = ORM.find(Job, job.id)
       assert job.meta.citing_count == 0
     end
+
+    @tag :wip
+    test "can cited job inside a comment", ~m(user job job2 job3 job4 job5)a do
+      comment_body =
+        mock_rich_text(
+          ~s(the <a href=#{@site_host}/job/#{job2.id} /> and <a href=#{@site_host}/job/#{job2.id}>same la</a> is awesome, the <a href=#{
+            @site_host
+          }/job/#{job3.id}></a> is awesome too.),
+          # second paragraph
+          ~s(the paragraph 2 <a href=#{@site_host}/job/#{job2.id} class=#{job2.title}> again</a>, the paragraph 2 <a href=#{
+            @site_host
+          }/job/#{job4.id}> again</a>, the paragraph 2 <a href=#{@site_host}/job/#{job5.id}> again</a>)
+        )
+
+      {:ok, comment} = CMS.create_comment(:job, job.id, comment_body, user)
+      CiteTasks.handle(comment)
+
+      comment_body = mock_rich_text(~s(the <a href=#{@site_host}/job/#{job3.id} />))
+      {:ok, comment} = CMS.create_comment(:job, job.id, comment_body, user)
+
+      CiteTasks.handle(comment)
+
+      {:ok, job2} = ORM.find(Job, job2.id)
+      {:ok, job3} = ORM.find(Job, job3.id)
+      {:ok, job4} = ORM.find(Job, job4.id)
+      {:ok, job5} = ORM.find(Job, job5.id)
+
+      assert job2.meta.citing_count == 1
+      assert job3.meta.citing_count == 2
+      assert job4.meta.citing_count == 1
+      assert job5.meta.citing_count == 1
+    end
   end
 end

test/groupher_server/cms/cite_contents/cite_post_test.exs

@@ -29,6 +29,7 @@ defmodule GroupherServer.Test.CMS.CiteContent.Post do
   end
 
   describe "[cite basic]" do
+    # @tag :wip
     test "cited multi post should work", ~m(user community post2 post3 post4 post5 post_attrs)a do
       body =
         mock_rich_text(
@@ -73,5 +74,37 @@ defmodule GroupherServer.Test.CMS.CiteContent.Post do
       {:ok, post} = ORM.find(Post, post.id)
       assert post.meta.citing_count == 0
     end
+
+    @tag :wip
+    test "can cited post inside a comment", ~m(user post post2 post3 post4 post5)a do
+      comment_body =
+        mock_rich_text(
+          ~s(the <a href=#{@site_host}/post/#{post2.id} /> and <a href=#{@site_host}/post/#{
+            post2.id
+          }>same la</a> is awesome, the <a href=#{@site_host}/post/#{post3.id}></a> is awesome too.),
+          # second paragraph
+          ~s(the paragraph 2 <a href=#{@site_host}/post/#{post2.id} class=#{post2.title}> again</a>, the paragraph 2 <a href=#{
+            @site_host
+          }/post/#{post4.id}> again</a>, the paragraph 2 <a href=#{@site_host}/post/#{post5.id}> again</a>)
+        )
+
+      {:ok, comment} = CMS.create_comment(:post, post.id, comment_body, user)
+      CiteTasks.handle(comment)
+
+      comment_body = mock_rich_text(~s(the <a href=#{@site_host}/post/#{post3.id} />))
+      {:ok, comment} = CMS.create_comment(:post, post.id, comment_body, user)
+
+      CiteTasks.handle(comment)
+
+      {:ok, post2} = ORM.find(Post, post2.id)
+      {:ok, post3} = ORM.find(Post, post3.id)
+      {:ok, post4} = ORM.find(Post, post4.id)
+      {:ok, post5} = ORM.find(Post, post5.id)
+
+      assert post2.meta.citing_count == 1
+      assert post3.meta.citing_count == 2
+      assert post4.meta.citing_count == 1
+      assert post5.meta.citing_count == 1
+    end
   end
 end

test/groupher_server_web/mutation/cms/comments/blog_comment_test.exs

@@ -279,7 +279,7 @@ defmodule GroupherServer.Test.Mutation.Comments.BlogComment do
       }
     }
     """
-    @tag :wip
+
     test "can pin a blog's comment", ~m(owner_conn blog user)a do
       {:ok, comment} = CMS.create_comment(:blog, blog.id, mock_comment(), user)
 
@@ -290,7 +290,6 @@ defmodule GroupherServer.Test.Mutation.Comments.BlogComment do
       assert result["isPinned"]
     end
 
-    @tag :wip
     test "unauth user fails.", ~m(guest_conn blog user)a do
       {:ok, comment} = CMS.create_comment(:blog, blog.id, mock_comment(), user)
       variables = %{id: comment.id}
@@ -306,7 +305,7 @@ defmodule GroupherServer.Test.Mutation.Comments.BlogComment do
       }
     }
     """
-    @tag :wip
+
     test "can undo pin a blog's comment", ~m(owner_conn blog user)a do
       {:ok, comment} = CMS.create_comment(:blog, blog.id, mock_comment(), user)
       {:ok, _} = CMS.pin_comment(comment.id)
@@ -318,7 +317,6 @@ defmodule GroupherServer.Test.Mutation.Comments.BlogComment do
       assert not result["isPinned"]
     end
 
-    @tag :wip
     test "unauth user undo fails.", ~m(guest_conn blog user)a do
       {:ok, comment} = CMS.create_comment(:blog, blog.id, mock_comment(), user)
       {:ok, _} = CMS.pin_comment(comment.id)

test/groupher_server_web/mutation/cms/comments/job_comment_test.exs

@@ -279,7 +279,7 @@ defmodule GroupherServer.Test.Mutation.Comments.JobComment do
       }
     }
     """
-    @tag :wip
+
     test "can pin a job's comment", ~m(owner_conn job user)a do
       {:ok, comment} = CMS.create_comment(:job, job.id, mock_comment(), user)
 
@@ -290,7 +290,6 @@ defmodule GroupherServer.Test.Mutation.Comments.JobComment do
       assert result["isPinned"]
     end
 
-    @tag :wip
     test "unauth user fails.", ~m(guest_conn job user)a do
       {:ok, comment} = CMS.create_comment(:job, job.id, mock_comment(), user)
       variables = %{id: comment.id}
@@ -306,7 +305,7 @@ defmodule GroupherServer.Test.Mutation.Comments.JobComment do
       }
     }
     """
-    @tag :wip
+
     test "can undo pin a job's comment", ~m(owner_conn job user)a do
       {:ok, comment} = CMS.create_comment(:job, job.id, mock_comment(), user)
       {:ok, _} = CMS.pin_comment(comment.id)
@@ -318,7 +317,6 @@ defmodule GroupherServer.Test.Mutation.Comments.JobComment do
       assert not result["isPinned"]
     end
 
-    @tag :wip
     test "unauth user undo fails.", ~m(guest_conn job user)a do
       {:ok, comment} = CMS.create_comment(:job, job.id, mock_comment(), user)
       {:ok, _} = CMS.pin_comment(comment.id)

test/groupher_server_web/mutation/cms/comments/post_comment_test.exs

@@ -280,7 +280,7 @@ defmodule GroupherServer.Test.Mutation.Comments.PostComment do
       }
     }
     """
-    @tag :wip
+
     test "can pin a post's comment", ~m(owner_conn post user)a do
       {:ok, comment} = CMS.create_comment(:post, post.id, mock_comment(), user)
 
@@ -291,7 +291,6 @@ defmodule GroupherServer.Test.Mutation.Comments.PostComment do
       assert result["isPinned"]
     end
 
-    @tag :wip
     test "unauth user fails.", ~m(guest_conn post user)a do
       {:ok, comment} = CMS.create_comment(:post, post.id, mock_comment(), user)
       variables = %{id: comment.id}
@@ -307,7 +306,7 @@ defmodule GroupherServer.Test.Mutation.Comments.PostComment do
       }
     }
     """
-    @tag :wip
+
     test "can undo pin a post's comment", ~m(owner_conn post user)a do
       {:ok, comment} = CMS.create_comment(:post, post.id, mock_comment(), user)
       {:ok, _} = CMS.pin_comment(comment.id)
@@ -319,7 +318,6 @@ defmodule GroupherServer.Test.Mutation.Comments.PostComment do
       assert not result["isPinned"]
     end
 
-    @tag :wip
     test "unauth user undo fails.", ~m(guest_conn post user)a do
       {:ok, comment} = CMS.create_comment(:post, post.id, mock_comment(), user)
       {:ok, _} = CMS.pin_comment(comment.id)