refactor(abuse-report): wip

Author: mydearxym

lib/groupher_server/cms/cms.ex

@@ -165,7 +165,7 @@ defmodule GroupherServer.CMS do
   defdelegate undo_report_article(thread, article_id, user), to: AbuseReport
   defdelegate list_reports(type, content_id, filter), to: AbuseReport
   defdelegate report_article_comment(comment_id, reason, attr, user), to: ArticleCommentAction
-  defdelegate unreport_article_comment(comment_id, user), to: ArticleCommentAction
+  defdelegate undo_report_article_comment(comment_id, user), to: AbuseReport
 
   # Passport CURD
   defdelegate stamp_passport(rules, user), to: PassportCURD

lib/groupher_server/cms/delegates/abuse_report.ex

@@ -49,6 +49,10 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
     end
   end
 
+  def undo_report_article_comment(comment_id, %User{} = user) do
+    undo_report_article(:article_comment, comment_id, user)
+  end
+
   @doc """
   undo report article content
   """

lib/groupher_server/cms/delegates/article_comment_action.ex

@@ -122,13 +122,6 @@ defmodule GroupherServer.CMS.Delegate.ArticleCommentAction do
     end
   end
 
-  @doc "unreport a comment"
-  def unreport_article_comment(comment_id, %User{} = _user) do
-    with {:ok, comment} <- ORM.find(ArticleComment, comment_id) do
-      comment |> ORM.update(%{is_reported: false})
-    end
-  end
-
   @doc "reply to exsiting comment"
   def reply_article_comment(comment_id, content, %User{} = user) do
     with {:ok, target_comment} <-

test/groupher_server/cms/abuse_reports/comment_report_test.exs

@@ -15,7 +15,7 @@ defmodule GroupherServer.Test.CMS.AbuseReports.CommentReport do
   end
 
   describe "[article comment report/unreport]" do
-    @tag :wip2
+    @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)
@@ -30,7 +30,7 @@ defmodule GroupherServer.Test.CMS.AbuseReports.CommentReport do
       assert List.first(report_cases).user.login == user.login
     end
 
-    @tag :wip2
+    @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,7 @@ defmodule GroupherServer.Test.CMS.AbuseReports.JobReport do
   end
 
   describe "[article job report/unreport]" do
-    @tag :wip2
+    @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)
@@ -37,7 +37,7 @@ defmodule GroupherServer.Test.CMS.AbuseReports.JobReport do
       assert job.meta.reported_count == 1
     end
 
-    @tag :wip2
+    @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)
@@ -47,7 +47,7 @@ defmodule GroupherServer.Test.CMS.AbuseReports.JobReport do
       assert all_reports.total_count == 0
     end
 
-    @tag :wip2
+    @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)
@@ -72,7 +72,7 @@ defmodule GroupherServer.Test.CMS.AbuseReports.JobReport do
       assert Enum.any?(report.report_cases, &(&1.user.login == user2.login))
     end
 
-    @tag :wip2
+    @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)
@@ -93,7 +93,7 @@ defmodule GroupherServer.Test.CMS.AbuseReports.JobReport do
       assert List.last(report_cases).user.login == user2.login
     end
 
-    @tag :wip2
+    @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,7 @@ defmodule GroupherServer.Test.CMS.AbuseReports.PostReport do
   end
 
   describe "[article post report/unreport]" do
-    @tag :wip2
+    @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)
@@ -37,7 +37,7 @@ defmodule GroupherServer.Test.CMS.AbuseReports.PostReport do
       assert post.meta.reported_count == 1
     end
 
-    @tag :wip2
+    @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)
@@ -47,7 +47,7 @@ defmodule GroupherServer.Test.CMS.AbuseReports.PostReport do
       assert all_reports.total_count == 0
     end
 
-    @tag :wip2
+    @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)
@@ -72,7 +72,7 @@ defmodule GroupherServer.Test.CMS.AbuseReports.PostReport do
       assert Enum.any?(report.report_cases, &(&1.user.login == user2.login))
     end
 
-    @tag :wip2
+    @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)
@@ -93,7 +93,7 @@ defmodule GroupherServer.Test.CMS.AbuseReports.PostReport do
       assert List.last(report_cases).user.login == user2.login
     end
 
