refactor: wip

Author: mydearxym

lib/groupher_server/cms/delegates/article_collect.ex

@@ -40,7 +40,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleCollect do
         Accounts.achieve(article.author.user, :inc, :collect)
       end)
       |> Multi.run(:inc_article_collects_count, fn _, _ ->
-        update_article_reactions_count(info, article, :collect, :inc)
+        update_article_reactions_count(info, article, :collects_count, :inc)
       end)
       |> Multi.run(:update_article_reaction_user_list, fn _, _ ->
         update_article_reaction_user_list(:collect, article, user_id, :add)
@@ -79,7 +79,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleCollect do
         Accounts.achieve(article.author.user, :dec, :collect)
       end)
       |> Multi.run(:inc_article_collects_count, fn _, _ ->
-        update_article_reactions_count(info, article, :collect, :dec)
+        update_article_reactions_count(info, article, :collects_count, :dec)
       end)
       |> Multi.run(:update_article_reaction_user_list, fn _, _ ->
         update_article_reaction_user_list(:collect, article, user_id, :remove)

lib/groupher_server/cms/delegates/article_upvote.ex

@@ -33,7 +33,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleUpvote do
          {:ok, article} <- ORM.find(info.model, article_id, preload: [author: :user]) do
       Multi.new()
       |> Multi.run(:inc_article_upvotes_count, fn _, _ ->
-        update_article_reactions_count(info, article, :upvote, :inc)
+        update_article_reactions_count(info, article, :upvotes_count, :inc)
       end)
       |> Multi.run(:update_article_reaction_user_list, fn _, _ ->
         update_article_reaction_user_list(:upvot, article, user_id, :add)
@@ -61,7 +61,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleUpvote do
          {:ok, article} <- ORM.find(info.model, article_id) do
       Multi.new()
       |> Multi.run(:inc_article_upvotes_count, fn _, _ ->
-        update_article_reactions_count(info, article, :upvote, :dec)
+        update_article_reactions_count(info, article, :upvotes_count, :dec)
       end)
       |> Multi.run(:update_article_reaction_user_list, fn _, _ ->
         update_article_reaction_user_list(:upvot, article, user_id, :remove)

lib/groupher_server/cms/delegates/helper.ex

@@ -114,8 +114,8 @@ defmodule GroupherServer.CMS.Delegate.Helper do
   def update_article_reactions_count(info, article, field, opt) do
     schema =
       case field do
-        :upvote -> ArticleUpvote
-        :collect -> ArticleCollect
+        :upvotes_count -> ArticleUpvote
+        :collects_count -> ArticleCollect
       end
 
     count_query = from(u in schema, where: field(u, ^info.foreign_key) == ^article.id)

test/groupher_server/cms/abuse_reports/post_report_test.exs

@@ -79,7 +79,6 @@ defmodule GroupherServer.Test.CMS.AbuseReports.PostReport do
       assert user.id not in post.meta.reported_user_ids
     end
 
-    @tag :wip2
     test "can undo a report with other user report it too",
          ~m(community user user2 post_attrs)a do
       {:ok, post} = CMS.create_content(community, :post, post_attrs, user)

test/groupher_server/cms/upvotes/job_upvote_test.exs

@@ -27,6 +27,7 @@ defmodule GroupherServer.Test.Upvotes.JobUpvote do
       assert article.upvotes_count == 2
     end
 
+    @tag :wip2
     test "job can be undo upvote && upvotes_count should dec by 1",
          ~m(user user2 community job_attrs)a do
       {:ok, job} = CMS.create_content(community, :job, job_attrs, user)

test/groupher_server_web/query/cms/flags/posts_flags_test.exs

@@ -89,7 +89,6 @@ defmodule GroupherServer.Test.Query.Flags.PostsFlags do
       assert results["entries"] |> Enum.any?(&(&1["id"] !== random_id))
     end
 
-    @tag :wip2
     test "if have trashed posts, the trashed posts should not appears in result",
          ~m(guest_conn community)a do
       variables = %{filter: %{community: community.raw}}