refactor(abuse-report): clean up

Author: mydearxym

lib/groupher_server/cms/embeds/article_comment_meta.ex

@@ -7,14 +7,15 @@ defmodule GroupherServer.CMS.Embeds.ArticleCommentMeta do
 
   import Ecto.Changeset
 
-  @optional_fields ~w(is_article_author_upvoted is_solution report_count is_reply_to_others reported_count)a
+  @optional_fields ~w(is_article_author_upvoted is_solution report_count is_reply_to_others reported_count reported_user_ids)a
 
   @default_meta %{
     is_article_author_upvoted: false,
     is_solution: false,
     is_reply_to_others: false,
     report_count: 0,
     upvoted_user_ids: [],
+    reported_user_ids: [],
     reported_count: 0
   }
 
@@ -30,6 +31,7 @@ defmodule GroupherServer.CMS.Embeds.ArticleCommentMeta do
     field(:report_count, :integer, default: 0)
 
     field(:upvoted_user_ids, {:array, :integer}, default: [])
+    field(:reported_user_ids, {:array, :integer}, default: [])
     field(:reported_count, :integer, default: 0)
   end
 

test/groupher_server/cms/abuse_reports/account_report_test.exs

@@ -23,7 +23,6 @@ defmodule GroupherServer.Test.CMS.AbuseReports.AccountReport do
   end
 
   describe "[account report/unreport]" do
-    @tag :wip3
     # test "list article reports should work", ~m(community user user2 post_attrs)a do
     #   {:ok, post} = CMS.create_content(community, :post, post_attrs, user)
     #   {:ok, _report} = CMS.report_article(:post, post.id, "reason", "attr_info", user)
@@ -37,7 +36,6 @@ defmodule GroupherServer.Test.CMS.AbuseReports.AccountReport do
     #   assert report.article.thread == :post
     # end
 
-    @tag :wip3
     test "report an account should have a abuse report record", ~m(user user2)a do
       {:ok, _report} = CMS.report_account(user.id, "reason", "attr_info", user2)
 
@@ -56,7 +54,6 @@ defmodule GroupherServer.Test.CMS.AbuseReports.AccountReport do
       assert user.meta.reported_count == 1
     end
 
-    @tag :wip2
     test "can undo a report", ~m(user user2)a do
       {:ok, _report} = CMS.report_account(user.id, "reason", "attr_info", user2)
       {:ok, user} = ORM.find(User, user.id)
@@ -72,7 +69,6 @@ defmodule GroupherServer.Test.CMS.AbuseReports.AccountReport do
       assert user2.id not in user.meta.reported_user_ids
     end
 
-    @tag :wip2
     test "can undo a existed report", ~m(user user2 user3)a do
       {:ok, _report} = CMS.report_account(user.id, "reason", "attr_info", user2)
       {:ok, _report} = CMS.report_account(user.id, "reason", "attr_info", user3)
@@ -87,7 +83,6 @@ defmodule GroupherServer.Test.CMS.AbuseReports.AccountReport do
       assert user3.id in user.meta.reported_user_ids
     end
 
-    @tag :wip3
     test "can undo a report with other user report it too", ~m(user user2 user3)a do
       {:ok, _report} = CMS.report_account(user.id, "reason", "attr_info", user2)
       {:ok, _report} = CMS.report_account(user.id, "reason", "attr_info", user3)
@@ -112,7 +107,6 @@ defmodule GroupherServer.Test.CMS.AbuseReports.AccountReport do
       assert Enum.any?(report.report_cases, &(&1.user.login == user3.login))
     end
 
-    @tag :wip3
     test "different user report a account should have same report with different report cases",
          ~m(user user2 user3)a do
       {:ok, _report} = CMS.report_account(user.id, "reason", "attr_info", user2)
@@ -132,7 +126,6 @@ defmodule GroupherServer.Test.CMS.AbuseReports.AccountReport do
       assert List.last(report_cases).user.login == user3.login
     end
 
-    @tag :wip3
     test "same user can not report a account twice", ~m(user user2)a do
       {:ok, _report} = CMS.report_account(user.id, "reason", "attr_info", user2)
       assert {:error, _report} = CMS.report_account(user.id, "reason", "attr_info", user2)

test/groupher_server/cms/abuse_reports/comment_report_test.exs

@@ -15,7 +15,6 @@ defmodule GroupherServer.Test.CMS.AbuseReports.CommentReport do
   end
 
   describe "[article comment report/unreport]" do
-    @tag :wip3
     test "report a comment should have a abuse report record", ~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)
