refactor(pinned-article): wip

Author: mydearxym

lib/groupher_server/cms/delegates/article_curd.ex

@@ -3,15 +3,18 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
   CURD operation on post/job ...
   """
   import Ecto.Query, warn: false
-  import GroupherServer.CMS.Utils.Matcher
+
+  import GroupherServer.CMS.Utils.Matcher2
+
+  import GroupherServer.CMS.Utils.Matcher, only: [match_action: 2, dynamic_where: 2]
   import Helper.Utils, only: [done: 1, pick_by: 2, integerfy: 1]
   import Helper.ErrorCode
   import ShortMaps
 
   alias GroupherServer.{Accounts, CMS, Delivery, Email, Repo, Statistics}
 
   alias Accounts.User
-  alias CMS.{Author, Community, Embeds, Delegate, Tag}
+  alias CMS.{Author, Community, PinnedArticle, Embeds, Delegate, Tag}
 
   alias Delegate.ArticleOperation
   alias Helper.{Later, ORM, QueryBuilder}
@@ -271,28 +274,22 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
   end
 
   defp read_state_query(queryable, %{read: false} = _filter, _user) do
-    # queryable
-    # |> join(:left, [content, f, c], viewers in assoc(content, :viewers))
-    # |> where([content, f, c, viewers], viewers.user_id != ^user.id)
-    # |> where([content, f, c, viewers], content.id != viewers.post_id)
-    # |> IO.inspect(label: "query")
     queryable
   end
 
   defp read_state_query(queryable, _, _), do: queryable
 
-  # only first page need pin contents
-  # TODO: use seperate pined table, which is much more smaller
-  defp add_pin_contents_ifneed(contents, CMS.Post, %{community: community} = filter) do
+  defp add_pin_contents_ifneed(contents, querable, %{community: _community} = filter) do
     with {:ok, _} <- should_add_pin?(filter),
+         {:ok, info} <- match(querable),
          {:ok, normal_contents} <- contents,
          true <- Map.has_key?(filter, :community),
          true <- 1 == Map.get(normal_contents, :page_number) do
       {:ok, pined_content} =
-        CMS.PinedPost
+        PinnedArticle
         |> join(:inner, [p], c in assoc(p, :community))
-        |> join(:inner, [p], content in assoc(p, :post))
-        |> where([p, c, content], c.raw == ^community)
+        |> join(:inner, [p], content in assoc(p, ^info.thread))
+        |> where([p, c, content], c.raw == ^filter.community)
         |> select([p, c, content], content)
         # 10 pined contents per community/thread, at most
         |> ORM.paginater(%{page: 1, size: 10})
@@ -305,38 +302,8 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
     end
   end
 
-  defp add_pin_contents_ifneed(contents, CMS.Job, %{community: _community} = filter) do
-    merge_pin_contents(contents, :job, CMS.PinedJob, filter)
-  end
-
-  defp add_pin_contents_ifneed(contents, CMS.Repo, %{community: _community} = filter) do
-    merge_pin_contents(contents, :repo, CMS.PinedRepo, filter)
-  end
-
   defp add_pin_contents_ifneed(contents, _querable, _filter), do: contents
 
-  defp merge_pin_contents(contents, thread, pin_schema, %{community: _community} = filter) do
-    with {:ok, _} <- should_add_pin?(filter),
-         {:ok, normal_contents} <- contents,
-         true <- Map.has_key?(filter, :community),
-         true <- 1 == Map.get(normal_contents, :page_number) do
-      {:ok, pined_content} =
-        pin_schema
-        |> join(:inner, [p], c in assoc(p, :community))
-        |> join(:inner, [p], content in assoc(p, ^thread))
-        |> where([p, c, content], c.raw == ^filter.community)
-        |> select([p, c, content], content)
-        # 10 pined contents per community/thread, at most
-        |> ORM.paginater(%{page: 1, size: 10})
-        |> done()
-
-      concat_contents(pined_content, normal_contents)
-    else
-      _error ->
-        contents
-    end
-  end
-
   # if filter contains like: tags, sort.., then don't add pin content
   defp should_add_pin?(%{page: 1, tag: :all, sort: :desc_inserted, read: :all} = filter) do
     filter

lib/groupher_server/cms/utils/matcher2.ex

@@ -25,10 +25,19 @@ defmodule GroupherServer.CMS.Utils.Matcher2 do
     {:error, "not supported"}
   end
 
+  # used for paged pin articles
+  def match(Post) do
+    {:ok, %{thread: :post}}
+  end
+
   def match(:post) do
     {:ok, %{model: Post, foreign_key: :post_id}}
   end
 
+  def match(Job) do
+    {:ok, %{thread: :job}}
+  end
+
   def match(:job) do
     {:ok, %{model: Job, foreign_key: :job_id}}
   end

test/groupher_server/cms/article_pin_test.exs

@@ -8,9 +8,9 @@ defmodule GroupherServer.Test.CMS.ArticlePin do
 
   alias CMS.{
     Community,
-    PinnedArticle,
-    Post,
-    Job
+    PinnedArticle
+    # Post,
+    # Job
   }
 
   @max_pinned_article_count_per_thread Community.max_pinned_article_count_per_thread()
@@ -35,7 +35,7 @@ defmodule GroupherServer.Test.CMS.ArticlePin do
       assert pind_article.post_id == post.id
     end
 
-    @tag :wip2
+    @tag :wip
     test "one community & thread can only pin certern count of post", ~m(community post user)a do
       {:ok, post2} = CMS.create_content(community, :post, mock_attrs(:post), user)
       {:ok, post3} = CMS.create_content(community, :post, mock_attrs(:post), user)
@@ -54,7 +54,7 @@ defmodule GroupherServer.Test.CMS.ArticlePin do
       assert {:error, _} = CMS.pin_article(:post, 8848, community.id)
     end
 
-    @tag :wip2
+    @tag :wip
     test "can undo pin to a post", ~m(community post)a do
       {:ok, _} = CMS.pin_article(:post, post.id, community.id)
 
@@ -65,35 +65,5 @@ defmodule GroupherServer.Test.CMS.ArticlePin do
     end
   end
 
-  # describe "[cms job pin]" do
-  #   test "can pin a job", ~m(community job)a do
-  #     {:ok, pined_job} = CMS.pin_content(job, community)
-
-  #     assert pined_job.id == job.id
-  #   end
-
-  #   test "can undo pin to a job", ~m(community job)a do
-  #     {:ok, pined_job} = CMS.pin_content(job, community)
-  #     assert pined_job.id == job.id
-
-  #     assert {:ok, unpined} = CMS.undo_pin_content(job, community)
-  #     assert unpined.id == job.id
-  #   end
-  # end
-
-  # describe "[cms repo pin]" do
-  #   test "can pin a repo", ~m(community repo)a do
-  #     {:ok, pined_repo} = CMS.pin_content(repo, community)
-
-  #     assert pined_repo.id == repo.id
-  #   end
-
-  #   test "can undo pin to a repo", ~m(community repo)a do
-  #     {:ok, pined_repo} = CMS.pin_content(repo, community)
-  #     assert pined_repo.id == repo.id
-
-  #     assert {:ok, unpined} = CMS.undo_pin_content(repo, community)
-  #     assert unpined.id == repo.id
-  #   end
-  # end
+  # TODO: Job, Repo
 end

test/groupher_server_web/query/cms/posts_flags_test.exs

@@ -51,6 +51,7 @@ defmodule GroupherServer.Test.Query.PostsFlags do
       }
     }
     """
+    @tag :wip2
     test "if have pined posts, the pined posts should at the top of entries",
          ~m(guest_conn community post_m)a do
       variables = %{filter: %{community: community.raw}}
@@ -62,7 +63,7 @@ defmodule GroupherServer.Test.Query.PostsFlags do
       assert results["pageSize"] == @page_size
       assert results["totalCount"] == @total_count
 
-      {:ok, _pined_post} = CMS.pin_content(post_m, community)
+      {:ok, _pined_post} = CMS.pin_article(:post, post_m.id, community.id)
 
       results = guest_conn |> query_result(@query, variables, "pagedPosts")
       entries_first = results["entries"] |> List.first()