refactor(viewer-upvote): gq-workflow done

Author: mydearxym

lib/groupher_server/cms/article_comment.ex

@@ -69,6 +69,7 @@ defmodule GroupherServer.CMS.ArticleComment do
 
     # 是否置顶
     field(:is_pinned, :boolean, default: false)
+    field(:viewer_has_upvoted, :boolean, default: false, virtual: true)
 
     belongs_to(:author, Accounts.User, foreign_key: :author_id)
     belongs_to(:post, Post, foreign_key: :post_id)

lib/groupher_server/cms/delegates/article_comment.ex

@@ -364,15 +364,14 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment 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 _, _ ->
+      |> Multi.run(:inc_upvotes_count, fn _, %{add_upvoted_user: comment} ->
         count_query = from(c in ArticleCommentUpvote, where: c.article_comment_id == ^comment.id)
         upvotes_count = Repo.aggregate(count_query, :count)
         ORM.update(comment, %{upvotes_count: upvotes_count})
@@ -385,20 +384,6 @@ 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),
@@ -410,7 +395,10 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
           user_id: user_id
         })
       end)
-      |> Multi.run(:desc_upvotes_count, fn _, _ ->
+      |> Multi.run(:remove_upvoted_user, fn _, _ ->
+        update_upvoted_user_list(comment, user_id, :remove)
+      end)
+      |> Multi.run(:desc_upvotes_count, fn _, %{remove_upvoted_user: comment} ->
         count_query = from(c in ArticleCommentUpvote, where: c.article_comment_id == ^comment_id)
         upvotes_count = Repo.aggregate(count_query, :count)
 
@@ -437,6 +425,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
       |> ORM.paginater(~m(page size)a)
       |> set_viewer_emotion_ifneed(user)
       |> add_pined_comments_ifneed(thread, article_id, filters)
+      |> mark_viewer_has_upvoted(user)
       |> done()
     end
   end
@@ -453,6 +442,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
     |> QueryBuilder.filter_pack(filters)
     |> ORM.paginater(~m(page size)a)
     |> set_viewer_emotion_ifneed(user)
+    |> mark_viewer_has_upvoted(user)
     |> done()
   end
 
@@ -625,6 +615,18 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
     %{paged_comments | entries: new_entries}
   end
 
+  defp mark_viewer_has_upvoted(paged_comments, nil), do: paged_comments
+
+  defp mark_viewer_has_upvoted(%{entries: entries} = paged_comments, %User{} = user) do
+    entries =
+      Enum.map(
+        entries,
+        &Map.merge(&1, %{viewer_has_upvoted: Enum.member?(&1.meta.upvoted_user_ids, user.id)})
+      )
+
+    Map.merge(paged_comments, %{entries: entries})
+  end
+
   defp get_article(%ArticleComment{post_id: post_id} = comment) when not is_nil(post_id) do
     with {:ok, article} <- ORM.find(Post, comment.post_id, preload: [author: :user]) do
       {:post, article}
@@ -692,6 +694,19 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
     end
   end
 
+  defp update_upvoted_user_list(comment, user_id, opt) do
+    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
+
   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}

lib/groupher_server/cms/embeds/article_comment_meta.ex

@@ -3,6 +3,8 @@ defmodule GroupherServer.CMS.Embeds.ArticleCommentMeta do
   general article comment meta info
   """
   use Ecto.Schema
+  use Accessible
+
   import Ecto.Changeset
 
   @optional_fields ~w(is_article_author_upvoted is_solution report_count is_reply_to_others)a

lib/groupher_server/cms/utils/loader.ex

@@ -9,7 +9,6 @@ defmodule GroupherServer.CMS.Utils.Loader do
 
   alias CMS.{
     Author,
-    ArticleCommentUpvote,
     CommunityEditor,
     CommunitySubscriber,
     CommunityThread,
@@ -165,12 +164,12 @@ defmodule GroupherServer.CMS.Utils.Loader do
     |> QueryBuilder.members_pack(args)
   end
 
-  def query({"articles_comments_upvotes", ArticleCommentUpvote}, %{
-        viewer_did: _,
-        cur_user: cur_user
-      }) do
-    ArticleCommentUpvote |> where([f], f.user_id == ^cur_user.id)
-  end
+  # def query({"articles_comments_upvotes", ArticleCommentUpvote}, %{
+  #       viewer_did: _,
+  #       cur_user: cur_user
+  #     }) do
+  #   ArticleCommentUpvote |> where([f], f.user_id == ^cur_user.id)
+  # end
 
   # default loader
   def query(queryable, _args) do

lib/groupher_server_web/schema/cms/cms_types.ex

@@ -339,15 +339,7 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
     field(:meta, :article_comment_meta)
     field(:replies_count, :integer)
     field(:reply_to, :article_comment_reply)
-
-    field :viewer_has_upvoted, :boolean do
-      arg(:viewer_did, :viewer_did_type, default_value: :viewer_did)
-
-      middleware(M.Authorize, :login)
-      middleware(M.PutCurrentUser)
-      resolve(dataloader(CMS, :upvotes))
-      middleware(M.ViewerDidConvert)
-    end
+    field(:viewer_has_upvoted, :boolean)
 
     timestamp_fields()
   end
@@ -365,15 +357,8 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
     field(:reply_to, :article_comment_reply)
     field(:replies, list_of(:article_comment_reply))
     field(:replies_count, :integer)
-    # field(:viewer_has_upvoted, :boolean, resolve: dataloader(CMS, :))
-    field :viewer_has_upvoted, :boolean do
-      arg(:viewer_did, :viewer_did_type, default_value: :viewer_did)
 
-      middleware(M.Authorize, :login)
-      middleware(M.PutCurrentUser)
-      resolve(dataloader(CMS, :upvotes))
-      middleware(M.ViewerDidConvert)
-    end
+    field(:viewer_has_upvoted, :boolean)
 
     timestamp_fields()
   end

test/groupher_server/cms/article_comment_test.exs

@@ -131,11 +131,29 @@ defmodule GroupherServer.Test.CMS.ArticleComment do
     end
 
     @tag :wip2
-    test "article author upvote post comment will update upvoted_user_ids", ~m(post user)a do
+    test "user upvote post comment will add id to 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")
+      {:ok, comment} = CMS.upvote_article_comment(comment.id, user)
+
+      assert user.id in comment.meta.upvoted_user_ids
+    end
+
+    @tag :wip2
+    test "user undo upvote post comment will remove id from upvoted_user_ids",
+         ~m(post user user2)a do
+      comment = "post_comment"
+      {:ok, comment} = CMS.create_article_comment(:post, post.id, comment, user)
+      {:ok, _comment} = CMS.upvote_article_comment(comment.id, user)
+      {:ok, comment} = CMS.upvote_article_comment(comment.id, user2)
+
+      assert user2.id in comment.meta.upvoted_user_ids
+      assert user.id in comment.meta.upvoted_user_ids
+
+      {:ok, comment} = CMS.undo_upvote_article_comment(comment.id, user2)
+
+      assert user.id in comment.meta.upvoted_user_ids
+      assert user2.id not in comment.meta.upvoted_user_ids
     end
 
     @tag :wip

test/groupher_server_web/query/cms/article_comment_test.exs

@@ -473,7 +473,7 @@ defmodule GroupherServer.Test.Query.ArticleComment do
              |> get_in(["emotions", "viewerHasDownvoteed"])
     end
 
-    @tag :wip
+    @tag :wip2
     test "comment should have viewer has upvoted flag", ~m(user_conn post user)a do
       total_count = 10
       page_size = 12