refactor(abuse-report): fix error

Author: mydearxym

lib/groupher_server/cms/delegates/article_comment.ex

@@ -96,14 +96,19 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
          # make sure the article exsit
          # author is passed by middleware, it's exsit for sure
          {:ok, article} <- ORM.find(info.model, article_id, preload: [author: :user]) do
+      IO.inspect(info, label: "bb")
+
       Multi.new()
       |> Multi.run(:create_article_comment, fn _, _ ->
+        IO.inspect("11")
         do_create_comment(content, info.foreign_key, article, user)
       end)
       |> Multi.run(:update_article_comments_count, fn _, %{create_article_comment: comment} ->
-        update_article_comments_count(comment, :inc)
+        IO.inspect("22")
+        update_article_comments_count(comment, :inc) |> IO.inspect(label: "22 after")
       end)
       |> Multi.run(:add_participator, fn _, _ ->
+        IO.inspect("33")
         add_participator_to_article(article, user)
       end)
       |> Repo.transaction()

lib/groupher_server/cms/helper/matcher2.ex

@@ -28,8 +28,12 @@ defmodule GroupherServer.CMS.Helper.Matcher2 do
     {:ok, %{model: Job, id: job_id, foreign_key: :job_id}}
   end
 
+  def match(:comment_article, %ArticleComment{repo_id: repo_id}) when not is_nil(repo_id) do
+    {:ok, %{model: Repo, id: repo_id, foreign_key: :repo_id}}
+  end
+
   def match(:comment_article, %ArticleComment{}) do
-    {:error, "not supported"}
+    {:error, "match error, not supported"}
   end
 
   def match(:account) do

test/groupher_server/cms/abuse_reports/job_report_test.exs

@@ -27,7 +27,7 @@ defmodule GroupherServer.Test.CMS.AbuseReports.JobReport do
 
       report = all_reports.entries |> List.first()
       assert report.article.id == job.id
-      assert report.article.thread == :job
+      assert report.article.thread == "JOB"
     end
 
     test "report a job should have a abuse report record", ~m(community user job_attrs)a do

test/groupher_server/cms/abuse_reports/post_report_test.exs

@@ -27,7 +27,7 @@ defmodule GroupherServer.Test.CMS.AbuseReports.PostReport do
 
       report = all_reports.entries |> List.first()
       assert report.article.id == post.id
-      assert report.article.thread == :post
+      assert report.article.thread == "POST"
     end
 
     test "report a post should have a abuse report record", ~m(community user post_attrs)a do

test/groupher_server/cms/abuse_reports/repo_report_test.exs

