refactor(abuse-report): wip

Author: mydearxym

lib/groupher_server/cms/article_comment.ex

@@ -12,14 +12,15 @@ defmodule GroupherServer.CMS.ArticleComment do
   alias CMS.{
     Post,
     Job,
+    Repo,
     Embeds,
     ArticleCommentUpvote
   }
 
   # alias Helper.HTML
 
   @required_fields ~w(body_html author_id)a
-  @optional_fields ~w(post_id job_id reply_to_id replies_count is_folded is_reported is_deleted floor is_article_author)a
+  @optional_fields ~w(post_id job_id repo_id reply_to_id replies_count is_folded is_reported is_deleted floor is_article_author)a
   @updatable_fields ~w(is_folded is_reported is_deleted floor upvotes_count is_pinned)a
 
   @max_participator_count 5
@@ -72,6 +73,8 @@ defmodule GroupherServer.CMS.ArticleComment do
 
     belongs_to(:post, Post, foreign_key: :post_id)
     belongs_to(:job, Job, foreign_key: :job_id)
+    belongs_to(:repo, Repo, foreign_key: :repo_id)
+
     belongs_to(:reply_to, ArticleComment, foreign_key: :reply_to_id)
 
     embeds_many(:replies, ArticleComment, on_replace: :delete)

lib/groupher_server/cms/cms.ex

@@ -163,7 +163,6 @@ defmodule GroupherServer.CMS do
   defdelegate create_report(type, content_id, reason, attr, user), to: AbuseReport
   defdelegate report_article(thread, article_id, reason, attr, user), to: AbuseReport
   defdelegate undo_report_article(thread, article_id, user), to: AbuseReport
-  defdelegate list_reports(type, content_id, filter), to: AbuseReport
   defdelegate list_reports(filter), to: AbuseReport
   defdelegate report_article_comment(comment_id, reason, attr, user), to: ArticleCommentAction
   defdelegate undo_report_article_comment(comment_id, user), to: AbuseReport

lib/groupher_server/cms/delegates/abuse_report.ex

@@ -13,12 +13,12 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
   alias GroupherServer.{Accounts, CMS, Repo}
 
   alias Accounts.User
-  alias CMS.{AbuseReport, Embeds}
+  alias CMS.{AbuseReport, ArticleComment, Embeds}
 
   alias Ecto.Multi
 
   # filter = %{
-  #   contentType: account | post | job | repo | article_comment
+  #   contentType: account | post | job | repo | article_comment | community
   #   contentId: ...
   #   operate_user_id,
   #   min_case_count,
@@ -28,9 +28,6 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
   #   size
   # }
 
-  # def list_all_reports(thread, filter)
-  # def list_all_reports(community, filter)
-  # def list_all_reports(filter)
   @article_threads [:post, :job, :repo]
   @export_report_keys [
     :id,
@@ -43,6 +40,34 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
     :updated_at
   ]
 
+  @export_author_keys [:id, :login, :nickname, :avatar]
+  @export_article_keys [:id, :title, :digest, :upvotes_count, :views]
+
+  @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,
+          where: field(r, ^info.foreign_key) == ^content_id,
+          preload: [article_comment: ^@article_threads],
+          preload: [article_comment: :author]
+        )
+
+      query
+      |> QueryBuilder.filter_pack(filter)
+      |> ORM.paginater(~m(page size)a)
+      |> reports_formater(:article_comment)
+      |> done()
+    end
+  end
+
+  @doc """
+  list paged reports for article
+  """
   def list_reports(%{content_type: thread, content_id: content_id} = filter)
       when thread in @article_threads do
     %{page: page, size: size} = filter
@@ -62,6 +87,17 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
     end
   end
 
+  defp reports_formater(%{entries: entries} = paged_reports, :article_comment) do
+    paged_reports
+    |> Map.put(
+      :entries,
+      Enum.map(entries, fn report ->
+        basic_report = report |> Map.take(@export_report_keys)
+        basic_report |> Map.put(:article_comment, extract_article_comment_info(report))
+      end)
+    )
+  end
+
   defp reports_formater(%{entries: entries} = paged_reports, thread)
        when thread in @article_threads do
     paged_reports
@@ -74,36 +110,18 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
     )
   end
 
+  # TODO: original community and communities info
   defp extract_article_info(thread, %AbuseReport{} = report) do
     article = Map.get(report, thread)
 
-    %{
-      thread: thread,
-      id: article.id,
-      title: article.title,
-      digest: article.digest,
-      upvotes_count: article.upvotes_count,
-      views: article.views
-    }
+    article
+    |> Map.take(@export_article_keys)
+    |> Map.merge(%{thread: thread})
   end
 
-  @doc """
-  list paged reports for both comment and article
-  """
-  def list_reports(thread, content_id, %{page: page, size: size} = filter) do
-    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)
-      |> done()
-    end
-  end
+  # def report_account(user_id) do
+  #   # TODO*
+  # end
 
   @doc """
   report article content
@@ -123,10 +141,6 @@ 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
   """
@@ -145,6 +159,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
+
   def create_report(type, content_id, reason, attr, %User{} = user) do
     with {:ok, info} <- match(type),
          {:ok, report} <- not_reported_before(info, content_id, user) do
@@ -243,6 +261,30 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
     end
   end
 
