refactor(article-tags): fix tests

Author: mydearxym

lib/groupher_server/cms/delegates/article_curd.ex

@@ -70,7 +70,6 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
 
     with {:ok, info} <- match(thread) do
       info.model
-      # TODO: trash -> mark_delete
       |> domain_filter_query(filter)
       |> QueryBuilder.filter_pack(Map.merge(filter, %{mark_delete: false}))
       |> ORM.paginater(~m(page size)a)
@@ -311,7 +310,9 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
   defp add_pin_articles_ifneed(articles, _querable, _filter), do: articles
 
   # if filter contains like: tags, sort.., then don't add pin article
-  defp should_add_pin?(%{page: 1, tag: :all, sort: :desc_inserted} = _filter) do
+  # TODO: tag
+  # defp should_add_pin?(%{page: 1, article_tag: :all, sort: :desc_inserted} = _filter) do
+  defp should_add_pin?(%{page: 1, sort: :desc_inserted} = _filter) do
     {:ok, :pass}
   end
 

test/groupher_server_web/mutation/cms/articles/job_test.exs

@@ -32,7 +32,7 @@ defmodule GroupherServer.Test.Mutation.Articles.Job do
       $scale: String!,
       $field: String!,
       $mentionUsers: [Ids],
-      $tags: [Ids]
+      $articleTags: [Ids]
      ) {
       createJob(
         title: $title,
@@ -49,7 +49,7 @@ defmodule GroupherServer.Test.Mutation.Articles.Job do
         scale: $scale,
         field: $field,
         mentionUsers: $mentionUsers,
-        tags: $tags
+        articleTags: $articleTags
         ) {
           id
           title
@@ -136,8 +136,8 @@ defmodule GroupherServer.Test.Mutation.Articles.Job do
     end
 
     @query """
-    mutation($id: ID!, $title: String, $body: String, $salary: String, $tags: [Ids]){
-      updateJob(id: $id, title: $title, body: $body, salary: $salary, tags: $tags) {
+    mutation($id: ID!, $title: String, $body: String, $salary: String, $articleTags: [Ids]){
+      updateJob(id: $id, title: $title, body: $body, salary: $salary, articleTags: $articleTags) {
         id
         title
         body

test/groupher_server_web/mutation/cms/articles/post_test.exs

@@ -23,7 +23,7 @@ defmodule GroupherServer.Test.Mutation.Articles.Post do
       $digest: String!
       $length: Int!
       $communityId: ID!
-      $tags: [Ids]
+      $articleTags: [Ids]
       $mentionUsers: [Ids]
     ) {
       createPost(
@@ -32,7 +32,7 @@ defmodule GroupherServer.Test.Mutation.Articles.Post do
         digest: $digest
         length: $length
         communityId: $communityId
-        tags: $tags
+        articleTags: $articleTags
         mentionUsers: $mentionUsers
       ) {
         title
@@ -164,8 +164,8 @@ defmodule GroupherServer.Test.Mutation.Articles.Post do
     end
 
     @query """
-    mutation($id: ID!, $title: String, $body: String, $copyRight: String, $tags: [Ids]){
-      updatePost(id: $id, title: $title, body: $body, copyRight: $copyRight, tags: $tags) {
+    mutation($id: ID!, $title: String, $body: String, $copyRight: String, $articleTags: [Ids]){
+      updatePost(id: $id, title: $title, body: $body, copyRight: $copyRight, articleTags: $articleTags) {
         id
         title
         body

test/groupher_server_web/mutation/cms/articles/repo_test.exs

@@ -34,7 +34,7 @@ defmodule GroupherServer.Test.Mutation.Articles.Repo do
       $primaryLanguage: RepoLangInput,
       $contributors: [RepoContributorInput],
       $communityId: ID!,
-      $tags: [Ids]
+      $articleTags: [Ids]
     ) {
       createRepo(
         title: $title,
@@ -54,7 +54,7 @@ defmodule GroupherServer.Test.Mutation.Articles.Repo do
         releaseTag: $releaseTag,
         contributors: $contributors,
         communityId: $communityId,
-        tags: $tags
+        articleTags: $articleTags
       ) {
         id
         title

test/groupher_server_web/mutation/statistics/statistics_test.exs

@@ -23,22 +23,23 @@ defmodule GroupherServer.Test.Mutation.Statistics do
       $digest: String!
       $length: Int!
       $communityId: ID!
-      $tags: [Ids]
+      $articleTags: [Ids]
     ) {
       createPost(
         title: $title
         body: $body
         digest: $digest
         length: $length
         communityId: $communityId
-        tags: $tags
+        articleTags: $articleTags
       ) {
         title
         body
         id
       }
     }
     """
+    @tag :wip2
     test "user should have contribute list after create a post", ~m(user_conn user community)a do
       post_attr = mock_attrs(:post)
       variables = post_attr |> Map.merge(%{communityId: community.id})
@@ -75,7 +76,7 @@ defmodule GroupherServer.Test.Mutation.Statistics do
       $finance: String!,
       $scale: String!,
       $field: String!,
-      $tags: [Ids]
+      $articleTags: [Ids]
     ) {
       createJob(
         title: $title,
@@ -91,7 +92,7 @@ defmodule GroupherServer.Test.Mutation.Statistics do
         finance: $finance,
         scale: $scale,
         field: $field,
-        tags: $tags
+        articleTags: $articleTags
       ) {
         id
         title
@@ -136,7 +137,7 @@ defmodule GroupherServer.Test.Mutation.Statistics do
       $primaryLanguage: RepoLangInput,
       $contributors: [RepoContributorInput],
       $communityId: ID!,
-      $tags: [Ids]
+      $articleTags: [Ids]
     ) {
       createRepo(
         title: $title,
@@ -156,7 +157,7 @@ defmodule GroupherServer.Test.Mutation.Statistics do
         releaseTag: $releaseTag,
         contributors: $contributors,
         communityId: $communityId,
-        tags: $tags
+        articleTags: $articleTags
       ) {
         id
         title

test/groupher_server_web/query/cms/cms_test.exs

@@ -66,7 +66,6 @@ defmodule GroupherServer.Test.Query.CMS.Basic do
       assert results["threadsCount"] == 5
     end
 
-    @tag :wip2
     test "can get tags count ", ~m(community guest_conn user)a do
       article_tag_attrs = mock_attrs(:article_tag)
       {:ok, article_tag} = CMS.create_article_tag(community, :post, article_tag_attrs, user)

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

@@ -48,7 +48,7 @@ defmodule GroupherServer.Test.Query.Flags.PostsFlags do
       }
     }
     """
-
+    @tag :wip
     test "if have pinned posts, the pinned posts should at the top of entries",
          ~m(guest_conn community post_m)a do
       variables = %{filter: %{community: community.raw}}