refactor(naming): utils -> helper

mydearxym · mydearxym · commit 117ec101eb69 · 2021-05-09T12:35:25.000+08:00
diff --git a/cover/excoveralls.json b/cover/excoveralls.json
diff --git a/lib/groupher_server/accounts/delegates/collect_folder.ex b/lib/groupher_server/accounts/delegates/collect_folder.ex
@@ -3,7 +3,7 @@ defmodule GroupherServer.Accounts.Delegate.CollectFolder do
   user collect folder related
   """
   import Ecto.Query, warn: false
-  import GroupherServer.CMS.Utils.Matcher2
+  import GroupherServer.CMS.Helper.Matcher2
 
   alias Helper.Types, as: T
   alias Helper.QueryBuilder
diff --git a/lib/groupher_server/accounts/delegates/publish.ex b/lib/groupher_server/accounts/delegates/publish.ex
@@ -7,7 +7,7 @@ defmodule GroupherServer.Accounts.Delegate.Publish do
   # import Helper.ErrorCode
   import ShortMaps
 
-  import GroupherServer.CMS.Utils.Matcher
+  import GroupherServer.CMS.Helper.Matcher
 
   alias Helper.{ORM, QueryBuilder}
   # alias GroupherServer.{Accounts, Repo}
diff --git a/lib/groupher_server/accounts/delegates/upvoted_articles.ex b/lib/groupher_server/accounts/delegates/upvoted_articles.ex
@@ -2,7 +2,7 @@ defmodule GroupherServer.Accounts.Delegate.UpvotedArticles do
   @moduledoc """
   get contents(posts, jobs ...) that user upvotes
   """
-  # import GroupherServer.CMS.Utils.Matcher
+  # import GroupherServer.CMS.Helper.Matcher
   import Ecto.Query, warn: false
   import Helper.Utils, only: [done: 1]
   import ShortMaps
diff --git a/lib/groupher_server/accounts/helper/loader.ex b/lib/groupher_server/accounts/helper/loader.ex
@@ -1,4 +1,4 @@
-defmodule GroupherServer.Accounts.Utils.Loader do
+defmodule GroupherServer.Accounts.Helper.Loader do
   @moduledoc """
   dataloader for accounts
   """
diff --git a/lib/groupher_server/cms/delegates/abuse_report.ex b/lib/groupher_server/cms/delegates/abuse_report.ex
@@ -5,7 +5,7 @@ defmodule GroupherServer.CMS.Delegate.AbuseReport do
   import Ecto.Query, warn: false
   # import Helper.Utils, only: [done: 1]
 
-  import GroupherServer.CMS.Utils.Matcher2
+  import GroupherServer.CMS.Helper.Matcher2
   # import ShortMaps
 
   alias Helper.{ORM}
diff --git a/lib/groupher_server/cms/delegates/article_comment.ex b/lib/groupher_server/cms/delegates/article_comment.ex
@@ -6,7 +6,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleComment do
   import Helper.Utils, only: [done: 1]
   import Helper.ErrorCode
 
-  import GroupherServer.CMS.Utils.Matcher2
+  import GroupherServer.CMS.Helper.Matcher2
   import ShortMaps
 
   alias Helper.Types, as: T
diff --git a/lib/groupher_server/cms/delegates/article_comment_action.ex b/lib/groupher_server/cms/delegates/article_comment_action.ex
@@ -9,7 +9,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleCommentAction do
   import GroupherServer.CMS.Delegate.ArticleComment,
     only: [add_participator_to_article: 2, do_create_comment: 4, update_article_comments_count: 2]
 
-  import GroupherServer.CMS.Utils.Matcher2
+  import GroupherServer.CMS.Helper.Matcher2
 
   alias Helper.Types, as: T
   alias Helper.ORM
diff --git a/lib/groupher_server/cms/delegates/article_curd.ex b/lib/groupher_server/cms/delegates/article_curd.ex
@@ -4,8 +4,8 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
   """
   import Ecto.Query, warn: false
 
-  import GroupherServer.CMS.Utils.Matcher2
-  import GroupherServer.CMS.Utils.Matcher, only: [match_action: 2]
+  import GroupherServer.CMS.Helper.Matcher2
+  import GroupherServer.CMS.Helper.Matcher, only: [match_action: 2]
 
   import Helper.Utils, only: [done: 1, pick_by: 2, integerfy: 1, strip_struct: 1]
   import Helper.ErrorCode
diff --git a/lib/groupher_server/cms/delegates/article_operation.ex b/lib/groupher_server/cms/delegates/article_operation.ex
@@ -2,13 +2,13 @@ defmodule GroupherServer.CMS.Delegate.ArticleOperation do
   @moduledoc """
   set / unset operations for Article-like resource
   """
-  import GroupherServer.CMS.Utils.Matcher
+  import GroupherServer.CMS.Helper.Matcher
   import Ecto.Query, warn: false
 
   import Helper.ErrorCode
   import ShortMaps
   import Helper.Utils, only: [strip_struct: 1]
-  import GroupherServer.CMS.Utils.Matcher2
+  import GroupherServer.CMS.Helper.Matcher2
 
   alias Helper.Types, as: T
   alias Helper.ORM
diff --git a/lib/groupher_server/cms/delegates/article_reaction.ex b/lib/groupher_server/cms/delegates/article_reaction.ex
@@ -2,7 +2,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleReaction do
   @moduledoc """
   reaction[upvote, collect, watch ...] on article [post, job...]
   """
-  import GroupherServer.CMS.Utils.Matcher2
+  import GroupherServer.CMS.Helper.Matcher2
   import Ecto.Query, warn: false
   import Helper.Utils, only: [done: 1, strip_struct: 1]
   # import Helper.ErrorCode
