refactor(abuse-report): add reported_user_ids

Author: mydearxym

lib/groupher_server/accounts/embeds/user_meta.ex

@@ -9,14 +9,16 @@ defmodule GroupherServer.Accounts.Embeds.UserMeta do
   @optional_fields ~w(reported_count)a
 
   @default_meta %{
-    reported_count: 0
+    reported_count: 0,
+    reported_user_ids: []
   }
 
   @doc "for test usage"
   def default_meta(), do: @default_meta
 
   embedded_schema do
     field(:reported_count, :integer, default: 0)
+    field(:reported_user_ids, {:array, :integer}, default: [])
   end
 
   def changeset(struct, params) do

lib/groupher_server/cms/abuse_report.ex

@@ -9,8 +9,8 @@ defmodule GroupherServer.CMS.AbuseReport do
   alias CMS.{ArticleComment, Embeds, Post, Job, Repo}
 
   # @required_fields ~w(article_comment_id user_id recived_user_id)a
-  @optional_fields ~w(article_comment_id post_id job_id repo_id account_id operate_user_id deal_with is_confirmed report_cases_count)a
-  @update_fields ~w(operate_user_id deal_with is_confirmed report_cases_count)a
+  @optional_fields ~w(article_comment_id post_id job_id repo_id account_id operate_user_id deal_with report_cases_count)a
+  @update_fields ~w(operate_user_id deal_with report_cases_count)a
 
   @type t :: %AbuseReport{}
   schema "abuse_reports" do
@@ -26,7 +26,6 @@ defmodule GroupherServer.CMS.AbuseReport do
     belongs_to(:operate_user, Accounts.User, foreign_key: :operate_user_id)
 
     field(:deal_with, :string)
-    field(:is_confirmed, :boolean, default: false)
 
     timestamps(type: :utc_datetime)
   end

lib/groupher_server/cms/cms.ex

@@ -121,10 +121,6 @@ defmodule GroupherServer.CMS do
 
   defdelegate list_folded_article_comments(thread, article_id, filters), to: ArticleComment
   defdelegate list_folded_article_comments(thread, article_id, filters, user), to: ArticleComment
-  defdelegate list_reported_article_comments(thread, article_id, filters), to: ArticleComment
-
-  defdelegate list_reported_article_comments(thread, article_id, filters, user),
-    to: ArticleComment
 
   defdelegate list_comment_replies(comment_id, filters), to: ArticleComment
   defdelegate list_comment_replies(comment_id, filters, user), to: ArticleComment
@@ -162,7 +158,7 @@ defmodule GroupherServer.CMS do
   # TODO: move report to abuse report module
   defdelegate create_report(type, content_id, reason, attr, user), to: AbuseReport
   defdelegate report_article(thread, article_id, reason, attr, user), to: AbuseReport
-  defdelegate report_article_comment(comment_id, reason, attr, user), to: ArticleCommentAction
+  defdelegate report_article_comment(comment_id, reason, attr, user), to: AbuseReport
   defdelegate report_account(account_id, reason, attr, user), to: AbuseReport
   defdelegate undo_report_account(account_id, user), to: AbuseReport
   defdelegate undo_report_article(thread, article_id, user), to: AbuseReport

lib/groupher_server/cms/delegates/abuse_report.ex

@@ -17,6 +17,8 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
 
   alias Ecto.Multi
 
+  @report_threshold_for_fold ArticleComment.report_threshold_for_fold()
+
   # filter = %{
   #   contentType: account | post | job | repo | article_comment | community
   #   contentId: ...
@@ -115,7 +117,7 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
       |> Multi.run(:create_abuse_report, fn _, _ ->
         create_report(:account_user, account.id, reason, attr, user)
       end)
