refactor(abuse-report): wip

Author: mydearxym

lib/groupher_server/cms/delegates/abuse_report.ex

@@ -19,16 +19,6 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
 
   @report_threshold_for_fold ArticleComment.report_threshold_for_fold()
 
-  # filter = %{
-  #   contentType: account | post | job | repo | article_comment | community
-  #   contentId: ...
-  #   operate_user_id,
-  #   min_case_count,
-  #   max_case_count,
-  #   page
-  #   size
-  # }
-
   @article_threads [:post, :job, :repo]
   @export_author_keys [:id, :login, :nickname, :avatar]
   @export_article_keys [:id, :title, :digest, :upvotes_count, :views]
@@ -45,30 +35,22 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
   @doc """
   list paged reports for article comemnts
   """
-  def list_reports(%{content_type: :user, content_id: content_id} = filter) do
-    %{page: page, size: size} = filter
-
-    with {:ok, info} <- match(:account_user) do
+  def list_reports(%{content_type: :account, content_id: content_id} = filter) do
+    with {:ok, info} <- match(:account) do
       query =
         from(r in AbuseReport,
           where: field(r, ^info.foreign_key) == ^content_id,
           preload: :account
         )
 
-      query
-      |> QueryBuilder.filter_pack(filter)
-      |> ORM.paginater(~m(page size)a)
-      |> reports_formater(:account_user)
-      |> done()
+      do_list_reports(query, :account, filter)
     end
   end
 
   @doc """
   list paged reports for article comemnts
   """
   def list_reports(%{content_type: :article_comment, content_id: content_id} = filter) do
-    %{page: page, size: size} = filter
-
     with {:ok, info} <- match(:article_comment) do
       query =
         from(r in AbuseReport,
@@ -77,11 +59,7 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
           preload: [article_comment: :author]
         )
 
-      query
-      |> QueryBuilder.filter_pack(filter)
-      |> ORM.paginater(~m(page size)a)
-      |> reports_formater(:article_comment)
-      |> done()
+      do_list_reports(query, :article_comment, filter)
     end
   end
 
@@ -90,32 +68,62 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
   """
   def list_reports(%{content_type: thread, content_id: content_id} = filter)
       when thread in @article_threads do
-    %{page: page, size: size} = filter
-
     with {:ok, info} <- match(thread) do
       query =
         from(r in AbuseReport,
           where: field(r, ^info.foreign_key) == ^content_id,
           preload: [^thread, :operate_user]
         )
 
-      query
-      |> QueryBuilder.filter_pack(filter)
-      |> ORM.paginater(~m(page size)a)
-      |> reports_formater(thread)
-      |> done()
+      do_list_reports(query, thread, filter)
+    end
+  end
+
+  # 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,
+          where: not is_nil(field(r, ^info.foreign_key)),
+          preload: [^thread, :operate_user],
+          preload: [article_comment: :author]
+        )
+
+      do_list_reports(query, thread, filter)
     end
   end
 
+  def list_reports(filter) do
+    query = from(r in AbuseReport, preload: [:operate_user])
+
+    do_list_reports(query, filter)
+  end
+
+  defp do_list_reports(query, thread, filter) do
+    %{page: page, size: size} = filter
+
+    query
+    |> QueryBuilder.filter_pack(filter)
+    |> ORM.paginater(~m(page size)a)
+    |> reports_formater(thread)
+    |> done()
+  end
+
+  defp do_list_reports(query, %{page: page, size: size}) do
+    query |> ORM.paginater(~m(page size)a) |> done()
+  end
+
   @doc """
   report an account
   """
   def report_account(account_id, reason, attr, user) do
-    with {:ok, info} <- match(:account_user),
+    with {:ok, info} <- match(:account),
          {:ok, account} <- ORM.find(info.model, account_id) do
       Multi.new()
       |> Multi.run(:create_abuse_report, fn _, _ ->
-        create_report(:account_user, account.id, reason, attr, user)
+        create_report(:account, account.id, reason, attr, user)
       end)
       |> Multi.run(:update_report_meta, fn _, _ ->
         update_report_meta(info, account)
@@ -129,11 +137,11 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
   undo report article content
   """
   def undo_report_account(account_id, %User{} = user) do
