refactor(article-comments): fix broken tests

Author: mydearxym

lib/groupher_server/cms/cms.ex

@@ -146,9 +146,6 @@ defmodule GroupherServer.CMS do
   # >> like / undo like
   defdelegate like_comment(thread, comment, user), to: CommentReaction
   defdelegate undo_like_comment(thread, comment, user), to: CommentReaction
-  # >> dislike / undo dislike
-  defdelegate dislike_comment(thread, comment, user), to: CommentReaction
-  defdelegate undo_dislike_comment(thread, comment, user), to: CommentReaction
 
   # Passport CURD
   defdelegate stamp_passport(rules, user), to: PassportCURD

lib/groupher_server/cms/delegates/comment_reaction.ex

@@ -12,14 +12,6 @@ defmodule GroupherServer.CMS.Delegate.CommentReaction do
     undo_feel_comment(thread, comment_id, user_id, :like)
   end
 
-  def dislike_comment(thread, comment_id, %Accounts.User{id: user_id}) do
-    feel_comment(thread, comment_id, user_id, :dislike)
-  end
-
-  def undo_dislike_comment(thread, comment_id, %Accounts.User{id: user_id}) do
-    undo_feel_comment(thread, comment_id, user_id, :dislike)
-  end
-
   defp merge_thread_comment_id(:post_comment, comment_id), do: %{post_comment_id: comment_id}
   defp merge_thread_comment_id(:job_comment, comment_id), do: %{job_comment_id: comment_id}
   defp merge_thread_comment_id(:repo_comment, comment_id), do: %{repo_comment_id: comment_id}

lib/groupher_server/cms/embeds/article_comment_meta.ex

@@ -7,6 +7,8 @@ defmodule GroupherServer.CMS.Embeds.ArticleCommentMeta do
   alias CMS.Embeds
 
   @default_meta %{
+    is_article_author_upvoted: false,
+    is_solution: false,
     report_count: 0,
     report_users: []
   }
@@ -15,6 +17,9 @@ defmodule GroupherServer.CMS.Embeds.ArticleCommentMeta do
   def default_meta(), do: @default_meta
 
   embedded_schema do
+    field(:is_article_author_upvoted, :boolean, default: false)
+    field(:is_solution, :boolean, default: false)
+
     field(:report_count, :integer, default: 0)
     embeds_many(:report_users, Embeds.User, on_replace: :delete)
   end

lib/groupher_server_web/resolvers/cms_resolver.ex

@@ -386,14 +386,6 @@ defmodule GroupherServerWeb.Resolvers.CMS do
     CMS.undo_like_comment(thread, id, user)
   end
 
-  def dislike_comment(_root, ~m(thread id)a, %{context: %{cur_user: user}}) do
-    CMS.dislike_comment(thread, id, user)
-  end
-
-  def undo_dislike_comment(_root, ~m(thread id)a, %{context: %{cur_user: user}}) do
-    CMS.undo_dislike_comment(thread, id, user)
-  end
-
   def stamp_passport(_root, ~m(user_id rules)a, %{context: %{cur_user: _user}}) do
     CMS.stamp_passport(rules, %User{id: user_id})
   end

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

@@ -94,21 +94,5 @@ defmodule GroupherServerWeb.Schema.CMS.Mutations.Comment do
       middleware(M.Authorize, :login)
       resolve(&R.CMS.undo_like_comment/3)
     end
-
-    field :dislike_comment, :comment do
-      arg(:thread, non_null(:cms_comment), default_value: :post_comment)
-      arg(:id, non_null(:id))
-
-      middleware(M.Authorize, :login)
-      resolve(&R.CMS.dislike_comment/3)
-    end
-
-    field :undo_dislike_comment, :comment do
-      arg(:thread, non_null(:cms_comment), default_value: :post_comment)
-      arg(:id, non_null(:id))
-
-      middleware(M.Authorize, :login)
-      resolve(&R.CMS.undo_dislike_comment/3)
-    end
   end
 end

test/groupher_server/cms/post_comment_test.exs

@@ -211,23 +211,6 @@ defmodule GroupherServer.Test.PostComment do
       assert false == comment_preload.likes |> Enum.any?(&(&1.id == like.id))
     end
 
