chore(article-comments): wip && clean up

Author: mydearxym

lib/groupher_server/cms/repo.ex

@@ -7,11 +7,12 @@ defmodule GroupherServer.CMS.Repo do
 
   import Ecto.Changeset
 
-  alias GroupherServer.CMS
+  alias GroupherServer.{CMS, Accounts}
 
   alias CMS.{
     Author,
     Embeds,
+    ArticleComment,
     Community,
     RepoContributor,
     RepoLang,
@@ -24,7 +25,7 @@ defmodule GroupherServer.CMS.Repo do
 
   @timestamps_opts [type: :utc_datetime_usec]
   @required_fields ~w(title owner_name owner_url repo_url desc readme star_count issues_count prs_count fork_count watch_count)a
-  @optional_fields ~w(original_community_id last_sync homepage_url release_tag license upvotes_count collects_count mark_delete)a
+  @optional_fields ~w(original_community_id last_sync homepage_url release_tag license upvotes_count collects_count mark_delete article_comments_count article_comments_participators_count)a
 
   @type t :: %Repo{}
   schema "cms_repos" do
@@ -73,6 +74,12 @@ defmodule GroupherServer.CMS.Repo do
 
     field(:last_sync, :utc_datetime)
 
+    has_many(:article_comments, {"articles_comments", ArticleComment})
+    field(:article_comments_count, :integer, default: 0)
+    field(:article_comments_participators_count, :integer, default: 0)
+    # 评论参与者，只保留最近 5 个
+    embeds_many(:article_comments_participators, Accounts.User, on_replace: :delete)
+
     many_to_many(
       :tags,
       Tag,

lib/groupher_server_web/schema/cms/cms_types.ex

@@ -178,6 +178,7 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
     field(:original_community, :community, resolve: dataloader(CMS, :original_community))
     field(:communities, list_of(:community), resolve: dataloader(CMS, :communities))
 
+    article_comments_fields()
     viewer_has_state_fields()
     # comments_count
     # comments_participators

priv/repo/migrations/20210516052616_add_comment_support_for_repo.exs

@@ -0,0 +1,11 @@
+defmodule GroupherServer.Repo.Migrations.AddCommentSupportForRepo do
+  use Ecto.Migration
+
+  def change do
+    alter table(:cms_repos) do
+      add(:article_comments_participators_count, :integer, default: 0)
+      add(:article_comments_count, :integer, default: 0)
+      add(:article_comments_participators, :map)
+    end
+  end
+end

test/groupher_server/accounts/achievement_test.exs

@@ -52,7 +52,6 @@ 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, :upvote)
@@ -77,7 +76,6 @@ 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, :upvote)

test/groupher_server/accounts/collect_folder_test.exs

@@ -22,7 +22,6 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
   end
 
   describe "[collect folder curd]" do
-    @tag :wip
     test "user can create collect folder", ~m(user)a do
       folder_title = "test folder"
 
@@ -35,23 +34,20 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert folder.meta |> Map.from_struct() |> Map.delete(:id) == @default_meta
     end
 
-    @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 :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 :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 +57,6 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert reason |> is_error?(:delete_no_empty_collect_folder)
     end
 
-    @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 +67,6 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert result.total_count == 2
     end
 
-    @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 +81,6 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert result.entries |> List.first() |> Map.get(:id) == folder.id
     end
 
-    @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 +93,6 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert result.total_count == 1
     end
 
-    @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 +104,6 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert result.total_count == 2
     end
 
-    @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 +119,6 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
   end
 
   describe "[add/remove from collect]" do
-    @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 +129,6 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert folder.collects |> List.first() |> Map.get(:post_id) == post.id
     end
 
-    @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 +137,6 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert reason |> is_error?(:already_collected_in_folder)
     end
 
-    @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 +147,6 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert article_collect_folder.id == folder.id
     end
 
-    @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 +162,6 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert result.total_count == 1
     end
 
-    @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)
@@ -191,7 +177,6 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert result.entries |> List.first() |> Map.get(:id) == post2.id
     end
 
-    @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)
@@ -210,7 +195,6 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert article_collect.id == folder2.id
     end
 