-    @tag :wip2
+    @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,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentEmotions do
   end
 
   describe "[emotion in paged article comment]" do
-    @tag :wip2
+    @tag :wip3
     test "login user should got viewer has emotioned status", ~m(job user)a do
       total_count = 0
       page_number = 10
@@ -76,7 +76,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentEmotions do
       assert @default_emotions == emotions
     end
 
-    @tag :wip2
+    @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 +91,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentEmotions do
       assert user_exist_in?(user2, emotions.latest_downvote_users)
     end
 
-    @tag :wip2
+    @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 +114,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentEmotions do
       assert not user_exist_in?(user2, emotions.latest_downvote_users)
     end
 
-    @tag :wip2
+    @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 +128,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentEmotions do
       assert user_exist_in?(user, parent_comment.emotions.latest_downvote_users)
     end
 
-    @tag :wip2
+    @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 +152,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentEmotions do
       assert record.heart
     end
 
-    @tag :wip2
+    @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,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentReplies do
       assert exist_in?(replyed_comment, parent_comment.replies)
     end
 
-    @tag :wip2
+    @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 +64,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentReplies do
       assert exist_in?(replyed_comment_2, parent_comment.replies)
     end
 
-    @tag :wip2
+    @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 +90,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentReplies do
       assert replyed_comment_3.reply_to_id == replyed_comment_2.id
     end
 
-    @tag :wip2
+    @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 +110,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentReplies do
       assert replyed_comment_3.meta.is_reply_to_others
     end
 
-    @tag :wip2
+    @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,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do
       assert comment.meta |> Map.from_struct() |> Map.delete(:id) == @default_comment_meta
     end
 
-    @tag :wip2
+    @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 +130,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do
       assert comment.meta.is_article_author_upvoted
     end
 
-    @tag :wip2
+    @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 +139,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do
       assert user.id in comment.meta.upvoted_user_ids
     end
 
-    @tag :wip2
+    @tag :wip3
     test "user undo upvote job comment will remove id from upvoted_user_ids",
          ~m(job user user2)a do
       comment = "job_comment"
@@ -290,12 +290,38 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do
 
       assert comment.is_reported
 
-      {:ok, _comment} = CMS.unreport_article_comment(comment.id, user)
+      {:ok, _comment} = CMS.undo_report_article_comment(comment.id, user)
       {:ok, comment} = ORM.find(ArticleComment, comment.id)
       assert not comment.is_reported
     end
 
-    @tag :wip
+    @tag :wip2
+    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)
+
+      {:ok, _comment} = CMS.report_article_comment(comment.id, "reason", "attr", user)
+      {:ok, _comment} = CMS.report_article_comment(comment.id, "reason", "attr", user2)
+
+      {:ok, all_reports} = CMS.list_reports(:article_comment, comment.id, %{page: 1, size: 20})
+      assert all_reports.total_count == 1
+
+      report = all_reports.entries |> List.first()
+      assert report.report_cases |> length == 2
+      assert Enum.any?(report.report_cases, &(&1.user.login == user.login))
+      assert Enum.any?(report.report_cases, &(&1.user.login == user2.login))
+
+      {:ok, _report} = CMS.undo_report_article(:article_comment, comment.id, user)
+
+      {:ok, all_reports} = CMS.list_reports(:article_comment, comment.id, %{page: 1, size: 20})
+      assert all_reports.total_count == 1
+
+      report = all_reports.entries |> List.first()
+      assert report.report_cases |> length == 1
+      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)
 
@@ -435,7 +461,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do
       assert paged_comments.total_count == total_count
     end
 
-    @tag :wip2
+    @tag :wip3
     test "paged article comments should not contains folded and repoted comments",
          ~m(user job)a do
       total_count = 15
@@ -543,7 +569,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do
   end
 
   describe "[article comment delete]" do
-    @tag :wip2
+    @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
@@ -568,7 +594,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do
       assert deleted_comment.body_html == @delete_hint
     end
 
-    @tag :wip2
+    @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)
@@ -586,7 +612,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do
       assert job.article_comments_count == 4
     end
 
-    @tag :wip2
+    @tag :wip3
     test "delete comment still delete pined record if needed", ~m(user job)a do
       total_count = 10
 

test/groupher_server/cms/comments/post_comment_emotions_test.exs

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