refactor(abuse-report): wip

Author: mydearxym

lib/groupher_server/cms/cms.ex

@@ -160,11 +160,11 @@ defmodule GroupherServer.CMS do
   defdelegate list_comments_participators(thread, content_id, filters), to: CommentCURD
 
   # TODO: move report to abuse report module
-  defdelegate create_report(type, content_id, args, user), to: AbuseReport
+  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 report_article_comment(comment_id, user), to: ArticleCommentAction
+  defdelegate report_article_comment(comment_id, reason, attr, user), to: ArticleCommentAction
   defdelegate unreport_article_comment(comment_id, user), to: ArticleCommentAction
 
   # Passport CURD

lib/groupher_server/cms/delegates/abuse_report.ex

@@ -17,6 +17,9 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
 
   alias Ecto.Multi
 
+  @doc """
+  list paged reports for both comment and article
+  """
   def list_reports(type, content_id, %{page: page, size: size} = filter) do
     with {:ok, info} <- match(type) do
       query = from(r in AbuseReport, where: field(r, ^info.foreign_key) == ^content_id)
@@ -28,6 +31,9 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
     end
   end
 
+  @doc """
+  report article content
+  """
   def report_article(thread, article_id, reason, attr, %User{} = user) do
     with {:ok, info} <- match(thread),
          {:ok, article} <- ORM.find(info.model, article_id) do
@@ -43,7 +49,9 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
     end
   end
 
-  @doc "unreport an article"
+  @doc """
+  undo report article content
+  """
   def undo_report_article(thread, article_id, %User{} = user) do
     with {:ok, info} <- match(thread),
          {:ok, article} <- ORM.find(info.model, article_id) do
@@ -59,47 +67,6 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
     end
   end
 
-  defp delete_report(thread, content_id, %User{} = user) do
-    with {:ok, info} <- match(thread),
-         {:error, _} <- not_reported_before(info, content_id, user),
-         {:ok, report} = ORM.find_by(AbuseReport, Map.put(%{}, info.foreign_key, content_id)) do
-      case length(report.report_cases) do
-        1 ->
-          ORM.delete(report)
-
-        _ ->
-          report_cases = report.report_cases |> Enum.reject(&(&1.user.login == user.login))
-
-          report
-          |> Ecto.Changeset.change(%{report_cases_count: length(report_cases)})
-          |> Ecto.Changeset.put_embed(:report_cases, report_cases)
-          |> Repo.update()
-      end
-    end
-  end
-
-  # update is_reported flag and reported_count in mete for article or comment
-  defp update_report_meta(info, content, is_reported) do
-    case ORM.find_by(AbuseReport, Map.put(%{}, info.foreign_key, content.id)) do
-      {:ok, record} ->
-        reported_count = record.report_cases |> length
-        meta = content.meta |> Map.merge(%{reported_count: reported_count}) |> strip_struct
-
-        content
-        |> Ecto.Changeset.change(%{is_reported: is_reported})
-        |> Ecto.Changeset.put_embed(:meta, meta)
-        |> Repo.update()
-
-      {:error, _} ->
-        meta = content.meta |> Map.merge(%{reported_count: 0}) |> strip_struct
-
-        content
-        |> Ecto.Changeset.change(%{is_reported: false})
-        |> Ecto.Changeset.put_embed(:meta, meta)
-        |> Repo.update()
-    end
-  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
@@ -126,7 +93,7 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
               length(report.report_cases),
               %Embeds.AbuseReportCase{
                 reason: reason,
-                additional_reason: "additional_reason",
+                additional_reason: attr,
                 user: %{login: user.login, nickname: user.nickname}
               }
             )
@@ -139,53 +106,52 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
     end
   end
 
-  ##############
-  ##############
-  ##############
-  ##############
-
-  @doc """
-  create report record
-  """
-  def create_report(type, content_id, %{reason: reason}, %User{} = user) do
-    with {:ok, info} <- match(type),
-         {:ok, report} <- not_reported_before(info, content_id, user) do
-      case report do
-        nil ->
-          updated_report_cases = [
-            %{
-              reason: reason,
-              additional_reason: "additional_reason",
-              user: %{login: user.login, nickname: user.nickname}
-            }
-          ]
-
-          args =
-            %{report_cases_count: 1, report_cases: updated_report_cases}
-            |> Map.put(info.foreign_key, content_id)
-
-          AbuseReport |> ORM.create(args)
+  defp delete_report(thread, content_id, %User{} = user) do
+    with {:ok, info} <- match(thread),
+         {:error, _} <- not_reported_before(info, content_id, user),
+         {:ok, report} = ORM.find_by(AbuseReport, Map.put(%{}, info.foreign_key, content_id)) do
+      case length(report.report_cases) do
+        1 ->
+          ORM.delete(report)
 
         _ ->
