From 43067b96bac84279c643e661691a01507743ccc0 Mon Sep 17 00:00:00 2001 From: mydearxym Date: Fri, 25 Jun 2021 00:08:07 +0800 Subject: [PATCH 1/2] refactor(naming): paged_folded_comments --- lib/groupher_server/cms/cms.ex | 4 ++-- lib/groupher_server/cms/delegates/comment_curd.ex | 4 ++-- test/groupher_server/cms/comments/blog_comment_test.exs | 2 +- test/groupher_server/cms/comments/job_comment_test.exs | 2 +- test/groupher_server/cms/comments/post_comment_test.exs | 2 +- test/groupher_server/cms/comments/repo_comment_test.exs | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/groupher_server/cms/cms.ex b/lib/groupher_server/cms/cms.ex index 575055c81..abc7f121a 100644 --- a/lib/groupher_server/cms/cms.ex +++ b/lib/groupher_server/cms/cms.ex @@ -137,8 +137,8 @@ defmodule GroupherServer.CMS do defdelegate paged_published_comments(user, thread, filters), to: CommentCurd defdelegate paged_published_comments(user, filters), to: CommentCurd - defdelegate paged_folded_article_comments(thread, article_id, filters), to: CommentCurd - defdelegate paged_folded_article_comments(thread, article_id, filters, user), to: CommentCurd + defdelegate paged_folded_comments(thread, article_id, filters), to: CommentCurd + defdelegate paged_folded_comments(thread, article_id, filters, user), to: CommentCurd defdelegate paged_comment_replies(comment_id, filters), to: CommentCurd defdelegate paged_comment_replies(comment_id, filters, user), to: CommentCurd diff --git a/lib/groupher_server/cms/delegates/comment_curd.ex b/lib/groupher_server/cms/delegates/comment_curd.ex index 5093a1614..4d9976ee0 100644 --- a/lib/groupher_server/cms/delegates/comment_curd.ex +++ b/lib/groupher_server/cms/delegates/comment_curd.ex @@ -83,12 +83,12 @@ defmodule GroupherServer.CMS.Delegate.CommentCurd do |> done() end - def paged_folded_article_comments(thread, article_id, filters) do + def paged_folded_comments(thread, article_id, filters) do where_query = dynamic([c], c.is_folded and not c.is_pinned) do_paged_comment(thread, article_id, filters, where_query, nil) end - def paged_folded_article_comments(thread, article_id, filters, user) do + def paged_folded_comments(thread, article_id, filters, user) do where_query = dynamic([c], c.is_folded and not c.is_pinned) do_paged_comment(thread, article_id, filters, where_query, user) end diff --git a/test/groupher_server/cms/comments/blog_comment_test.exs b/test/groupher_server/cms/comments/blog_comment_test.exs index e34aff708..61ce0d197 100644 --- a/test/groupher_server/cms/comments/blog_comment_test.exs +++ b/test/groupher_server/cms/comments/blog_comment_test.exs @@ -538,7 +538,7 @@ defmodule GroupherServer.Test.CMS.Comments.BlogComment do random_comment_3 = all_folded_comments |> Enum.at(5) {:ok, paged_comments} = - CMS.paged_folded_article_comments(:blog, blog.id, %{page: page_number, size: page_size}) + CMS.paged_folded_comments(:blog, blog.id, %{page: page_number, size: page_size}) assert exist_in?(random_comment_1, paged_comments.entries) assert exist_in?(random_comment_2, paged_comments.entries) diff --git a/test/groupher_server/cms/comments/job_comment_test.exs b/test/groupher_server/cms/comments/job_comment_test.exs index 3b225c886..e20294b35 100644 --- a/test/groupher_server/cms/comments/job_comment_test.exs +++ b/test/groupher_server/cms/comments/job_comment_test.exs @@ -538,7 +538,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do random_comment_3 = all_folded_comments |> Enum.at(5) {:ok, paged_comments} = - CMS.paged_folded_article_comments(:job, job.id, %{page: page_number, size: page_size}) + CMS.paged_folded_comments(:job, job.id, %{page: page_number, size: page_size}) assert exist_in?(random_comment_1, paged_comments.entries) assert exist_in?(random_comment_2, paged_comments.entries) diff --git a/test/groupher_server/cms/comments/post_comment_test.exs b/test/groupher_server/cms/comments/post_comment_test.exs index 7fed0ebc9..b48dd76c0 100644 --- a/test/groupher_server/cms/comments/post_comment_test.exs +++ b/test/groupher_server/cms/comments/post_comment_test.exs @@ -538,7 +538,7 @@ defmodule GroupherServer.Test.CMS.Comments.PostComment do random_comment_3 = all_folded_comments |> Enum.at(5) {:ok, paged_comments} = - CMS.paged_folded_article_comments(:post, post.id, %{page: page_number, size: page_size}) + CMS.paged_folded_comments(:post, post.id, %{page: page_number, size: page_size}) assert exist_in?(random_comment_1, paged_comments.entries) assert exist_in?(random_comment_2, paged_comments.entries) diff --git a/test/groupher_server/cms/comments/repo_comment_test.exs b/test/groupher_server/cms/comments/repo_comment_test.exs index 4c7162506..9bf52e4c9 100644 --- a/test/groupher_server/cms/comments/repo_comment_test.exs +++ b/test/groupher_server/cms/comments/repo_comment_test.exs @@ -538,7 +538,7 @@ defmodule GroupherServer.Test.CMS.Comments.RepoComment do random_comment_3 = all_folded_comments |> Enum.at(5) {:ok, paged_comments} = - CMS.paged_folded_article_comments(:repo, repo.id, %{page: page_number, size: page_size}) + CMS.paged_folded_comments(:repo, repo.id, %{page: page_number, size: page_size}) assert exist_in?(random_comment_1, paged_comments.entries) assert exist_in?(random_comment_2, paged_comments.entries) From 36ec29bfaaf538e6b9e4d430aeb7af34d7568efa Mon Sep 17 00:00:00 2001 From: mydearxym Date: Fri, 25 Jun 2021 00:17:49 +0800 Subject: [PATCH 2/2] refactor(naming): drop article prefix in comments action --- lib/groupher_server/cms/cms.ex | 12 +++--- .../cms/delegates/abuse_report.ex | 6 +-- .../cms/delegates/comment_action.ex | 12 +++--- .../cms/delegates/comment_curd.ex | 2 +- .../cms/delegates/hooks/cite.ex | 2 +- lib/groupher_server/cms/models/comment.ex | 2 +- .../cms/models/comment_upvote.ex | 4 +- .../resolvers/cms_resolver.ex | 7 ++-- .../schema/Helper/mutations.ex | 4 +- .../schema/cms/cms_types.ex | 6 +-- lib/helper/error_code.ex | 2 +- .../cms/abuse_reports/comment_report_test.exs | 10 ++--- .../cms/articles/post_meta_test.exs | 4 +- .../cms/comments/blog_comment_test.exs | 40 +++++++++---------- .../cms/comments/job_comment_test.exs | 40 +++++++++---------- .../cms/comments/post_comment_test.exs | 40 +++++++++---------- .../cms/comments/repo_comment_test.exs | 40 +++++++++---------- .../cms/comments/blog_comment_test.exs | 2 +- .../cms/comments/job_comment_test.exs | 2 +- .../cms/comments/post_comment_test.exs | 2 +- .../cms/comments/repo_comment_test.exs | 2 +- .../cms/abuse_reports/job_report_test.exs | 2 +- .../cms/abuse_reports/post_report_test.exs | 2 +- .../cms/abuse_reports/repo_report_test.exs | 2 +- 24 files changed, 124 insertions(+), 123 deletions(-) diff --git a/lib/groupher_server/cms/cms.ex b/lib/groupher_server/cms/cms.ex index abc7f121a..01680023a 100644 --- a/lib/groupher_server/cms/cms.ex +++ b/lib/groupher_server/cms/cms.ex @@ -154,14 +154,14 @@ defmodule GroupherServer.CMS do defdelegate upvote_comment(comment_id, user), to: CommentAction defdelegate undo_upvote_comment(comment_id, user), to: CommentAction defdelegate reply_comment(comment_id, args, user), to: CommentAction - defdelegate lock_article_comment(thread, article_id), to: CommentAction - defdelegate undo_lock_article_comment(thread, article_id), to: CommentAction + defdelegate lock_article_comments(thread, article_id), to: CommentAction + defdelegate undo_lock_article_comments(thread, article_id), to: CommentAction defdelegate pin_comment(comment_id), to: CommentAction defdelegate undo_pin_comment(comment_id), to: CommentAction - defdelegate fold_article_comment(comment_id, user), to: CommentAction - defdelegate unfold_article_comment(comment_id, user), to: CommentAction + defdelegate fold_comment(comment_id, user), to: CommentAction + defdelegate unfold_comment(comment_id, user), to: CommentAction defdelegate emotion_to_comment(comment_id, args, user), to: CommentEmotion defdelegate undo_emotion_to_comment(comment_id, args, user), to: CommentEmotion @@ -172,12 +172,12 @@ defmodule GroupherServer.CMS do # TODO: move report to abuse report module defdelegate report_article(thread, article_id, reason, attr, user), to: AbuseReport - defdelegate report_article_comment(comment_id, reason, attr, user), to: AbuseReport + defdelegate report_comment(comment_id, reason, attr, user), to: AbuseReport defdelegate report_account(account_id, reason, attr, user), to: AbuseReport defdelegate undo_report_account(account_id, user), to: AbuseReport defdelegate undo_report_article(thread, article_id, user), to: AbuseReport defdelegate paged_reports(filter), to: AbuseReport - defdelegate undo_report_article_comment(comment_id, user), to: AbuseReport + defdelegate undo_report_comment(comment_id, user), to: AbuseReport # Passport CURD defdelegate stamp_passport(rules, user), to: PassportCURD diff --git a/lib/groupher_server/cms/delegates/abuse_report.ex b/lib/groupher_server/cms/delegates/abuse_report.ex index 169dbfca4..62bf2b56b 100644 --- a/lib/groupher_server/cms/delegates/abuse_report.ex +++ b/lib/groupher_server/cms/delegates/abuse_report.ex @@ -172,7 +172,7 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do end @doc "report a comment" - def report_article_comment(comment_id, reason, attr, %User{} = user) do + def report_comment(comment_id, reason, attr, %User{} = user) do with {:ok, comment} <- ORM.find(Comment, comment_id) do Multi.new() |> Multi.run(:create_abuse_report, fn _, _ -> @@ -184,7 +184,7 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do end) |> Multi.run(:fold_comment_report_too_many, fn _, %{create_abuse_report: abuse_report} -> if abuse_report.report_cases_count >= @report_threshold_for_fold, - do: CMS.fold_article_comment(comment, user), + do: CMS.fold_comment(comment, user), else: {:ok, comment} end) |> Repo.transaction() @@ -192,7 +192,7 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do end end - def undo_report_article_comment(comment_id, %User{} = user) do + def undo_report_comment(comment_id, %User{} = user) do undo_report_article(:comment, comment_id, user) end diff --git a/lib/groupher_server/cms/delegates/comment_action.ex b/lib/groupher_server/cms/delegates/comment_action.ex index 9f29864b7..103f87965 100644 --- a/lib/groupher_server/cms/delegates/comment_action.ex +++ b/lib/groupher_server/cms/delegates/comment_action.ex @@ -81,19 +81,19 @@ defmodule GroupherServer.CMS.Delegate.CommentAction do end @doc "fold a comment" - def fold_article_comment(%Comment{} = comment, %User{} = _user) do + def fold_comment(%Comment{} = comment, %User{} = _user) do comment |> ORM.update(%{is_folded: true}) end @doc "fold a comment" - def fold_article_comment(comment_id, %User{} = _user) do + def fold_comment(comment_id, %User{} = _user) do with {:ok, comment} <- ORM.find(Comment, comment_id) do comment |> ORM.update(%{is_folded: true}) end end @doc "unfold a comment" - def unfold_article_comment(comment_id, %User{} = _user) do + def unfold_comment(comment_id, %User{} = _user) do with {:ok, comment} <- ORM.find(Comment, comment_id) do comment |> ORM.update(%{is_folded: false}) end @@ -145,7 +145,7 @@ defmodule GroupherServer.CMS.Delegate.CommentAction do |> Repo.transaction() |> result() else - false -> raise_error(:article_comment_locked, "this article is forbid comment") + false -> raise_error(:article_comments_locked, "this article is forbid comment") {:error, error} -> {:error, error} end end @@ -228,7 +228,7 @@ defmodule GroupherServer.CMS.Delegate.CommentAction do end @doc "lock comment of a article" - def lock_article_comment(thread, id) do + def lock_article_comments(thread, id) do with {:ok, info} <- match(thread), {:ok, article} <- ORM.find(info.model, id) do article_meta = ensure(article.meta, @default_article_meta) @@ -239,7 +239,7 @@ defmodule GroupherServer.CMS.Delegate.CommentAction do end @doc "undo lock comment of a article" - def undo_lock_article_comment(thread, id) do + def undo_lock_article_comments(thread, id) do with {:ok, info} <- match(thread), {:ok, article} <- ORM.find(info.model, id) do article_meta = ensure(article.meta, @default_article_meta) diff --git a/lib/groupher_server/cms/delegates/comment_curd.ex b/lib/groupher_server/cms/delegates/comment_curd.ex index 4d9976ee0..d714febfd 100644 --- a/lib/groupher_server/cms/delegates/comment_curd.ex +++ b/lib/groupher_server/cms/delegates/comment_curd.ex @@ -153,7 +153,7 @@ defmodule GroupherServer.CMS.Delegate.CommentCurd do |> Repo.transaction() |> result() else - false -> raise_error(:article_comment_locked, "this article is forbid comment") + false -> raise_error(:article_comments_locked, "this article is forbid comment") {:error, error} -> {:error, error} end end diff --git a/lib/groupher_server/cms/delegates/hooks/cite.ex b/lib/groupher_server/cms/delegates/hooks/cite.ex index d836c45bd..5da3f350c 100644 --- a/lib/groupher_server/cms/delegates/hooks/cite.ex +++ b/lib/groupher_server/cms/delegates/hooks/cite.ex @@ -20,7 +20,7 @@ defmodule GroupherServer.CMS.Delegate.Hooks.Cite do cited_type: thread or comment artiment: article or comment - # cited_article_comment_id, [xxx_article]_id, [block_id, block2_id, ...], + # cited_comment_id, [xxx_article]_id, [block_id, block2_id, ...], 注意 cited_by_type 不能命名为 cited_by_thread diff --git a/lib/groupher_server/cms/models/comment.ex b/lib/groupher_server/cms/models/comment.ex index a9a092824..1da2f52a0 100644 --- a/lib/groupher_server/cms/models/comment.ex +++ b/lib/groupher_server/cms/models/comment.ex @@ -35,7 +35,7 @@ defmodule GroupherServer.CMS.Model.Comment do # 每篇文章最多含有置顶评论的条数 @pinned_comment_limit 10 - @doc "latest participants stores in article article_comment_participants field" + @doc "latest participants stores in article comment_participants field" def max_participator_count(), do: @max_participator_count @doc "latest replies stores in comment replies field, used for frontend display" def max_parent_replies_count(), do: @max_parent_replies_count diff --git a/lib/groupher_server/cms/models/comment_upvote.ex b/lib/groupher_server/cms/models/comment_upvote.ex index 3755c09ad..fec25d477 100644 --- a/lib/groupher_server/cms/models/comment_upvote.ex +++ b/lib/groupher_server/cms/models/comment_upvote.ex @@ -21,8 +21,8 @@ defmodule GroupherServer.CMS.Model.CommentUpvote do end @doc false - def changeset(%CommentUpvote{} = article_comment_upvote, attrs) do - article_comment_upvote + def changeset(%CommentUpvote{} = comment_upvote, attrs) do + comment_upvote |> cast(attrs, @required_fields) |> validate_required(@required_fields) |> foreign_key_constraint(:comment_id) diff --git a/lib/groupher_server_web/resolvers/cms_resolver.ex b/lib/groupher_server_web/resolvers/cms_resolver.ex index 3fadf2bd4..b29c72c39 100644 --- a/lib/groupher_server_web/resolvers/cms_resolver.ex +++ b/lib/groupher_server_web/resolvers/cms_resolver.ex @@ -111,10 +111,11 @@ defmodule GroupherServerWeb.Resolvers.CMS do # ####################### # thread reaction .. # ####################### - def lock_article_comment(_root, ~m(id thread)a, _info), do: CMS.lock_article_comment(thread, id) + def lock_article_comments(_root, ~m(id thread)a, _info), + do: CMS.lock_article_comments(thread, id) - def undo_lock_article_comment(_root, ~m(id thread)a, _info) do - CMS.undo_lock_article_comment(thread, id) + def undo_lock_article_comments(_root, ~m(id thread)a, _info) do + CMS.undo_lock_article_comments(thread, id) end def sink_article(_root, ~m(id thread)a, _info), do: CMS.sink_article(thread, id) diff --git a/lib/groupher_server_web/schema/Helper/mutations.ex b/lib/groupher_server_web/schema/Helper/mutations.ex index 9d17b51fc..738dfe29d 100644 --- a/lib/groupher_server_web/schema/Helper/mutations.ex +++ b/lib/groupher_server_web/schema/Helper/mutations.ex @@ -261,7 +261,7 @@ defmodule GroupherServerWeb.Schema.Helper.Mutations do middleware(M.Authorize, :login) middleware(M.PassportLoader, source: :community) middleware(M.Passport, claim: unquote("cms->c?->#{to_string(thread)}.lock_comment")) - resolve(&R.CMS.lock_article_comment/3) + resolve(&R.CMS.lock_article_comments/3) end @desc unquote("undo lock to a #{thread}") @@ -273,7 +273,7 @@ defmodule GroupherServerWeb.Schema.Helper.Mutations do middleware(M.Authorize, :login) middleware(M.PassportLoader, source: :community) middleware(M.Passport, claim: unquote("cms->c?->#{to_string(thread)}.undo_lock_comment")) - resolve(&R.CMS.undo_lock_article_comment/3) + resolve(&R.CMS.undo_lock_article_comments/3) end end end diff --git a/lib/groupher_server_web/schema/cms/cms_types.ex b/lib/groupher_server_web/schema/cms/cms_types.ex index 350c91b47..a997fc373 100644 --- a/lib/groupher_server_web/schema/cms/cms_types.ex +++ b/lib/groupher_server_web/schema/cms/cms_types.ex @@ -246,7 +246,7 @@ defmodule GroupherServerWeb.Schema.CMS.Types do emotion_fields() end - object :article_comment_meta do + object :comment_meta do field(:is_article_author_upvoted, :boolean) field(:is_reply_to_others, :boolean) @@ -263,7 +263,7 @@ defmodule GroupherServerWeb.Schema.CMS.Types do field(:upvotes_count, :integer) field(:is_article_author, :boolean) field(:emotions, :comment_emotions) - field(:meta, :article_comment_meta) + field(:meta, :comment_meta) field(:replies_count, :integer) field(:reply_to, :comment_reply) field(:viewer_has_upvoted, :boolean) @@ -281,7 +281,7 @@ defmodule GroupherServerWeb.Schema.CMS.Types do field(:upvotes_count, :integer) field(:emotions, :comment_emotions) field(:is_article_author, :boolean) - field(:meta, :article_comment_meta) + field(:meta, :comment_meta) field(:reply_to, :comment_reply) field(:replies, list_of(:comment_reply)) field(:replies_count, :integer) diff --git a/lib/helper/error_code.ex b/lib/helper/error_code.ex index 6f8af85f8..dec73b5dd 100644 --- a/lib/helper/error_code.ex +++ b/lib/helper/error_code.ex @@ -49,7 +49,7 @@ defmodule Helper.ErrorCode do def ecode(:mirror_article), do: @article_base + 5 def ecode(:invalid_domain_tag), do: @article_base + 6 def ecode(:undo_sink_old_article), do: @article_base + 7 - def ecode(:article_comment_locked), do: @article_base + 8 + def ecode(:article_comments_locked), do: @article_base + 8 def ecode(:require_questioner), do: @article_base + 9 def ecode(:cite_artilce), do: @article_base + 10 # def ecode(:already_solved), do: @article_base + 10 diff --git a/test/groupher_server/cms/abuse_reports/comment_report_test.exs b/test/groupher_server/cms/abuse_reports/comment_report_test.exs index c6980a0bd..af68bac98 100644 --- a/test/groupher_server/cms/abuse_reports/comment_report_test.exs +++ b/test/groupher_server/cms/abuse_reports/comment_report_test.exs @@ -17,7 +17,7 @@ defmodule GroupherServer.Test.CMS.AbuseReports.CommentReport do describe "[article comment report/unreport]" do test "report a comment should have a abuse report record", ~m(user post)a do {:ok, comment} = CMS.create_comment(:post, post.id, mock_comment(), user) - {:ok, _comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) + {:ok, _comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user) filter = %{content_type: :comment, content_id: comment.id, page: 1, size: 20} {:ok, all_reports} = CMS.paged_reports(filter) @@ -34,8 +34,8 @@ defmodule GroupherServer.Test.CMS.AbuseReports.CommentReport do test "different user report a comment should have same report with different report cases", ~m(user user2 post)a do {:ok, comment} = CMS.create_comment(:post, post.id, mock_comment(), user) - {:ok, _} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) - {:ok, _} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user2) + {:ok, _} = CMS.report_comment(comment.id, mock_comment(), "attr", user) + {:ok, _} = CMS.report_comment(comment.id, mock_comment(), "attr", user2) filter = %{content_type: :comment, content_id: comment.id, page: 1, size: 20} {:ok, all_reports} = CMS.paged_reports(filter) @@ -53,8 +53,8 @@ defmodule GroupherServer.Test.CMS.AbuseReports.CommentReport do test "same user can not report a comment twice", ~m(user post)a do {:ok, comment} = CMS.create_comment(:post, post.id, mock_comment(), user) - {:ok, comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) - assert {:error, _} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) + {:ok, comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user) + assert {:error, _} = CMS.report_comment(comment.id, mock_comment(), "attr", user) end end end diff --git a/test/groupher_server/cms/articles/post_meta_test.exs b/test/groupher_server/cms/articles/post_meta_test.exs index d31e8c7df..e6f7b5b4c 100644 --- a/test/groupher_server/cms/articles/post_meta_test.exs +++ b/test/groupher_server/cms/articles/post_meta_test.exs @@ -46,12 +46,12 @@ defmodule GroupherServer.Test.CMS.PostMeta do {:ok, post} = CMS.create_article(community, :post, post_attrs, user) assert not post.meta.is_comment_locked - {:ok, _} = CMS.lock_article_comment(:post, post.id) + {:ok, _} = CMS.lock_article_comments(:post, post.id) {:ok, post} = ORM.find_by(Post, id: post.id) assert post.meta.is_comment_locked - {:ok, _} = CMS.undo_lock_article_comment(:post, post.id) + {:ok, _} = CMS.undo_lock_article_comments(:post, post.id) {:ok, post} = ORM.find_by(Post, id: post.id) assert not post.meta.is_comment_locked diff --git a/test/groupher_server/cms/comments/blog_comment_test.exs b/test/groupher_server/cms/comments/blog_comment_test.exs index 61ce0d197..e5fd7f8df 100644 --- a/test/groupher_server/cms/comments/blog_comment_test.exs +++ b/test/groupher_server/cms/comments/blog_comment_test.exs @@ -235,19 +235,19 @@ defmodule GroupherServer.Test.CMS.Comments.BlogComment do assert not comment.is_folded - {:ok, comment} = CMS.fold_article_comment(comment.id, user) + {:ok, comment} = CMS.fold_comment(comment.id, user) {:ok, comment} = ORM.find(Comment, comment.id) assert comment.is_folded end test "user can unfold a comment", ~m(user blog)a do {:ok, comment} = CMS.create_comment(:blog, blog.id, mock_comment(), user) - {:ok, _comment} = CMS.fold_article_comment(comment.id, user) + {:ok, _comment} = CMS.fold_comment(comment.id, user) {:ok, comment} = ORM.find(Comment, comment.id) assert comment.is_folded - {:ok, _comment} = CMS.unfold_article_comment(comment.id, user) + {:ok, _comment} = CMS.unfold_comment(comment.id, user) {:ok, comment} = ORM.find(Comment, comment.id) assert not comment.is_folded end @@ -296,25 +296,25 @@ defmodule GroupherServer.Test.CMS.Comments.BlogComment do # {:ok, comment} = CMS.create_comment(:blog, blog.id, mock_comment(), user) # {:ok, comment} = ORM.find(Comment, comment.id) - # {:ok, comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) + # {:ok, comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user) # {:ok, comment} = ORM.find(Comment, comment.id) # end # # test "user can unreport a comment", ~m(user blog)a do # {:ok, comment} = CMS.create_comment(:blog, blog.id, mock_comment(), user) - # {:ok, _comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) + # {:ok, _comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user) # {:ok, comment} = ORM.find(Comment, comment.id) - # {:ok, _comment} = CMS.undo_report_article_comment(comment.id, user) + # {:ok, _comment} = CMS.undo_report_comment(comment.id, user) # {:ok, comment} = ORM.find(Comment, comment.id) # end test "can undo a report with other user report it too", ~m(user user2 blog)a do {:ok, comment} = CMS.create_comment(:blog, blog.id, mock_comment(), user) - {:ok, _comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) - {:ok, _comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user2) + {:ok, _comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user) + {:ok, _comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user2) filter = %{content_type: :comment, content_id: comment.id, page: 1, size: 20} {:ok, all_reports} = CMS.paged_reports(filter) @@ -344,7 +344,7 @@ defmodule GroupherServer.Test.CMS.Comments.BlogComment do Enum.reduce(1..(@report_threshold_for_fold - 1), [], fn _, _acc -> {:ok, user} = db_insert(:user) - {:ok, _comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) + {:ok, _comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user) end) {:ok, comment} = ORM.find(Comment, comment.id) @@ -358,7 +358,7 @@ defmodule GroupherServer.Test.CMS.Comments.BlogComment do Enum.reduce(1..(@report_threshold_for_fold + 1), [], fn _, _acc -> {:ok, user} = db_insert(:user) - {:ok, _comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) + {:ok, _comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user) end) {:ok, comment} = ORM.find(Comment, comment.id) @@ -499,9 +499,9 @@ defmodule GroupherServer.Test.CMS.Comments.BlogComment do random_comment_2 = all_comments |> Enum.at(1) random_comment_3 = all_comments |> Enum.at(3) - {:ok, _comment} = CMS.fold_article_comment(random_comment_1.id, user) - {:ok, _comment} = CMS.fold_article_comment(random_comment_2.id, user) - {:ok, _comment} = CMS.fold_article_comment(random_comment_3.id, user) + {:ok, _comment} = CMS.fold_comment(random_comment_1.id, user) + {:ok, _comment} = CMS.fold_comment(random_comment_2.id, user) + {:ok, _comment} = CMS.fold_comment(random_comment_3.id, user) {:ok, paged_comments} = CMS.paged_comments( @@ -528,7 +528,7 @@ defmodule GroupherServer.Test.CMS.Comments.BlogComment do all_folded_comments = Enum.reduce(1..total_count, [], fn _, acc -> {:ok, comment} = CMS.create_comment(:blog, blog.id, mock_comment(), user) - CMS.fold_article_comment(comment.id, user) + CMS.fold_comment(comment.id, user) acc ++ [comment] end) @@ -631,12 +631,12 @@ defmodule GroupherServer.Test.CMS.Comments.BlogComment do describe "[lock/unlock blog comment]" do test "locked blog can not be comment", ~m(user blog)a do {:ok, _} = CMS.create_comment(:blog, blog.id, mock_comment(), user) - {:ok, _} = CMS.lock_article_comment(:blog, blog.id) + {:ok, _} = CMS.lock_article_comments(:blog, blog.id) {:error, reason} = CMS.create_comment(:blog, blog.id, mock_comment(), user) - assert reason |> is_error?(:article_comment_locked) + assert reason |> is_error?(:article_comments_locked) - {:ok, _} = CMS.undo_lock_article_comment(:blog, blog.id) + {:ok, _} = CMS.undo_lock_article_comments(:blog, blog.id) {:ok, _} = CMS.create_comment(:blog, blog.id, mock_comment(), user) end @@ -644,12 +644,12 @@ defmodule GroupherServer.Test.CMS.Comments.BlogComment do {:ok, parent_comment} = CMS.create_comment(:blog, blog.id, mock_comment(), user) {:ok, _} = CMS.reply_comment(parent_comment.id, mock_comment(), user) - {:ok, _} = CMS.lock_article_comment(:blog, blog.id) + {:ok, _} = CMS.lock_article_comments(:blog, blog.id) {:error, reason} = CMS.reply_comment(parent_comment.id, mock_comment(), user) - assert reason |> is_error?(:article_comment_locked) + assert reason |> is_error?(:article_comments_locked) - {:ok, _} = CMS.undo_lock_article_comment(:blog, blog.id) + {:ok, _} = CMS.undo_lock_article_comments(:blog, blog.id) {:ok, _} = CMS.reply_comment(parent_comment.id, mock_comment(), user) end end diff --git a/test/groupher_server/cms/comments/job_comment_test.exs b/test/groupher_server/cms/comments/job_comment_test.exs index e20294b35..2e98b7c60 100644 --- a/test/groupher_server/cms/comments/job_comment_test.exs +++ b/test/groupher_server/cms/comments/job_comment_test.exs @@ -235,19 +235,19 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do assert not comment.is_folded - {:ok, comment} = CMS.fold_article_comment(comment.id, user) + {:ok, comment} = CMS.fold_comment(comment.id, user) {:ok, comment} = ORM.find(Comment, comment.id) assert comment.is_folded end test "user can unfold a comment", ~m(user job)a do {:ok, comment} = CMS.create_comment(:job, job.id, mock_comment(), user) - {:ok, _comment} = CMS.fold_article_comment(comment.id, user) + {:ok, _comment} = CMS.fold_comment(comment.id, user) {:ok, comment} = ORM.find(Comment, comment.id) assert comment.is_folded - {:ok, _comment} = CMS.unfold_article_comment(comment.id, user) + {:ok, _comment} = CMS.unfold_comment(comment.id, user) {:ok, comment} = ORM.find(Comment, comment.id) assert not comment.is_folded end @@ -296,25 +296,25 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do # {:ok, comment} = CMS.create_comment(:job, job.id, mock_comment(), user) # {:ok, comment} = ORM.find(Comment, comment.id) - # {:ok, comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) + # {:ok, comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user) # {:ok, comment} = ORM.find(Comment, comment.id) # end # # test "user can unreport a comment", ~m(user job)a do # {:ok, comment} = CMS.create_comment(:job, job.id, mock_comment(), user) - # {:ok, _comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) + # {:ok, _comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user) # {:ok, comment} = ORM.find(Comment, comment.id) - # {:ok, _comment} = CMS.undo_report_article_comment(comment.id, user) + # {:ok, _comment} = CMS.undo_report_comment(comment.id, user) # {:ok, comment} = ORM.find(Comment, comment.id) # end test "can undo a report with other user report it too", ~m(user user2 job)a do {:ok, comment} = CMS.create_comment(:job, job.id, mock_comment(), user) - {:ok, _comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) - {:ok, _comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user2) + {:ok, _comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user) + {:ok, _comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user2) filter = %{content_type: :comment, content_id: comment.id, page: 1, size: 20} {:ok, all_reports} = CMS.paged_reports(filter) @@ -344,7 +344,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do Enum.reduce(1..(@report_threshold_for_fold - 1), [], fn _, _acc -> {:ok, user} = db_insert(:user) - {:ok, _comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) + {:ok, _comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user) end) {:ok, comment} = ORM.find(Comment, comment.id) @@ -358,7 +358,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do Enum.reduce(1..(@report_threshold_for_fold + 1), [], fn _, _acc -> {:ok, user} = db_insert(:user) - {:ok, _comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) + {:ok, _comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user) end) {:ok, comment} = ORM.find(Comment, comment.id) @@ -499,9 +499,9 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do random_comment_2 = all_comments |> Enum.at(1) random_comment_3 = all_comments |> Enum.at(3) - {:ok, _comment} = CMS.fold_article_comment(random_comment_1.id, user) - {:ok, _comment} = CMS.fold_article_comment(random_comment_2.id, user) - {:ok, _comment} = CMS.fold_article_comment(random_comment_3.id, user) + {:ok, _comment} = CMS.fold_comment(random_comment_1.id, user) + {:ok, _comment} = CMS.fold_comment(random_comment_2.id, user) + {:ok, _comment} = CMS.fold_comment(random_comment_3.id, user) {:ok, paged_comments} = CMS.paged_comments( @@ -528,7 +528,7 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do all_folded_comments = Enum.reduce(1..total_count, [], fn _, acc -> {:ok, comment} = CMS.create_comment(:job, job.id, mock_comment(), user) - CMS.fold_article_comment(comment.id, user) + CMS.fold_comment(comment.id, user) acc ++ [comment] end) @@ -631,12 +631,12 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do describe "[lock/unlock job comment]" do test "locked job can not be comment", ~m(user job)a do {:ok, _} = CMS.create_comment(:job, job.id, mock_comment(), user) - {:ok, _} = CMS.lock_article_comment(:job, job.id) + {:ok, _} = CMS.lock_article_comments(:job, job.id) {:error, reason} = CMS.create_comment(:job, job.id, mock_comment(), user) - assert reason |> is_error?(:article_comment_locked) + assert reason |> is_error?(:article_comments_locked) - {:ok, _} = CMS.undo_lock_article_comment(:job, job.id) + {:ok, _} = CMS.undo_lock_article_comments(:job, job.id) {:ok, _} = CMS.create_comment(:job, job.id, mock_comment(), user) end @@ -644,12 +644,12 @@ defmodule GroupherServer.Test.CMS.Comments.JobComment do {:ok, parent_comment} = CMS.create_comment(:job, job.id, mock_comment(), user) {:ok, _} = CMS.reply_comment(parent_comment.id, mock_comment(), user) - {:ok, _} = CMS.lock_article_comment(:job, job.id) + {:ok, _} = CMS.lock_article_comments(:job, job.id) {:error, reason} = CMS.reply_comment(parent_comment.id, mock_comment(), user) - assert reason |> is_error?(:article_comment_locked) + assert reason |> is_error?(:article_comments_locked) - {:ok, _} = CMS.undo_lock_article_comment(:job, job.id) + {:ok, _} = CMS.undo_lock_article_comments(:job, job.id) {:ok, _} = CMS.reply_comment(parent_comment.id, mock_comment(), user) end end diff --git a/test/groupher_server/cms/comments/post_comment_test.exs b/test/groupher_server/cms/comments/post_comment_test.exs index b48dd76c0..66d66a69d 100644 --- a/test/groupher_server/cms/comments/post_comment_test.exs +++ b/test/groupher_server/cms/comments/post_comment_test.exs @@ -235,19 +235,19 @@ defmodule GroupherServer.Test.CMS.Comments.PostComment do assert not comment.is_folded - {:ok, comment} = CMS.fold_article_comment(comment.id, user) + {:ok, comment} = CMS.fold_comment(comment.id, user) {:ok, comment} = ORM.find(Comment, comment.id) assert comment.is_folded end test "user can unfold a comment", ~m(user post)a do {:ok, comment} = CMS.create_comment(:post, post.id, mock_comment(), user) - {:ok, _comment} = CMS.fold_article_comment(comment.id, user) + {:ok, _comment} = CMS.fold_comment(comment.id, user) {:ok, comment} = ORM.find(Comment, comment.id) assert comment.is_folded - {:ok, _comment} = CMS.unfold_article_comment(comment.id, user) + {:ok, _comment} = CMS.unfold_comment(comment.id, user) {:ok, comment} = ORM.find(Comment, comment.id) assert not comment.is_folded end @@ -296,25 +296,25 @@ defmodule GroupherServer.Test.CMS.Comments.PostComment do # {:ok, comment} = CMS.create_comment(:post, post.id, mock_comment(), user) # {:ok, comment} = ORM.find(Comment, comment.id) - # {:ok, comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) + # {:ok, comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user) # {:ok, comment} = ORM.find(Comment, comment.id) # end # # test "user can unreport a comment", ~m(user post)a do # {:ok, comment} = CMS.create_comment(:post, post.id, mock_comment(), user) - # {:ok, _comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) + # {:ok, _comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user) # {:ok, comment} = ORM.find(Comment, comment.id) - # {:ok, _comment} = CMS.undo_report_article_comment(comment.id, user) + # {:ok, _comment} = CMS.undo_report_comment(comment.id, user) # {:ok, comment} = ORM.find(Comment, comment.id) # end test "can undo a report with other user report it too", ~m(user user2 post)a do {:ok, comment} = CMS.create_comment(:post, post.id, mock_comment(), user) - {:ok, _comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) - {:ok, _comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user2) + {:ok, _comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user) + {:ok, _comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user2) filter = %{content_type: :comment, content_id: comment.id, page: 1, size: 20} {:ok, all_reports} = CMS.paged_reports(filter) @@ -344,7 +344,7 @@ defmodule GroupherServer.Test.CMS.Comments.PostComment do Enum.reduce(1..(@report_threshold_for_fold - 1), [], fn _, _acc -> {:ok, user} = db_insert(:user) - {:ok, _comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) + {:ok, _comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user) end) {:ok, comment} = ORM.find(Comment, comment.id) @@ -358,7 +358,7 @@ defmodule GroupherServer.Test.CMS.Comments.PostComment do Enum.reduce(1..(@report_threshold_for_fold + 1), [], fn _, _acc -> {:ok, user} = db_insert(:user) - {:ok, _comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) + {:ok, _comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user) end) {:ok, comment} = ORM.find(Comment, comment.id) @@ -499,9 +499,9 @@ defmodule GroupherServer.Test.CMS.Comments.PostComment do random_comment_2 = all_comments |> Enum.at(1) random_comment_3 = all_comments |> Enum.at(3) - {:ok, _comment} = CMS.fold_article_comment(random_comment_1.id, user) - {:ok, _comment} = CMS.fold_article_comment(random_comment_2.id, user) - {:ok, _comment} = CMS.fold_article_comment(random_comment_3.id, user) + {:ok, _comment} = CMS.fold_comment(random_comment_1.id, user) + {:ok, _comment} = CMS.fold_comment(random_comment_2.id, user) + {:ok, _comment} = CMS.fold_comment(random_comment_3.id, user) {:ok, paged_comments} = CMS.paged_comments( @@ -528,7 +528,7 @@ defmodule GroupherServer.Test.CMS.Comments.PostComment do all_folded_comments = Enum.reduce(1..total_count, [], fn _, acc -> {:ok, comment} = CMS.create_comment(:post, post.id, mock_comment(), user) - CMS.fold_article_comment(comment.id, user) + CMS.fold_comment(comment.id, user) acc ++ [comment] end) @@ -631,12 +631,12 @@ defmodule GroupherServer.Test.CMS.Comments.PostComment do describe "[lock/unlock post comment]" do test "locked post can not be comment", ~m(user post)a do {:ok, _} = CMS.create_comment(:post, post.id, mock_comment(), user) - {:ok, _} = CMS.lock_article_comment(:post, post.id) + {:ok, _} = CMS.lock_article_comments(:post, post.id) {:error, reason} = CMS.create_comment(:post, post.id, mock_comment(), user) - assert reason |> is_error?(:article_comment_locked) + assert reason |> is_error?(:article_comments_locked) - {:ok, _} = CMS.undo_lock_article_comment(:post, post.id) + {:ok, _} = CMS.undo_lock_article_comments(:post, post.id) {:ok, _} = CMS.create_comment(:post, post.id, mock_comment(), user) end @@ -644,12 +644,12 @@ defmodule GroupherServer.Test.CMS.Comments.PostComment do {:ok, parent_comment} = CMS.create_comment(:post, post.id, mock_comment(), user) {:ok, _} = CMS.reply_comment(parent_comment.id, mock_comment(), user) - {:ok, _} = CMS.lock_article_comment(:post, post.id) + {:ok, _} = CMS.lock_article_comments(:post, post.id) {:error, reason} = CMS.reply_comment(parent_comment.id, mock_comment(), user) - assert reason |> is_error?(:article_comment_locked) + assert reason |> is_error?(:article_comments_locked) - {:ok, _} = CMS.undo_lock_article_comment(:post, post.id) + {:ok, _} = CMS.undo_lock_article_comments(:post, post.id) {:ok, _} = CMS.reply_comment(parent_comment.id, mock_comment(), user) end end diff --git a/test/groupher_server/cms/comments/repo_comment_test.exs b/test/groupher_server/cms/comments/repo_comment_test.exs index 9bf52e4c9..434b9252c 100644 --- a/test/groupher_server/cms/comments/repo_comment_test.exs +++ b/test/groupher_server/cms/comments/repo_comment_test.exs @@ -235,19 +235,19 @@ defmodule GroupherServer.Test.CMS.Comments.RepoComment do assert not comment.is_folded - {:ok, comment} = CMS.fold_article_comment(comment.id, user) + {:ok, comment} = CMS.fold_comment(comment.id, user) {:ok, comment} = ORM.find(Comment, comment.id) assert comment.is_folded end test "user can unfold a comment", ~m(user repo)a do {:ok, comment} = CMS.create_comment(:repo, repo.id, mock_comment(), user) - {:ok, _comment} = CMS.fold_article_comment(comment.id, user) + {:ok, _comment} = CMS.fold_comment(comment.id, user) {:ok, comment} = ORM.find(Comment, comment.id) assert comment.is_folded - {:ok, _comment} = CMS.unfold_article_comment(comment.id, user) + {:ok, _comment} = CMS.unfold_comment(comment.id, user) {:ok, comment} = ORM.find(Comment, comment.id) assert not comment.is_folded end @@ -296,25 +296,25 @@ defmodule GroupherServer.Test.CMS.Comments.RepoComment do # {:ok, comment} = CMS.create_comment(:repo, repo.id, mock_comment(), user) # {:ok, comment} = ORM.find(Comment, comment.id) - # {:ok, comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) + # {:ok, comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user) # {:ok, comment} = ORM.find(Comment, comment.id) # end # # test "user can unreport a comment", ~m(user repo)a do # {:ok, comment} = CMS.create_comment(:repo, repo.id, mock_comment(), user) - # {:ok, _comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) + # {:ok, _comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user) # {:ok, comment} = ORM.find(Comment, comment.id) - # {:ok, _comment} = CMS.undo_report_article_comment(comment.id, user) + # {:ok, _comment} = CMS.undo_report_comment(comment.id, user) # {:ok, comment} = ORM.find(Comment, comment.id) # end test "can undo a report with other user report it too", ~m(user user2 repo)a do {:ok, comment} = CMS.create_comment(:repo, repo.id, mock_comment(), user) - {:ok, _comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) - {:ok, _comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user2) + {:ok, _comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user) + {:ok, _comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user2) filter = %{content_type: :comment, content_id: comment.id, page: 1, size: 20} {:ok, all_reports} = CMS.paged_reports(filter) @@ -344,7 +344,7 @@ defmodule GroupherServer.Test.CMS.Comments.RepoComment do Enum.reduce(1..(@report_threshold_for_fold - 1), [], fn _, _acc -> {:ok, user} = db_insert(:user) - {:ok, _comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) + {:ok, _comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user) end) {:ok, comment} = ORM.find(Comment, comment.id) @@ -358,7 +358,7 @@ defmodule GroupherServer.Test.CMS.Comments.RepoComment do Enum.reduce(1..(@report_threshold_for_fold + 1), [], fn _, _acc -> {:ok, user} = db_insert(:user) - {:ok, _comment} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) + {:ok, _comment} = CMS.report_comment(comment.id, mock_comment(), "attr", user) end) {:ok, comment} = ORM.find(Comment, comment.id) @@ -499,9 +499,9 @@ defmodule GroupherServer.Test.CMS.Comments.RepoComment do random_comment_2 = all_comments |> Enum.at(1) random_comment_3 = all_comments |> Enum.at(3) - {:ok, _comment} = CMS.fold_article_comment(random_comment_1.id, user) - {:ok, _comment} = CMS.fold_article_comment(random_comment_2.id, user) - {:ok, _comment} = CMS.fold_article_comment(random_comment_3.id, user) + {:ok, _comment} = CMS.fold_comment(random_comment_1.id, user) + {:ok, _comment} = CMS.fold_comment(random_comment_2.id, user) + {:ok, _comment} = CMS.fold_comment(random_comment_3.id, user) {:ok, paged_comments} = CMS.paged_comments( @@ -528,7 +528,7 @@ defmodule GroupherServer.Test.CMS.Comments.RepoComment do all_folded_comments = Enum.reduce(1..total_count, [], fn _, acc -> {:ok, comment} = CMS.create_comment(:repo, repo.id, mock_comment(), user) - CMS.fold_article_comment(comment.id, user) + CMS.fold_comment(comment.id, user) acc ++ [comment] end) @@ -631,12 +631,12 @@ defmodule GroupherServer.Test.CMS.Comments.RepoComment do describe "[lock/unlock repo comment]" do test "locked repo can not be comment", ~m(user repo)a do {:ok, _} = CMS.create_comment(:repo, repo.id, mock_comment(), user) - {:ok, _} = CMS.lock_article_comment(:repo, repo.id) + {:ok, _} = CMS.lock_article_comments(:repo, repo.id) {:error, reason} = CMS.create_comment(:repo, repo.id, mock_comment(), user) - assert reason |> is_error?(:article_comment_locked) + assert reason |> is_error?(:article_comments_locked) - {:ok, _} = CMS.undo_lock_article_comment(:repo, repo.id) + {:ok, _} = CMS.undo_lock_article_comments(:repo, repo.id) {:ok, _} = CMS.create_comment(:repo, repo.id, mock_comment(), user) end @@ -644,12 +644,12 @@ defmodule GroupherServer.Test.CMS.Comments.RepoComment do {:ok, parent_comment} = CMS.create_comment(:repo, repo.id, mock_comment(), user) {:ok, _} = CMS.reply_comment(parent_comment.id, mock_comment(), user) - {:ok, _} = CMS.lock_article_comment(:repo, repo.id) + {:ok, _} = CMS.lock_article_comments(:repo, repo.id) {:error, reason} = CMS.reply_comment(parent_comment.id, mock_comment(), user) - assert reason |> is_error?(:article_comment_locked) + assert reason |> is_error?(:article_comments_locked) - {:ok, _} = CMS.undo_lock_article_comment(:repo, repo.id) + {:ok, _} = CMS.undo_lock_article_comments(:repo, repo.id) {:ok, _} = CMS.reply_comment(parent_comment.id, mock_comment(), user) end end diff --git a/test/groupher_server_web/mutation/cms/comments/blog_comment_test.exs b/test/groupher_server_web/mutation/cms/comments/blog_comment_test.exs index a9c663fb4..d90ca5b08 100644 --- a/test/groupher_server_web/mutation/cms/comments/blog_comment_test.exs +++ b/test/groupher_server_web/mutation/cms/comments/blog_comment_test.exs @@ -248,7 +248,7 @@ defmodule GroupherServer.Test.Mutation.Comments.BlogComment do """ test "can undo lock a blog's comment", ~m(community blog)a do - {:ok, _} = CMS.lock_article_comment(:blog, blog.id) + {:ok, _} = CMS.lock_article_comments(:blog, blog.id) {:ok, blog} = ORM.find(Blog, blog.id) assert blog.meta.is_comment_locked diff --git a/test/groupher_server_web/mutation/cms/comments/job_comment_test.exs b/test/groupher_server_web/mutation/cms/comments/job_comment_test.exs index 4076c3930..65f34ea23 100644 --- a/test/groupher_server_web/mutation/cms/comments/job_comment_test.exs +++ b/test/groupher_server_web/mutation/cms/comments/job_comment_test.exs @@ -248,7 +248,7 @@ defmodule GroupherServer.Test.Mutation.Comments.JobComment do """ test "can undo lock a job's comment", ~m(community job)a do - {:ok, _} = CMS.lock_article_comment(:job, job.id) + {:ok, _} = CMS.lock_article_comments(:job, job.id) {:ok, job} = ORM.find(Job, job.id) assert job.meta.is_comment_locked diff --git a/test/groupher_server_web/mutation/cms/comments/post_comment_test.exs b/test/groupher_server_web/mutation/cms/comments/post_comment_test.exs index 43f46e4dd..d92f20d75 100644 --- a/test/groupher_server_web/mutation/cms/comments/post_comment_test.exs +++ b/test/groupher_server_web/mutation/cms/comments/post_comment_test.exs @@ -249,7 +249,7 @@ defmodule GroupherServer.Test.Mutation.Comments.PostComment do """ test "can undo lock a post's comment", ~m(community post)a do - {:ok, _} = CMS.lock_article_comment(:post, post.id) + {:ok, _} = CMS.lock_article_comments(:post, post.id) {:ok, post} = ORM.find(Post, post.id) assert post.meta.is_comment_locked diff --git a/test/groupher_server_web/mutation/cms/comments/repo_comment_test.exs b/test/groupher_server_web/mutation/cms/comments/repo_comment_test.exs index e5304b1a6..d76a902c0 100644 --- a/test/groupher_server_web/mutation/cms/comments/repo_comment_test.exs +++ b/test/groupher_server_web/mutation/cms/comments/repo_comment_test.exs @@ -248,7 +248,7 @@ defmodule GroupherServer.Test.Mutation.Comments.RepoComment do """ test "can undo lock a repo's comment", ~m(community repo)a do - {:ok, _} = CMS.lock_article_comment(:repo, repo.id) + {:ok, _} = CMS.lock_article_comments(:repo, repo.id) {:ok, repo} = ORM.find(Repo, repo.id) assert repo.meta.is_comment_locked diff --git a/test/groupher_server_web/query/cms/abuse_reports/job_report_test.exs b/test/groupher_server_web/query/cms/abuse_reports/job_report_test.exs index 23ca18789..8a89c153a 100644 --- a/test/groupher_server_web/query/cms/abuse_reports/job_report_test.exs +++ b/test/groupher_server_web/query/cms/abuse_reports/job_report_test.exs @@ -93,7 +93,7 @@ defmodule GroupherServer.Test.Query.AbuseReports.JobReport do test "support comment", ~m(guest_conn job user)a do {:ok, comment} = CMS.create_comment(:job, job.id, mock_comment(), user) - {:ok, _} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) + {:ok, _} = CMS.report_comment(comment.id, mock_comment(), "attr", user) variables = %{filter: %{content_type: "COMMENT", page: 1, size: 10}} results = guest_conn |> query_result(@query, variables, "pagedAbuseReports") diff --git a/test/groupher_server_web/query/cms/abuse_reports/post_report_test.exs b/test/groupher_server_web/query/cms/abuse_reports/post_report_test.exs index 52c5b53fb..b5f681922 100644 --- a/test/groupher_server_web/query/cms/abuse_reports/post_report_test.exs +++ b/test/groupher_server_web/query/cms/abuse_reports/post_report_test.exs @@ -93,7 +93,7 @@ defmodule GroupherServer.Test.Query.AbuseReports.PostReport do test "support comment", ~m(guest_conn post user)a do {:ok, comment} = CMS.create_comment(:post, post.id, mock_comment(), user) - {:ok, _} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) + {:ok, _} = CMS.report_comment(comment.id, mock_comment(), "attr", user) variables = %{filter: %{content_type: "COMMENT", page: 1, size: 10}} results = guest_conn |> query_result(@query, variables, "pagedAbuseReports") diff --git a/test/groupher_server_web/query/cms/abuse_reports/repo_report_test.exs b/test/groupher_server_web/query/cms/abuse_reports/repo_report_test.exs index 3d0c6c28b..7db108703 100644 --- a/test/groupher_server_web/query/cms/abuse_reports/repo_report_test.exs +++ b/test/groupher_server_web/query/cms/abuse_reports/repo_report_test.exs @@ -93,7 +93,7 @@ defmodule GroupherServer.Test.Query.AbuseReports.RepoReport do test "support comment", ~m(guest_conn repo user)a do {:ok, comment} = CMS.create_comment(:repo, repo.id, mock_comment(), user) - {:ok, _} = CMS.report_article_comment(comment.id, mock_comment(), "attr", user) + {:ok, _} = CMS.report_comment(comment.id, mock_comment(), "attr", user) variables = %{filter: %{content_type: "COMMENT", page: 1, size: 10}} results = guest_conn |> query_result(@query, variables, "pagedAbuseReports")