@@ -0,0 +1,136 @@
+defmodule GroupherServer.Test.CMS.AbuseReports.RepoReport do
+  @moduledoc false
+
+  use GroupherServer.TestTools
+
+  alias Helper.ORM
+  alias GroupherServer.CMS
+
+  setup do
+    {:ok, user} = db_insert(:user)
+    {:ok, user2} = db_insert(:user)
+
+    {:ok, community} = db_insert(:community)
+    repo_attrs = mock_attrs(:repo, %{community_id: community.id})
+
+    {:ok, ~m(user user2 community repo_attrs)a}
+  end
+
+  describe "[article repo report/unreport]" do
+    test "list article reports should work", ~m(community user user2 repo_attrs)a do
+      {:ok, repo} = CMS.create_content(community, :repo, repo_attrs, user)
+      {:ok, _report} = CMS.report_article(:repo, repo.id, "reason", "attr_info", user)
+      {:ok, _report} = CMS.report_article(:repo, repo.id, "reason", "attr_info", user2)
+
+      filter = %{content_type: :repo, content_id: repo.id, page: 1, size: 20}
+      {:ok, all_reports} = CMS.list_reports(filter)
+
+      report = all_reports.entries |> List.first()
+      assert report.article.id == repo.id
+      assert report.article.thread == "REPO"
+    end
+
+    test "report a repo should have a abuse report record", ~m(community user repo_attrs)a do
+      {:ok, repo} = CMS.create_content(community, :repo, repo_attrs, user)
+      {:ok, _report} = CMS.report_article(:repo, repo.id, "reason", "attr_info", user)
+
+      filter = %{content_type: :repo, content_id: repo.id, page: 1, size: 20}
+      {:ok, all_reports} = CMS.list_reports(filter)
+
+      report = List.first(all_reports.entries)
+      report_cases = report.report_cases
+
+      assert report.article.id == repo.id
+      assert all_reports.total_count == 1
+      assert report.report_cases_count == 1
+      assert List.first(report_cases).user.login == user.login
+
+      {:ok, repo} = ORM.find(CMS.Repo, repo.id)
+      assert repo.meta.reported_count == 1
+      assert user.id in repo.meta.reported_user_ids
+    end
+
+    test "can undo a report", ~m(community user repo_attrs)a do
+      {:ok, repo} = CMS.create_content(community, :repo, repo_attrs, user)
+      {:ok, _report} = CMS.report_article(:repo, repo.id, "reason", "attr_info", user)
+      {:ok, _report} = CMS.undo_report_article(:repo, repo.id, user)
+
+      filter = %{content_type: :repo, content_id: repo.id, page: 1, size: 20}
+      {:ok, all_reports} = CMS.list_reports(filter)
+      assert all_reports.total_count == 0
+
+      {:ok, repo} = ORM.find(CMS.Repo, repo.id)
+      assert user.id not in repo.meta.reported_user_ids
+    end
+
+    test "can undo a existed report", ~m(community user user2 repo_attrs)a do
+      {:ok, repo} = CMS.create_content(community, :repo, repo_attrs, user)
+      {:ok, _report} = CMS.report_article(:repo, repo.id, "reason", "attr_info", user)
+      {:ok, _report} = CMS.report_article(:repo, repo.id, "reason", "attr_info", user2)
+      {:ok, _report} = CMS.undo_report_article(:repo, repo.id, user)
+
+      filter = %{content_type: :repo, content_id: repo.id, page: 1, size: 20}
+      {:ok, all_reports} = CMS.list_reports(filter)
+      assert all_reports.total_count == 1
+
+      {:ok, repo} = ORM.find(CMS.Repo, repo.id)
+
+      assert user2.id in repo.meta.reported_user_ids
+      assert user.id not in repo.meta.reported_user_ids
+    end
+
+    test "can undo a report with other user report it too",
+         ~m(community user user2 repo_attrs)a do
+      {:ok, repo} = CMS.create_content(community, :repo, repo_attrs, user)
+      {:ok, _report} = CMS.report_article(:repo, repo.id, "reason", "attr_info", user)
+      {:ok, _report} = CMS.report_article(:repo, repo.id, "reason", "attr_info", user2)
+
+      filter = %{content_type: :repo, content_id: repo.id, page: 1, size: 20}
+      {:ok, all_reports} = CMS.list_reports(filter)
+      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(:repo, repo.id, user)
+
+      filter = %{content_type: :repo, content_id: repo.id, page: 1, size: 20}
+      {:ok, all_reports} = CMS.list_reports(filter)
+      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
+
+    test "different user report a comment should have same report with different report cases",
+         ~m(community user user2 repo_attrs)a do
+      {:ok, repo} = CMS.create_content(community, :repo, repo_attrs, user)
+
+      {:ok, _report} = CMS.report_article(:repo, repo.id, "reason", "attr_info", user)
+      {:ok, _report} = CMS.report_article(:repo, repo.id, "reason2", "attr_info 2", user2)
+
+      filter = %{content_type: :repo, content_id: repo.id, page: 1, size: 20}
+      {:ok, all_reports} = CMS.list_reports(filter)
+
+      report = List.first(all_reports.entries)
+      report_cases = report.report_cases
+
+      assert all_reports.total_count == 1
+      assert length(report_cases) == 2
+      assert report.report_cases_count == 2
+
+      assert List.first(report_cases).user.login == user.login
+      assert List.last(report_cases).user.login == user2.login
+    end
+
+    test "same user can not report a comment twice", ~m(community repo_attrs user)a do
+      {:ok, repo} = CMS.create_content(community, :repo, repo_attrs, user)
+
+      {:ok, _report} = CMS.report_article(:repo, repo.id, "reason", "attr_info", user)
+      assert {:error, _report} = CMS.report_article(:repo, repo.id, "reason", "attr_info", user)
+    end
+  end
+end

