refactor(article-comments): support sort in filters (#347)

* refactor(article-comments): support sort in filters

* refactor(article-comments): update job test

* refactor(article-comments): fix test

* refactor(article-comments): fix test

Author: mydearxym

lib/groupher_server/cms/delegates/article_comment.ex

@@ -204,14 +204,16 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
 
   defp do_list_article_comment(thread, article_id, filters, where_query, user) do
     %{page: page, size: size} = filters
+    sort = Map.get(filters, :sort, :asc_inserted)
 
     with {:ok, thread_query} <- match(thread, :query, article_id) do
       query = from(c in ArticleComment, preload: [reply_to: :author])
 
       query
       |> where(^thread_query)
       |> where(^where_query)
-      |> QueryBuilder.filter_pack(Map.merge(filters, %{sort: :asc_inserted}))
+      # |> QueryBuilder.filter_pack(Map.merge(filters, %{sort: :asc_inserted}))
+      |> QueryBuilder.filter_pack(Map.merge(filters, %{sort: sort}))
       |> ORM.paginater(~m(page size)a)
       |> set_viewer_emotion_ifneed(user)
       |> add_pined_comments_ifneed(thread, article_id, filters)

lib/groupher_server_web/resolvers/cms_resolver.ex

@@ -286,21 +286,15 @@ defmodule GroupherServerWeb.Resolvers.CMS do
   # #######################
   def paged_article_comments(_root, ~m(id thread filter mode)a, %{context: %{cur_user: user}}) do
     case mode do
-      :replies ->
-        CMS.list_article_comments(thread, id, filter, :replies, user)
-
-      :timeline ->
-        CMS.list_article_comments(thread, id, filter, :timeline, user)
+      :replies -> CMS.list_article_comments(thread, id, filter, :replies, user)
+      :timeline -> CMS.list_article_comments(thread, id, filter, :timeline, user)
     end
   end
 
   def paged_article_comments(_root, ~m(id thread filter mode)a, _info) do
     case mode do
-      :replies ->
-        CMS.list_article_comments(thread, id, filter, :replies)
-
-      :timeline ->
-        CMS.list_article_comments(thread, id, filter, :timeline)
+      :replies -> CMS.list_article_comments(thread, id, filter, :replies)
+      :timeline -> CMS.list_article_comments(thread, id, filter, :timeline)
     end
   end
 

lib/groupher_server_web/schema/Helper/metrics.ex

@@ -33,6 +33,6 @@ defmodule GroupherServerWeb.Schema.Helper.Metrics do
 
   input_object :common_paged_filter do
     pagination_args()
-    field(:sort, :comment_sort_enum, default_value: :desc_inserted)
+    field(:sort, :inserted_sort_enum, default_value: :desc_inserted)
   end
 end

lib/groupher_server_web/schema/cms/cms_misc.ex

@@ -95,11 +95,9 @@ defmodule GroupherServerWeb.Schema.CMS.Misc do
     value(:this_year)
   end
 
-  enum :comment_sort_enum do
+  enum :inserted_sort_enum do
     value(:asc_inserted)
     value(:desc_inserted)
-    value(:most_likes)
-    value(:most_dislikes)
   end
 
   enum :thread_sort_enum do
@@ -173,7 +171,7 @@ defmodule GroupherServerWeb.Schema.CMS.Misc do
 
   input_object :comments_filter do
     pagination_args()
-    field(:sort, :comment_sort_enum, default_value: :asc_inserted)
+    field(:sort, :inserted_sort_enum, default_value: :asc_inserted)
   end
 
   input_object :communities_filter do

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 :wip2
+    @tag :wip3
     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 :wip2
+    @tag :wip3
     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 :wip2
+    @tag :wip3
     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 :wip2
+    @tag :wip3
     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 :wip2
+    @tag :wip3
     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 :wip2
+    @tag :wip3
     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 :wip2
+    @tag :wip3
     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 :wip2
+    @tag :wip3
     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 :wip2
+    @tag :wip3
     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 :wip2
+    @tag :wip3
     test "comment replies only contains @max_parent_replies_count replies", ~m(job user)a do
       total_reply_count = @max_parent_replies_count + 1
 

test/groupher_server/cms/comments/job_comment_test.exs

@@ -39,7 +39,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do
       assert comment.meta |> Map.from_struct() |> Map.delete(:id) == @default_comment_meta
     end
 
-    @tag :wip2
+    @tag :wip3
     test "comment can be updated", ~m(job user)a do
       {:ok, comment} = CMS.create_article_comment(:job, job.id, "job comment", user)
 
@@ -130,7 +130,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do
       assert comment.meta.is_article_author_upvoted
     end
 
-    @tag :wip2
+    @tag :wip3
     test "user upvote job comment will add id to upvoted_user_ids", ~m(job user)a do
       comment = "job_comment"
       {:ok, comment} = CMS.create_article_comment(:job, job.id, comment, user)
@@ -139,7 +139,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do
       assert user.id in comment.meta.upvoted_user_ids
     end
 
-    @tag :wip2
+    @tag :wip3
     test "user undo upvote job comment will remove id from upvoted_user_ids",
          ~m(job user user2)a do
       comment = "job_comment"
@@ -543,7 +543,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do
   end
 
   describe "[article comment delete]" do
-    @tag :wip2
+    @tag :wip3
     test "delete comment still exsit in paged list and content is gone", ~m(user job)a do
       total_count = 10
       page_number = 1
@@ -568,7 +568,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do
       assert deleted_comment.body_html == @delete_hint
     end
 
-    @tag :wip2
+    @tag :wip3
     test "delete comment still update article's comments_count field", ~m(user job)a do
       {:ok, _comment} = CMS.create_article_comment(:job, job.id, "commment", user)
       {:ok, _comment} = CMS.create_article_comment(:job, job.id, "commment", user)
@@ -586,7 +586,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do
       assert job.article_comments_count == 4
     end
 
-    @tag :wip2
+    @tag :wip3
     test "delete comment still delete pined record if needed", ~m(user job)a do
       total_count = 10
 

test/groupher_server/cms/comments/post_comment_emotions_test.exs

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

test/groupher_server/cms/comments/post_comment_replies_test.exs

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

test/groupher_server/cms/comments/post_comment_test.exs

@@ -39,7 +39,7 @@ defmodule GroupherServer.Test.CMS.Comments.PostComment do
       assert comment.meta |> Map.from_struct() |> Map.delete(:id) == @default_comment_meta
     end
 
-    @tag :wip2
+    @tag :wip3
     test "comment can be updated", ~m(post user)a do
       {:ok, comment} = CMS.create_article_comment(:post, post.id, "post comment", user)
 
@@ -130,7 +130,7 @@ defmodule GroupherServer.Test.CMS.Comments.PostComment do
       assert comment.meta.is_article_author_upvoted
     end
 
-    @tag :wip2
+    @tag :wip3
     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)
