refactor(viewer-upvote): comment wip

Author: mydearxym

lib/groupher_server/accounts/delegates/collect_folder.ex

@@ -208,8 +208,7 @@ defmodule GroupherServer.Accounts.Delegate.CollectFolder do
     folder
     |> Ecto.Changeset.change(%{total_count: total_count, last_updated: last_updated})
     |> Ecto.Changeset.put_embed(:collects, collects)
-    |> Ecto.Changeset.put_embed(:meta, meta)
-    |> Repo.update()
+    |> ORM.update_meta(meta)
   end
 
   # check if the article is already in this folder

lib/groupher_server/cms/delegates/article_comment.ex

@@ -3,7 +3,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
   CURD and operations for article comments
   """
   import Ecto.Query, warn: false
-  import Helper.Utils, only: [done: 1]
+  import Helper.Utils, only: [done: 1, strip_struct: 1]
   import Helper.ErrorCode
 
   import GroupherServer.CMS.Utils.Matcher2
@@ -363,11 +363,15 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
   def upvote_article_comment(comment_id, %User{id: user_id}) do
     with {:ok, comment} <- ORM.find(ArticleComment, comment_id),
          false <- comment.is_deleted do
+      # TODO: is user upvoted before?
       # IO.inspect(comment, label: "the comment")
       Multi.new()
       |> Multi.run(:create_comment_upvote, fn _, _ ->
         ORM.create(ArticleCommentUpvote, %{article_comment_id: comment.id, user_id: user_id})
       end)
+      |> Multi.run(:add_upvoted_user, fn _, _ ->
+        update_upvoted_user_list(comment, user_id, :add)
+      end)
       |> Multi.run(:inc_upvotes_count, fn _, _ ->
         count_query = from(c in ArticleCommentUpvote, where: c.article_comment_id == ^comment.id)
         upvotes_count = Repo.aggregate(count_query, :count)
@@ -381,6 +385,20 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
     end
   end
 
+  defp update_upvoted_user_list(comment, user_id, opt) do
+    IO.inspect(comment.meta, label: "update_upvoted_user_list meta")
+    cur_user_ids = get_in(comment, [:meta, :upvoted_user_ids])
+
+    user_ids =
+      case opt do
+        :add -> [user_id] ++ cur_user_ids
+        :remove -> cur_user_ids -- [user_id]
+      end
+
+    meta = comment.meta |> Map.merge(%{upvoted_user_ids: user_ids}) |> strip_struct
+    ORM.update_meta(comment, meta)
+  end
+
   @doc "upvote a comment"
   def undo_upvote_article_comment(comment_id, %User{id: user_id}) do
     with {:ok, comment} <- ORM.find(ArticleComment, comment_id),

lib/groupher_server/cms/delegates/article_curd.ex

@@ -7,7 +7,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
   import GroupherServer.CMS.Utils.Matcher2
   import GroupherServer.CMS.Utils.Matcher, only: [match_action: 2]
 
-  import Helper.Utils, only: [done: 1, pick_by: 2, integerfy: 1]
+  import Helper.Utils, only: [done: 1, pick_by: 2, integerfy: 1, strip_struct: 1]
   import Helper.ErrorCode
 
   alias Helper.{Later, ORM}
@@ -443,16 +443,11 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
 
   defp exec_update_tags(_content, _), do: {:ok, :pass}
 
-  # TODO: move to utils
-  defp strip_struct(struct) do
-    struct |> Map.from_struct() |> Map.delete(:id)
-  end
-
   defp update_viewed_user_list(%{meta: nil} = article, user_id) do
     new_ids = Enum.uniq([user_id] ++ @default_article_meta.viewed_user_ids)
     meta = @default_article_meta |> Map.merge(%{viewed_user_ids: new_ids})
 
-    do_update_viewed_user_list(article, meta)
+    ORM.update_meta(article, meta)
   end
 
   defp update_viewed_user_list(%{meta: meta} = article, user_id) do
@@ -462,20 +457,13 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
       true ->
         new_ids = Enum.uniq([user_id] ++ meta.viewed_user_ids)
         meta = meta |> Map.merge(%{viewed_user_ids: new_ids}) |> strip_struct
-        do_update_viewed_user_list(article, meta)
+        ORM.update_meta(article, meta)
 
       false ->
         {:ok, :pass}
     end
   end
 
-  defp do_update_viewed_user_list(article, meta) do
-    article
-    |> Ecto.Changeset.change()
-    |> Ecto.Changeset.put_embed(:meta, meta)
-    |> Repo.update()
-  end
-
   defp read_result({:ok, %{inc_views: result}}), do: result |> done()
 
   defp read_result({:error, _, result, _steps}) do

lib/groupher_server/cms/delegates/article_operation.ex

@@ -7,6 +7,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleOperation do
 
   import Helper.ErrorCode
   import ShortMaps
+  import Helper.Utils, only: [strip_struct: 1]
   import GroupherServer.CMS.Utils.Matcher2
 
   alias Helper.Types, as: T
@@ -163,20 +164,15 @@ defmodule GroupherServer.CMS.Delegate.ArticleOperation do
   @doc "update isEdited meta label if needed"
   # TODO: diff history
   def update_edit_status(%{meta: %Embeds.ArticleMeta{is_edited: false} = meta} = content) do
-    new_meta =
-      meta
-      |> Map.from_struct()
-      |> Map.delete(:id)
-      |> Map.merge(%{is_edited: true})
-
-    do_update_meta(content, new_meta)
+    meta = meta |> strip_struct |> Map.merge(%{is_edited: true})
+    ORM.update_meta(content, meta)
   end
 
   # for test or exsiting articles
   def update_edit_status(%{meta: nil} = content) do
-    new_meta = Embeds.ArticleMeta.default_meta() |> Map.merge(%{is_edited: true})
+    meta = Embeds.ArticleMeta.default_meta() |> Map.merge(%{is_edited: true})
 
-    do_update_meta(content, new_meta)
+    ORM.update_meta(content, meta)
   end
 
   def update_edit_status(content, _), do: {:ok, content}
@@ -186,25 +182,17 @@ defmodule GroupherServer.CMS.Delegate.ArticleOperation do
   def lock_article_comment(
         %{meta: %Embeds.ArticleMeta{is_comment_locked: false} = meta} = content
       ) do
-    new_meta =
+    meta =
       meta
       |> Map.from_struct()
       |> Map.delete(:id)
       |> Map.merge(%{is_comment_locked: true})
 
-    do_update_meta(content, new_meta)
+    ORM.update_meta(content, meta)
   end
 
   def lock_article_comment(content), do: {:ok, content}
 
-  # TODO: put it into ORM helper
-  defp do_update_meta(%{meta: _} = content, meta_params) do
-    content
-    |> Ecto.Changeset.change()
-    |> Ecto.Changeset.put_embed(:meta, meta_params)
-    |> Repo.update()
-  end
-
   # check if the thread has aready enough pined articles
   defp check_pinned_article_count(community_id, thread) do
     thread_upcase = thread |> to_string |> String.upcase()

lib/groupher_server/cms/delegates/article_reaction.ex

@@ -2,10 +2,9 @@ defmodule GroupherServer.CMS.Delegate.ArticleReaction do
   @moduledoc """
   reaction[upvote, collect, watch ...] on article [post, job...]
   """
-  import Helper.Utils, only: [done: 1]
-
   import GroupherServer.CMS.Utils.Matcher2
   import Ecto.Query, warn: false
+  import Helper.Utils, only: [done: 1, strip_struct: 1]
   # import Helper.ErrorCode
   import ShortMaps
 
@@ -232,9 +231,8 @@ defmodule GroupherServer.CMS.Delegate.ArticleReaction do
         :remove -> cur_user_ids -- [user_id]
       end
 
-    updated_meta = @default_article_meta |> Map.merge(%{"#{action}ed_user_ids": updated_user_ids})
-
-    do_update_article_meta(article, updated_meta)
+    meta = @default_article_meta |> Map.merge(%{"#{action}ed_user_ids": updated_user_ids})
+    ORM.update_meta(article, meta)
   end
 
   defp update_article_reaction_user_list(action, article, user_id, opt) do
@@ -246,20 +244,8 @@ defmodule GroupherServer.CMS.Delegate.ArticleReaction do
         :remove -> cur_user_ids -- [user_id]
       end
 
-    meta =
-      article.meta
-      |> Map.merge(%{"#{action}ed_user_ids": updated_user_ids})
-      |> Map.from_struct()
-      |> Map.delete(:id)
-
-    do_update_article_meta(article, meta)
-  end
-
-  defp do_update_article_meta(article, meta) do
-    article
-    |> Ecto.Changeset.change()
-    |> Ecto.Changeset.put_embed(:meta, meta)
-    |> Repo.update()
+    meta = article.meta |> Map.merge(%{"#{action}ed_user_ids": updated_user_ids}) |> strip_struct
+    ORM.update_meta(article, meta)
   end
 
   defp reaction_result({:ok, %{create_upvote: result}}), do: result |> done()

lib/groupher_server/cms/embeds/article_comment_meta.ex

@@ -11,7 +11,8 @@ defmodule GroupherServer.CMS.Embeds.ArticleCommentMeta do
     is_article_author_upvoted: false,
     is_solution: false,
     is_reply_to_others: false,
-    report_count: 0
+    report_count: 0,
+    upvoted_user_ids: []
   }
 
   @doc "for test usage"
@@ -24,6 +25,8 @@ defmodule GroupherServer.CMS.Embeds.ArticleCommentMeta do
     # 用于回复模式，指代这条回复是回复“回复列表其他人的” （方便前端展示）
     field(:is_reply_to_others, :boolean, default: false)
     field(:report_count, :integer, default: 0)
+
+    field(:upvoted_user_ids, {:array, :integer}, default: [])
   end
 
   def changeset(struct, params) do

lib/helper/orm.ex

@@ -262,6 +262,16 @@ defmodule Helper.ORM do
     queryable |> count() |> add()
   end
 
+  @doc """
+  update meta info for article / comment
+  """
+  def update_meta(queryable, meta) do
+    queryable
+    |> Ecto.Changeset.change()
+    |> Ecto.Changeset.put_embed(:meta, meta)
+    |> Repo.update()
+  end
+
   @doc "extract common articles info"
   @spec extract_articles(T.paged_data(), [Atom.t()]) :: T.paged_article_common()
   def extract_articles(%{entries: entries} = paged_articles, supported_threads) do

lib/helper/utils/utils.ex

@@ -166,6 +166,13 @@ defmodule Helper.Utils do
     value < target
   end
 
+  @doc """
+  convert struct to normal map and remove :id field
+  """
+  def strip_struct(struct) when is_struct(struct) do
+    struct |> Map.from_struct() |> Map.delete(:id)
+  end
+
   @doc "html uniq id generator for editorjs"
   @spec uid(:html, map) :: String.t()
   def uid(:html, %{"id" => id}) when g_none_empty_str(id), do: id

test/groupher_server/cms/article_comment_test.exs

@@ -130,6 +130,14 @@ defmodule GroupherServer.Test.CMS.ArticleComment do
       assert comment.meta.is_article_author_upvoted
     end
 
+    @tag :wip2
+    test "article author upvote post comment will update upvoted_user_ids", ~m(post user)a do
+      comment = "post_comment"
+      {:ok, comment} = CMS.create_article_comment(:post, post.id, comment, user)
+      CMS.upvote_article_comment(comment.id, user)
+      # IO.inspect(hello, label: "the hello")
+    end
+
     @tag :wip
     test "user can upvote a job comment", ~m(user job)a do
       comment = "job_comment"