refactor(abuse-report): remove is_reported field

Author: mydearxym

lib/groupher_server/accounts/user.ex

@@ -61,7 +61,6 @@ defmodule GroupherServer.Accounts.User do
     # field(:paid_member, :boolean)
     # field(:platinum_member, :boolean)
 
-    field(:is_reported, :boolean, default: false)
     embeds_one(:meta, Embeds.UserMeta, on_replace: :update)
 
     has_one(:customization, Customization)

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_closed report_cases_count)a
-  @update_fields ~w(operate_user_id deal_with is_closed report_cases_count)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
 
   @type t :: %AbuseReport{}
   schema "abuse_reports" do
@@ -26,7 +26,7 @@ defmodule GroupherServer.CMS.AbuseReport do
     belongs_to(:operate_user, Accounts.User, foreign_key: :operate_user_id)
 
     field(:deal_with, :string)
-    field(:is_closed, :boolean, default: false)
+    field(:is_confirmed, :boolean, default: false)
 
     timestamps(type: :utc_datetime)
   end

lib/groupher_server/cms/article_comment.ex

@@ -20,8 +20,8 @@ defmodule GroupherServer.CMS.ArticleComment do
   # alias Helper.HTML
 
   @required_fields ~w(body_html author_id)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
+  @optional_fields ~w(post_id job_id repo_id reply_to_id replies_count is_folded is_deleted floor is_article_author)a
+  @updatable_fields ~w(is_folded is_deleted floor upvotes_count is_pinned)a
 
   @max_participator_count 5
   @max_parent_replies_count 3
@@ -56,8 +56,6 @@ defmodule GroupherServer.CMS.ArticleComment do
     field(:body_html, :string)
     # 是否被折叠
     field(:is_folded, :boolean, default: false)
-    # 是否被举报
-    field(:is_reported, :boolean, default: false)
     # 是否被删除
     field(:is_deleted, :boolean, default: false)
     # 楼层

lib/groupher_server/cms/delegates/abuse_report.ex

@@ -23,7 +23,6 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
   #   operate_user_id,
   #   min_case_count,
   #   max_case_count,
-  #   is_closed
   #   page
   #   size
   # }
