fix(reaction-replate): test errors

Author: mydearxym

lib/groupher_server/cms/delegates/article_comment.ex

@@ -496,14 +496,11 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
 
       cur_count = Repo.aggregate(count_query, :count)
 
+      # dec 是 comment 还没有删除的时候的操作，和 inc 不同
+      # 因为 dec 操作如果放在 delete 后面，那么 update 会失败
       case opt do
-        :inc ->
-          new_count = Enum.max([0, cur_count])
-          ORM.update(article, %{article_comments_count: new_count + 1})
-
-        :dec ->
-          new_count = Enum.max([1, cur_count])
-          ORM.update(article, %{article_comments_count: new_count - 1})
+        :inc -> ORM.update(article, %{article_comments_count: cur_count})
+        :dec -> ORM.update(article, %{article_comments_count: Enum.max([1, cur_count]) - 1})
       end
     end
   end

lib/groupher_server/cms/utils/matcher.ex

@@ -15,11 +15,6 @@ defmodule GroupherServer.CMS.Utils.Matcher do
     JobViewer,
     RepoViewer,
     # reactions
-    PostFavorite,
-    JobFavorite,
-    RepoFavorite,
-    PostStar,
-    JobStar,
     # comments
     PostComment,
     # commtnes reaction
@@ -39,10 +34,6 @@ defmodule GroupherServer.CMS.Utils.Matcher do
   def match_action(:post, :self),
     do: {:ok, %{target: Post, reactor: Post, preload: :author, viewer: PostViewer}}
 
-  def match_action(:post, :favorite),
-    do: {:ok, %{target: Post, reactor: PostFavorite, preload: :user, preload_right: :post}}
-
-  def match_action(:post, :star), do: {:ok, %{target: Post, reactor: PostStar, preload: :user}}
   def match_action(:post, :tag), do: {:ok, %{target: Post, reactor: Tag}}
   # NOTE: the tech, radar, share, city thread also use common tag
   def match_action(:radar, :tag), do: {:ok, %{target: Post, reactor: Tag}}
@@ -68,10 +59,6 @@ defmodule GroupherServer.CMS.Utils.Matcher do
   def match_action(:job, :community),
     do: {:ok, %{target: Job, reactor: Community, flag: JobCommunityFlag}}
 
-  def match_action(:job, :favorite),
-    do: {:ok, %{target: Job, reactor: JobFavorite, preload: :user}}
-
-  def match_action(:job, :star), do: {:ok, %{target: Job, reactor: JobStar, preload: :user}}
   def match_action(:job, :tag), do: {:ok, %{target: Job, reactor: Tag}}
 
   #########################################
@@ -85,9 +72,6 @@ defmodule GroupherServer.CMS.Utils.Matcher do
 
   def match_action(:repo, :tag), do: {:ok, %{target: Repo, reactor: Tag}}
 
-  def match_action(:repo, :favorite),
-    do: {:ok, %{target: Repo, reactor: RepoFavorite, preload: :user}}
-
   # dynamic where query match
   def dynamic_where(thread, id) do
     case thread do

lib/groupher_server/statistics/delegates/contribute.ex

@@ -70,11 +70,8 @@ defmodule GroupherServer.Statistics.Delegate.Contribute do
     scope = Cache.get_scope(:community_contributes, id)
 
     case Cache.get(:common, scope) do
-      {:ok, result} ->
-        {:ok, result}
-
-      {:error, _} ->
-        get_contributes_then_cache(%Community{id: id})
+      {:ok, result} -> {:ok, result}
+      {:error, _} -> get_contributes_then_cache(%Community{id: id})
     end
   end
 
@@ -85,7 +82,7 @@ defmodule GroupherServer.Statistics.Delegate.Contribute do
     %Community{id: id}
     |> do_get_contributes()
     |> to_counts_digest(days: @community_contribute_days)