@@ -32,7 +31,6 @@ defmodule GroupherServer.Test.CMS.AbuseReports.CommentReport do
       assert List.first(report_cases).user.login == user.login
     end
 
-    @tag :wip3
     test "different user report a comment should have same report with different report cases",
          ~m(user user2 post)a do
       {:ok, comment} = CMS.create_article_comment(:post, post.id, "commment", user)

test/groupher_server/cms/abuse_reports/job_report_test.exs

@@ -17,7 +17,6 @@ defmodule GroupherServer.Test.CMS.AbuseReports.JobReport do
   end
 
   describe "[article job report/unreport]" do
-    @tag :wip3
     test "list article reports should work", ~m(community user user2 job_attrs)a do
       {:ok, job} = CMS.create_content(community, :job, job_attrs, user)
       {:ok, _report} = CMS.report_article(:job, job.id, "reason", "attr_info", user)
@@ -31,7 +30,6 @@ defmodule GroupherServer.Test.CMS.AbuseReports.JobReport do
       assert report.article.thread == :job
     end
 
-    @tag :wip3
     test "report a job should have a abuse report record", ~m(community user job_attrs)a do
       {:ok, job} = CMS.create_content(community, :job, job_attrs, user)
       {:ok, _report} = CMS.report_article(:job, job.id, "reason", "attr_info", user)
@@ -52,7 +50,6 @@ defmodule GroupherServer.Test.CMS.AbuseReports.JobReport do
       assert user.id in job.meta.reported_user_ids
     end
 
-    @tag :wip3
     test "can undo a report", ~m(community user job_attrs)a do
       {:ok, job} = CMS.create_content(community, :job, job_attrs, user)
       {:ok, _report} = CMS.report_article(:job, job.id, "reason", "attr_info", user)
@@ -66,7 +63,6 @@ defmodule GroupherServer.Test.CMS.AbuseReports.JobReport do
       assert user.id not in job.meta.reported_user_ids
     end
 
-    @tag :wip2
     test "can undo a existed report", ~m(community user user2 job_attrs)a do
       {:ok, job} = CMS.create_content(community, :job, job_attrs, user)
       {:ok, _report} = CMS.report_article(:job, job.id, "reason", "attr_info", user)
@@ -83,7 +79,6 @@ defmodule GroupherServer.Test.CMS.AbuseReports.JobReport do
       assert user.id not in job.meta.reported_user_ids
     end
 
-    @tag :wip3
     test "can undo a report with other user report it too",
          ~m(community user user2 job_attrs)a do
       {:ok, job} = CMS.create_content(community, :job, job_attrs, user)
@@ -110,7 +105,6 @@ defmodule GroupherServer.Test.CMS.AbuseReports.JobReport do
       assert Enum.any?(report.report_cases, &(&1.user.login == user2.login))
     end
 
-    @tag :wip3
     test "different user report a comment should have same report with different report cases",
          ~m(community user user2 job_attrs)a do
       {:ok, job} = CMS.create_content(community, :job, job_attrs, user)
@@ -132,7 +126,6 @@ defmodule GroupherServer.Test.CMS.AbuseReports.JobReport do
       assert List.last(report_cases).user.login == user2.login
     end
 
-    @tag :wip3
     test "same user can not report a comment twice", ~m(community job_attrs user)a do
       {:ok, job} = CMS.create_content(community, :job, job_attrs, user)
 

test/groupher_server/cms/abuse_reports/post_report_test.exs

@@ -17,7 +17,6 @@ defmodule GroupherServer.Test.CMS.AbuseReports.PostReport do
   end
 
   describe "[article post report/unreport]" do
-    @tag :wip3
     test "list article reports should work", ~m(community user user2 post_attrs)a do
       {:ok, post} = CMS.create_content(community, :post, post_attrs, user)
       {:ok, _report} = CMS.report_article(:post, post.id, "reason", "attr_info", user)
@@ -31,7 +30,6 @@ defmodule GroupherServer.Test.CMS.AbuseReports.PostReport do
       assert report.article.thread == :post
     end
 
-    @tag :wip3
     test "report a post should have a abuse report record", ~m(community user post_attrs)a do
       {:ok, post} = CMS.create_content(community, :post, post_attrs, user)
       {:ok, _report} = CMS.report_article(:post, post.id, "reason", "attr_info", user)
@@ -52,7 +50,6 @@ defmodule GroupherServer.Test.CMS.AbuseReports.PostReport do
       assert user.id in post.meta.reported_user_ids
     end
 
