refactor(abuse-report): wip

Author: mydearxym

lib/groupher_server/accounts/user.ex

@@ -3,6 +3,7 @@ defmodule GroupherServer.Accounts.User do
   alias __MODULE__
 
   use Ecto.Schema
+  use Accessible
 
   # import GroupherServerWeb.Schema.Helper.Fields
   import Ecto.Changeset

lib/groupher_server/cms/abuse_report.ex

@@ -3,6 +3,7 @@ defmodule GroupherServer.CMS.AbuseReport do
   alias __MODULE__
 
   use Ecto.Schema
+  use Accessible
   import Ecto.Changeset
 
   alias GroupherServer.{Accounts, CMS}

lib/groupher_server/cms/delegates/abuse_report.ex

@@ -81,8 +81,6 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
 
   # def list_reports(%{content_type: thread} = filter) when thread in @article_threads do
   def list_reports(%{content_type: thread} = filter) do
-    IO.inspect(filter, label: "list filter 1-")
-
     with {:ok, info} <- match(thread) do
       query =
         from(r in AbuseReport,
@@ -354,7 +352,7 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
     report
     |> Map.get(thread)
     |> Map.take(@export_article_keys)
-    |> Map.merge(%{thread: thread})
+    |> Map.merge(%{thread: thread |> to_string |> String.upcase()})
   end
 
   def extract_article_comment_info(%AbuseReport{} = report) do

lib/groupher_server_web/schema/cms/cms_types.ex

@@ -396,14 +396,23 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
     timestamp_fields()
   end
 
+  ####### reports
+  object :abuse_report_case do
+    field(:reason, :string)
+    field(:attr, :string)
+    field(:user, :common_user)
+  end
+
   object :abuse_report do
     field(:id, :id)
+    field(:article, :common_article)
     # field(:article_comment, :article_comment, resolve: dataloader(CMS, :article_comment))
     field(:article_comment, :common_article_comment)
-    # field(:account, :user)
+    field(:account, :common_user)
     field(:report_cases_count, :integer)
     field(:deal_with, :string)
     field(:operate_user, :user)
+    field(:report_cases, list_of(:abuse_report_case))
 
     timestamp_fields()
   end
@@ -494,6 +503,4 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
     field(:is_comment_locked, :boolean)
     # field(:linked_posts_count, :integer)
   end
-
-  ####### reports
 end

test/groupher_server_web/mutation/cms/articles/job_report_test.exs renamed to test/groupher_server_web/mutation/cms/abuse_reports/job_report_test.exs

@@ -1,4 +1,4 @@
-defmodule GroupherServer.Test.Mutation.Articles.JobReport do
+defmodule GroupherServer.Test.Mutation.AbuseReports.JobReport do
   use GroupherServer.TestTools
 
   alias GroupherServer.CMS

test/groupher_server_web/mutation/cms/articles/post_report_test.exs renamed to test/groupher_server_web/mutation/cms/abuse_reports/post_report_test.exs

@@ -1,4 +1,4 @@
-defmodule GroupherServer.Test.Mutation.Articles.PostReport do
+defmodule GroupherServer.Test.Mutation.AbuseReports.PostReport do
   use GroupherServer.TestTools
 
   alias GroupherServer.CMS

test/groupher_server_web/mutation/cms/articles/repo_report_test.exs renamed to test/groupher_server_web/mutation/cms/abuse_reports/repo_report_test.exs

@@ -1,4 +1,4 @@
-defmodule GroupherServer.Test.Mutation.Articles.RepoReport do
+defmodule GroupherServer.Test.Mutation.AbuseReports.RepoReport do
   use GroupherServer.TestTools
 
   alias GroupherServer.CMS

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

@@ -0,0 +1,67 @@
+defmodule GroupherServer.Test.Query.AbuseReports.AccountReport do
+  @moduledoc false
+
+  use GroupherServer.TestTools
+
+  alias GroupherServer.CMS
+
+  setup do
+    {:ok, user} = db_insert(:user)
+    {:ok, user2} = db_insert(:user)
+
+    {:ok, community} = db_insert(:community)
+    guest_conn = simu_conn(:guest)
+
+    {:ok, ~m(guest_conn community user user2)a}
+  end
+
+  describe "[query paged_posts filter pagination]" do
+    # id
+    @query """
+    query($filter: ReportFilter!) {
+      pagedAbuseReports(filter: $filter) {
+        entries {
+          id
+          dealWith
+          operateUser {
+            id
+            login
+          }
+          articleComment {
+            id
+            bodyHtml
+            author {
+              login
+            }
+          }
+          account {
+            login
+          }
+          reportCases {
+            reason
+            attr
+            user {
+              login
+            }
+          }
+        }
+        totalPages
+        totalCount
+        pageSize
+        pageNumber
+      }
+    }
+    """
+    @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)
+
+      variables = %{filter: %{content_type: "ACCOUNT", page: 1, size: 10}}
+      results = guest_conn |> query_result(@query, variables, "pagedAbuseReports")
+
+      report = results["entries"] |> List.first()
+      assert results |> is_valid_pagination?
+      assert get_in(report, ["account", "login"]) == user.login
+    end
+  end
+end

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