-    |> done_and_cache(:common, scope, expire: 60_000)
+    |> done_and_cache(:common, scope, expire_min: 10)
   end
 
   defp update_contribute_record(%UserContribute{} = contribute) do

lib/helper/utils/utils.ex

@@ -67,14 +67,21 @@ defmodule Helper.Utils do
   def done({n, nil}) when is_integer(n), do: {:ok, %{done: true}}
   def done(result), do: {:ok, result}
 
-  def done_and_cache(pool, result, scope, expire: expire_time) do
+  def done_and_cache(result, pool, scope, expire_sec: expire_sec) do
     with {:ok, res} <- done(result) do
-      Cache.put(pool, scope, res, expire: expire_time)
+      Cache.put(pool, scope, res, expire_sec: expire_sec)
       {:ok, res}
     end
   end
 
-  def done_and_cache(pool, result, scope) do
+  def done_and_cache(result, pool, scope, expire_min: expire_min) do
+    with {:ok, res} <- done(result) do
+      Cache.put(pool, scope, res, expire_min: expire_min)
+      {:ok, res}
+    end
+  end
+
+  def done_and_cache(result, pool, scope) do
     with {:ok, res} <- done(result) do
       Cache.put(pool, scope, res)
       {:ok, res}

test/groupher_server/accounts/achievement_test.exs

@@ -51,10 +51,11 @@ defmodule GroupherServer.Test.Accounts.Achievement do
   describe "[Accounts Achievement funtion]" do
     alias Accounts.Achievement
 
+    @tag :wip
     test "Accounts.achieve should inc / dec achievement by parts", ~m(user)a do
       user |> Accounts.achieve(:inc, :follow)
-      user |> Accounts.achieve(:inc, :star)
-      user |> Accounts.achieve(:inc, :favorite)
+      user |> Accounts.achieve(:inc, :upvote)
+      user |> Accounts.achieve(:inc, :collect)
       {:ok, achievement} = Achievement |> ORM.find_by(user_id: user.id)
 
       assert achievement.followers_count == 1
@@ -65,8 +66,8 @@ defmodule GroupherServer.Test.Accounts.Achievement do
       assert achievement.reputation == reputation
 
       user |> Accounts.achieve(:dec, :follow)
-      user |> Accounts.achieve(:dec, :star)
-      user |> Accounts.achieve(:dec, :favorite)
+      user |> Accounts.achieve(:dec, :upvote)
+      user |> Accounts.achieve(:dec, :collect)
 
       {:ok, achievement} = Achievement |> ORM.find_by(user_id: user.id)
       assert achievement.followers_count == 0
@@ -75,10 +76,11 @@ defmodule GroupherServer.Test.Accounts.Achievement do
       assert achievement.reputation == 0
     end
 
+    @tag :wip
     test "Accounts.achieve can not minus count < 0", ~m(user)a do
       user |> Accounts.achieve(:dec, :follow)
-      user |> Accounts.achieve(:dec, :star)
-      user |> Accounts.achieve(:dec, :favorite)
+      user |> Accounts.achieve(:dec, :upvote)
+      user |> Accounts.achieve(:dec, :collect)
 
       {:ok, achievement} = Achievement |> ORM.find_by(user_id: user.id)
       assert achievement.followers_count == 0

test/groupher_server/accounts/collect_folder_test.exs

@@ -22,7 +22,7 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
   end
 
   describe "[collect folder curd]" do
-    @tag :wip3
+    @tag :wip
     test "user can create collect folder", ~m(user)a do
       folder_title = "test folder"
 
@@ -35,23 +35,23 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert folder.meta |> Map.from_struct() |> Map.delete(:id) == @default_meta
     end
 
-    @tag :wip3
+    @tag :wip
     test "user create dup collect folder fails", ~m(user)a do
       {:ok, _folder} = Accounts.create_collect_folder(%{title: "test folder"}, user)
       {:error, reason} = Accounts.create_collect_folder(%{title: "test folder"}, user)
 
       assert reason |> is_error?(:already_exsit)
     end
 