-    with {:ok, info} <- match(:account_user),
+    with {:ok, info} <- match(:account),
          {:ok, account} <- ORM.find(info.model, account_id) do
       Multi.new()
       |> Multi.run(:delete_abuse_report, fn _, _ ->
-        delete_report(:account_user, account.id, user)
+        delete_report(:account, account.id, user)
       end)
       |> Multi.run(:update_report_meta, fn _, _ ->
         update_report_meta(info, account)
@@ -270,16 +278,14 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
           safe_meta = if is_nil(content.meta), do: info.default_meta, else: content.meta
           reported_user_ids = report_cases |> Enum.map(& &1.user.user_id)
 
-          meta =
-            safe_meta
-            |> Map.merge(%{reported_count: reported_count, reported_user_ids: reported_user_ids})
-            |> strip_struct
+          safe_meta
+          |> Map.merge(%{reported_count: reported_count, reported_user_ids: reported_user_ids})
+          |> strip_struct
 
         {:error, _} ->
           safe_meta = if is_nil(content.meta), do: info.default_meta, else: content.meta
 
-          meta =
-            safe_meta |> Map.merge(%{reported_count: 0, reported_user_ids: []}) |> strip_struct
+          safe_meta |> Map.merge(%{reported_count: 0, reported_user_ids: []}) |> strip_struct
       end
 
     content |> ORM.update_meta(meta)
@@ -305,7 +311,7 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
     end
   end
 
-  defp reports_formater(%{entries: entries} = paged_reports, :account_user) do
+  defp reports_formater(%{entries: entries} = paged_reports, :account) do
     paged_reports
     |> Map.put(
       :entries,
@@ -340,7 +346,7 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
   end
 
   defp extract_account_info(%AbuseReport{} = report) do
-    account = report |> Map.get(:account) |> Map.take(@export_author_keys)
+    report |> Map.get(:account) |> Map.take(@export_author_keys)
   end
 
   # TODO: original community and communities info

lib/groupher_server/cms/helper/matcher2.ex

@@ -32,7 +32,7 @@ defmodule GroupherServer.CMS.Helper.Matcher2 do
     {:error, "not supported"}
   end
 
-  def match(:account_user) do
+  def match(:account) do
     {:ok,
      %{
        model: User,

lib/groupher_server_web/resolvers/cms_resolver.ex

@@ -62,6 +62,10 @@ defmodule GroupherServerWeb.Resolvers.CMS do
     CMS.paged_articles(thread, filter)
   end
 
+  def list_reports(_root, ~m(filter)a, _) do
+    CMS.list_reports(filter)
+  end
+
   def wiki(_root, ~m(community)a, _info), do: CMS.get_wiki(%Community{raw: community})
   def cheatsheet(_root, ~m(community)a, _info), do: CMS.get_cheatsheet(%Community{raw: community})
 

lib/groupher_server_web/schema/cms/cms_misc.ex

@@ -40,32 +40,10 @@ defmodule GroupherServerWeb.Schema.CMS.Misc do
     # value(:watch)
   end
 
-  enum :react_thread do
-    value(:post)
-    value(:job)
-    value(:repo)
-    # home community
-    value(:tech)
-    value(:city)
-    value(:share)
-    value(:radar)
-  end
-
   enum :cms_comment do
     value(:post_comment)
   end
 
-  enum :commentable_thread do
-    value(:post)
-    value(:job)
-    value(:repo)
-    # home community
-    value(:tech)
-    value(:city)
-    value(:share)
-    value(:radar)
-  end
-
   enum :thread do
     value(:post)
     value(:job)
@@ -83,11 +61,6 @@ defmodule GroupherServerWeb.Schema.CMS.Misc do
     value(:company)
   end
 
-  enum :order_enum do
-    value(:asc)
-    value(:desc)
-  end
-
   enum :when_enum do
     value(:today)
     value(:this_week)
@@ -297,11 +270,25 @@ defmodule GroupherServerWeb.Schema.CMS.Misc do
     field(:color, :string)
   end
 
-  enum :search_part do
-    value(:community)
+  enum :report_content_type do
     value(:post)
     value(:job)
     value(:repo)
+    value(:account)
+    value(:article_comment)
+    # value(:community)
+  end
+
+  @desc """
+  abuse report filter
+  """
+  input_object :report_filter do
+    field(:content_type, :report_content_type)
+    field(:content_id, :id)
+    pagination_args()
+    #   operate_user_id,
+    #   min_case_count,
+    #   max_case_count,
   end
 
   @doc """

lib/groupher_server_web/schema/cms/cms_queries.ex

@@ -79,9 +79,6 @@ defmodule GroupherServerWeb.Schema.CMS.Queries do
       resolve(&R.CMS.cheatsheet/3)
     end
 
-    article_reacted_users_query(:upvot, &R.CMS.upvoted_users/3)
-    article_reacted_users_query(:collect, &R.CMS.collected_users/3)
-
     # get all tags
     @desc "get paged tags"
     field :paged_tags, :paged_tags do
@@ -204,6 +201,16 @@ defmodule GroupherServerWeb.Schema.CMS.Queries do
       resolve(&R.CMS.search_items/3)
     end
 
+    @desc "paged reports list"
+    field :paged_abuse_reports, :paged_reports do
+      arg(:filter, non_null(:report_filter))
+
+      resolve(&R.CMS.list_reports/3)
+    end
+
+    article_reacted_users_query(:upvot, &R.CMS.upvoted_users/3)
+    article_reacted_users_query(:collect, &R.CMS.collected_users/3)
+
     article_queries(:post)
     article_queries(:job)
     article_queries(:repo)

lib/groupher_server_web/schema/cms/cms_types.ex

@@ -13,6 +13,33 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
 
   import_types(Schema.CMS.Misc)
 
+  ######
+  # common stands for minimal info of the type
+  # usually used in abuse_report, feeds, etc ..
+  object :common_user do
+    field(:login, :string)
+    field(:nickname, :string)
+    field(:avatar, :string)
+  end
+
+  object :common_article do
+    field(:thread, :string)
+    field(:id, :id)
+    # field(:body_html, :string)
+    field(:title, :string)
+    field(:author, :user, resolve: dataloader(CMS, :author))
+  end
+
+  object :common_article_comment do
+    field(:id, :id)
+    field(:body_html, :string)
+    field(:upvotes_count, :integer)
+    field(:author, :common_user)
+    field(:article, :common_article)
+  end
+
+  ######
+
   object :idlike do
     field(:id, :id)
   end
@@ -369,16 +396,25 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
     timestamp_fields()
   end
 
-  object :comment do
-    comments_fields()
+  object :abuse_report do
+    field(:id, :id)
+    # field(:article_comment, :article_comment, resolve: dataloader(CMS, :article_comment))
+    field(:article_comment, :common_article_comment)
+    # field(:account, :user)
+    field(:report_cases_count, :integer)
+    field(:deal_with, :string)
+    field(:operate_user, :user)
+
+    timestamp_fields()
   end
 
-  object :common_article do
-    field(:thread, :string)
-    field(:id, :id)
-    # field(:body_html, :string)
-    field(:title, :string)
-    field(:author, :user, resolve: dataloader(CMS, :author))
+  object :paged_reports do
+    field(:entries, list_of(:abuse_report))
+    pagination_fields()
+  end
+
+  object :comment do
+    comments_fields()
   end
 
   object :post_comment do
@@ -457,12 +493,7 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
     field(:is_edited, :boolean)
     field(:is_comment_locked, :boolean)
     # field(:linked_posts_count, :integer)
-    # field(:linked_jobs_count, :integer)
-    # field(:linked_works_count, :integer)
-
-    # reaction: %{
-    #   rocketCount: 0,
-    #   heartCount: 0,
-    # }
   end
+
+  ####### reports
 end