-    @tag :wip3
     test "can undo a report", ~m(community user post_attrs)a do
       {:ok, post} = CMS.create_content(community, :post, post_attrs, user)
       {:ok, _report} = CMS.report_article(:post, post.id, "reason", "attr_info", user)
@@ -66,7 +63,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 existed report", ~m(community user user2 post_attrs)a do
       {:ok, post} = CMS.create_content(community, :post, post_attrs, user)
       {:ok, _report} = CMS.report_article(:post, post.id, "reason", "attr_info", user)
@@ -83,7 +79,6 @@ defmodule GroupherServer.Test.CMS.AbuseReports.PostReport do
       assert user.id not in post.meta.reported_user_ids
     end
 
-    @tag :wip3
     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)
@@ -110,7 +105,6 @@ defmodule GroupherServer.Test.CMS.AbuseReports.PostReport do
       assert Enum.any?(report.report_cases, &(&1.user.login == user2.login))
     end
 
-    @tag :wip3
     test "different user report a comment should have same report with different report cases",
          ~m(community user user2 post_attrs)a do
       {:ok, post} = CMS.create_content(community, :post, post_attrs, user)
@@ -132,7 +126,6 @@ defmodule GroupherServer.Test.CMS.AbuseReports.PostReport do
       assert List.last(report_cases).user.login == user2.login
     end
 
-    @tag :wip3
     test "same user can not report a comment twice", ~m(community post_attrs user)a do
       {:ok, post} = CMS.create_content(community, :post, post_attrs, user)
 

test/groupher_server/cms/comments/job_comment_emotions_test.exs

@@ -21,7 +21,6 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentEmotions do
   end
 
   describe "[emotion in paged article comment]" do
-    @tag :wip3
     test "login user should got viewer has emotioned status", ~m(job user)a do
       total_count = 0
       page_number = 10
@@ -76,7 +75,6 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentEmotions do
       assert @default_emotions == emotions
     end
 
-    @tag :wip3
     test "can make emotion to comment", ~m(job user user2)a do
       parent_content = "parent comment"
       {:ok, parent_comment} = CMS.create_article_comment(:job, job.id, parent_content, user)
@@ -91,7 +89,6 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentEmotions do
       assert user_exist_in?(user2, emotions.latest_downvote_users)
     end
 
-    @tag :wip3
     test "can undo emotion to comment", ~m(job user user2)a do
       parent_content = "parent comment"
       {:ok, parent_comment} = CMS.create_article_comment(:job, job.id, parent_content, user)
@@ -114,7 +111,6 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentEmotions do
       assert not user_exist_in?(user2, emotions.latest_downvote_users)
     end
 
-    @tag :wip3
     test "same user make same emotion to same comment.", ~m(job user)a do
       parent_content = "parent comment"
       {:ok, parent_comment} = CMS.create_article_comment(:job, job.id, parent_content, user)
@@ -128,7 +124,6 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentEmotions do
       assert user_exist_in?(user, parent_comment.emotions.latest_downvote_users)
     end
 
-    @tag :wip3
     test "same user same emotion to same comment only have one user_emotion record",
          ~m(job user)a do
       parent_content = "parent comment"
@@ -152,7 +147,6 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentEmotions do
       assert record.heart
     end
 
-    @tag :wip3
     test "different user can make same emotions on same comment", ~m(job user user2 user3)a do
       {:ok, parent_comment} = CMS.create_article_comment(:job, job.id, "parent comment", user)
 

test/groupher_server/cms/comments/job_comment_replies_test.exs

@@ -33,7 +33,6 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentReplies do
       assert exist_in?(replyed_comment, parent_comment.replies)
     end
 
-    @tag :wip3
     test "deleted comment can not be reply", ~m(job user user2)a do
       parent_content = "parent comment"
       reply_content = "reply comment"
@@ -64,7 +63,6 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentReplies do
       assert exist_in?(replyed_comment_2, parent_comment.replies)
     end
 
-    @tag :wip3
     test "reply to reply inside a comment should belong same parent comment",
          ~m(job user user2)a do
       {:ok, parent_comment} = CMS.create_article_comment(:job, job.id, "parent comment", user)
@@ -90,7 +88,6 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentReplies do
       assert replyed_comment_3.reply_to_id == replyed_comment_2.id
     end
 
-    @tag :wip3
     test "reply to reply inside a comment should have is_reply_to_others flag in meta",
          ~m(job user user2)a do
       {:ok, parent_comment} = CMS.create_article_comment(:job, job.id, "parent comment", user)
@@ -110,7 +107,6 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentReplies do
       assert replyed_comment_3.meta.is_reply_to_others
     end
 