-          updated_report_cases =
-            report.report_cases
-            |> List.insert_at(
-              length(report.report_cases),
-              %Embeds.AbuseReportCase{
-                reason: reason,
-                additional_reason: "additional_reason",
-                user: %{login: user.login, nickname: user.nickname}
-              }
-            )
+          report_cases = report.report_cases |> Enum.reject(&(&1.user.login == user.login))
 
           report
-          |> Ecto.Changeset.change(%{report_cases_count: length(updated_report_cases)})
-          |> Ecto.Changeset.put_embed(:report_cases, updated_report_cases)
+          |> Ecto.Changeset.change(%{report_cases_count: length(report_cases)})
+          |> Ecto.Changeset.put_embed(:report_cases, report_cases)
           |> Repo.update()
       end
     end
   end
 
+  # update is_reported flag and reported_count in mete for article or comment
+  defp update_report_meta(info, content, is_reported) do
+    case ORM.find_by(AbuseReport, Map.put(%{}, info.foreign_key, content.id)) do
+      {:ok, record} ->
+        reported_count = record.report_cases |> length
+        meta = content.meta |> Map.merge(%{reported_count: reported_count}) |> strip_struct
+
+        content
+        |> Ecto.Changeset.change(%{is_reported: is_reported})
+        |> Ecto.Changeset.put_embed(:meta, meta)
+        |> Repo.update()
+
+      {:error, _} ->
+        meta = content.meta |> Map.merge(%{reported_count: 0}) |> strip_struct
+
+        content
+        |> Ecto.Changeset.change(%{is_reported: false})
+        |> Ecto.Changeset.put_embed(:meta, meta)
+        |> Repo.update()
+    end
+  end
+
+  ##############
+  ##############
+  ##############
+  ##############
+
   defp not_reported_before(info, content_id, %User{login: login}) do
     query = from(r in AbuseReport, where: field(r, ^info.foreign_key) == ^content_id)
 
@@ -202,9 +168,7 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
           |> length
           |> Kernel.>(0)
 
-        if not reported_before,
-          do: {:ok, report},
-          else: {:error, "#{login} already reported"}
+        if not reported_before, do: {:ok, report}, else: {:error, "#{login} already reported"}
     end
   end
 

lib/groupher_server/cms/delegates/article_comment_action.ex

@@ -102,11 +102,11 @@ defmodule GroupherServer.CMS.Delegate.ArticleCommentAction do
   end
 
   @doc "report a comment"
-  def report_article_comment(comment_id, %User{} = user) do
+  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: "todo fucked"}, user)
+        CMS.create_report(:article_comment, comment_id, reason, attr, user)
       end)
       |> Multi.run(:update_report_flag, fn _, _ ->
         # TODO: update report count in meta

lib/groupher_server/cms/embeds/article_comment_meta.ex

@@ -7,14 +7,15 @@ defmodule GroupherServer.CMS.Embeds.ArticleCommentMeta do
 
   import Ecto.Changeset
 
-  @optional_fields ~w(is_article_author_upvoted is_solution report_count is_reply_to_others)a
+  @optional_fields ~w(is_article_author_upvoted is_solution report_count is_reply_to_others reported_count)a
 
   @default_meta %{
     is_article_author_upvoted: false,
     is_solution: false,
     is_reply_to_others: false,
     report_count: 0,
-    upvoted_user_ids: []
+    upvoted_user_ids: [],
+    reported_count: 0
   }
 
   @doc "for test usage"
@@ -29,6 +30,7 @@ defmodule GroupherServer.CMS.Embeds.ArticleCommentMeta do
     field(:report_count, :integer, default: 0)
 
     field(:upvoted_user_ids, {:array, :integer}, default: [])
+    field(:reported_count, :integer, default: 0)
   end
 
   def changeset(struct, params) do

test/groupher_server/cms/abuse_reports/comment_report_test.exs

@@ -3,11 +3,8 @@ defmodule GroupherServer.Test.CMS.AbuseReports.CommentReport do
 
   use GroupherServer.TestTools
 
-  alias Helper.ORM
   alias GroupherServer.CMS
 
-  alias CMS.AbuseReport
-
   setup do
     {:ok, user} = db_insert(:user)
     {:ok, user2} = db_insert(:user)
@@ -18,10 +15,10 @@ 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, 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})
 
