refactor: improve extract article method

Author: mydearxym

lib/groupher_server/accounts/delegates/collect_folder.ex

@@ -9,7 +9,7 @@ defmodule GroupherServer.Accounts.Delegate.CollectFolder do
   alias Helper.QueryBuilder
 
   import Helper.ErrorCode
-  import Helper.Utils, only: [done: 1]
+  import Helper.Utils, only: [done: 1, get_config: 2]
 
   import ShortMaps
 
@@ -24,7 +24,7 @@ defmodule GroupherServer.Accounts.Delegate.CollectFolder do
   # @max_article_count_per_collect_folder 300
 
   @default_meta Embeds.CollectFolderMeta.default_meta()
-  @supported_collect_threads [:post, :job]
+  @article_threads get_config(:article, :article_threads)
 
   @doc """
   list a user's not-private collect folders
@@ -75,9 +75,15 @@ defmodule GroupherServer.Accounts.Delegate.CollectFolder do
   end
 
   defp do_paged_collect_folder_articles(folder, filter) do
-    Repo.preload(folder.collects, @supported_collect_threads)
+    article_preload =
+      @article_threads
+      |> Enum.reduce([], fn thread, acc ->
+        acc ++ Keyword.new([{thread, [author: :user]}])
+      end)
+
+    Repo.preload(folder.collects, article_preload)
     |> ORM.embeds_paginater(filter)
-    |> ORM.extract_articles(@supported_collect_threads)
+    |> ORM.extract_articles()
     |> done()
   end
 

lib/groupher_server/accounts/delegates/upvoted_articles.ex

@@ -3,16 +3,15 @@ defmodule GroupherServer.Accounts.Delegate.UpvotedArticles do
   get contents(posts, jobs ...) that user upvotes
   """
   import Ecto.Query, warn: false
-  import Helper.Utils, only: [done: 1]
+  import Helper.Utils, only: [done: 1, get_config: 2]
   import ShortMaps
 
   alias Helper.{ORM, QueryBuilder}
 
   alias GroupherServer.CMS
   alias CMS.{ArticleUpvote}
 
-  # TODO: move to Model
-  @supported_uovoted_threads [:post, :job]
+  @article_threads get_config(:article, :article_threads)
 
   @doc """
   get paged upvoted articles
@@ -31,13 +30,19 @@ defmodule GroupherServer.Accounts.Delegate.UpvotedArticles do
   end
 
   defp load_upvoted_articles(where_query, %{page: page, size: size} = filter) do
-    query = from(a in ArticleUpvote, preload: ^@supported_uovoted_threads)
+    article_preload =
+      @article_threads
+      |> Enum.reduce([], fn thread, acc ->
+        acc ++ Keyword.new([{thread, [author: :user]}])
+      end)
+
+    query = from(a in ArticleUpvote, preload: ^article_preload)
 
     query
     |> where(^where_query)
     |> QueryBuilder.filter_pack(filter)
     |> ORM.paginater(~m(page size)a)
-    |> ORM.extract_articles(@supported_uovoted_threads)
+    |> ORM.extract_articles()
     |> done()
   end
 end

lib/helper/orm.ex

@@ -310,13 +310,13 @@ defmodule Helper.ORM do
 
   @doc "extract common articles info"
   @spec extract_articles(T.paged_data(), [Atom.t()]) :: T.paged_article_common()
-  def extract_articles(%{entries: entries} = paged_articles, supported_threads) do
+  def extract_articles(%{entries: entries} = paged_articles, threads \\ @article_threads) do
     paged_articles
-    |> Map.put(:entries, Enum.map(entries, &extract_article_info(&1, supported_threads)))
+    |> Map.put(:entries, Enum.map(entries, &extract_article_info(&1, threads)))
   end
 
-  defp extract_article_info(reaction, supported_threads) do
-    thread = Enum.find(supported_threads, &(not is_nil(Map.get(reaction, &1))))
+  defp extract_article_info(reaction, threads) do
+    thread = Enum.find(threads, &(not is_nil(Map.get(reaction, &1))))
     article = Map.get(reaction, thread)
 
     export_article_info(thread, article)

test/groupher_server/accounts/reacted_articles_test.exs

@@ -14,6 +14,7 @@ defmodule GroupherServer.Test.Accounts.ReactedContents do
   end
 
   describe "[user upvoted articles]" do
+    @tag :wip2
     test "user can get paged upvoted common articles", ~m(user post job)a do
       {:ok, _} = CMS.upvote_article(:post, post.id, user)
       {:ok, _} = CMS.upvote_article(:job, job.id, user)
@@ -28,8 +29,8 @@ defmodule GroupherServer.Test.Accounts.ReactedContents do
       assert job.id == article_job |> Map.get(:id)
       assert post.id == article_post |> Map.get(:id)
 
-      assert [:id, :thread, :title, :upvotes_count] == article_post |> Map.keys()
-      assert [:id, :thread, :title, :upvotes_count] == article_job |> Map.keys()
+      assert [:author, :id, :thread, :title, :upvotes_count] == article_post |> Map.keys()
+      assert [:author, :id, :thread, :title, :upvotes_count] == article_job |> Map.keys()
     end
 
     test "user can get paged upvoted posts by thread filter", ~m(user post job)a do

test/groupher_server_web/query/accounts/published/published_jobs_test.exs

@@ -75,7 +75,7 @@ defmodule GroupherServer.Test.Query.Accounts.Published.Jobs do
       }
     }
     """
-    @tag :wip2
+
     test "user can get paged published comments on job", ~m(guest_conn user job)a do
       pub_comments =
         Enum.reduce(1..@publish_count, [], fn _, acc ->

test/groupher_server_web/query/accounts/published/published_posts_test.exs

@@ -75,7 +75,7 @@ defmodule GroupherServer.Test.Query.Accounts.Published.Posts do
       }
     }
     """
-    @tag :wip2
+
     test "user can get paged published comments on post", ~m(guest_conn user post)a do
       pub_comments =
         Enum.reduce(1..@publish_count, [], fn _, acc ->

test/groupher_server_web/query/accounts/published/published_repos_test.exs

@@ -75,7 +75,7 @@ defmodule GroupherServer.Test.Query.Accounts.Published.Repos do
       }
     }
     """
-    @tag :wip2
+
     test "user can get paged published comments on repo", ~m(guest_conn user repo)a do
       pub_comments =
         Enum.reduce(1..@publish_count, [], fn _, acc ->