-    @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)
@@ -231,7 +215,6 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert result.total_count == 0
     end
 
-    @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)
 
@@ -248,7 +231,6 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert folder.meta.job_count == 1
     end
 
-    @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)
@@ -270,7 +252,6 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert not folder.meta.has_job
     end
 
-    @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)
@@ -291,7 +272,6 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
       assert collect_post.title == post.title
     end
 
-    @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/published_contents_test.exs

@@ -67,7 +67,6 @@ defmodule GroupherServer.Test.Accounts.PublishedContents do
       assert results.total_count == 0
     end
 
-    @tag :wip
     test "user can get paged published jobs", ~m(user user2 community community2)a do
       pub_jobs =
         Enum.reduce(1..@publish_count, [], fn _, acc ->

test/groupher_server/accounts/reacted_articles_test.exs

@@ -14,7 +14,6 @@ defmodule GroupherServer.Test.Accounts.ReactedContents do
   end
 
   describe "[user upvoted articles]" do
-    @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 +32,6 @@ defmodule GroupherServer.Test.Accounts.ReactedContents do
       assert [:id, :thread, :title, :upvotes_count] == article_job |> Map.keys()
     end
 
-    @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 +44,6 @@ defmodule GroupherServer.Test.Accounts.ReactedContents do
       assert 1 == articles |> Map.get(:total_count)
     end
 
-    @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,6 @@ defmodule GroupherServer.Test.Accounts.Utils do
   @cache_pool :user_login
 
   describe "[get userid]" do
-    @tag :wip
     test "get_userid_and_cache should work" do
       {:ok, user} = db_insert(:user)
 

test/groupher_server/cms/abuse_reports/comment_report_test.exs

@@ -51,7 +51,6 @@ defmodule GroupherServer.Test.CMS.AbuseReports.CommentReport do
       assert List.last(report_cases).user.login == user2.login
     end
 
-    @tag :wip
     test "same user can not report a comment twice", ~m(user post)a do
       {:ok, comment} = CMS.create_article_comment(:post, post.id, "commment", user)
       {:ok, comment} = CMS.report_article_comment(comment.id, "reason", "attr", user)

test/groupher_server/cms/article_collect_test.exs

@@ -18,7 +18,6 @@ defmodule GroupherServer.Test.ArticleCollect do
   end
 
   describe "[cms post collect]" do
-    @tag :wip
     test "post can be collect && collects_count should inc by 1",
          ~m(user user2 community post_attrs)a do
       {:ok, post} = CMS.create_article(community, :post, post_attrs, user)
@@ -35,7 +34,6 @@ defmodule GroupherServer.Test.ArticleCollect do
       assert article.collects_count == 2
     end
 
-    @tag :wip
     test "post can be undo collect && collects_count should dec by 1",
          ~m(user community post_attrs)a do
       {:ok, post} = CMS.create_article(community, :post, post_attrs, user)
@@ -50,7 +48,6 @@ defmodule GroupherServer.Test.ArticleCollect do
       assert article.collects_count == 0
     end
 
-    @tag :wip
     test "can get collect_users", ~m(user user2 community post_attrs)a do
       {:ok, post} = CMS.create_article(community, :post, post_attrs, user)
 
@@ -100,7 +97,6 @@ defmodule GroupherServer.Test.ArticleCollect do
   end
 
   describe "[cms job collect]" do
-    @tag :wip
     test "job can be collect && collects_count should inc by 1",
          ~m(user user2 community job_attrs)a do
       {:ok, job} = CMS.create_article(community, :job, job_attrs, user)
@@ -116,7 +112,6 @@ defmodule GroupherServer.Test.ArticleCollect do
       assert article.collects_count == 2
     end
 
-    @tag :wip
     test "job can be undo collect && collects_count should dec by 1",
          ~m(user community job_attrs)a do
       {:ok, job} = CMS.create_article(community, :job, job_attrs, user)
@@ -132,7 +127,6 @@ defmodule GroupherServer.Test.ArticleCollect do
       assert article.collects_count == 0
     end
 
-    @tag :wip
     test "can get collect_users", ~m(user user2 community job_attrs)a do
       {:ok, job} = CMS.create_article(community, :job, job_attrs, user)