+  def extract_article_comment_info(%AbuseReport{} = report) do
+    keys = [:id, :upvotes_count, :body_html]
+    author = Map.take(report.article_comment.author, @export_author_keys)
+
+    comment = Map.take(report.article_comment, keys)
+    comment = Map.merge(comment, %{author: author})
+
+    article = extract_article_in_comment(report.article_comment)
+    Map.merge(comment, %{article: article})
+  end
+
+  defp extract_article_in_comment(%ArticleComment{} = article_comment) do
+    article_thread =
+      Enum.filter(@article_threads, fn thread ->
+        not is_nil(Map.get(article_comment, :"#{thread}_id"))
+      end)
+      |> List.first()
+
+    article_comment
+    |> Map.get(article_thread)
+    |> Map.take(@export_article_keys)
+    |> Map.merge(%{thread: article_thread})
+  end
+
   defp result({:ok, %{update_report_flag: result}}), do: result |> done()
 
   defp result({:error, _, result, _steps}) do

priv/repo/migrations/20210512041939_add_repo_to_article_comment.exs

@@ -0,0 +1,11 @@
+defmodule GroupherServer.Repo.Migrations.AddRepoToArticleComment do
+  use Ecto.Migration
+
+  def change do
+    alter table(:articles_comments) do
+      add(:repo_id, references(:cms_repos, on_delete: :delete_all))
+    end
+
+    create(index(:articles_comments, [:repo_id]))
+  end
+end

test/groupher_server/cms/abuse_reports/comment_report_test.exs

@@ -15,29 +15,32 @@ defmodule GroupherServer.Test.CMS.AbuseReports.CommentReport do
   end
 
   describe "[article comment report/unreport]" do
-    @tag :wip3
+    @tag :wip2
     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)
 
-      {:ok, all_reports} = CMS.list_reports(:article_comment, comment.id, %{page: 1, size: 20})
+      filter = %{content_type: :article_comment, content_id: comment.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_comment.id == comment.id
 
       assert all_reports.total_count == 1
       assert report.report_cases_count == 1
       assert List.first(report_cases).user.login == user.login
     end
 
-    @tag :wip3
+    @tag :wip2
     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)
       {:ok, _} = CMS.report_article_comment(comment.id, "reason", "attr", user)
       {:ok, _} = CMS.report_article_comment(comment.id, "reason", "attr", user2)
 
-      {:ok, all_reports} = CMS.list_reports(:article_comment, comment.id, %{page: 1, size: 20})
+      filter = %{content_type: :article_comment, content_id: comment.id, page: 1, size: 20}
+      {:ok, all_reports} = CMS.list_reports(filter)
 
       report = List.first(all_reports.entries)
       report_cases = report.report_cases

test/groupher_server/cms/abuse_reports/job_report_test.exs

@@ -17,17 +17,32 @@ 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)
+      {:ok, _report} = CMS.report_article(:job, job.id, "reason", "attr_info", user2)
+
+      filter = %{content_type: :job, content_id: job.id, page: 1, size: 20}
+      {:ok, all_reports} = CMS.list_reports(filter)
+
+      report = all_reports.entries |> List.first()
+      assert report.article.id == job.id
+      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)
 
-      {:ok, all_reports} = CMS.list_reports(:job, job.id, %{page: 1, size: 20})
+      filter = %{content_type: :job, content_id: job.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.job_id == job.id
+      assert report.article.id == job.id
       assert all_reports.total_count == 1
       assert report.report_cases_count == 1
       assert List.first(report_cases).user.login == user.login
@@ -43,7 +58,8 @@ defmodule GroupherServer.Test.CMS.AbuseReports.JobReport do
       {:ok, _report} = CMS.report_article(:job, job.id, "reason", "attr_info", user)
       {:ok, _report} = CMS.undo_report_article(:job, job.id, user)
 
-      {:ok, all_reports} = CMS.list_reports(:job, job.id, %{page: 1, size: 20})
+      filter = %{content_type: :job, content_id: job.id, page: 1, size: 20}
+      {:ok, all_reports} = CMS.list_reports(filter)
       assert all_reports.total_count == 0
     end
 
@@ -54,7 +70,8 @@ defmodule GroupherServer.Test.CMS.AbuseReports.JobReport do
       {:ok, _report} = CMS.report_article(:job, job.id, "reason", "attr_info", user)
       {:ok, _report} = CMS.report_article(:job, job.id, "reason", "attr_info", user2)
 
-      {:ok, all_reports} = CMS.list_reports(:job, job.id, %{page: 1, size: 20})
+      filter = %{content_type: :job, content_id: job.id, page: 1, size: 20}
+      {:ok, all_reports} = CMS.list_reports(filter)
       assert all_reports.total_count == 1
 
       report = all_reports.entries |> List.first()
@@ -64,7 +81,8 @@ defmodule GroupherServer.Test.CMS.AbuseReports.JobReport do
 
       {:ok, _report} = CMS.undo_report_article(:job, job.id, user)
 
-      {:ok, all_reports} = CMS.list_reports(:job, job.id, %{page: 1, size: 20})
+      filter = %{content_type: :job, content_id: job.id, page: 1, size: 20}
+      {:ok, all_reports} = CMS.list_reports(filter)
       assert all_reports.total_count == 1
 
       report = all_reports.entries |> List.first()
@@ -80,7 +98,8 @@ defmodule GroupherServer.Test.CMS.AbuseReports.JobReport do
       {:ok, _report} = CMS.report_article(:job, job.id, "reason", "attr_info", user)
       {:ok, _report} = CMS.report_article(:job, job.id, "reason2", "attr_info 2", user2)
 
-      {:ok, all_reports} = CMS.list_reports(:job, job.id, %{page: 1, size: 20})
+      filter = %{content_type: :job, content_id: job.id, page: 1, size: 20}
+      {:ok, all_reports} = CMS.list_reports(filter)
 
       report = List.first(all_reports.entries)
       report_cases = report.report_cases