fix(tests): error fix

Author: mydearxym

lib/groupher_server/cms/delegates/article_comment.ex

@@ -266,7 +266,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
     with {:ok, info} <- match(thread),
          # make sure the article exsit
          # author is passed by middleware, it's exsit for sure
-         {:ok, article} <- ORM.find(info.model, article_id) do
+         {:ok, article} <- ORM.find(info.model, article_id, preload: [author: :user]) do
       Multi.new()
       |> Multi.run(:create_article_comment, fn _, _ ->
         do_create_comment(content, info.foreign_key, article, user)
@@ -351,6 +351,8 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
           article_comment_id: comment.id,
           user_id: user_id
         })
+
+        {:ok, :pass}
       end)
       |> Multi.run(:desc_upvotes_count, fn _, _ ->
         count_query = from(c in ArticleCommentUpvote, where: c.article_comment_id == ^comment_id)
@@ -383,15 +385,8 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
   # set floor
   # TODO: parse editor-json
   # set default emotions
-  defp do_create_comment(
-         content,
-         foreign_key,
-         %{id: article_id, author_id: article_author_id},
-         %User{
-           id: user_id
-         }
-       ) do
-    count_query = from(c in ArticleComment, where: field(c, ^foreign_key) == ^article_id)
+  defp do_create_comment(content, foreign_key, article, %User{id: user_id}) do
+    count_query = from(c in ArticleComment, where: field(c, ^foreign_key) == ^article.id)
     floor = Repo.aggregate(count_query, :count) + 1
 
     ArticleComment
@@ -402,11 +397,11 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
           body_html: content,
           emotions: @default_emotions,
           floor: floor,
-          is_article_author: user_id == article_author_id,
+          is_article_author: user_id == article.author.user.id,
           meta: @default_comment_meta
         },
         foreign_key,
-        article_id
+        article.id
       )
     )
   end
@@ -461,13 +456,13 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
   defp add_participator_to_article(_, _), do: {:ok, :pass}
 
   defp get_article(%ArticleComment{post_id: post_id} = comment) when not is_nil(post_id) do
-    with {:ok, article} <- ORM.find(Post, comment.post_id) do
+    with {:ok, article} <- ORM.find(Post, comment.post_id, preload: [author: :user]) do
       {:post, article}
     end
   end
 
   defp get_article(%ArticleComment{job_id: job_id} = comment) when not is_nil(job_id) do
-    with {:ok, article} <- ORM.find(Job, comment.job_id) do
+    with {:ok, article} <- ORM.find(Job, comment.job_id, preload: [author: :user]) do
       {:job, article}
     end
   end

lib/helper/orm.ex

@@ -128,9 +128,8 @@ defmodule Helper.ORM do
   end
 
   def findby_delete(queryable, clauses) do
-    case find_by(queryable, clauses) do
-      {:ok, content} -> delete(content)
-      {:error, _} -> {:ok, :pass}
+    with {:ok, content} <- find_by(queryable, clauses) do
+      delete(content)
     end
   end
 

test/groupher_server/cms/article_comment_test.exs

@@ -22,6 +22,7 @@ defmodule GroupherServer.Test.CMS.ArticleComment do
   end
 
   describe "[basic article comment]" do
+    @tag :wip2
     test "post, job are supported by article comment.", ~m(user post job)a do
       post_comment_1 = "post_comment 1"
       post_comment_2 = "post_comment 2"
@@ -41,7 +42,7 @@ defmodule GroupherServer.Test.CMS.ArticleComment do
       assert List.first(job.article_comments).body_html == job_comment_1
     end
 
-    @tag :wip2
+    @tag :wip
     test "comment should have default meta after create", ~m(user post)a do
       {:ok, comment} = CMS.create_article_comment(:post, post.id, "post comment", user)
       assert comment.meta |> Map.from_struct() |> Map.delete(:id) == @default_comment_meta
@@ -118,7 +119,7 @@ defmodule GroupherServer.Test.CMS.ArticleComment do
       assert List.first(comment.upvotes).user_id == user.id
     end
 