@@ -33,12 +30,12 @@ defmodule GroupherServer.Test.CMS.AbuseReports.CommentReport do
       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, user)
-      {:ok, _} = CMS.report_article_comment(comment.id, user2)
+      {: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})
 
@@ -56,8 +53,8 @@ defmodule GroupherServer.Test.CMS.AbuseReports.CommentReport do
     @tag :wip
     test "same user can not report a comment twice", ~m(user post)a do
       {:ok, comment} = CMS.create_article_comment(:post, post.id, "commment", user)
-      {:ok, comment} = CMS.report_article_comment(comment.id, user)
-      assert {:error, _} = CMS.report_article_comment(comment.id, user)
+      {:ok, comment} = CMS.report_article_comment(comment.id, "reason", "attr", user)
+      assert {:error, _} = CMS.report_article_comment(comment.id, "reason", "attr", user)
     end
   end
 end

test/groupher_server/cms/comments/job_comment_emotions_test.exs

@@ -21,7 +21,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentEmotions do
   end
 
   describe "[emotion in paged article comment]" do
-    @tag :wip3
+    @tag :wip2
     test "login user should got viewer has emotioned status", ~m(job user)a do
       total_count = 0
       page_number = 10
@@ -76,7 +76,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentEmotions do
       assert @default_emotions == emotions
     end
 
-    @tag :wip3
+    @tag :wip2
     test "can make emotion to comment", ~m(job user user2)a do
       parent_content = "parent comment"
       {:ok, parent_comment} = CMS.create_article_comment(:job, job.id, parent_content, user)
@@ -91,7 +91,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentEmotions do
       assert user_exist_in?(user2, emotions.latest_downvote_users)
     end
 
-    @tag :wip3
+    @tag :wip2
     test "can undo emotion to comment", ~m(job user user2)a do
       parent_content = "parent comment"
       {:ok, parent_comment} = CMS.create_article_comment(:job, job.id, parent_content, user)
@@ -114,7 +114,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentEmotions do
       assert not user_exist_in?(user2, emotions.latest_downvote_users)
     end
 
-    @tag :wip3
+    @tag :wip2
     test "same user make same emotion to same comment.", ~m(job user)a do
       parent_content = "parent comment"
       {:ok, parent_comment} = CMS.create_article_comment(:job, job.id, parent_content, user)
@@ -128,7 +128,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentEmotions do
       assert user_exist_in?(user, parent_comment.emotions.latest_downvote_users)
     end
 
-    @tag :wip3
+    @tag :wip2
     test "same user same emotion to same comment only have one user_emotion record",
          ~m(job user)a do
       parent_content = "parent comment"
@@ -152,7 +152,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentEmotions do
       assert record.heart
     end
 
-    @tag :wip3
+    @tag :wip2
     test "different user can make same emotions on same comment", ~m(job user user2 user3)a do
       {:ok, parent_comment} = CMS.create_article_comment(:job, job.id, "parent comment", user)
 

test/groupher_server/cms/comments/job_comment_replies_test.exs

@@ -33,7 +33,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentReplies do
       assert exist_in?(replyed_comment, parent_comment.replies)
     end
 
-    @tag :wip3
+    @tag :wip2
     test "deleted comment can not be reply", ~m(job user user2)a do
       parent_content = "parent comment"
       reply_content = "reply comment"
@@ -64,7 +64,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentReplies do
       assert exist_in?(replyed_comment_2, parent_comment.replies)
     end
 
-    @tag :wip3
+    @tag :wip2
     test "reply to reply inside a comment should belong same parent comment",
          ~m(job user user2)a do
       {:ok, parent_comment} = CMS.create_article_comment(:job, job.id, "parent comment", user)
@@ -90,7 +90,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentReplies do
       assert replyed_comment_3.reply_to_id == replyed_comment_2.id
     end
 
-    @tag :wip3
+    @tag :wip2
     test "reply to reply inside a comment should have is_reply_to_others flag in meta",
          ~m(job user user2)a do
       {:ok, parent_comment} = CMS.create_article_comment(:job, job.id, "parent comment", user)
@@ -110,7 +110,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobCommentReplies do
       assert replyed_comment_3.meta.is_reply_to_others
     end
 
-    @tag :wip3
+    @tag :wip2
     test "comment replies only contains @max_parent_replies_count replies", ~m(job user)a do
       total_reply_count = @max_parent_replies_count + 1