@@ -34,7 +33,6 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
   @export_report_keys [
     :id,
     :deal_with,
-    :is_closed,
     :operate_user,
     :report_cases,
     :report_cases_count,
@@ -107,6 +105,9 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
     end
   end
 
+  @doc """
+  report an account
+  """
   def report_account(account_id, reason, attr, user) do
     with {:ok, info} <- match(:account_user),
          {:ok, account} <- ORM.find(info.model, account_id) do
@@ -352,6 +353,7 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
   end
 
   defp result({:ok, %{update_report_flag: result}}), do: result |> done()
+  defp result({:ok, %{update_content_reported_flag: result}}), do: result |> done()
 
   defp result({:error, _, result, _steps}) do
     {:error, result}

lib/groupher_server/cms/delegates/article_comment.ex

@@ -33,7 +33,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
   def list_article_comments(thread, article_id, filters, mode, user \\ nil)
 
   def list_article_comments(thread, article_id, filters, :timeline, user) do
-    where_query = dynamic([c], not c.is_folded and not c.is_reported and not c.is_pinned)
+    where_query = dynamic([c], not c.is_folded and not c.is_pinned)
     do_list_article_comment(thread, article_id, filters, where_query, user)
   end
 
@@ -44,26 +44,19 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
     where_query =
       dynamic(
         [c],
-        is_nil(c.reply_to_id) and not c.is_folded and not c.is_reported and not c.is_pinned
+        is_nil(c.reply_to_id) and not c.is_folded and not c.is_pinned
       )
 
     do_list_article_comment(thread, article_id, filters, where_query, user)
   end
 
   def list_folded_article_comments(thread, article_id, filters) do
-    where_query = dynamic([c], c.is_folded and not c.is_reported and not c.is_pinned)
+    where_query = dynamic([c], c.is_folded and not c.is_pinned)
     do_list_article_comment(thread, article_id, filters, where_query, nil)
   end
 
   def list_folded_article_comments(thread, article_id, filters, user) do
-    where_query = dynamic([c], c.is_folded and not c.is_reported and not c.is_pinned)
-    do_list_article_comment(thread, article_id, filters, where_query, user)
-  end
-
-  def list_reported_article_comments(thread, article_id, filters, user \\ nil)
-
-  def list_reported_article_comments(thread, article_id, filters, user) do
-    where_query = dynamic([c], c.is_reported)
+    where_query = dynamic([c], c.is_folded and not c.is_pinned)
     do_list_article_comment(thread, article_id, filters, where_query, user)
   end
 
@@ -227,8 +220,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
     %{page: page, size: size} = filters
     query = from(c in ArticleComment, preload: [reply_to: :author])
 
-    where_query =
-      dynamic([c], not c.is_reported and not c.is_folded and c.reply_to_id == ^comment_id)
+    where_query = dynamic([c], not c.is_folded and c.reply_to_id == ^comment_id)
 
     query
     |> where(^where_query)

lib/groupher_server/cms/delegates/article_comment_action.ex

@@ -108,10 +108,6 @@ defmodule GroupherServer.CMS.Delegate.ArticleCommentAction do
       |> Multi.run(:create_abuse_report, fn _, _ ->
         CMS.create_report(:article_comment, comment_id, reason, attr, user)
       end)
-      |> Multi.run(:update_report_flag, fn _, _ ->
-        # TODO: update report count in meta
-        ORM.update(comment, %{is_reported: true})
-      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),
@@ -349,7 +345,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleCommentAction do
   defp upsert_comment_result({:ok, %{create_article_comment: result}}), do: {:ok, result}
   defp upsert_comment_result({:ok, %{add_reply_to: result}}), do: {:ok, result}
   defp upsert_comment_result({:ok, %{check_article_author_upvoted: result}}), do: {:ok, result}
-  defp upsert_comment_result({:ok, %{update_report_flag: result}}), do: {:ok, result}
+  defp upsert_comment_result({:ok, %{fold_comment_report_too_many: result}}), do: {:ok, result}
   defp upsert_comment_result({:ok, %{update_comment_flag: result}}), do: {:ok, result}
   defp upsert_comment_result({:ok, %{delete_article_comment: result}}), do: {:ok, result}
 

lib/groupher_server/cms/helper/matcher2.ex

@@ -15,6 +15,7 @@ defmodule GroupherServer.CMS.Helper.Matcher2 do
      %{
        model: ArticleComment,
        foreign_key: :article_comment_id,
+       preload: :article_comment,
        default_meta: CMS.Embeds.ArticleCommentMeta.default_meta()
      }}
   end
@@ -36,6 +37,7 @@ defmodule GroupherServer.CMS.Helper.Matcher2 do
      %{
        model: User,
        foreign_key: :account_id,
+       preload: :account,
        default_meta: Accounts.Embeds.UserMeta.default_meta()
      }}
   end
@@ -47,7 +49,12 @@ defmodule GroupherServer.CMS.Helper.Matcher2 do
 
   def match(:post) do
     {:ok,
-     %{model: Post, foreign_key: :post_id, default_meta: CMS.Embeds.ArticleMeta.default_meta()}}
+     %{
+       model: Post,
+       foreign_key: :post_id,
+       preload: :post,
+       default_meta: CMS.Embeds.ArticleMeta.default_meta()
+     }}
   end
 
   def match(Job) do
@@ -56,7 +63,12 @@ defmodule GroupherServer.CMS.Helper.Matcher2 do
 
   def match(:job) do
     {:ok,
-     %{model: Job, foreign_key: :job_id, default_meta: CMS.Embeds.ArticleMeta.default_meta()}}
+     %{
+       model: Job,
+       foreign_key: :job_id,
+       preload: :job,
+       default_meta: CMS.Embeds.ArticleMeta.default_meta()
+     }}
   end
 
   def match(Repo) do
