refactor(config): rename article_xxx -> xxx (#380)

mydearxym · web-flow · commit db723eccb490 · 2021-06-02T10:19:16.000+08:00
* refactor(config): rename article_threads -&gt; threads

* refactor(config): rename supported_emotions -&gt; emotions

* chore: clean up unused warnings

* chore: enhance active_at tests
diff --git a/config/config.exs b/config/config.exs
@@ -62,7 +62,7 @@ config :groupher_server, :customization,
 
 config :groupher_server, :article,
   # NOTE: do not change unless you know what you are doing
-  article_threads: [:post, :job, :repo],
+  threads: [:post, :job, :repo],
   # in this period, paged articles will sort front if non-article-author commented
   # 在此时间段内，一旦有非文章作者的用户评论，该文章就会排到前面
   active_period_days: %{
@@ -73,7 +73,7 @@ config :groupher_server, :article,
 
   # NOTE: if you want to add/remove emotion, just edit the list below
   # and migrate the field to table "articles_users_emotions"
-  supported_emotions: [
+  emotions: [
     :upvote,
     :downvote,
     :beer,
@@ -86,7 +86,7 @@ config :groupher_server, :article,
   ],
   # NOTE: if you want to add/remove emotion, just edit the list below
   # and migrate the field to table "articles_comments_users_emotions"
-  comment_supported_emotions: [
+  comment_emotions: [
     :downvote,
     :beer,
     :heart,
diff --git a/lib/groupher_server/accounts/delegates/collect_folder.ex b/lib/groupher_server/accounts/delegates/collect_folder.ex
@@ -24,7 +24,7 @@ defmodule GroupherServer.Accounts.Delegate.CollectFolder do
   # @max_article_count_per_collect_folder 300
 
   @default_meta Embeds.CollectFolderMeta.default_meta()
-  @article_threads get_config(:article, :article_threads)
+  @article_threads get_config(:article, :threads)
 
   @doc """
   list a user's not-private collect folders
diff --git a/lib/groupher_server/accounts/delegates/upvoted_articles.ex b/lib/groupher_server/accounts/delegates/upvoted_articles.ex
@@ -11,7 +11,7 @@ defmodule GroupherServer.Accounts.Delegate.UpvotedArticles do
   alias GroupherServer.CMS
   alias CMS.{ArticleUpvote}
 
-  @article_threads get_config(:article, :article_threads)
+  @article_threads get_config(:article, :threads)
 
   @doc """
   get paged upvoted articles
diff --git a/lib/groupher_server/accounts/embeds/collect_folder_meta.ex b/lib/groupher_server/accounts/embeds/collect_folder_meta.ex
@@ -12,7 +12,7 @@ defmodule GroupherServer.Accounts.Embeds.CollectFolderMeta.Macros do
   """
   import Helper.Utils, only: [get_config: 2]
 
-  @article_threads get_config(:article, :article_threads)
+  @article_threads get_config(:article, :threads)
 
   defmacro threads_fields() do
     @article_threads
@@ -34,7 +34,7 @@ defmodule GroupherServer.Accounts.Embeds.CollectFolderMeta do
   import GroupherServer.Accounts.Embeds.CollectFolderMeta.Macros
   import Helper.Utils, only: [get_config: 2]
 
-  @article_threads get_config(:article, :article_threads)
+  @article_threads get_config(:article, :threads)
 
   @optional_fields Enum.map(@article_threads, &:"#{&1}_count") ++
                      Enum.map(@article_threads, &:"has_#{&1}")
diff --git a/lib/groupher_server/accounts/embeds/user_meta.ex b/lib/groupher_server/accounts/embeds/user_meta.ex
@@ -3,7 +3,7 @@ defmodule GroupherServer.Accounts.Embeds.UserMeta.Macro do
 
   import Helper.Utils, only: [get_config: 2]
 
-  @article_threads get_config(:article, :article_threads)
+  @article_threads get_config(:article, :threads)
 
   defmacro published_article_count_fields() do
     @article_threads
@@ -26,7 +26,7 @@ defmodule GroupherServer.Accounts.Embeds.UserMeta do
   import GroupherServer.Accounts.Embeds.UserMeta.Macro
   import Helper.Utils, only: [get_config: 2]
 
-  @article_threads get_config(:article, :article_threads)
+  @article_threads get_config(:article, :threads)
 
   @general_options %{
     reported_count: 0,
diff --git a/lib/groupher_server/cms/abuse_report.ex b/lib/groupher_server/cms/abuse_report.ex
@@ -13,7 +13,7 @@ defmodule GroupherServer.CMS.AbuseReport do
   alias GroupherServer.{Accounts, CMS}
   alias CMS.{ArticleComment, Embeds}
 
-  @article_threads get_config(:article, :article_threads)
+  @article_threads get_config(:article, :threads)
 
   # @required_fields ~w(article_comment_id user_id recived_user_id)a
   @optional_fields ~w(article_comment_id account_id operate_user_id deal_with report_cases_count)a
diff --git a/lib/groupher_server/cms/article_collect.ex b/lib/groupher_server/cms/article_collect.ex
@@ -12,7 +12,7 @@ defmodule GroupherServer.CMS.ArticleCollect do
   alias GroupherServer.Accounts
   alias Accounts.{User, CollectFolder}
 
-  @article_threads get_config(:article, :article_threads)
+  @article_threads get_config(:article, :threads)
 
   @required_fields ~w(user_id)a
   @optional_fields ~w(thread)a
diff --git a/lib/groupher_server/cms/article_comment.ex b/lib/groupher_server/cms/article_comment.ex
@@ -14,7 +14,7 @@ defmodule GroupherServer.CMS.ArticleComment do
   alias CMS.{Embeds, ArticleCommentUpvote}
 
   # alias Helper.HTML
-  @article_threads get_config(:article, :article_threads)
+  @article_threads get_config(:article, :threads)
 
   @required_fields ~w(body_html author_id)a
   @optional_fields ~w(reply_to_id replies_count is_folded is_deleted floor is_article_author thread)a
diff --git a/lib/groupher_server/cms/article_comment_user_emotion.ex b/lib/groupher_server/cms/article_comment_user_emotion.ex
@@ -1,7 +1,7 @@
 defmodule GroupherServer.CMS.ArticleCommentUserEmotion.Macros do
   import Helper.Utils, only: [get_config: 2]
 
-  @supported_emotions get_config(:article, :comment_supported_emotions)
+  @supported_emotions get_config(:article, :comment_emotions)
 
   defmacro emotion_fields() do
     @supported_emotions
@@ -25,7 +25,7 @@ defmodule GroupherServer.CMS.ArticleCommentUserEmotion do
   alias GroupherServer.{Accounts, CMS}
   alias CMS.ArticleComment
 
-  @supported_emotions get_config(:article, :comment_supported_emotions)
+  @supported_emotions get_config(:article, :comment_emotions)
 
   @required_fields ~w(article_comment_id user_id recived_user_id)a
   @optional_fields Enum.map(@supported_emotions, &:"#{&1}")
diff --git a/lib/groupher_server/cms/article_pinned_comment.ex b/lib/groupher_server/cms/article_pinned_comment.ex
@@ -14,7 +14,7 @@ defmodule GroupherServer.CMS.ArticlePinnedComment do
   alias CMS.ArticleComment
 
   # alias Helper.HTML
-  @article_threads get_config(:article, :article_threads)
+  @article_threads get_config(:article, :threads)
 
   @required_fields ~w(article_comment_id)a
   # @optional_fields ~w(post_id job_id repo_id)a
diff --git a/lib/groupher_server/cms/article_upvote.ex b/lib/groupher_server/cms/article_upvote.ex
@@ -12,7 +12,7 @@ defmodule GroupherServer.CMS.ArticleUpvote do
   alias GroupherServer.Accounts
   alias Accounts.User
 
-  @article_threads get_config(:article, :article_threads)
+  @article_threads get_config(:article, :threads)
 
   @required_fields ~w(user_id)a
   @optional_fields ~w(thread)a
diff --git a/lib/groupher_server/cms/article_user_emotion.ex b/lib/groupher_server/cms/article_user_emotion.ex
@@ -1,7 +1,7 @@
 defmodule GroupherServer.CMS.ArticleUserEmotion.Macros do
   import Helper.Utils, only: [get_config: 2]
 
-  @supported_emotions get_config(:article, :supported_emotions)
+  @supported_emotions get_config(:article, :emotions)
 
   defmacro emotion_fields() do
     @supported_emotions
@@ -26,8 +26,8 @@ defmodule GroupherServer.CMS.ArticleUserEmotion do
 
   alias GroupherServer.Accounts
 
-  @supported_emotions get_config(:article, :supported_emotions)
-  @article_threads get_config(:article, :article_threads)
+  @supported_emotions get_config(:article, :emotions)
+  @article_threads get_config(:article, :threads)
 
   @required_fields ~w(user_id recived_user_id)a
   @optional_fields Enum.map(@article_threads, &:"#{&1}_id") ++
diff --git a/lib/groupher_server/cms/delegates/abuse_report.ex b/lib/groupher_server/cms/delegates/abuse_report.ex
@@ -17,7 +17,7 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
 
   alias Ecto.Multi
 
-  @article_threads get_config(:article, :article_threads)
+  @article_threads get_config(:article, :threads)
   @report_threshold_for_fold ArticleComment.report_threshold_for_fold()
 
   @export_author_keys [:id, :login, :nickname, :avatar]
diff --git a/lib/groupher_server/cms/delegates/article_comment_action.ex b/lib/groupher_server/cms/delegates/article_comment_action.ex
@@ -20,7 +20,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleCommentAction do
 
   alias Ecto.Multi
 
-  @article_threads get_config(:article, :article_threads)
+  @article_threads get_config(:article, :threads)
 
   @max_parent_replies_count ArticleComment.max_parent_replies_count()
   @pinned_comment_limit ArticleComment.pinned_comment_limit()
diff --git a/lib/groupher_server/cms/delegates/community_curd.ex b/lib/groupher_server/cms/delegates/community_curd.ex
@@ -25,7 +25,7 @@ defmodule GroupherServer.CMS.Delegate.CommunityCURD do
   }
 
   @default_meta Embeds.CommunityMeta.default_meta()
-  @article_threads get_config(:article, :article_threads)
+  @article_threads get_config(:article, :threads)
 
   def read_community(clauses, user), do: read_community(clauses) |> viewer_has_states(user)
   def read_community(%{id: id}), do: ORM.read(Community, id, inc: :views)
diff --git a/lib/groupher_server/cms/delegates/helper.ex b/lib/groupher_server/cms/delegates/helper.ex
@@ -18,8 +18,8 @@ defmodule GroupherServer.CMS.Delegate.Helper do
   # TODO:
   # @max_latest_emotion_users_count ArticleComment.max_latest_emotion_users_count()
   @max_latest_emotion_users_count 4
-  @supported_emotions get_config(:article, :supported_emotions)
-  @supported_comment_emotions get_config(:article, :comment_supported_emotions)
+  @supported_emotions get_config(:article, :emotions)
+  @supported_comment_emotions get_config(:article, :comment_emotions)
 
   #######
   # emotion related
diff --git a/lib/groupher_server/cms/embeds/article_comment_emotion.ex b/lib/groupher_server/cms/embeds/article_comment_emotion.ex
@@ -13,7 +13,7 @@ defmodule GroupherServer.CMS.Embeds.ArticleCommentEmotion.Macros do
   alias GroupherServer.CMS
   alias CMS.Embeds
 
-  @supported_emotions get_config(:article, :comment_supported_emotions)
+  @supported_emotions get_config(:article, :comment_emotions)
 
   defmacro emotion_fields() do
     @supported_emotions
@@ -39,7 +39,7 @@ defmodule GroupherServer.CMS.Embeds.ArticleCommentEmotion do
   import GroupherServer.CMS.Embeds.ArticleCommentEmotion.Macros
   import Helper.Utils, only: [get_config: 2]
 
-  @supported_emotions get_config(:article, :comment_supported_emotions)
+  @supported_emotions get_config(:article, :comment_emotions)
   @optional_fields Enum.map(@supported_emotions, &:"#{&1}_count") ++
                      Enum.map(@supported_emotions, &:"#{&1}_user_logins")
 
diff --git a/lib/groupher_server/cms/embeds/article_emotion.ex b/lib/groupher_server/cms/embeds/article_emotion.ex
@@ -13,7 +13,7 @@ defmodule GroupherServer.CMS.Embeds.ArticleEmotion.Macros do
   alias GroupherServer.CMS
   alias CMS.Embeds
 
-  @supported_emotions get_config(:article, :supported_emotions)
+  @supported_emotions get_config(:article, :emotions)
 
   defmacro emotion_fields() do
     @supported_emotions
@@ -39,7 +39,7 @@ defmodule GroupherServer.CMS.Embeds.ArticleEmotion do
   import GroupherServer.CMS.Embeds.ArticleEmotion.Macros
   import Helper.Utils, only: [get_config: 2]
 
-  @supported_emotions get_config(:article, :supported_emotions)
+  @supported_emotions get_config(:article, :emotions)
 
   @optional_fields Enum.map(@supported_emotions, &:"#{&1}_count") ++
                      Enum.map(@supported_emotions, &:"#{&1}_user_logins")
diff --git a/lib/groupher_server/cms/embeds/community_meta.ex b/lib/groupher_server/cms/embeds/community_meta.ex
@@ -3,7 +3,7 @@ defmodule GroupherServer.CMS.Embeds.CommunityMeta.Macro do
 
   import Helper.Utils, only: [get_config: 2]
 
-  @article_threads get_config(:article, :article_threads)
+  @article_threads get_config(:article, :threads)
 
   defmacro thread_count_fields() do
     @article_threads
@@ -26,7 +26,7 @@ defmodule GroupherServer.CMS.Embeds.CommunityMeta do
   import Helper.Utils, only: [get_config: 2]
   import GroupherServer.CMS.Embeds.CommunityMeta.Macro
 
-  @article_threads get_config(:article, :article_threads)
+  @article_threads get_config(:article, :threads)
 
   @general_options %{
     editors_ids: [],
diff --git a/lib/groupher_server/cms/helper/macros.ex b/lib/groupher_server/cms/helper/macros.ex
@@ -9,7 +9,7 @@ defmodule GroupherServer.CMS.Helper.Macros do
   alias Accounts.User
   alias CMS.{Author, Community, ArticleComment, ArticleTag, ArticleUpvote, ArticleCollect}
 
-  @article_threads get_config(:article, :article_threads)
+  @article_threads get_config(:article, :threads)
 
   @doc """
   generate belongs to fields for given thread
diff --git a/lib/groupher_server/cms/helper/matcher_macros.ex b/lib/groupher_server/cms/helper/matcher_macros.ex
@@ -7,7 +7,7 @@ defmodule GroupherServer.CMS.Helper.MatcherMacros do
   alias GroupherServer.CMS
   alias CMS.{ArticleComment, Embeds}
 
-  @article_threads get_config(:article, :article_threads)
+  @article_threads get_config(:article, :threads)
 
   @doc """
   match basic threads
diff --git a/lib/groupher_server/cms/helper/utils.ex b/lib/groupher_server/cms/helper/utils.ex
@@ -8,7 +8,7 @@ defmodule GroupherServer.CMS.Helper.Utils do
   alias GroupherServer.CMS
   alias CMS.Community
 
-  @article_threads get_config(:article, :article_threads)
+  @article_threads get_config(:article, :threads)
   @article_fields @article_threads |> Enum.map(&:"#{&1}_id")
 
   @doc """
diff --git a/lib/groupher_server/cms/pinned_article.ex b/lib/groupher_server/cms/pinned_article.ex
@@ -12,7 +12,7 @@ defmodule GroupherServer.CMS.PinnedArticle do
   alias GroupherServer.CMS
   alias CMS.Community
 
-  @article_threads get_config(:article, :article_threads)
+  @article_threads get_config(:article, :threads)
 
   @required_fields ~w(community_id thread)a
   # @optional_fields ~w(post_id job_id repo_id)a
diff --git a/lib/groupher_server_web/schema/Helper/fields.ex b/lib/groupher_server_web/schema/Helper/fields.ex
@@ -7,10 +7,10 @@ defmodule GroupherServerWeb.Schema.Helper.Fields do
   alias GroupherServer.{Accounts, CMS}
 
   @page_size get_config(:general, :page_size)
-  @supported_emotions get_config(:article, :supported_emotions)
-  @supported_comment_emotions get_config(:article, :comment_supported_emotions)
+  @supported_emotions get_config(:article, :emotions)
+  @supported_comment_emotions get_config(:article, :comment_emotions)
 
-  @article_threads get_config(:article, :article_threads)
+  @article_threads get_config(:article, :threads)
 
   defmacro timestamp_fields(:article) do
     quote do
diff --git a/lib/groupher_server_web/schema/Helper/queries.ex b/lib/groupher_server_web/schema/Helper/queries.ex
@@ -7,7 +7,7 @@ defmodule GroupherServerWeb.Schema.Helper.Queries do
   alias GroupherServerWeb.Middleware, as: M
   alias GroupherServerWeb.Resolvers, as: R
 
-  @article_threads get_config(:article, :article_threads)
+  @article_threads get_config(:article, :threads)
 
   # user published articles
   defmacro published_article_queries() do
diff --git a/lib/helper/orm.ex b/lib/helper/orm.ex
@@ -12,7 +12,7 @@ defmodule Helper.ORM do
   alias GroupherServer.Repo
   alias Helper.{QueryBuilder, SpecType}
 
-  @article_threads get_config(:article, :article_threads)
+  @article_threads get_config(:article, :threads)
 
   @doc """
   a wrap for paginate request
diff --git a/test/groupher_server/cms/articles/job_test.exs b/test/groupher_server/cms/articles/job_test.exs
@@ -95,7 +95,6 @@ defmodule GroupherServer.Test.Articles.Job do
   end
 
   describe "[cms job sink/undo_sink]" do
-    @tag :wip2
     test "if a job is too old, read job should update can_undo_sink flag",
          ~m(user community job_attrs)a do
       {:ok, job} = CMS.create_article(community, :job, job_attrs, user)
@@ -110,7 +109,6 @@ defmodule GroupherServer.Test.Articles.Job do
       assert not job_last_year.meta.can_undo_sink
     end
 
-    @tag :wip2
     test "can sink a job", ~m(user community job_attrs)a do
       {:ok, job} = CMS.create_article(community, :job, job_attrs, user)
       assert not job.meta.is_sinked
@@ -120,7 +118,6 @@ defmodule GroupherServer.Test.Articles.Job do
       assert job.active_at == job.inserted_at
     end
 
-    @tag :wip2
     test "can undo sink job", ~m(user community job_attrs)a do
       {:ok, job} = CMS.create_article(community, :job, job_attrs, user)
       {:ok, job} = CMS.sink_article(:job, job.id)
@@ -132,7 +129,6 @@ defmodule GroupherServer.Test.Articles.Job do
       assert job.active_at == job.meta.last_active_at
     end
 
-    @tag :wip2
     test "can not undo sink to old job", ~m()a do
       {:ok, job_last_year} = db_insert(:job, %{title: "last year", inserted_at: @last_year})
 
diff --git a/test/groupher_server/cms/articles/post_meta_test.exs b/test/groupher_server/cms/articles/post_meta_test.exs
@@ -42,7 +42,6 @@ defmodule GroupherServer.Test.CMS.PostMeta do
       assert post.meta.is_edited
     end
 
-    @tag :wip
     test "post's lock article should work", ~m(user community post_attrs)a do
       {:ok, post} = CMS.create_article(community, :post, post_attrs, user)
       assert not post.meta.is_comment_locked
diff --git a/test/groupher_server/cms/articles/post_test.exs b/test/groupher_server/cms/articles/post_test.exs
@@ -105,7 +105,6 @@ defmodule GroupherServer.Test.CMS.Articles.Post do
   end
 
   describe "[cms post sink/undo_sink]" do
-    @tag :wip2
     test "if a post is too old, read post should update can_undo_sink flag",
          ~m(user community post_attrs)a do
       {:ok, post} = CMS.create_article(community, :post, post_attrs, user)
@@ -120,7 +119,6 @@ defmodule GroupherServer.Test.CMS.Articles.Post do
       assert not post_last_year.meta.can_undo_sink
     end
 
-    @tag :wip2
     test "can sink a post", ~m(user community post_attrs)a do
       {:ok, post} = CMS.create_article(community, :post, post_attrs, user)
       assert not post.meta.is_sinked
@@ -130,7 +128,6 @@ defmodule GroupherServer.Test.CMS.Articles.Post do
       assert post.active_at == post.inserted_at
     end
 
-    @tag :wip2
     test "can undo sink post", ~m(user community post_attrs)a do
       {:ok, post} = CMS.create_article(community, :post, post_attrs, user)
       {:ok, post} = CMS.sink_article(:post, post.id)
@@ -142,7 +139,6 @@ defmodule GroupherServer.Test.CMS.Articles.Post do
       assert post.active_at == post.meta.last_active_at
     end
 
-    @tag :wip2
     test "can not undo sink to old post", ~m()a do
       {:ok, post_last_year} = db_insert(:post, %{title: "last year", inserted_at: @last_year})
 
diff --git a/test/groupher_server/cms/articles/repo_test.exs b/test/groupher_server/cms/articles/repo_test.exs
diff --git a/test/groupher_server/cms/comments/job_comment_test.exs b/test/groupher_server/cms/comments/job_comment_test.exs
diff --git a/test/groupher_server/cms/comments/post_comment_test.exs b/test/groupher_server/cms/comments/post_comment_test.exs
diff --git a/test/groupher_server/cms/comments/repo_comment_test.exs b/test/groupher_server/cms/comments/repo_comment_test.exs
diff --git a/test/groupher_server_web/mutation/cms/sink/job_sink_test.exs b/test/groupher_server_web/mutation/cms/sink/job_sink_test.exs
diff --git a/test/groupher_server_web/mutation/cms/sink/post_sink_test.exs b/test/groupher_server_web/mutation/cms/sink/post_sink_test.exs
diff --git a/test/groupher_server_web/mutation/cms/sink/repo_sink_test.exs b/test/groupher_server_web/mutation/cms/sink/repo_sink_test.exs
diff --git a/test/groupher_server_web/query/cms/paged_articles/paged_posts_test.exs b/test/groupher_server_web/query/cms/paged_articles/paged_posts_test.exs
