refactor(article-comments): improve replies test

Author: mydearxym

lib/groupher_server/cms/delegates/article_comment.ex

@@ -107,11 +107,12 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
 
   defp do_list_comment_replies(comment_id, filters, user) 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)
 
-    ArticleComment
+    query
     |> where(^where_query)
     |> QueryBuilder.filter_pack(filters)
     |> ORM.paginater(~m(page size)a)

lib/groupher_server_web/resolvers/cms_resolver.ex

@@ -361,6 +361,14 @@ defmodule GroupherServerWeb.Resolvers.CMS do
     end
   end
 
+  def paged_comment_replies(_root, ~m(id filter)a, %{context: %{cur_user: user}}) do
+    CMS.list_comment_replies(id, filter, user)
+  end
+
+  def paged_comment_replies(_root, ~m(id filter)a, _info) do
+    CMS.list_comment_replies(id, filter)
+  end
+
   def paged_comments(_root, ~m(id thread filter)a, _info) do
     CMS.list_comments(thread, id, filter)
   end

lib/groupher_server_web/schema/cms/cms_queries.ex

@@ -171,6 +171,15 @@ defmodule GroupherServerWeb.Schema.CMS.Queries do
       resolve(&R.CMS.paged_article_comments/3)
     end
 
+    @desc "get paged replies of a comment"
+    field :paged_comment_replies, :paged_article_replies do
+      arg(:id, non_null(:id))
+      arg(:filter, :comments_filter)
+
+      middleware(M.PageSizeProof)
+      resolve(&R.CMS.paged_comment_replies/3)
+    end
+
     @desc "get paged comments"
     field :paged_comments, :paged_comments do
       arg(:id, non_null(:id))

lib/groupher_server_web/schema/cms/cms_types.ex

@@ -345,7 +345,23 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
     field(:body_html, :string)
     field(:author, :user, resolve: dataloader(CMS, :author))
     field(:floor, :integer)
+    field(:upvotes_count, :integer)
     field(:is_article_author, :boolean)
+    field(:emotions, :article_comment_emotions)
+    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
+
+    timestamp_fields()
   end
 
   object :article_comment do
@@ -371,8 +387,6 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
       middleware(M.ViewerDidConvert)
     end
 
-    # replies ...
-
     timestamp_fields()
   end
 
@@ -422,11 +436,15 @@ defmodule GroupherServerWeb.Schema.CMS.Types do
   end
 
   object :paged_article_comments do
-    # field(:id, :string)
     field(:entries, list_of(:article_comment))
     pagination_fields()
   end
 
+  object :paged_article_replies do
+    field(:entries, list_of(:article_comment_reply))
+    pagination_fields()
+  end
+
   object :paged_post_comments do
     field(:entries, list_of(:post_comment))
     pagination_fields()

test/groupher_server_web/query/cms/article_comment_test.exs

@@ -17,6 +17,86 @@ defmodule GroupherServer.Test.Query.ArticleComment do
     {:ok, ~m(user_conn guest_conn post job user user2)a}
   end
 
+  describe "paged replies" do
+    @query """
+      query($id: ID!, $filter: CommentsFilter!) {
+        pagedCommentReplies(id: $id, filter: $filter) {
+          entries {
+            id
+            bodyHtml
+            author {
+              id
+              nickname
+            }
+            upvotesCount
+            emotions {
+              downvoteCount
+              latestDownvoteUsers {
+                login
+                nickname
+              }
+              viewerHasDownvoteed
+              beerCount
+              latestBeerUsers {
+                login
+                nickname
+              }
+              viewerHasBeered
+            }
+            isArticleAuthor
+            meta {
+              isArticleAuthorUpvoted
+            }
+            replyTo {
+              id
+              bodyHtml
+              floor
+              isArticleAuthor
+              author {
+                id
+                login
+              }
+            }
+            repliesCount
+            viewerHasUpvoted
+          }
+          totalPages
+          totalCount
+          pageSize
+          pageNumber
+        }
+    }
+    """
+    @tag :wip2
+    test "guest user can get paged replies", ~m(guest_conn post user user2)a do
+      comment = "test comment"
+      total_count = 2
+      page_size = 10
+      thread = :post
+
+      author_user = post.author.user
+      {:ok, parent_comment} = CMS.create_article_comment(thread, post.id, comment, user)
+
+      Enum.reduce(1..total_count, [], fn i, acc ->
+        {:ok, reply_comment} = CMS.reply_article_comment(parent_comment.id, "reply #{i}", user2)
+
+        acc ++ [reply_comment]
+      end)
+
+      {:ok, author_reply_comment} =
+        CMS.reply_article_comment(parent_comment.id, "author reply", author_user)
+
+      variables = %{id: parent_comment.id, filter: %{page: 1, size: page_size}}
+      results = guest_conn |> query_result(@query, variables, "pagedCommentReplies")
+
+      author_reply_comment =
+        Enum.find(results["entries"], &(&1["id"] == to_string(author_reply_comment.id)))
+
+      assert author_reply_comment["isArticleAuthor"]
+      assert results["entries"] |> length == total_count + 1
+    end
+  end
+
   describe "[baisc article post comment]" do
     @query """
     query($id: ID!) {
@@ -187,7 +267,7 @@ defmodule GroupherServer.Test.Query.ArticleComment do
       assert random_comment["repliesCount"] == 2
     end
 
-    @tag :wip2
+    @tag :wip
     test "comment should have reply_to content if need", ~m(guest_conn post user user2)a do
       total_count = 2
       thread = :post