@@ -139,7 +139,7 @@ defmodule GroupherServer.Test.CMS.Comments.PostComment do
       assert user.id in comment.meta.upvoted_user_ids
     end
 
-    @tag :wip2
+    @tag :wip3
     test "user undo upvote post comment will remove id from upvoted_user_ids",
          ~m(post user user2)a do
       comment = "post_comment"
@@ -543,7 +543,7 @@ defmodule GroupherServer.Test.CMS.Comments.PostComment do
   end
 
   describe "[article comment delete]" do
-    @tag :wip2
+    @tag :wip3
     test "delete comment still exsit in paged list and content is gone", ~m(user post)a do
       total_count = 10
       page_number = 1
@@ -568,7 +568,7 @@ defmodule GroupherServer.Test.CMS.Comments.PostComment do
       assert deleted_comment.body_html == @delete_hint
     end
 
-    @tag :wip2
+    @tag :wip3
     test "delete comment still update article's comments_count field", ~m(user post)a do
       {:ok, _comment} = CMS.create_article_comment(:post, post.id, "commment", user)
       {:ok, _comment} = CMS.create_article_comment(:post, post.id, "commment", user)
@@ -586,7 +586,7 @@ defmodule GroupherServer.Test.CMS.Comments.PostComment do
       assert post.article_comments_count == 4
     end
 
-    @tag :wip2
+    @tag :wip3
     test "delete comment still delete pined record if needed", ~m(user post)a do
       total_count = 10