-    @tag :wip3
+    @tag :wip
     test "user can delete a empty collect folder", ~m(user)a do
       {:ok, folder} = Accounts.create_collect_folder(%{title: "test folder"}, user)
       {:ok, _} = Accounts.delete_collect_folder(folder.id)
 
       assert {:error, _} = ORM.find(CMS.ArticleCollect, folder.id)
     end
 
-    @tag :wip3
+    @tag :wip
     test "user can not delete a non-empty collect folder", ~m(post user)a do
       {:ok, folder} = Accounts.create_collect_folder(%{title: "test folder"}, user)
       {:ok, _folder} = Accounts.add_to_collect(:post, post.id, folder.id, user)
@@ -61,7 +61,7 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert reason |> is_error?(:delete_no_empty_collect_folder)
     end
 
-    @tag :wip2
+    @tag :wip
     test "user can get public collect-folder list", ~m(user)a do
       {:ok, _folder} = Accounts.create_collect_folder(%{title: "test folder"}, user)
       {:ok, _folder} = Accounts.create_collect_folder(%{title: "test folder2"}, user)
@@ -72,7 +72,7 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert result.total_count == 2
     end
 
-    @tag :wip3
+    @tag :wip
     test "user can get public collect-folder list by thread", ~m(user post)a do
       {:ok, folder} = Accounts.create_collect_folder(%{title: "test folder"}, user)
       {:ok, _folder} = Accounts.create_collect_folder(%{title: "test folder2"}, user)
@@ -87,7 +87,7 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert result.entries |> List.first() |> Map.get(:id) == folder.id
     end
 
-    @tag :wip3
+    @tag :wip
     test "user can not get private folder list of other user", ~m(user user2)a do
       {:ok, _folder} =
         Accounts.create_collect_folder(%{title: "test folder", private: true}, user2)
@@ -100,7 +100,7 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert result.total_count == 1
     end
 
-    @tag :wip3
+    @tag :wip
     test "collect creator can get both public and private folder list", ~m(user)a do
       {:ok, _folder} =
         Accounts.create_collect_folder(%{title: "test folder", private: true}, user)
@@ -112,7 +112,7 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert result.total_count == 2
     end
 
-    @tag :wip2
+    @tag :wip
     test "user can update a collect folder", ~m(user)a do
       {:ok, folder} = Accounts.create_collect_folder(%{title: "test folder", private: true}, user)
 
@@ -128,7 +128,7 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
   end
 
   describe "[add/remove from collect]" do
-    @tag :wip3
+    @tag :wip
     test "can add post to exsit colect-folder", ~m(user post)a do
       {:ok, folder} = Accounts.create_collect_folder(%{title: "test folder"}, user)
 
@@ -139,7 +139,7 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert folder.collects |> List.first() |> Map.get(:post_id) == post.id
     end
 
-    @tag :wip3
+    @tag :wip
     test "can not collect some article in one collect-folder", ~m(user post)a do
       {:ok, folder} = Accounts.create_collect_folder(%{title: "test folder"}, user)
       {:ok, folder} = Accounts.add_to_collect(:post, post.id, folder.id, user)
@@ -148,7 +148,7 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert reason |> is_error?(:already_collected_in_folder)
     end
 
-    @tag :wip3
+    @tag :wip
     test "colect-folder should in article_collect's meta info too", ~m(user post)a do
       {:ok, folder} = Accounts.create_collect_folder(%{title: "test folder"}, user)
       {:ok, folder} = Accounts.add_to_collect(:post, post.id, folder.id, user)
@@ -159,7 +159,7 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert article_collect_folder.id == folder.id
     end
 
-    @tag :wip3
+    @tag :wip
     test "one article collected in different collect-folder should only have one article-collect record",
          ~m(user post)a do
       {:ok, folder} = Accounts.create_collect_folder(%{title: "test folder"}, user)
@@ -175,7 +175,7 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert result.total_count == 1
     end
 