@@ -0,0 +1,112 @@
+defmodule GroupherServer.Test.Query.AbuseReports.JobReport do
+  @moduledoc false
+
+  use GroupherServer.TestTools
+
+  alias GroupherServer.CMS
+
+  setup do
+    {:ok, job} = db_insert(:job)
+    {:ok, user} = db_insert(:user)
+    {:ok, user2} = db_insert(:user)
+
+    {:ok, community} = db_insert(:community)
+    job_attrs = mock_attrs(:job, %{community_id: community.id})
+
+    guest_conn = simu_conn(:guest)
+
+    {:ok, ~m(guest_conn community job job_attrs user user2)a}
+  end
+
+  describe "[query paged_jobs filter pagination]" do
+    # id
+    @query """
+    query($filter: ReportFilter!) {
+      pagedAbuseReports(filter: $filter) {
+        entries {
+          id
+          dealWith
+          article {
+            id
+            thread
+            title
+          }
+          operateUser {
+            id
+            login
+          }
+          articleComment {
+            id
+            bodyHtml
+            author {
+              login
+            }
+          }
+          reportCases {
+            reason
+            attr
+            user {
+              login
+            }
+          }
+        }
+        totalPages
+        totalCount
+        pageSize
+        pageNumber
+      }
+    }
+    """
+    @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)
+
+      {:ok, _report} = CMS.report_article(:job, job.id, "reason", "attr_info", user)
+      {:ok, _report} = CMS.report_article(:job, job2.id, "reason", "attr_info", user2)
+
+      variables = %{filter: %{content_type: "JOB", page: 1, size: 10}}
+      results = guest_conn |> query_result(@query, variables, "pagedAbuseReports")
+
+      assert results |> is_valid_pagination?
+      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)
+
+      {:ok, _report} = CMS.report_article(:job, job.id, "reason", "attr_info", user)
+      {:ok, _report} = CMS.report_article(:job, job2.id, "reason", "attr_info", user2)
+
+      variables = %{filter: %{content_type: "JOB", content_id: job.id, page: 1, size: 10}}
+      results = guest_conn |> query_result(@query, variables, "pagedAbuseReports")
+
+      report = results["entries"] |> List.first()
+
+      assert get_in(report, ["article", "thread"]) == "JOB"
+      assert get_in(report, ["article", "id"]) == to_string(job.id)
+
+      assert results |> is_valid_pagination?
+      assert results["totalCount"] == 1
+    end
+
+    @tag :wip3
+    test "support article_comment", ~m(guest_conn job user)a do
+      {:ok, comment} = CMS.create_article_comment(:job, job.id, "comment", user)
+      {:ok, _} = CMS.report_article_comment(comment.id, "reason", "attr", user)
+
+      variables = %{filter: %{content_type: "ARTICLE_COMMENT", page: 1, size: 10}}
+      results = guest_conn |> query_result(@query, variables, "pagedAbuseReports")
+
+      report = results["entries"] |> List.first()
+      report_case = get_in(report, ["reportCases"])
+      assert is_list(report_case)
+
+      assert get_in(report, ["articleComment", "bodyHtml"]) == "comment"
+      assert get_in(report, ["articleComment", "id"]) == to_string(comment.id)
+      assert not is_nil(get_in(report, ["articleComment", "author", "login"]))
+    end
+  end
+end

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

