refactor(article-emotions): fix broken test

Author: mydearxym

lib/groupher_server/cms/delegates/article_curd.ex

@@ -300,22 +300,21 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
 
   defp domain_filter_query(queryable, _filter), do: queryable
 
-  defp add_pin_contents_ifneed(contents, querable, %{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} =
+         true <- 1 == Map.get(contents, :page_number) do
+      {:ok, pinned_articles} =
         PinnedArticle
         |> join(:inner, [p], c in assoc(p, :community))
-        |> join(:inner, [p], content in assoc(p, ^info.thread))
-        |> where([p, c, content], c.raw == ^filter.community)
-        |> select([p, c, content], content)
+        # |> join(:inner, [p], article in assoc(p, ^filter.thread))
+        |> join(:inner, [p], article in assoc(p, ^info.thread))
+        |> where([p, c, article], c.raw == ^community)
+        |> select([p, c, article], article)
         # 10 pined contents per community/thread, at most
-        |> ORM.paginater(%{page: 1, size: 10})
+        |> ORM.find_all(%{page: 1, size: 10})
 
-      concat_contents(pined_content, normal_contents)
+      concat_contents(pinned_articles, contents)
     else
       _error -> contents
     end
@@ -325,22 +324,16 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
 
   # if filter contains like: tags, sort.., then don't add pin content
   defp should_add_pin?(%{page: 1, tag: :all, sort: :desc_inserted} = filter) do
-    filter
-    |> Map.keys()
-    |> Enum.reject(fn x -> x in [:community, :tag, :sort, :page, :size] end)
-    |> case do
-      [] -> {:ok, :pass}
-      _ -> {:error, :pass}
-    end
+    {:ok, :pass}
   end
 
   defp should_add_pin?(_filter), do: {:error, :pass}
 
   defp concat_contents(%{total_count: 0}, normal_contents), do: normal_contents
 
-  defp concat_contents(pined_content, normal_contents) do
+  defp concat_contents(pinned_articles, normal_contents) do
     pind_entries =
-      pined_content
+      pinned_articles
       |> Map.get(:entries)
       |> Enum.map(&struct(&1, %{is_pinned: true}))
 

lib/groupher_server/cms/delegates/helper.ex

@@ -17,6 +17,7 @@ defmodule GroupherServer.CMS.Delegate.Helper do
   defp get_supported_mentions(_), do: @supported_emotions
 
   def mark_viewer_emotion_states(paged_contents, nil), do: paged_contents
+  def mark_viewer_emotion_states(paged_contents, nil, :comment), do: paged_contents
   def mark_viewer_emotion_states(%{entries: []} = paged_contents, _), do: paged_contents
 
   @doc """

lib/groupher_server/cms/repo.ex

@@ -53,6 +53,7 @@ defmodule GroupherServer.CMS.Repo do
     field(:views, :integer, default: 0)
 
     embeds_one(:meta, Embeds.ArticleMeta, on_replace: :update)
+    embeds_one(:emotions, Embeds.ArticleEmotion, on_replace: :update)
 
     belongs_to(:author, Author)
     has_many(:community_flags, {"repos_communities_flags", RepoCommunityFlag})

lib/groupher_server_web/schema/cms/cms_queries.ex

@@ -79,10 +79,6 @@ defmodule GroupherServerWeb.Schema.CMS.Queries do
       resolve(&R.CMS.cheatsheet/3)
     end
 
-    article_queries(:post)
-    article_queries(:job)
-    article_queries(:repo)
-
     article_reacted_users_query(:upvot, &R.CMS.upvoted_users/3)
     article_reacted_users_query(:collect, &R.CMS.collected_users/3)
 
@@ -207,5 +203,9 @@ defmodule GroupherServerWeb.Schema.CMS.Queries do
 
       resolve(&R.CMS.search_items/3)
     end
+
+    article_queries(:post)
+    article_queries(:job)
+    article_queries(:repo)
   end
 end

priv/repo/migrations/20210510090556_add_emotions_to_repo.exs

@@ -0,0 +1,9 @@
+defmodule GroupherServer.Repo.Migrations.AddEmotionsToRepo do
+  use Ecto.Migration
+
+  def change do
+    alter table(:cms_repos) do
+      add(:emotions, :map)
+    end
+  end
+end

test/groupher_server/cms/comments/post_comment_replies_test.exs

@@ -160,7 +160,7 @@ defmodule GroupherServer.Test.CMS.Comments.PostCommentReplies do
   end
 
   describe "[paged article comment replies]" do
-    @tag :wip
+    @tag :wip3
     test "can get paged replies of a parent comment", ~m(post user)a do
       {:ok, parent_comment} = CMS.create_article_comment(:post, post.id, "parent_conent", user)
       {:ok, paged_replies} = CMS.list_comment_replies(parent_comment.id, %{page: 1, size: 20})

test/groupher_server/cms/comments/post_comment_test.exs

@@ -435,7 +435,7 @@ defmodule GroupherServer.Test.CMS.Comments.PostComment do
       assert paged_comments.total_count == total_count
     end
 
-    @tag :wip
+    @tag :wip3
     test "paged article comments should not contains folded and repoted comments",
          ~m(user post)a do
       total_count = 15

test/groupher_server/cms/post_test.exs

@@ -18,6 +18,7 @@ defmodule GroupherServer.Test.CMS.Post do
   describe "[cms post curd]" do
     alias CMS.{Author, Community}
 
+    @tag :wip3
     test "can create post with valid attrs", ~m(user community post_attrs)a do
       assert {:error, _} = ORM.find_by(Author, user_id: user.id)
 

test/groupher_server/cms/repo_test.exs

@@ -17,7 +17,7 @@ defmodule GroupherServer.Test.Repo do
 
   describe "[cms repo curd]" do
     alias CMS.{Author, Community}
-
+    @tag :wip3
     test "can create repo with valid attrs", ~m(user community repo_attrs)a do
       assert {:error, _} = ORM.find_by(Author, user_id: user.id)
 

test/groupher_server_web/mutation/cms/articles/job_emotion_test.exs

@@ -32,7 +32,7 @@ defmodule GroupherServer.Test.Mutation.Articles.JobEmotion do
       }
     }
     """
-    @tag :wip2
+    @tag :wip3
     test "login user can emotion to a pjob", ~m(community job_attrs user user_conn)a do
       {:ok, job} = CMS.create_content(community, :job, job_attrs, user)
 
@@ -58,7 +58,7 @@ defmodule GroupherServer.Test.Mutation.Articles.JobEmotion do
       }
     }
     """
-    @tag :wip2
+    @tag :wip3
     test "login user can undo emotion to a job", ~m(community job_attrs user owner_conn)a do
       {:ok, job} = CMS.create_content(community, :job, job_attrs, user)
       {:ok, _} = CMS.emotion_to_article(:job, job.id, :beer, user)