-    @tag :wip3
     test "comment replies only contains @max_parent_replies_count replies", ~m(job user)a do
       total_reply_count = @max_parent_replies_count + 1
 

test/groupher_server/cms/comments/job_comment_test.exs

@@ -39,7 +39,6 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do
       assert comment.meta |> Map.from_struct() |> Map.delete(:id) == @default_comment_meta
     end
 
-    @tag :wip3
     test "comment can be updated", ~m(job user)a do
       {:ok, comment} = CMS.create_article_comment(:job, job.id, "job comment", user)
 
@@ -130,7 +129,6 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do
       assert comment.meta.is_article_author_upvoted
     end
 
-    @tag :wip3
     test "user upvote job comment will add id to upvoted_user_ids", ~m(job user)a do
       comment = "job_comment"
       {:ok, comment} = CMS.create_article_comment(:job, job.id, comment, user)
@@ -139,7 +137,6 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do
       assert user.id in comment.meta.upvoted_user_ids
     end
 
-    @tag :wip3
     test "user undo upvote job comment will remove id from upvoted_user_ids",
          ~m(job user user2)a do
       comment = "job_comment"
@@ -289,7 +286,6 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do
     #   {:ok, comment} = ORM.find(ArticleComment, comment.id)
     # end
 
-    @tag :wip3
     test "can undo a report with other user report it too",
          ~m(user user2 job)a do
       {:ok, comment} = CMS.create_article_comment(:job, job.id, "commment", user)
@@ -317,7 +313,6 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do
       assert Enum.any?(report.report_cases, &(&1.user.login == user2.login))
     end
 
-    @tag :wip3
     test "report user < @report_threshold_for_fold will not fold comment", ~m(user job)a do
       {:ok, comment} = CMS.create_article_comment(:job, job.id, "commment", user)
 
@@ -453,7 +448,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do
       assert paged_comments.total_count == total_count
     end
 
-    @tag :wip3
+    @tag :wip2
     test "paged article comments should not contains folded and repoted comments",
          ~m(user job)a do
       total_count = 15
@@ -471,32 +466,20 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do
       random_comment_2 = all_comments |> Enum.at(1)
       random_comment_3 = all_comments |> Enum.at(3)
 
-      random_comment_4 = all_comments |> Enum.at(2)
-      random_comment_5 = all_comments |> Enum.at(4)
-      random_comment_6 = all_comments |> Enum.at(8)
-
       {:ok, _comment} = CMS.fold_article_comment(random_comment_1.id, user)
       {:ok, _comment} = CMS.fold_article_comment(random_comment_2.id, user)
       {:ok, _comment} = CMS.fold_article_comment(random_comment_3.id, user)
 
-      {:ok, _comment} = CMS.report_article_comment(random_comment_4.id, "reason", "attr", user)
-      {:ok, _comment} = CMS.report_article_comment(random_comment_5.id, "reason", "attr", user)
-      {:ok, _comment} = CMS.report_article_comment(random_comment_6.id, "reason", "attr", user)
-
       {:ok, paged_comments} =
         CMS.list_article_comments(:job, job.id, %{page: page_number, size: page_size}, :replies)
 
       assert not exist_in?(random_comment_1, paged_comments.entries)
       assert not exist_in?(random_comment_2, paged_comments.entries)
       assert not exist_in?(random_comment_3, paged_comments.entries)
 
-      assert not exist_in?(random_comment_4, paged_comments.entries)
-      assert not exist_in?(random_comment_5, paged_comments.entries)
-      assert not exist_in?(random_comment_6, paged_comments.entries)
-
       assert page_number == paged_comments.page_number
       assert page_size == paged_comments.page_size
-      assert total_count - 6 == paged_comments.total_count
+      assert total_count - 3 == paged_comments.total_count
     end
 
     @tag :wip
@@ -531,7 +514,6 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do
   end
 
   describe "[article comment delete]" do
-    @tag :wip3
     test "delete comment still exsit in paged list and content is gone", ~m(user job)a do
       total_count = 10
       page_number = 1
@@ -556,7 +538,6 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do
       assert deleted_comment.body_html == @delete_hint
     end
 
-    @tag :wip3
     test "delete comment still update article's comments_count field", ~m(user job)a do
       {:ok, _comment} = CMS.create_article_comment(:job, job.id, "commment", user)
       {:ok, _comment} = CMS.create_article_comment(:job, job.id, "commment", user)
@@ -574,7 +555,6 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do
       assert job.article_comments_count == 4
     end
 
-    @tag :wip3
     test "delete comment still delete pined record if needed", ~m(user job)a do
       total_count = 10