refactor(cite-workflow): wip

Author: mydearxym

lib/groupher_server/cms/cms.ex

@@ -97,7 +97,7 @@ defmodule GroupherServer.CMS do
   defdelegate sink_article(thread, id), to: ArticleCURD
   defdelegate undo_sink_article(thread, id), to: ArticleCURD
 
-  defdelegate paged_citing_contents(id, filter), to: CitedContent
+  defdelegate paged_citing_contents(type, id, filter), to: CitedContent
 
   defdelegate upvote_article(thread, article_id, user), to: ArticleUpvote
   defdelegate undo_upvote_article(thread, article_id, user), to: ArticleUpvote

lib/groupher_server/cms/delegates/cited_content.ex

@@ -9,7 +9,7 @@ defmodule GroupherServer.CMS.Delegate.CitedContent do
 
   alias Helper.Types, as: T
   alias GroupherServer.{CMS, Repo}
-  alias Helper.ORM
+  alias Helper.{ORM, QueryBuilder}
 
   alias CMS.Model.CitedContent
 
@@ -21,9 +21,10 @@ defmodule GroupherServer.CMS.Delegate.CitedContent do
   @cited_preloads @article_preloads ++ [[comment: :author] ++ @comment_article_preloads]
 
   @doc "get paged citing contents"
-  def paged_citing_contents(cited_by_id, %{page: page, size: size}) do
+  def paged_citing_contents(cited_by_type, cited_by_id, %{page: page, size: size} = filter) do
     CitedContent
-    |> where([c], c.cited_by_id == ^cited_by_id)
+    |> where([c], c.cited_by_id == ^cited_by_id and c.cited_by_type == ^cited_by_type)
+    |> QueryBuilder.filter_pack(Map.merge(filter, %{sort: :asc_inserted}))
     |> ORM.paginater(~m(page size)a)
     |> extract_contents
     |> done
@@ -40,7 +41,12 @@ defmodule GroupherServer.CMS.Delegate.CitedContent do
   # shape comment cite
   @spec shape_article(CitedContent.t()) :: T.cite_info()
   defp shape_article(%CitedContent{comment_id: comment_id} = cited) when not is_nil(comment_id) do
-    %{block_linker: block_linker, cited_by_type: cited_by_type, comment: comment} = cited
+    %{
+      block_linker: block_linker,
+      cited_by_type: cited_by_type,
+      comment: comment,
+      inserted_at: inserted_at
+    } = cited
 
     comment_thread = comment.thread |> String.downcase() |> String.to_atom()
     article = comment |> Map.get(comment_thread)