@@ -3,12 +3,7 @@ defmodule GroupherServer.Test.Query.AbuseReports.PostReport do
 
   use GroupherServer.TestTools
 
-  import Helper.Utils, only: [get_config: 2]
-
   alias GroupherServer.CMS
-  alias GroupherServer.Repo
-
-  alias CMS.Post
 
   setup do
     {:ok, post} = db_insert(:post)
@@ -31,6 +26,11 @@ defmodule GroupherServer.Test.Query.AbuseReports.PostReport do
         entries {
           id
           dealWith
+          article {
+            id
+            thread
+            title
+          }
           operateUser {
             id
             login
@@ -42,6 +42,13 @@ defmodule GroupherServer.Test.Query.AbuseReports.PostReport do
               login
             }
           }
+          reportCases {
+            reason
+            attr
+            user {
+              login
+            }
+          }
         }
         totalPages
         totalCount
@@ -50,29 +57,53 @@ defmodule GroupherServer.Test.Query.AbuseReports.PostReport do
       }
     }
     """
-    @tag :wip
+    @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)
+
       {:ok, _report} = CMS.report_article(:post, post.id, "reason", "attr_info", user)
-      {:ok, _report} = CMS.report_article(:post, post.id, "reason", "attr_info", user2)
+      {:ok, _report} = CMS.report_article(:post, post2.id, "reason", "attr_info", user2)
 
       variables = %{filter: %{content_type: "POST", page: 1, size: 10}}
       results = guest_conn |> query_result(@query, variables, "pagedAbuseReports")
 
       assert results |> is_valid_pagination?
+      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)
+
+      {:ok, _report} = CMS.report_article(:post, post.id, "reason", "attr_info", user)
+      {:ok, _report} = CMS.report_article(:post, post2.id, "reason", "attr_info", user2)
+
+      variables = %{filter: %{content_type: "POST", content_id: post.id, page: 1, size: 10}}
+      results = guest_conn |> query_result(@query, variables, "pagedAbuseReports")
+
+      report = results["entries"] |> List.first()
+
+      assert get_in(report, ["article", "thread"]) == "POST"
+      assert get_in(report, ["article", "id"]) == to_string(post.id)
+
+      assert results |> is_valid_pagination?
+      assert results["totalCount"] == 1
+    end
+
+    @tag :wip3
     test "support article_comment", ~m(guest_conn post user)a do
       {:ok, comment} = CMS.create_article_comment(:post, post.id, "comment", user)
       {:ok, _} = CMS.report_article_comment(comment.id, "reason", "attr", user)
 
       variables = %{filter: %{content_type: "ARTICLE_COMMENT", page: 1, size: 10}}
       results = guest_conn |> query_result(@query, variables, "pagedAbuseReports")
 
-      IO.inspect(results, label: "results- -")
-
       report = results["entries"] |> List.first()
+      report_case = get_in(report, ["reportCases"])
+      assert is_list(report_case)
+
       assert get_in(report, ["articleComment", "bodyHtml"]) == "comment"
       assert get_in(report, ["articleComment", "id"]) == to_string(comment.id)
       assert not is_nil(get_in(report, ["articleComment", "author", "login"]))