-    test "user can dislike a comment", ~m(comment user)a do
-      # {:ok, like} = CMS.reaction(:post_comment, :like, comment.id, user.id)
-      {:ok, disliked_comment} = CMS.dislike_comment(:post_comment, comment.id, user)
-
-      {:ok, comment_preload} = ORM.find(PostComment, disliked_comment.id, preload: :dislikes)
-
-      assert comment_preload.dislikes |> Enum.any?(&(&1.post_comment_id == comment.id))
-    end
-
-    test "user can undo a dislike action", ~m(comment user)a do
-      {:ok, dislike} = CMS.dislike_comment(:post_comment, comment.id, user)
-      {:ok, _} = CMS.undo_dislike_comment(:post_comment, comment.id, user)
-
-      {:ok, comment_preload} = ORM.find(PostComment, comment.id, preload: :dislikes)
-      assert false == comment_preload.dislikes |> Enum.any?(&(&1.id == dislike.id))
-    end
-
     test "user can get paged likes of a post comment", ~m(comment)a do
       {:ok, user1} = db_insert(:user)
       {:ok, user2} = db_insert(:user)

test/groupher_server_web/mutation/cms/post_comment_test.exs

@@ -267,72 +267,5 @@ defmodule GroupherServer.Test.Mutation.PostComment do
 
       assert found.likes |> Enum.any?(&(&1.post_comment_id == comment.id))
     end
-
-    @undo_like_comment_query """
-    mutation($thread: CmsComment!, $id: ID!) {
-      undoLikeComment(thread: $thread, id: $id) {
-        id
-      }
-    }
-    """
-    test "login user can undo a like action to comment", ~m(user comment)a do
-      variables = %{thread: "POST_COMMENT", id: comment.id}
-      user_conn = simu_conn(:user, user)
-      user_conn |> mutation_result(@like_comment_query, variables, "likeComment")
-
-      {:ok, found} = CMS.PostComment |> ORM.find(comment.id, preload: :likes)
-      assert found.likes |> Enum.any?(&(&1.post_comment_id == comment.id))
-
-      user_conn |> mutation_result(@undo_like_comment_query, variables, "undoLikeComment")
-
-      {:ok, found} = CMS.PostComment |> ORM.find(comment.id, preload: :likes)
-      assert false == found.likes |> Enum.any?(&(&1.post_comment_id == comment.id))
-    end
-
-    @dislike_comment_query """
-    mutation($thread: CmsComment!, $id: ID!) {
-      dislikeComment(thread: $thread, id: $id) {
-        id
-      }
-    }
-    """
-    test "login user can dislike a comment", ~m(user_conn comment)a do
-      variables = %{thread: "POST_COMMENT", id: comment.id}
-      user_conn |> mutation_result(@dislike_comment_query, variables, "dislikeComment")
-
-      {:ok, found} = CMS.PostComment |> ORM.find(comment.id, preload: :dislikes)
-
-      assert found.dislikes |> Enum.any?(&(&1.post_comment_id == comment.id))
-    end
-
-    @undo_dislike_comment_query """
-    mutation($thread: CmsComment!, $id: ID!) {
-      undoDislikeComment(thread: $thread, id: $id) {
-      id
-      }
-    }
-    """
-    test "login user can undo dislike a comment", ~m(user comment)a do
-      variables = %{thread: "POST_COMMENT", id: comment.id}
-      user_conn = simu_conn(:user, user)
-      user_conn |> mutation_result(@dislike_comment_query, variables, "dislikeComment")
-      {:ok, found} = CMS.PostComment |> ORM.find(comment.id, preload: :dislikes)
-      assert found.dislikes |> Enum.any?(&(&1.post_comment_id == comment.id))
-
-      user_conn |> mutation_result(@undo_dislike_comment_query, variables, "undoDislikeComment")
-
-      {:ok, found} = CMS.PostComment |> ORM.find(comment.id, preload: :dislikes)
-      assert false == found.dislikes |> Enum.any?(&(&1.post_comment_id == comment.id))
-    end
-
-    test "unloged user do/undo like/dislike comment fails", ~m(guest_conn comment)a do
-      variables = %{thread: "POST_COMMENT", id: comment.id}
-
-      assert guest_conn |> mutation_get_error?(@like_comment_query, variables)
-      assert guest_conn |> mutation_get_error?(@dislike_comment_query, variables)
-
-      assert guest_conn |> mutation_get_error?(@undo_like_comment_query, variables)
-      assert guest_conn |> mutation_get_error?(@undo_dislike_comment_query, variables)
-    end
   end
 end