refactor(cite-workflow): wip

Author: mydearxym

lib/groupher_server/cms/delegates/cited_content.ex

@@ -4,46 +4,29 @@ defmodule GroupherServer.CMS.Delegate.CitedContent do
   """
   import Ecto.Query, warn: false
 
-  import GroupherServer.CMS.Helper.Matcher
   import Helper.Utils, only: [done: 1, get_config: 2]
   import ShortMaps
 
+  alias Helper.Types, as: T
   alias GroupherServer.{CMS, Repo}
   alias Helper.ORM
 
   alias CMS.Model.CitedContent
 
   @article_threads get_config(:article, :threads)
-  @cited_preloads @article_threads |> Enum.map(&Keyword.new([{&1, [author: :user]}]))
 
-  """
-  article:
-  thread title timestamp who
-
-  comment:
-  thread title/的评论(digest)中 timestamp who
-
-  %Article {
-    thread: "",
-    id: "",
-    title: "",
-    updatedAt: "",
-    user: %User{},
-    block_linker: [],
+  @article_preloads @article_threads |> Enum.map(&Keyword.new([{&1, [author: :user]}]))
 
-    in_comment: boolean
-
-    user: %User{},
-  }
-  """
+  @comment_article_preloads @article_threads |> Enum.map(&Keyword.new([{:comment, &1}]))
+  @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} = filter) do
+  def paged_citing_contents(cited_by_id, %{page: page, size: size}) do
     CitedContent
     |> where([c], c.cited_by_id == ^cited_by_id)
     |> ORM.paginater(~m(page size)a)
     |> extract_contents
-    |> IO.inspect(label: "bb")
+    |> done
   end
 
   def extract_contents(%{entries: entries} = paged_contents) do
@@ -52,17 +35,39 @@ defmodule GroupherServer.CMS.Delegate.CitedContent do
     Map.put(paged_contents, :entries, entries)
   end
 
-  def shape_article(%CitedContent{} = cited) do
-    thread = cited.cited_by_type |> String.downcase() |> String.to_atom()
-    # original_community
-    block_linker = cited.block_linker
+  defp thread_to_atom(thread), do: thread |> String.downcase() |> String.to_atom()
+
+  # 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
+
+    comment_thread = comment.thread |> String.downcase() |> String.to_atom()
+    article = comment |> Map.get(comment_thread)
+    user = comment.author |> Map.take([:login, :nickname, :avatar])
+
+    article
+    |> Map.take([:id, :title])
+    |> Map.merge(%{
+      updated_at: comment.updated_at,
+      user: user,
+      thread: thread_to_atom(cited_by_type),
+      comment_id: comment.id,
+      block_linker: block_linker
+    })
+  end
+
+  # shape general article cite
+  defp shape_article(%CitedContent{} = cited) do
+    %{block_linker: block_linker, cited_by_type: cited_by_type} = cited
+
+    thread = thread_to_atom(cited_by_type)
     article = Map.get(cited, thread)
 
-    thread = get_in(article, [:meta]) |> Map.get(:thread)
     user = get_in(article, [:author, :user]) |> Map.take([:login, :nickname, :avatar])
 
     article
-    |> Map.take([:title, :updated_at])
+    |> Map.take([:id, :title, :updated_at])
     |> Map.merge(%{user: user, thread: thread, block_linker: block_linker})
   end
 end

lib/helper/types.ex

@@ -33,7 +33,7 @@ defmodule Helper.Types do
           company: nil | String.t()
         }
 
-  @type article_thread :: :post | :job | :repo
+  @type article_thread :: :post | :job | :repo | :blog
 
   @type paged_filter :: %{
           page: Integer.t(),
@@ -182,4 +182,18 @@ defmodule Helper.Types do
   html fragment
   """
   @type html :: String.t()