-      |> Multi.run(:update_report_flag, fn _, _ ->
+      |> Multi.run(:update_report_meta, fn _, _ ->
         update_report_meta(info, account)
       end)
       |> Repo.transaction()
@@ -133,7 +135,7 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
       |> Multi.run(:delete_abuse_report, fn _, _ ->
         delete_report(:account_user, account.id, user)
       end)
-      |> Multi.run(:update_report_flag, fn _, _ ->
+      |> Multi.run(:update_report_meta, fn _, _ ->
         update_report_meta(info, account)
       end)
       |> Repo.transaction()
@@ -151,7 +153,7 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
       |> Multi.run(:create_abuse_report, fn _, _ ->
         create_report(thread, article.id, reason, attr, user)
       end)
-      |> Multi.run(:update_report_flag, fn _, _ ->
+      |> Multi.run(:update_report_meta, fn _, _ ->
         update_report_meta(info, article)
       end)
       |> Repo.transaction()
@@ -169,14 +171,35 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
       |> Multi.run(:delete_abuse_report, fn _, _ ->
         delete_report(thread, article.id, user)
       end)
-      |> Multi.run(:update_report_flag, fn _, _ ->
+      |> Multi.run(:update_report_meta, fn _, _ ->
         update_report_meta(info, article)
       end)
       |> Repo.transaction()
       |> result()
     end
   end
 
+  @doc "report a comment"
+  def report_article_comment(comment_id, reason, attr, %User{} = user) do
+    with {:ok, comment} <- ORM.find(ArticleComment, comment_id) do
+      Multi.new()
+      |> Multi.run(:create_abuse_report, fn _, _ ->
+        CMS.create_report(:article_comment, comment_id, reason, attr, user)
+      end)
+      |> Multi.run(:update_report_meta, fn _, _ ->
+        {:ok, info} = match(:article_comment)
+        update_report_meta(info, comment)
+      end)
+      |> Multi.run(:fold_comment_report_too_many, fn _, %{create_abuse_report: abuse_report} ->
+        if abuse_report.report_cases_count >= @report_threshold_for_fold,
+          do: CMS.fold_article_comment(comment, user),
+          else: {:ok, comment}
+      end)
+      |> Repo.transaction()
+      |> result()
+    end
+  end
+
   def undo_report_article_comment(comment_id, %User{} = user) do
     undo_report_article(:article_comment, comment_id, user)
   end
@@ -190,7 +213,7 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
             %{
               reason: reason,
               attr: attr,
-              user: %{login: user.login, nickname: user.nickname}
+              user: %{user_id: user.id, login: user.login, nickname: user.nickname}
             }
           ]
 
@@ -201,7 +224,7 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
           AbuseReport |> ORM.create(args)
 
         _ ->
-          user = %{login: user.login, nickname: user.nickname}
+          user = %{user_id: user.id, login: user.login, nickname: user.nickname}
 
           report_cases =
             report.report_cases
@@ -237,29 +260,29 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
     end
   end
 
-  # update  reported_count in mete for article or comment
+  # update reported_count in mete for article | comment | account
   defp update_report_meta(info, content) do
-    case ORM.find_by(AbuseReport, Map.put(%{}, info.foreign_key, content.id)) do
-      {:ok, record} ->
-        reported_count = record.report_cases |> length
-
-        safe_meta = if is_nil(content.meta), do: info.default_meta, else: content.meta
-        meta = safe_meta |> Map.merge(%{reported_count: reported_count}) |> strip_struct
-
-        content
-        |> Ecto.Changeset.change()
-        |> Ecto.Changeset.put_embed(:meta, meta)
-        |> Repo.update()
-
-      {:error, _} ->
-        safe_meta = if is_nil(content.meta), do: info.default_meta, else: content.meta
-        meta = safe_meta |> Map.merge(%{reported_count: 0}) |> strip_struct
-
-        content
-        |> Ecto.Changeset.change()
-        |> Ecto.Changeset.put_embed(:meta, meta)
-        |> Repo.update()
-    end
+    meta =
+      case ORM.find_by(AbuseReport, Map.put(%{}, info.foreign_key, content.id)) do
+        {:ok, record} ->
+          report_cases = record.report_cases
+          reported_count = length(report_cases)
+          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
+
+        {: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
+      end
+
+    content |> ORM.update_meta(meta)
   end
 
   defp not_reported_before(info, content_id, %User{login: login}) do
@@ -352,7 +375,7 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
     |> Map.merge(%{thread: article_thread})
   end
 
-  defp result({:ok, %{update_report_flag: result}}), do: result |> done()
+  defp result({:ok, %{update_report_meta: result}}), do: result |> done()
   defp result({:ok, %{update_content_reported_flag: result}}), do: result |> done()
 
   defp result({:error, _, result, _steps}) do

lib/groupher_server/cms/delegates/article_comment_action.ex

@@ -30,7 +30,6 @@ defmodule GroupherServer.CMS.Delegate.ArticleCommentAction do
   alias Ecto.Multi
 
   @max_parent_replies_count ArticleComment.max_parent_replies_count()
-  @report_threshold_for_fold ArticleComment.report_threshold_for_fold()
   @pined_comment_limit ArticleComment.pined_comment_limit()
 
   @spec pin_article_comment(Integer.t()) :: {:ok, ArticleComment.t()}
@@ -101,23 +100,6 @@ defmodule GroupherServer.CMS.Delegate.ArticleCommentAction do
     end
   end
 
-  @doc "report a comment"
-  def report_article_comment(comment_id, reason, attr, %User{} = user) do
-    with {:ok, comment} <- ORM.find(ArticleComment, comment_id) do
-      Multi.new()
-      |> Multi.run(:create_abuse_report, fn _, _ ->
-        CMS.create_report(:article_comment, comment_id, reason, attr, user)
-      end)
-      |> Multi.run(:fold_comment_report_too_many, fn _, %{create_abuse_report: abuse_report} ->
-        if abuse_report.report_cases_count >= @report_threshold_for_fold,
-          do: fold_article_comment(comment, user),
-          else: {:ok, comment}
-      end)
-      |> Repo.transaction()
-      |> upsert_comment_result()
-    end
-  end
-
   @doc "reply to exsiting comment"
   def reply_article_comment(comment_id, content, %User{} = user) do
     with {:ok, target_comment} <-

lib/groupher_server/cms/embeds/user.ex

@@ -7,13 +7,14 @@ defmodule GroupherServer.CMS.Embeds.User do
   import Ecto.Changeset
 
   embedded_schema do
+    field(:user_id, :integer)
     field(:login, :string)
     field(:nickname, :string)
   end
 
   def changeset(struct, params) do
     struct
-    |> cast(params, [:login, :nickname])
+    |> cast(params, [:login, :nickname, :user_id])
     |> validate_required([:login, :nickname])
   end
 end

test/groupher_server/cms/abuse_reports/account_report_test.exs

@@ -39,7 +39,7 @@ defmodule GroupherServer.Test.CMS.AbuseReports.AccountReport do
 
     @tag :wip3
     test "report an account should have a abuse report record", ~m(user user2)a do
-      {:ok, report} = CMS.report_account(user.id, "reason", "attr_info", user2)
+      {:ok, _report} = CMS.report_account(user.id, "reason", "attr_info", user2)
 
       filter = %{content_type: :user, content_id: user.id, page: 1, size: 20}
       {:ok, all_reports} = CMS.list_reports(filter)
@@ -56,14 +56,35 @@ defmodule GroupherServer.Test.CMS.AbuseReports.AccountReport do
       assert user.meta.reported_count == 1
     end
 
-    @tag :wip3
+    @tag :wip2
     test "can undo a report", ~m(user user2)a do
-      {:ok, report} = CMS.report_account(user.id, "reason", "attr_info", user2)
+      {:ok, _report} = CMS.report_account(user.id, "reason", "attr_info", user2)
+      {:ok, user} = ORM.find(User, user.id)
+      assert user2.id in user.meta.reported_user_ids
+
       {:ok, _report} = CMS.undo_report_account(user.id, user2)
 
       filter = %{content_type: :user, content_id: user.id, page: 1, size: 20}
       {:ok, all_reports} = CMS.list_reports(filter)
       assert all_reports.total_count == 0
+
+      {:ok, user} = ORM.find(User, user.id)
+      assert user2.id not in user.meta.reported_user_ids
+    end
+
+    @tag :wip2
+    test "can undo a existed report", ~m(user user2 user3)a do
+      {:ok, _report} = CMS.report_account(user.id, "reason", "attr_info", user2)
+      {:ok, _report} = CMS.report_account(user.id, "reason", "attr_info", user3)
+      {:ok, _report} = CMS.undo_report_account(user.id, user2)
+
+      filter = %{content_type: :user, content_id: user.id, page: 1, size: 20}
+      {:ok, all_reports} = CMS.list_reports(filter)
+      assert all_reports.total_count == 1
+
+      {:ok, user} = ORM.find(User, user.id)
+      assert user2.id not in user.meta.reported_user_ids
+      assert user3.id in user.meta.reported_user_ids
     end
 
     @tag :wip3

test/groupher_server/cms/abuse_reports/job_report_test.exs

@@ -49,6 +49,7 @@ defmodule GroupherServer.Test.CMS.AbuseReports.JobReport do
 
       {:ok, job} = ORM.find(CMS.Job, job.id)
       assert job.meta.reported_count == 1
+      assert user.id in job.meta.reported_user_ids
     end
 
     @tag :wip3
@@ -60,6 +61,26 @@ defmodule GroupherServer.Test.CMS.AbuseReports.JobReport do
       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
+
+      {:ok, job} = ORM.find(CMS.Job, job.id)
+      assert user.id not in job.meta.reported_user_ids
+    end
+
+    @tag :wip2
+    test "can undo a existed report", ~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)
+      {:ok, _report} = CMS.undo_report_article(:job, job.id, user)
+
+      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
+
+      {:ok, job} = ORM.find(CMS.Job, job.id)
+
+      assert user2.id in job.meta.reported_user_ids
+      assert user.id not in job.meta.reported_user_ids
     end
 
     @tag :wip3

test/groupher_server/cms/abuse_reports/post_report_test.exs

@@ -49,6 +49,7 @@ defmodule GroupherServer.Test.CMS.AbuseReports.PostReport do
 
       {:ok, post} = ORM.find(CMS.Post, post.id)
       assert post.meta.reported_count == 1
+      assert user.id in post.meta.reported_user_ids
     end
 
     @tag :wip3
@@ -60,6 +61,26 @@ defmodule GroupherServer.Test.CMS.AbuseReports.PostReport do
       filter = %{content_type: :post, content_id: post.id, page: 1, size: 20}
       {:ok, all_reports} = CMS.list_reports(filter)
       assert all_reports.total_count == 0
+
+      {:ok, post} = ORM.find(CMS.Post, post.id)
+      assert user.id not in post.meta.reported_user_ids
+    end
+
+    @tag :wip2
+    test "can undo a existed report", ~m(community user user2 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)
+      {:ok, _report} = CMS.report_article(:post, post.id, "reason", "attr_info", user2)
+      {:ok, _report} = CMS.undo_report_article(:post, post.id, user)
+
+      filter = %{content_type: :post, content_id: post.id, page: 1, size: 20}
+      {:ok, all_reports} = CMS.list_reports(filter)
+      assert all_reports.total_count == 1
+
+      {:ok, post} = ORM.find(CMS.Post, post.id)
+
+      assert user2.id in post.meta.reported_user_ids
+      assert user.id not in post.meta.reported_user_ids
     end
 
     @tag :wip3