diff --git a/lib/groupher_server/cms/delegates/comment_curd.ex b/lib/groupher_server/cms/delegates/comment_curd.ex
@@ -6,7 +6,7 @@ defmodule GroupherServer.CMS.Delegate.CommentCURD do
   import Helper.Utils, only: [done: 1]
   import Helper.ErrorCode
 
-  import GroupherServer.CMS.Utils.Matcher
+  import GroupherServer.CMS.Helper.Matcher
   import ShortMaps
 
   alias Helper.{ORM, QueryBuilder}
diff --git a/lib/groupher_server/cms/delegates/community_curd.ex b/lib/groupher_server/cms/delegates/community_curd.ex
@@ -3,7 +3,7 @@ defmodule GroupherServer.CMS.Delegate.CommunityCURD do
   community curd
   """
   import Ecto.Query, warn: false
-  import GroupherServer.CMS.Utils.Matcher
+  import GroupherServer.CMS.Helper.Matcher
   import Helper.Utils, only: [done: 1, map_atom_value: 2]
   import GroupherServer.CMS.Delegate.ArticleCURD, only: [ensure_author_exists: 1]
   import ShortMaps
diff --git a/lib/groupher_server/cms/delegates/seeds.ex b/lib/groupher_server/cms/delegates/seeds.ex
@@ -7,7 +7,7 @@ defmodule GroupherServer.CMS.Delegate.Seeds do
   import Ecto.Query, warn: false
 
   @oss_endpoint "https://cps-oss.oss-cn-shanghai.aliyuncs.com"
-  # import GroupherServer.CMS.Utils.Matcher
+  # import GroupherServer.CMS.Helper.Matcher
   # import Helper.Utils, only: [done: 1, map_atom_value: 2]
   # import GroupherServer.CMS.Delegate.ArticleCURD, only: [ensure_author_exists: 1]
   import ShortMaps
diff --git a/lib/groupher_server/cms/helper/loader.ex b/lib/groupher_server/cms/helper/loader.ex
@@ -1,4 +1,4 @@
-defmodule GroupherServer.CMS.Utils.Loader do
+defmodule GroupherServer.CMS.Helper.Loader do
   @moduledoc """
   dataloader for cms context
   """
diff --git a/lib/groupher_server/cms/helper/matcher.ex b/lib/groupher_server/cms/helper/matcher.ex
@@ -1,4 +1,4 @@
-defmodule GroupherServer.CMS.Utils.Matcher do
+defmodule GroupherServer.CMS.Helper.Matcher do
   @moduledoc """
   this module defined the matches and handy guard ...
   """
diff --git a/lib/groupher_server/cms/helper/matcher2.ex b/lib/groupher_server/cms/helper/matcher2.ex
@@ -1,4 +1,4 @@
-defmodule GroupherServer.CMS.Utils.Matcher2 do
+defmodule GroupherServer.CMS.Helper.Matcher2 do
   @moduledoc """
   this module defined the matches and handy guard ...
   """
diff --git a/lib/groupher_server_web/middleware/passport_loader.ex b/lib/groupher_server_web/middleware/passport_loader.ex
@@ -4,7 +4,7 @@ defmodule GroupherServerWeb.Middleware.PassportLoader do
   """
   @behaviour Absinthe.Middleware
 
-  import GroupherServer.CMS.Utils.Matcher
+  import GroupherServer.CMS.Helper.Matcher
   import Helper.Utils
   import Helper.ErrorCode
   import ShortMaps
diff --git a/lib/groupher_server_web/resolvers/cms_resolver.ex b/lib/groupher_server_web/resolvers/cms_resolver.ex
@@ -1,7 +1,7 @@
 defmodule GroupherServerWeb.Resolvers.CMS do
   @moduledoc false
 
-  import GroupherServer.CMS.Utils.Matcher
+  import GroupherServer.CMS.Helper.Matcher
   import ShortMaps
   import Ecto.Query, warn: false
 
diff --git a/lib/groupher_server_web/schema.ex b/lib/groupher_server_web/schema.ex
@@ -11,7 +11,7 @@ defmodule GroupherServerWeb.Schema do
   import_types(Absinthe.Type.Custom)
 
   # utils
-  import_types(Helper.CommonTypes)
+  import_types(Helper.Metrics)
 
   # account
   import_types(Account.Types)
@@ -91,8 +91,8 @@ defmodule GroupherServerWeb.Schema do
     alias GroupherServer.{Accounts, CMS}
 
     Dataloader.new()
-    |> Dataloader.add_source(Accounts, Accounts.Utils.Loader.data())
-    |> Dataloader.add_source(CMS, CMS.Utils.Loader.data())
+    |> Dataloader.add_source(Accounts, Accounts.Helper.Loader.data())
+    |> Dataloader.add_source(CMS, CMS.Helper.Loader.data())
   end
 
   def context(ctx) do
diff --git a/lib/groupher_server_web/schema/Helper/metrics.ex b/lib/groupher_server_web/schema/Helper/metrics.ex
@@ -1,4 +1,4 @@
-defmodule GroupherServerWeb.Schema.Helper.CommonTypes do
+defmodule GroupherServerWeb.Schema.Helper.Metrics do
   @moduledoc """
   common types might be used in all context
   """

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-defmodule GroupherServer.Accounts.Utils.Loader do`
	`1`	`+defmodule GroupherServer.Accounts.Helper.Loader do`
`2`	`2`	`@moduledoc """`
`3`	`3`	`dataloader for accounts`
`4`	`4`	`"""`