+
+  @type cite_info :: %{
+          id: Integer.t(),
+          thread: article_thread,
+          title: String.t(),
+          updated_at: String.t(),
+          block_linker: [String.t()],
+          comment_id: Integer.t() | nil,
+          user: %{
+            login: String.t(),
+            avatar: String.t(),
+            nickname: String.t()
+          }
+        }
 end

test/groupher_server/cms/cite_contents/cite_blog_test.exs

@@ -161,4 +161,57 @@ defmodule GroupherServer.Test.CMS.CiteContent.Blog do
       assert blog5.meta.citing_count == 1
     end
   end
+
+  describe "[cite pagi]" do
+    @tag :wip
+    test "can get paged cited articles.", ~m(user community blog2 blog_attrs)a do
+      {:ok, comment} =
+        CMS.create_comment(
+          :blog,
+          blog2.id,
+          mock_comment(~s(the <a href=#{@site_host}/blog/#{blog2.id} />)),
+          user
+        )
+
+      body =
+        mock_rich_text(
+          ~s(the <a href=#{@site_host}/blog/#{blog2.id} />),
+          ~s(the <a href=#{@site_host}/blog/#{blog2.id} />)
+        )
+
+      blog_attrs = blog_attrs |> Map.merge(%{body: body})
+      {:ok, blog_x} = CMS.create_article(community, :blog, blog_attrs, user)
+
+      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)
+
+      CiteTasks.handle(blog_x)
+      CiteTasks.handle(comment)
+      CiteTasks.handle(blog_y)
+
+      {:ok, result} = CMS.paged_citing_contents(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
+
+      assert result |> is_valid_pagination?(:raw)
+      assert result.total_count == 3
+    end
+  end
 end

test/groupher_server/cms/cite_contents/cite_post_test.exs

@@ -27,29 +27,6 @@ defmodule GroupherServer.Test.CMS.CiteContent.Post do
     {:ok, ~m(user user2 community post post2 post3 post4 post5 post_attrs)a}
   end
 
-  describe "[cite pagi]" do
-    @tag :wip
-    test "--can get paged cited articles.", ~m(user community post2 post_attrs)a do
-      body =
-        mock_rich_text(
-          ~s(the <a href=#{@site_host}/post/#{post2.id} />),
-          ~s(the <a href=#{@site_host}/post/#{post2.id} />)
-        )
-
-      post_attrs = post_attrs |> Map.merge(%{body: body})
-      {:ok, post_x} = CMS.create_article(community, :post, post_attrs, user)
-
-      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)
-
-      CiteTasks.handle(post_x)
-      CiteTasks.handle(post_y)
-
-      CMS.paged_citing_contents(post2.id, %{page: 1, size: 10})
-    end
-  end
-
   describe "[cite basic]" do
     #
     test "cited multi post should work", ~m(user community post2 post3 post4 post5 post_attrs)a do
@@ -185,4 +162,57 @@ defmodule GroupherServer.Test.CMS.CiteContent.Post do
       assert post5.meta.citing_count == 1
     end
   end
+
+  describe "[cite pagi]" do
+    @tag :wip
+    test "can get paged cited articles.", ~m(user community post2 post_attrs)a do
+      {:ok, comment} =
+        CMS.create_comment(
+          :post,
+          post2.id,
+          mock_comment(~s(the <a href=#{@site_host}/post/#{post2.id} />)),
+          user
+        )
+
+      body =
+        mock_rich_text(
+          ~s(the <a href=#{@site_host}/post/#{post2.id} />),
+          ~s(the <a href=#{@site_host}/post/#{post2.id} />)
+        )
+
+      post_attrs = post_attrs |> Map.merge(%{body: body})
+      {:ok, post_x} = CMS.create_article(community, :post, post_attrs, user)
+
+      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)
+
+      CiteTasks.handle(post_x)
+      CiteTasks.handle(comment)
+      CiteTasks.handle(post_y)
+
+      {:ok, result} = CMS.paged_citing_contents(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
+
+      assert result |> is_valid_pagination?(:raw)
+      assert result.total_count == 3
+    end
+  end
 end