-    @tag :wip2
+    @tag :wip
     test "article author upvote post comment will have flag", ~m(post user)a do
       comment = "post_comment"
       {:ok, comment} = CMS.create_article_comment(:post, post.id, comment, user)
@@ -166,7 +167,7 @@ defmodule GroupherServer.Test.CMS.ArticleComment do
       assert comment.upvotes_count == 2
     end
 
-    @tag :wip2
+    @tag :wip
     test "user can undo upvote a post comment", ~m(user post)a do
       content = "post_comment"
       {:ok, comment} = CMS.create_article_comment(:post, post.id, content, user)
@@ -179,7 +180,7 @@ defmodule GroupherServer.Test.CMS.ArticleComment do
       assert 0 == comment.upvotes_count
     end
 
-    @tag :wip2
+    @tag :wip
     test "user can undo upvote a post comment with no upvote", ~m(user post)a do
       content = "post_comment"
       {:ok, comment} = CMS.create_article_comment(:post, post.id, content, user)
@@ -440,12 +441,12 @@ defmodule GroupherServer.Test.CMS.ArticleComment do
   end
 
   describe "[article comment info]" do
-    @tag :wip
+    @tag :wip2
     test "author of the article comment a comment should have flag", ~m(user post)a do
       {:ok, comment} = CMS.create_article_comment(:post, post.id, "commment", user)
       assert not comment.is_article_author
 
-      {:ok, author_user} = db_insert(:user, %{id: post.author.user.id})
+      author_user = post.author.user
       {:ok, comment} = CMS.create_article_comment(:post, post.id, "commment", author_user)
       assert comment.is_article_author
     end

test/groupher_server_web/mutation/cms/cms_test.exs

@@ -705,6 +705,7 @@ defmodule GroupherServer.Test.Mutation.CMS.Basic do
       assert false == cur_subscribers.entries |> Enum.any?(&(&1.id == user.id))
     end
 
+    @tag :wip2
     test "other login user unsubscribe community fails", ~m(user_conn community)a do
       variables = %{communityId: community.id}
 

test/groupher_server_web/query/cms/post_comment_test.exs

@@ -129,55 +129,6 @@ defmodule GroupherServer.Test.Query.PostComment do
 
       assert participators["totalCount"] == 10
     end
-
-    @query """
-    query($filter: PagedPostsFilter) {
-      pagedPosts(filter: $filter) {
-        entries {
-          id
-          commentsParticipators(filter: { first: 5 }) {
-            id
-            nickname
-          }
-        }
-      }
-    }
-    """
-    test "top N per Group test v2", ~m(user guest_conn)a do
-      body = "this is a test comment"
-
-      {:ok, community} = db_insert(:community)
-      {:ok, post} = CMS.create_content(community, :post, mock_attrs(:post), user)
-      {:ok, post2} = CMS.create_content(community, :post, mock_attrs(:post), user)
-      {:ok, users_list} = db_insert_multi(:user, 10)
-      {:ok, users_list2} = db_insert_multi(:user, 10)
-
-      post_last_comment_user_id = users_list |> List.last() |> Map.get(:id)
-      post2_last_comment_user_id = users_list2 |> List.last() |> Map.get(:id)
-
-      Enum.each(
-        users_list,
-        &CMS.create_comment(:post, post.id, %{community: community.raw, body: body}, &1)
-      )
-
-      Enum.each(
-        users_list2,
-        &CMS.create_comment(:post, post2.id, %{community: community.raw, body: body}, &1)
-      )
-
-      variables = %{filter: %{community: community.raw}}
-      results = guest_conn |> query_result(@query, variables, "pagedPosts")
-
-      first_result = results["entries"] |> List.first() |> Map.get("commentsParticipators")
-      last_result = results["entries"] |> List.last() |> Map.get("commentsParticipators")
-
-      assert 5 == first_result |> length
-      assert 5 == last_result |> length
-
-      # 默认显示最新评论的登陆用户
-      assert to_string(post_last_comment_user_id) == first_result |> List.first() |> Map.get("id")
-      assert to_string(post2_last_comment_user_id) == last_result |> List.first() |> Map.get("id")
-    end
   end
 
   @query """