-    @tag :wip3
+    @tag :wip
     test "can remove post to exsit colect-folder", ~m(user post post2)a do
       {:ok, folder} = Accounts.create_collect_folder(%{title: "test folder"}, user)
       {:ok, _folder} = Accounts.add_to_collect(:post, post.id, folder.id, user)
@@ -190,7 +190,7 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert result.entries |> List.first() |> Map.get(:id) == post2.id
     end
 
-    @tag :wip3
+    @tag :wip
     test "can remove post to exsit colect-folder should update article collect meta",
          ~m(user post)a do
       {:ok, folder} = Accounts.create_collect_folder(%{title: "test folder"}, user)
@@ -209,7 +209,7 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert article_collect.id == folder2.id
     end
 
-    @tag :wip3
+    @tag :wip
     test "post belongs to other folder should keep article collect record",
          ~m(user post)a do
       {:ok, folder} = Accounts.create_collect_folder(%{title: "test folder"}, user)
@@ -230,7 +230,7 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert result.total_count == 0
     end
 
-    @tag :wip3
+    @tag :wip
     test "add post to exsit colect-folder should update meta", ~m(user post post2 job)a do
       {:ok, folder} = Accounts.create_collect_folder(%{title: "test folder"}, user)
 
@@ -247,7 +247,7 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert folder.meta.job_count == 1
     end
 
-    @tag :wip3
+    @tag :wip
     test "remove post to exsit colect-folder should update meta", ~m(user post post2 job)a do
       {:ok, folder} = Accounts.create_collect_folder(%{title: "test folder"}, user)
       {:ok, _folder} = Accounts.add_to_collect(:post, post.id, folder.id, user)
@@ -269,7 +269,7 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert not folder.meta.has_job
     end
 
-    @tag :wip3
+    @tag :wip
     test "can get articles of a collect folder", ~m(user post job)a do
       {:ok, folder} = Accounts.create_collect_folder(%{title: "test folder"}, user)
       {:ok, _folder} = Accounts.add_to_collect(:post, post.id, folder.id, user)
@@ -288,7 +288,7 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert collect_post.title == post.title
     end
 
-    @tag :wip3
+    @tag :wip
     test "can not get articles of a private collect folder if not owner",
          ~m(user user2 post job)a do
       {:ok, folder} = Accounts.create_collect_folder(%{title: "test folder", private: true}, user)

test/groupher_server/accounts/reacted_articles_test.exs

@@ -14,7 +14,7 @@ defmodule GroupherServer.Test.Accounts.ReactedContents do
   end
 
   describe "[user upvoted articles]" do
-    @tag :wip2
+    @tag :wip
     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)
@@ -33,7 +33,7 @@ defmodule GroupherServer.Test.Accounts.ReactedContents do
       assert [:id, :thread, :title, :upvotes_count] == article_job |> Map.keys()
     end
 
-    @tag :wip2
+    @tag :wip
     test "user can get paged upvoted posts by thread filter", ~m(user post job)a do
       {:ok, _} = CMS.upvote_article(:post, post.id, user)
       {:ok, _} = CMS.upvote_article(:job, job.id, user)
@@ -46,7 +46,7 @@ defmodule GroupherServer.Test.Accounts.ReactedContents do
       assert 1 == articles |> Map.get(:total_count)
     end
 
-    @tag :wip2
+    @tag :wip
     test "user can get paged upvoted jobs by thread filter", ~m(user post job)a do
       {:ok, _} = CMS.upvote_article(:post, post.id, user)
       {:ok, _} = CMS.upvote_article(:job, job.id, user)

test/groupher_server/accounts/utils_test.exs

@@ -8,7 +8,7 @@ defmodule GroupherServer.Test.Accounts.Utils do
   @cache_pool :user_login
 
   describe "[get userid]" do
-    @tag :wip2
+    @tag :wip
     test "get_userid_and_cache should work" do
       {:ok, user} = db_insert(:user)