test/groupher_server_web/query/cms/abuse_reports/account_report_test.exs

@@ -52,7 +52,7 @@ defmodule GroupherServer.Test.Query.AbuseReports.AccountReport do
       }
     }
     """
-    @tag :wip2
+
     test "should get pagination info", ~m(guest_conn user user2)a do
       {:ok, _report} = CMS.report_article(:account, user.id, "reason", "attr_info", user2)
 

test/groupher_server_web/query/cms/abuse_reports/job_report_test.exs

@@ -57,7 +57,7 @@ defmodule GroupherServer.Test.Query.AbuseReports.JobReport do
       }
     }
     """
-    @tag :wip2
+
     test "should get pagination info", ~m(guest_conn community job_attrs user user2)a do
       {:ok, job} = CMS.create_content(community, :job, job_attrs, user)
       {:ok, job2} = CMS.create_content(community, :job, job_attrs, user)
@@ -72,7 +72,6 @@ defmodule GroupherServer.Test.Query.AbuseReports.JobReport do
       assert results["totalCount"] == 2
     end
 
-    @tag :wip2
     test "support search with id", ~m(guest_conn user user2)a do
       {:ok, job} = db_insert(:job)
       {:ok, job2} = db_insert(:job)

test/groupher_server_web/query/cms/abuse_reports/post_report_test.exs

@@ -57,7 +57,7 @@ defmodule GroupherServer.Test.Query.AbuseReports.PostReport do
       }
     }
     """
-    @tag :wip2
+
     test "should get pagination info", ~m(guest_conn community post_attrs user user2)a do
       {:ok, post} = CMS.create_content(community, :post, post_attrs, user)
       {:ok, post2} = CMS.create_content(community, :post, post_attrs, user)
@@ -72,7 +72,6 @@ defmodule GroupherServer.Test.Query.AbuseReports.PostReport do
       assert results["totalCount"] == 2
     end
 
-    @tag :wip2
     test "support search with id", ~m(guest_conn user user2)a do
       {:ok, post} = db_insert(:post)
       {:ok, post2} = db_insert(:post)

test/groupher_server_web/query/cms/abuse_reports/repo_report_test.exs

@@ -57,7 +57,7 @@ defmodule GroupherServer.Test.Query.AbuseReports.RepoReport do
       }
     }
     """
-    @tag :wip2
+
     test "should get pagination info", ~m(guest_conn community repo_attrs user user2)a do
       {:ok, repo} = CMS.create_content(community, :repo, repo_attrs, user)
       {:ok, repo2} = CMS.create_content(community, :repo, repo_attrs, user)
@@ -72,7 +72,6 @@ defmodule GroupherServer.Test.Query.AbuseReports.RepoReport do
       assert results["totalCount"] == 2
     end
 
-    @tag :wip2
     test "support search with id", ~m(guest_conn user user2)a do
       {:ok, repo} = db_insert(:repo)
       {:ok, repo2} = db_insert(:repo)
@@ -92,7 +91,7 @@ defmodule GroupherServer.Test.Query.AbuseReports.RepoReport do
       assert results["totalCount"] == 1
     end
 
-    @tag :wip3
+    @tag :wip2
     test "support article_comment", ~m(guest_conn repo user)a do
       {:ok, comment} = CMS.create_article_comment(:repo, repo.id, "comment", user)
       {:ok, _} = CMS.report_article_comment(comment.id, "reason", "attr", user)