Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit b142c80

Browse files
committed
chore: Merge branch 'import-order' into dev
2 parents e7742ee + 5649d0f commit b142c80

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+250
-154
lines changed

lib/groupher_server/application.ex

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
defmodule GroupherServer.Application do
2+
@moduledoc false
23
use Application
34

45
# See https://hexdocs.pm/elixir/Application.html

lib/groupher_server/cms/author.ex

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ defmodule GroupherServer.CMS.Author do
44

55
use Ecto.Schema
66
import Ecto.Changeset
7-
alias GroupherServer.Accounts
8-
alias GroupherServer.CMS.Post
7+
8+
alias GroupherServer.{Accounts, CMS}
9+
10+
alias CMS.Post
911

1012
@type t :: %Author{}
1113

lib/groupher_server/cms/category.ex

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ defmodule GroupherServer.CMS.Category do
44

55
use Ecto.Schema
66
import Ecto.Changeset
7+
78
alias GroupherServer.CMS.{Author, Community}
8-
# alias GroupherServer.Accounts
9-
# alias Helper.Certification
109

1110
@required_fields ~w(title raw author_id)a
1211
@optional_fields ~w(index)a

lib/groupher_server/cms/cms.ex

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ defmodule GroupherServer.CMS do
44
[CMS]: post, job, ...
55
[CURD]: create, update, delete ...
66
"""
7-
alias GroupherServer.CMS.Delegate.{
7+
8+
alias GroupherServer.CMS.Delegate
9+
10+
alias Delegate.{
811
ArticleCURD,
912
ArticleOperation,
1013
ArticleReaction,

lib/groupher_server/cms/community.ex

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
defmodule GroupherServer.CMS.Community do
2+
@moduledoc false
23
alias __MODULE__
34

45
use Ecto.Schema
56
import Ecto.Changeset
67

7-
alias GroupherServer.CMS.{
8+
alias GroupherServer.{Accounts, CMS}
9+
10+
alias CMS.{
811
Category,
912
Post,
1013
Video,
@@ -17,8 +20,6 @@ defmodule GroupherServer.CMS.Community do
1720
CommunityCheatsheet
1821
}
1922

20-
alias GroupherServer.Accounts
21-
2223
@required_fields ~w(title desc user_id logo raw)a
2324
# @required_fields ~w(title desc user_id)a
2425
@optional_fields ~w(label geo_info index aka)a

lib/groupher_server/cms/community_category.ex

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ defmodule GroupherServer.CMS.CommunityCategory do
44

55
use Ecto.Schema
66
import Ecto.Changeset
7-
alias GroupherServer.CMS.{Category, Community}
7+
8+
alias GroupherServer.CMS
9+
10+
alias CMS.{Category, Community}
811

912
@type t :: %CommunityCategory{}
1013

lib/groupher_server/cms/community_cheatsheet.ex

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ defmodule GroupherServer.CMS.CommunityCheatsheet do
55
use Ecto.Schema
66
import Ecto.Changeset
77

8-
alias GroupherServer.CMS.{Community, GithubContributor}
8+
alias GroupherServer.CMS
9+
10+
alias CMS.{Community, GithubContributor}
911

1012
@required_fields ~w(community_id last_sync)a
1113
@optional_fields ~w(readme)a

lib/groupher_server/cms/community_editor.ex

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ defmodule GroupherServer.CMS.CommunityEditor do
44

55
use Ecto.Schema
66
import Ecto.Changeset
7+
8+
alias GroupherServer.{Accounts, CMS}
9+
10+
alias CMS.Community
711
alias Helper.Certification
8-
alias GroupherServer.Accounts
9-
alias GroupherServer.CMS.Community
1012

1113
@required_fields ~w(user_id community_id title)a
1214

lib/groupher_server/cms/community_subscriber.ex

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ defmodule GroupherServer.CMS.CommunitySubscriber do
44

55
use Ecto.Schema
66
import Ecto.Changeset
7-
alias GroupherServer.Accounts
8-
alias GroupherServer.CMS.Community
7+
8+
alias GroupherServer.{Accounts, CMS}
9+
10+
alias CMS.Community
911

1012
@required_fields ~w(user_id community_id)a
1113

lib/groupher_server/cms/community_thread.ex

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ defmodule GroupherServer.CMS.CommunityThread do
55
use Ecto.Schema
66
import Ecto.Changeset
77

8-
alias GroupherServer.CMS.{Community, Thread}
8+
alias GroupherServer.CMS
9+
alias CMS.{Community, Thread}
910

1011
@required_fields ~w(community_id thread_id)a
1112

0 commit comments

Comments
 (0)