@@ -49,7 +55,7 @@ defmodule GroupherServer.CMS.Delegate.CitedContent do
     article
     |> Map.take([:id, :title])
     |> Map.merge(%{
-      updated_at: comment.updated_at,
+      inserted_at: inserted_at,
       user: user,
       thread: thread_to_atom(cited_by_type),
       comment_id: comment.id,
@@ -59,15 +65,20 @@ defmodule GroupherServer.CMS.Delegate.CitedContent do
 
   # shape general article cite
   defp shape_article(%CitedContent{} = cited) do
-    %{block_linker: block_linker, cited_by_type: cited_by_type} = cited
+    %{block_linker: block_linker, cited_by_type: cited_by_type, inserted_at: inserted_at} = cited
 
     thread = thread_to_atom(cited_by_type)
     article = Map.get(cited, thread)
 
     user = get_in(article, [:author, :user]) |> Map.take([:login, :nickname, :avatar])
 
     article
-    |> Map.take([:id, :title, :updated_at])
-    |> Map.merge(%{user: user, thread: thread, block_linker: block_linker})
+    |> Map.take([:id, :title])
+    |> Map.merge(%{
+      user: user,
+      thread: thread,
+      block_linker: block_linker,
+      inserted_at: inserted_at
+    })
   end
 end

lib/helper/types.ex

@@ -187,7 +187,7 @@ defmodule Helper.Types do
           id: Integer.t(),
           thread: article_thread,
           title: String.t(),
-          updated_at: String.t(),
+          inserted_at: String.t(),
           block_linker: [String.t()],
           comment_id: Integer.t() | nil,
           user: %{

test/groupher_server/cms/cite_contents/cite_blog_test.exs

@@ -173,6 +173,8 @@ defmodule GroupherServer.Test.CMS.CiteContent.Blog do
           user
         )
 
+      Process.sleep(1000)
+
       body =
         mock_rich_text(
           ~s(the <a href=#{@site_host}/blog/#{blog2.id} />),
@@ -182,6 +184,7 @@ defmodule GroupherServer.Test.CMS.CiteContent.Blog do
       blog_attrs = blog_attrs |> Map.merge(%{body: body})
       {:ok, blog_x} = CMS.create_article(community, :blog, blog_attrs, user)
 
+      Process.sleep(1000)
       body = mock_rich_text(~s(the <a href=#{@site_host}/blog/#{blog2.id} />))
       blog_attrs = blog_attrs |> Map.merge(%{body: body})
       {:ok, blog_y} = CMS.create_article(community, :blog, blog_attrs, user)
@@ -190,25 +193,27 @@ defmodule GroupherServer.Test.CMS.CiteContent.Blog do
       CiteTasks.handle(comment)
       CiteTasks.handle(blog_y)
 
-      {:ok, result} = CMS.paged_citing_contents(blog2.id, %{page: 1, size: 10})
+      {:ok, result} = CMS.paged_citing_contents("BLOG", blog2.id, %{page: 1, size: 10})
 
       entries = result.entries
-      first = entries |> List.first()
-      middle = entries |> Enum.at(1)
-      last = entries |> List.last()
-      article_map_keys = [:block_linker, :id, :thread, :title, :updated_at, :user]
-
-      assert first.id == blog_x.id
-      assert first.block_linker |> length == 2
-      assert first |> Map.keys() == article_map_keys
-
-      assert middle.comment_id == comment.id
-      assert middle.id == blog2.id
-      assert middle.title == blog2.title
-
-      assert last.id == blog_y.id
-      assert last.block_linker |> length == 1
-      assert last |> Map.keys() == article_map_keys
+
+      result_comment = entries |> List.first()
+      result_blog_x = entries |> Enum.at(1)
+      result_blog_y = entries |> List.last()
+
+      article_map_keys = [:block_linker, :id, :inserted_at, :thread, :title, :user]
+
+      assert result_comment.comment_id == comment.id
+      assert result_comment.id == blog2.id
+      assert result_comment.title == blog2.title
+
+      assert result_blog_x.id == blog_x.id
+      assert result_blog_x.block_linker |> length == 2
+      assert result_blog_x |> Map.keys() == article_map_keys
+
+      assert result_blog_y.id == blog_y.id
+      assert result_blog_y.block_linker |> length == 1
+      assert result_blog_y |> Map.keys() == article_map_keys
 
       assert result |> is_valid_pagination?(:raw)
       assert result.total_count == 3

test/groupher_server/cms/cite_contents/cite_job_test.exs

@@ -161,4 +161,61 @@ defmodule GroupherServer.Test.CMS.CiteContent.Job do
       assert job5.meta.citing_count == 1
     end
   end
+
+  describe "[cite pagi]" do
+    @tag :wip
+    test "can get paged cited articles.", ~m(user community job2 job_attrs)a do
+      {:ok, comment} =
+        CMS.create_comment(
+          :job,
+          job2.id,
+          mock_comment(~s(the <a href=#{@site_host}/job/#{job2.id} />)),
+          user
+        )
+
+      Process.sleep(1000)
+
+      body =
+        mock_rich_text(
+          ~s(the <a href=#{@site_host}/job/#{job2.id} />),
+          ~s(the <a href=#{@site_host}/job/#{job2.id} />)
+        )
+
+      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})
+      {:ok, job_y} = CMS.create_article(community, :job, job_attrs, user)
+
+      CiteTasks.handle(job_x)
+      CiteTasks.handle(comment)
+      CiteTasks.handle(job_y)
+
+      {:ok, result} = CMS.paged_citing_contents("JOB", job2.id, %{page: 1, size: 10})
+
+      entries = result.entries
+
+      result_comment = entries |> List.first()
+      result_job_x = entries |> Enum.at(1)
+      result_job_y = entries |> List.last()
+
+      article_map_keys = [:block_linker, :id, :inserted_at, :thread, :title, :user]
+
+      assert result_comment.comment_id == comment.id
+      assert result_comment.id == job2.id
+      assert result_comment.title == job2.title
+
+      assert result_job_x.id == job_x.id
+      assert result_job_x.block_linker |> length == 2
+      assert result_job_x |> Map.keys() == article_map_keys
+
+      assert result_job_y.id == job_y.id
+      assert result_job_y.block_linker |> length == 1
+      assert result_job_y |> Map.keys() == article_map_keys
+
+      assert result |> is_valid_pagination?(:raw)
+      assert result.total_count == 3
+    end
+  end
 end

test/groupher_server/cms/cite_contents/cite_post_test.exs

@@ -174,6 +174,8 @@ defmodule GroupherServer.Test.CMS.CiteContent.Post do
           user
         )
 
+      Process.sleep(1000)
+
       body =
         mock_rich_text(
           ~s(the <a href=#{@site_host}/post/#{post2.id} />),
@@ -183,6 +185,7 @@ defmodule GroupherServer.Test.CMS.CiteContent.Post do
       post_attrs = post_attrs |> Map.merge(%{body: body})
       {:ok, post_x} = CMS.create_article(community, :post, post_attrs, user)
 
+      Process.sleep(1000)
       body = mock_rich_text(~s(the <a href=#{@site_host}/post/#{post2.id} />))
       post_attrs = post_attrs |> Map.merge(%{body: body})
       {:ok, post_y} = CMS.create_article(community, :post, post_attrs, user)
@@ -191,25 +194,27 @@ defmodule GroupherServer.Test.CMS.CiteContent.Post do
       CiteTasks.handle(comment)
       CiteTasks.handle(post_y)
 
-      {:ok, result} = CMS.paged_citing_contents(post2.id, %{page: 1, size: 10})
+      {:ok, result} = CMS.paged_citing_contents("POST", post2.id, %{page: 1, size: 10})
 
       entries = result.entries
-      first = entries |> List.first()
-      middle = entries |> Enum.at(1)
-      last = entries |> List.last()
-      article_map_keys = [:block_linker, :id, :thread, :title, :updated_at, :user]
-
-      assert first.id == post_x.id
-      assert first.block_linker |> length == 2
-      assert first |> Map.keys() == article_map_keys
-
-      assert middle.comment_id == comment.id
-      assert middle.id == post2.id
-      assert middle.title == post2.title
-
-      assert last.id == post_y.id
-      assert last.block_linker |> length == 1
-      assert last |> Map.keys() == article_map_keys
+
+      result_comment = entries |> List.first()
+      result_post_x = entries |> Enum.at(1)
+      result_post_y = entries |> List.last()
+
+      article_map_keys = [:block_linker, :id, :inserted_at, :thread, :title, :user]
+
+      assert result_comment.comment_id == comment.id
+      assert result_comment.id == post2.id
+      assert result_comment.title == post2.title
+
+      assert result_post_x.id == post_x.id
+      assert result_post_x.block_linker |> length == 2
+      assert result_post_x |> Map.keys() == article_map_keys
+
+      assert result_post_y.id == post_y.id
+      assert result_post_y.block_linker |> length == 1
+      assert result_post_y |> Map.keys() == article_map_keys
 
       assert result |> is_valid_pagination?(:raw)
       assert result.total_count == 3