chore: wip

Author: mydearxym

lib/groupher_server_web/schema/cms/mutations/blog.ex

@@ -11,11 +11,9 @@ defmodule GroupherServerWeb.Schema.CMS.Mutations.Blog do
       arg(:title, non_null(:string))
       arg(:body, non_null(:string))
       arg(:digest, non_null(:string))
-      arg(:length, non_null(:integer))
+      arg(:length, :integer)
       arg(:community_id, non_null(:id))
-
       arg(:link_addr, :string)
-
       arg(:thread, :thread, default_value: :blog)
       arg(:article_tags, list_of(:ids))
 

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

@@ -23,7 +23,7 @@ defmodule GroupherServer.Test.Mutation.Articles.Blog do
       $title: String!,
       $body: String,
       $digest: String!,
-      $length: Int!,
+      $length: Int,
       $communityId: ID!,
       $articleTags: [Ids]
      ) {

test/groupher_server_web/mutation/statistics/statistics_test.exs

@@ -100,6 +100,36 @@ defmodule GroupherServer.Test.Mutation.Statistics do
       assert contributes.count == 1
     end
 
+    @create_blog_query """
+    mutation (
+      $title: String!,
+      $body: String!,
+      $digest: String!,
+      $communityId: ID!,
+      $articleTags: [Ids]
+    ) {
+      createBlog(
+        title: $title,
+        body: $body,
+        digest: $digest,
+        communityId: $communityId,
+        articleTags: $articleTags
+      ) {
+        id
+        title
+        body
+      }
+    }
+    """
+    test "user should have contribute list after create a blog", ~m(user_conn user community)a do
+      variables = blog_attr |> Map.merge(%{communityId: community.id}) |> camelize_map_key
+
+      user_conn |> mutation_result(@create_blog_query, variables, "createBlog")
+
+      {:ok, contributes} = ORM.find_by(UserContribute, user_id: user.id)
+      assert contributes.count == 1
+    end
+
     @create_repo_query """
     mutation(
       $title: String!,
@@ -157,19 +187,18 @@ defmodule GroupherServer.Test.Mutation.Statistics do
       assert contributes.count == 1
     end
 
-    @create_comment_query """
-    mutation($community: String!, $thread: Thread, $id: ID!, $body: String!) {
-      createComment(community: $community, thread: $thread, id: $id, body: $body) {
+    @write_comment_query """
+    mutation($thread: Thread!, $id: ID!, $content: String!) {
+      createArticleComment(thread: $thread, id: $id, content: $content) {
         id
-        body
+        bodyHtml
       }
     }
     """
-    test "user should have contribute list after create a comment",
-         ~m(user_conn user community)a do
+    test "user should have contribute list after create a comment", ~m(user_conn user)a do
       {:ok, post} = db_insert(:post)
-      variables = %{community: community.raw, thread: "POST", id: post.id, body: "this a comment"}
-      user_conn |> mutation_result(@create_comment_query, variables, "createComment")
+      variables = %{thread: "POST", id: post.id, content: "comment"}
+      user_conn |> mutation_result(@write_comment_query, variables, "createArticleComment")
 
       {:ok, contributes} = ORM.find_by(UserContribute, user_id: user.id)
       assert contributes.count == 1

test/helper/orm_test.exs

@@ -40,10 +40,10 @@ defmodule GroupherServer.Test.Helper.ORM do
     end
 
     test "find/3 with preload can preload muilt fields", %{post: post} do
-      {:ok, found} = ORM.find(Post, post.id, preload: [:author, :comments, :communities])
+      {:ok, found} = ORM.find(Post, post.id, preload: [:author, :article_tags, :communities])
       # IO.inspect found
       assert %Author{} = found.author
-      assert %Ecto.Association.NotLoaded{} != found.comments
+      assert %Ecto.Association.NotLoaded{} != found.article_tags
       assert %Ecto.Association.NotLoaded{} != found.communities
     end