chore(article-comments): wip && clean up

Author: mydearxym

lib/groupher_server/cms/delegates/article_comment_action.ex

@@ -22,13 +22,15 @@ defmodule GroupherServer.CMS.Delegate.ArticleCommentAction do
     ArticlePinedComment,
     ArticleCommentUpvote,
     ArticleCommentReply,
+    Community,
     # TODO: remove spec type
     Post,
     Job
   }
 
   alias Ecto.Multi
 
+  @article_threads Community.article_threads()
   @max_parent_replies_count ArticleComment.max_parent_replies_count()
   @pined_comment_limit ArticleComment.pined_comment_limit()
 
@@ -264,7 +266,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleCommentAction do
 
   @spec get_full_comment(String.t()) :: {:ok, T.article_info()} | {:error, nil}
   defp get_full_comment(comment_id) do
-    query = from(c in ArticleComment, where: c.id == ^comment_id, preload: :post, preload: :job)
+    query = from(c in ArticleComment, where: c.id == ^comment_id, preload: ^@article_threads)
 
     with {:ok, comment} <- Repo.one(query) |> done() do
       extract_article_info(comment)

test/groupher_server_web/mutation/cms/cms_manager_test.exs

@@ -28,7 +28,7 @@ defmodule GroupherServer.Test.Mutation.CMS.Manager do
       }
     }
     """
-    @tag :wip2
+
     test "root can markDelete a post", ~m(community user)a do
       post_attrs = mock_attrs(:post, %{community_id: community.id})
       {:ok, post} = CMS.create_article(community, :post, post_attrs, user)

test/groupher_server_web/mutation/cms/flags/post_flag_test.exs

@@ -25,7 +25,7 @@ defmodule GroupherServer.Test.Mutation.Flags.PostFlag do
       }
     }
     """
-    test "auth user can markDelete post", ~m(community post)a do
+    test "auth user can markDelete post", ~m(post)a do
       variables = %{id: post.id}
 
       passport_rules = %{"post.mark_delete" => true}

test/groupher_server_web/query/cms/comments/job_comment_test.exs

@@ -243,7 +243,6 @@ defmodule GroupherServer.Test.Query.Comments.JobComment do
       assert results["totalCount"] == total_count
     end
 
-    @tag :wip2
     test "guest user can get paged comment with pinned comment in it",
          ~m(guest_conn job user)a do
       total_count = 20

test/groupher_server_web/query/cms/comments/post_comment_test.exs

@@ -243,7 +243,6 @@ defmodule GroupherServer.Test.Query.Comments.PostComment do
       assert results["totalCount"] == total_count
     end
 
-    @tag :wip2
     test "guest user can get paged comment with pinned comment in it",
          ~m(guest_conn post user)a do
       total_count = 20

test/groupher_server_web/query/cms/comments/repo_comment_test.exs

@@ -243,7 +243,6 @@ defmodule GroupherServer.Test.Query.Comments.RepoComment do
       assert results["totalCount"] == total_count
     end
 
-    @tag :wip2
     test "guest user can get paged comment with pinned comment in it",
          ~m(guest_conn repo user)a do
       total_count = 20
@@ -364,7 +363,7 @@ defmodule GroupherServer.Test.Query.Comments.RepoComment do
       assert List.last(results["entries"]) |> Map.get("id") == to_string(comment.id)
     end
 
-    @tag :wip
+    @tag :wip2
     test "guest user can get paged comment with upvotes_count", ~m(guest_conn repo user user2)a do
       total_count = 10
       page_size = 10

test/groupher_server_web/query/cms/flags/jobs_flags_test.exs

@@ -4,9 +4,6 @@ defmodule GroupherServer.Test.Query.Flags.JobsFlags do
   import Helper.Utils, only: [get_config: 2]
 
   alias GroupherServer.CMS
-  # alias GroupherServer.Repo
-
-  alias CMS.Job
 
   @total_count 35
   @page_size get_config(:general, :page_size)

test/groupher_server_web/query/cms/flags/posts_flags_test.exs

@@ -4,9 +4,6 @@ defmodule GroupherServer.Test.Query.Flags.PostsFlags do
   import Helper.Utils, only: [get_config: 2]
 
   alias GroupherServer.CMS
-  # alias GroupherServer.Repo
-
-  alias CMS.Post
 
   @total_count 35
   @page_size get_config(:general, :page_size)

test/groupher_server_web/query/cms/flags/repos_flags_test.exs

@@ -4,9 +4,6 @@ defmodule GroupherServer.Test.Query.Flags.ReposFlags do
   import Helper.Utils, only: [get_config: 2]
 
   alias GroupherServer.CMS
-  # alias GroupherServer.Repo
-
-  alias CMS.Repo
 
   @total_count 35
   @page_size get_config(:general, :page_size)