@@ -65,7 +77,12 @@ defmodule GroupherServer.CMS.Helper.Matcher2 do
 
   def match(:repo) do
     {:ok,
-     %{model: Repo, foreign_key: :repo_id, default_meta: CMS.Embeds.ArticleMeta.default_meta()}}
+     %{
+       model: Repo,
+       foreign_key: :repo_id,
+       preload: :repo,
+       default_meta: CMS.Embeds.ArticleMeta.default_meta()
+     }}
   end
 
   def match(:post, :query, id), do: {:ok, dynamic([c], c.post_id == ^id)}

lib/groupher_server/cms/job.ex

@@ -24,7 +24,7 @@ defmodule GroupherServer.CMS.Job do
 
   @timestamps_opts [type: :utc_datetime_usec]
   @required_fields ~w(title company company_logo body digest length)a
-  @optional_fields ~w(origial_community_id desc company_link link_addr copy_right salary exp education field finance scale article_comments_count article_comments_participators_count upvotes_count collects_count is_reported)a
+  @optional_fields ~w(origial_community_id desc company_link link_addr copy_right salary exp education field finance scale article_comments_count article_comments_participators_count upvotes_count collects_count)a
 
   @type t :: %Job{}
   schema "cms_jobs" do
@@ -57,7 +57,6 @@ defmodule GroupherServer.CMS.Job do
     # NOTE: this one is tricky, pin is dynamic changed when return by func: add_pin_contents_ifneed
     field(:is_pinned, :boolean, default: false, virtual: true)
     field(:trash, :boolean, default_value: false, virtual: true)
-    field(:is_reported, :boolean, default: false)
 
     has_many(:upvotes, {"article_upvotes", ArticleUpvote})
     field(:upvotes_count, :integer, default: 0)

lib/groupher_server/cms/post.ex

@@ -26,7 +26,7 @@ defmodule GroupherServer.CMS.Post do
 
   @timestamps_opts [type: :utc_datetime_usec]
   @required_fields ~w(title body digest length)a
-  @optional_fields ~w(origial_community_id link_addr copy_right link_addr link_icon article_comments_count article_comments_participators_count upvotes_count collects_count is_reported)a
+  @optional_fields ~w(origial_community_id link_addr copy_right link_addr link_icon article_comments_count article_comments_participators_count upvotes_count collects_count)a
 
   @type t :: %Post{}
   schema "cms_posts" do
@@ -48,7 +48,6 @@ defmodule GroupherServer.CMS.Post do
     # field(:pin, :boolean, default_value: false, virtual: true)
     field(:is_pinned, :boolean, default: false, virtual: true)
     field(:trash, :boolean, default_value: false, virtual: true)
-    field(:is_reported, :boolean, default: false)
 
     field(:viewer_has_viewed, :boolean, default: false, virtual: true)
     field(:viewer_has_upvoted, :boolean, default: false, virtual: true)

lib/groupher_server/cms/repo.ex

@@ -25,7 +25,7 @@ defmodule GroupherServer.CMS.Repo do
 
   @timestamps_opts [type: :utc_datetime_usec]
   @required_fields ~w(title owner_name owner_url repo_url desc readme star_count issues_count prs_count fork_count watch_count upvotes_count collects_count)a
-  @optional_fields ~w(origial_community_id last_sync homepage_url release_tag license is_reported)a
+  @optional_fields ~w(origial_community_id last_sync homepage_url release_tag license)a
 
   @type t :: %Repo{}
   schema "cms_repos" do
@@ -61,7 +61,6 @@ defmodule GroupherServer.CMS.Repo do
     # NOTE: this one is tricky, pin is dynamic changed when return by func: add_pin_contents_ifneed
     field(:is_pinned, :boolean, default: false, virtual: true)
     field(:trash, :boolean, default_value: false)
-    field(:is_reported, :boolean, default: false)
 
     has_many(:upvotes, {"article_upvotes", ArticleUpvote})
     field(:upvotes_count, :integer, default: 0)