refactor: clean up

Author: mydearxym

lib/groupher_server/cms/delegates/article_comment_action.ex

@@ -63,7 +63,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleCommentAction do
         )
       end)
       |> Repo.transaction()
-      |> upsert_comment_result()
+      |> result()
     end
   end
 
@@ -77,7 +77,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleCommentAction do
         ORM.findby_delete(ArticlePinedComment, %{article_comment_id: comment.id})
       end)
       |> Repo.transaction()
-      |> upsert_comment_result()
+      |> result()
     end
   end
 
@@ -141,7 +141,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleCommentAction do
         |> Repo.update()
       end)
       |> Repo.transaction()
-      |> upsert_comment_result()
+      |> result()
     end
   end
 
@@ -166,7 +166,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleCommentAction do
         update_article_author_upvoted_info(comment, user_id)
       end)
       |> Repo.transaction()
-      |> upsert_comment_result()
+      |> result()
     end
   end
 
@@ -194,7 +194,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleCommentAction do
         update_article_author_upvoted_info(updated_comment, user_id)
       end)
       |> Repo.transaction()
-      |> upsert_comment_result()
+      |> result()
     end
   end
 
@@ -324,24 +324,24 @@ defmodule GroupherServer.CMS.Delegate.ArticleCommentAction do
     ORM.update_meta(comment, meta)
   end
 
-  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, %{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}
+  defp result({:ok, %{create_article_comment: result}}), do: {:ok, result}
+  defp result({:ok, %{add_reply_to: result}}), do: {:ok, result}
+  defp result({:ok, %{check_article_author_upvoted: result}}), do: {:ok, result}
+  defp result({:ok, %{fold_comment_report_too_many: result}}), do: {:ok, result}
+  defp result({:ok, %{update_comment_flag: result}}), do: {:ok, result}
+  defp result({:ok, %{delete_article_comment: result}}), do: {:ok, result}
 
-  defp upsert_comment_result({:error, :create_article_comment, result, _steps}) do
+  defp result({:error, :create_article_comment, result, _steps}) do
     raise_error(:create_comment, result)
   end
 
-  defp upsert_comment_result({:error, :add_participator, result, _steps}) do
+  defp result({:error, :add_participator, result, _steps}) do
     {:error, result}
   end
 
-  defp upsert_comment_result({:error, :create_abuse_report, result, _steps}) do
+  defp result({:error, :create_abuse_report, result, _steps}) do
     {:error, result}
   end
 
-  defp upsert_comment_result({:error, _, result, _steps}), do: {:error, result}
+  defp result({:error, _, result, _steps}), do: {:error, result}
 end

lib/groupher_server/cms/delegates/helper.ex

@@ -28,8 +28,8 @@ defmodule GroupherServer.CMS.Delegate.Helper do
   defp get_supported_mentions(_), do: @supported_emotions
 
   def mark_viewer_emotion_states(paged_contents, nil), do: paged_contents
-  def mark_viewer_emotion_states(paged_contents, nil, :comment), do: paged_contents
   def mark_viewer_emotion_states(%{entries: []} = paged_contents, _), do: paged_contents
+  def mark_viewer_emotion_states(paged_contents, nil, :comment), do: paged_contents
 
   @doc """
   mark viewer emotions status for article or comment
@@ -101,16 +101,26 @@ defmodule GroupherServer.CMS.Delegate.Helper do
   ######
   # reaction related end, include upvote && collect
   #######
-  def load_reaction_users(schema, thread, article_id, %{page: page, size: size} = filter) do
+  @doc """
+  paged [reaction] users list
+  """
+  def load_reaction_users(queryable, thread, article_id, filter) do
+    %{page: page, size: size} = filter
+
     with {:ok, info} <- match(thread) do
-      schema
+      queryable
       |> where([u], field(u, ^info.foreign_key) == ^article_id)
       |> QueryBuilder.load_inner_users(filter)
       |> ORM.paginater(~m(page size)a)
       |> done()
     end
   end
 
+  @doc """
+  update the [reaction]s_count for article
+  e.g:
+  inc/dec upvotes_count of article
+  """
   def update_article_reactions_count(info, article, field, opt) do
     schema =
       case field do