From c6ca8e5e3adc9f1808ff9d2588b3ce9b0339bc29 Mon Sep 17 00:00:00 2001 From: mydearxym Date: Fri, 7 May 2021 22:14:25 +0800 Subject: [PATCH] chore(rename): make_emotion -> emotion_to_comment --- lib/groupher_server/cms/cms.ex | 2 +- .../cms/delegates/article_comment.ex | 2 +- .../cms/article_comment_emotions_test.exs | 30 +++++++++---------- .../query/cms/article_comment_test.exs | 10 +++---- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/groupher_server/cms/cms.ex b/lib/groupher_server/cms/cms.ex index a7b22e92d..f2dfa3128 100644 --- a/lib/groupher_server/cms/cms.ex +++ b/lib/groupher_server/cms/cms.ex @@ -134,7 +134,7 @@ defmodule GroupherServer.CMS do defdelegate pin_article_comment(comment_id), to: ArticleComment defdelegate undo_pin_article_comment(comment_id), to: ArticleComment - defdelegate make_emotion(comment_id, args, user), to: ArticleComment + defdelegate emotion_to_comment(comment_id, args, user), to: ArticleComment defdelegate fold_article_comment(comment_id, user), to: ArticleComment defdelegate unfold_article_comment(comment_id, user), to: ArticleComment defdelegate report_article_comment(comment_id, user), to: ArticleComment diff --git a/lib/groupher_server/cms/delegates/article_comment.ex b/lib/groupher_server/cms/delegates/article_comment.ex index cec7fcd27..c64e44643 100644 --- a/lib/groupher_server/cms/delegates/article_comment.ex +++ b/lib/groupher_server/cms/delegates/article_comment.ex @@ -225,7 +225,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do end @doc "make emotion to a comment" - def make_emotion(comment_id, emotion, %User{} = user) do + def emotion_to_comment(comment_id, emotion, %User{} = user) do with {:ok, comment} <- ORM.find(ArticleComment, comment_id) do Multi.new() diff --git a/test/groupher_server/cms/article_comment_emotions_test.exs b/test/groupher_server/cms/article_comment_emotions_test.exs index bbda52c2b..de7aaffea 100644 --- a/test/groupher_server/cms/article_comment_emotions_test.exs +++ b/test/groupher_server/cms/article_comment_emotions_test.exs @@ -36,9 +36,9 @@ defmodule GroupherServer.Test.CMS.ArticleCommentEmotions do first_comment = List.first(all_comment) - {:ok, _} = CMS.make_emotion(first_comment.id, :downvote, user) - {:ok, _} = CMS.make_emotion(first_comment.id, :beer, user) - {:ok, _} = CMS.make_emotion(first_comment.id, :popcorn, user) + {:ok, _} = CMS.emotion_to_comment(first_comment.id, :downvote, user) + {:ok, _} = CMS.emotion_to_comment(first_comment.id, :beer, user) + {:ok, _} = CMS.emotion_to_comment(first_comment.id, :popcorn, user) {:ok, paged_comments} = CMS.list_article_comments( @@ -82,8 +82,8 @@ defmodule GroupherServer.Test.CMS.ArticleCommentEmotions do parent_content = "parent comment" {:ok, parent_comment} = CMS.create_article_comment(:post, post.id, parent_content, user) - {:ok, _} = CMS.make_emotion(parent_comment.id, :downvote, user) - {:ok, _} = CMS.make_emotion(parent_comment.id, :downvote, user2) + {:ok, _} = CMS.emotion_to_comment(parent_comment.id, :downvote, user) + {:ok, _} = CMS.emotion_to_comment(parent_comment.id, :downvote, user2) {:ok, %{emotions: emotions}} = ORM.find(ArticleComment, parent_comment.id) @@ -97,8 +97,8 @@ defmodule GroupherServer.Test.CMS.ArticleCommentEmotions do parent_content = "parent comment" {:ok, parent_comment} = CMS.create_article_comment(:post, post.id, parent_content, user) - {:ok, _} = CMS.make_emotion(parent_comment.id, :downvote, user) - {:ok, _} = CMS.make_emotion(parent_comment.id, :downvote, user) + {:ok, _} = CMS.emotion_to_comment(parent_comment.id, :downvote, user) + {:ok, _} = CMS.emotion_to_comment(parent_comment.id, :downvote, user) {:ok, parent_comment} = ORM.find(ArticleComment, parent_comment.id) @@ -110,9 +110,9 @@ defmodule GroupherServer.Test.CMS.ArticleCommentEmotions do test "different user can make same emotions on same comment", ~m(post user user2 user3)a do {:ok, parent_comment} = CMS.create_article_comment(:post, post.id, "parent comment", user) - {:ok, _} = CMS.make_emotion(parent_comment.id, :beer, user) - {:ok, _} = CMS.make_emotion(parent_comment.id, :beer, user2) - {:ok, _} = CMS.make_emotion(parent_comment.id, :beer, user3) + {:ok, _} = CMS.emotion_to_comment(parent_comment.id, :beer, user) + {:ok, _} = CMS.emotion_to_comment(parent_comment.id, :beer, user2) + {:ok, _} = CMS.emotion_to_comment(parent_comment.id, :beer, user3) {:ok, %{emotions: emotions}} = ORM.find(ArticleComment, parent_comment.id) # IO.inspect(emotions, label: "the parent_comment") @@ -128,11 +128,11 @@ defmodule GroupherServer.Test.CMS.ArticleCommentEmotions do parent_content = "parent comment" {:ok, parent_comment} = CMS.create_article_comment(:post, post.id, parent_content, user) - {:ok, _} = CMS.make_emotion(parent_comment.id, :downvote, user) - {:ok, _} = CMS.make_emotion(parent_comment.id, :downvote, user) - {:ok, _} = CMS.make_emotion(parent_comment.id, :beer, user) - {:ok, _} = CMS.make_emotion(parent_comment.id, :heart, user) - {:ok, _} = CMS.make_emotion(parent_comment.id, :orz, user) + {:ok, _} = CMS.emotion_to_comment(parent_comment.id, :downvote, user) + {:ok, _} = CMS.emotion_to_comment(parent_comment.id, :downvote, user) + {:ok, _} = CMS.emotion_to_comment(parent_comment.id, :beer, user) + {:ok, _} = CMS.emotion_to_comment(parent_comment.id, :heart, user) + {:ok, _} = CMS.emotion_to_comment(parent_comment.id, :orz, user) {:ok, %{emotions: emotions}} = ORM.find(ArticleComment, parent_comment.id) diff --git a/test/groupher_server_web/query/cms/article_comment_test.exs b/test/groupher_server_web/query/cms/article_comment_test.exs index 980832477..c67dcdc6c 100644 --- a/test/groupher_server_web/query/cms/article_comment_test.exs +++ b/test/groupher_server_web/query/cms/article_comment_test.exs @@ -412,9 +412,9 @@ defmodule GroupherServer.Test.Query.ArticleComment do comment = all_comment |> Enum.at(0) comment2 = all_comment |> Enum.at(1) - {:ok, _} = CMS.make_emotion(comment.id, :downvote, user) - {:ok, _} = CMS.make_emotion(comment.id, :downvote, user2) - {:ok, _} = CMS.make_emotion(comment2.id, :beer, user2) + {:ok, _} = CMS.emotion_to_comment(comment.id, :downvote, user) + {:ok, _} = CMS.emotion_to_comment(comment.id, :downvote, user2) + {:ok, _} = CMS.emotion_to_comment(comment2.id, :beer, user2) variables = %{id: post.id, thread: "POST", filter: %{page: 1, size: page_size}} results = guest_conn |> query_result(@query, variables, "pagedArticleComments") @@ -463,8 +463,8 @@ defmodule GroupherServer.Test.Query.ArticleComment do comment = all_comment |> Enum.at(0) comment2 = all_comment |> Enum.at(1) - {:ok, _} = CMS.make_emotion(comment.id, :downvote, user) - {:ok, _} = CMS.make_emotion(comment2.id, :downvote, user2) + {:ok, _} = CMS.emotion_to_comment(comment.id, :downvote, user) + {:ok, _} = CMS.emotion_to_comment(comment2.id, :downvote, user2) variables = %{id: post.id, thread: "POST", filter: %{page: 1, size: page_size}} results = user_conn |> query_result(@query, variables, "pagedArticleComments")