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

Commit 5e6ac6c

Browse files
mydearxymmydearxym
authored
refactor(model): extract model dir && concept (#386)
* chore(posts): remove link icon field * refactor(dir): extract cms model dir * refactor(dir): add Model prefix for import & test * refactor(dir): fix build error * refactor(dir): fix build error * refactor(dir): fix build error * refactor(dir): fix build error * refactor(dir): fix build error * refactor(dir): fix build error * refactor(dir): fix build error * refactor(dir): fix build error n * refactor(dir): fix build error nn * refactor(dir): fix test error * refactor(dir): fix test error n * refactor(dir): fix test error wip * refactor(dir): fix test error wip * refactor(dir): fix test error wip * refactor(dir): fix test error wip * refactor(dir): fix test error wip * refactor(dir): fix test error wip * refactor(dir): fix test error wip * refactor(dir): fix test error wip n * refactor(dir): fix test error wip n * refactor(dir): accounts model wip * refactor(dir): accounts model wip * refactor(dir): accounts model wip * refactor(dir): accounts model wip * refactor(dir): accounts model wip * refactor(dir): accounts model wip * refactor(dir): delivery model wip * refactor(dir): delivery model wip * refactor(dir): statistics model wip * refactor(dir): statistics model wip * refactor(dir): statistics model wip * refactor(dir): statistics model wip * refactor(dir): statistics model wip * refactor(dir): billing model wip
1 parent 8d82bf5 commit 5e6ac6c

File tree

239 files changed

+890
-663
lines changed

Some content is hidden

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

239 files changed

+890
-663
lines changed

‎cover/excoveralls.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎docs/testing/graphql-testing.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ accounts billing cms statistics
4848
defmodule GroupherServer.Test.Query.CMS.Basic do
4949
use GroupherServer.TestTools
5050

51-
alias GroupherServer.Accounts.User
51+
alias GroupherServer.Accounts.Model.User
5252
alias GroupherServer.CMS
53-
alias CMS.{Community, Thread, Category}
53+
alias CMS.Model.{Community, Thread, Category}
5454

5555
setup do
5656
guest_conn = simu_conn(:guest)

‎docs/testing/graphql-testing.zh-CN.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ accounts billing cms statistics
4949
defmodule GroupherServer.Test.Query.CMS.Basic do
5050
use GroupherServer.TestTools
5151

52-
alias GroupherServer.Accounts.User
52+
alias GroupherServer.Accounts.Model.User
5353
alias GroupherServer.CMS
54-
alias CMS.{Community, Thread, Category}
54+
alias CMS.Model.{Community, Thread, Category}
5555

5656
setup do
5757
guest_conn = simu_conn(:guest)

‎docs/testing/unit-testing.zh-CN.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ accounts billing cms delivery logs seeds statistics
4343
defmodule GroupherServer.Test.CMS do
4444
use GroupherServer.TestTools
4545

46-
alias GroupherServer.Accounts.User
46+
alias GroupherServer.Accounts.Model.User
4747
alias GroupherServer.CMS
48-
alias CMS.Community
48+
alias CMS.Model.Community
4949

5050
alias Helper.{Certification, ORM}
5151

‎lib/groupher_server/accounts/delegates/achievements.ex‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ defmodule GroupherServer.Accounts.Delegate.Achievements do
1212
import ShortMaps
1313

1414
alias Helper.{ORM, SpecType}
15-
alias GroupherServer.Accounts.{Achievement, User}
15+
alias GroupherServer.Accounts.Model.{Achievement, User}
16+
17+
alias GroupherServer.CMS.Model.CommunityEditor
1618

1719
@collect_weight get_config(:general, :user_achieve_collect_weight)
1820
@upvote_weight get_config(:general, :user_achieve_upvote_weight)
@@ -125,7 +127,6 @@ defmodule GroupherServer.Accounts.Delegate.Achievements do
125127
@doc """
126128
list communities which the user is editor in it
127129
"""
128-
alias GroupherServer.CMS.CommunityEditor
129130

130131
def paged_editable_communities(%User{id: user_id}, %{page: page, size: size}) do
131132
with {:ok, user} <- ORM.find(User, user_id) do

‎lib/groupher_server/accounts/delegates/collect_folder.ex‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ defmodule GroupherServer.Accounts.Delegate.CollectFolder do
1616
alias Helper.ORM
1717
alias GroupherServer.{Accounts, CMS, Repo}
1818

19-
alias Accounts.{CollectFolder, Embeds, User}
20-
alias CMS.ArticleCollect
19+
alias Accounts.Model.{CollectFolder, Embeds, User}
20+
alias CMS.Model.ArticleCollect
2121

2222
alias Ecto.Multi
2323

‎lib/groupher_server/accounts/delegates/customization.ex‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ defmodule GroupherServer.Accounts.Delegate.Customization do
99
alias GroupherServer.Accounts
1010
alias Helper.ORM
1111

12-
alias Accounts.{Customization, Delegate, User}
13-
alias Delegate.Achievements
12+
alias Accounts.Model.{Customization, User}
13+
alias Accounts.Delegate.Achievements
1414

1515
def upgrade_by_plan(%User{} = user, :donate) do
1616
Achievements.set_member(user, :donate)

‎lib/groupher_server/accounts/delegates/fans.ex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ defmodule GroupherServer.Accounts.Delegate.Fans do
1010
alias Helper.{ORM, QueryBuilder, SpecType}
1111
alias GroupherServer.{Accounts, Repo}
1212

13-
alias GroupherServer.Accounts.{User, Embeds, UserFollower, UserFollowing}
13+
alias GroupherServer.Accounts.Model.{User, Embeds, UserFollower, UserFollowing}
1414

1515
alias Ecto.Multi
1616

‎lib/groupher_server/accounts/delegates/mails.ex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ defmodule GroupherServer.Accounts.Delegate.Mails do
44
import ShortMaps
55

66
alias GroupherServer.Repo
7-
alias GroupherServer.Accounts.{User, MentionMail, NotificationMail, SysNotificationMail}
7+
alias GroupherServer.Accounts.Model.{User, MentionMail, NotificationMail, SysNotificationMail}
88
alias GroupherServer.Delivery
99
alias Helper.ORM
1010

‎lib/groupher_server/accounts/delegates/profile.ex‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ defmodule GroupherServer.Accounts.Delegate.Profile do
88

99
alias GroupherServer.{Accounts, CMS, Email, Repo, Statistics}
1010

11-
alias Accounts.{Achievement, GithubUser, User, Social}
12-
alias Helper.{Guardian, ORM, QueryBuilder, RadarSearch}
11+
alias Accounts.Model.{Achievement, GithubUser, User, Social}
12+
alias CMS.Model.{Community, CommunitySubscriber}
1313

1414
alias GroupherServer.Accounts.Delegate.Fans
15+
16+
alias Helper.{Guardian, ORM, QueryBuilder, RadarSearch}
1517
alias Ecto.Multi
1618

1719
@default_subscribed_communities get_config(:general, :default_subscribed_communities)
@@ -70,7 +72,7 @@ defmodule GroupherServer.Accounts.Delegate.Profile do
7072
"""
7173
def update_subscribe_count(user_id) do
7274
with {:ok, user} <- ORM.find(User, user_id) do
73-
count_query = from(s in CMS.CommunitySubscriber, where: s.user_id == ^user.id)
75+
count_query = from(s in CommunitySubscriber, where: s.user_id == ^user.id)
7476
count = Repo.aggregate(count_query, :count)
7577

7678
user |> ORM.update(%{subscribed_communities_count: count})
@@ -120,8 +122,8 @@ defmodule GroupherServer.Accounts.Delegate.Profile do
120122
def default_subscribed_communities(%{page: _, size: _} = filter) do
121123
filter = Map.merge(filter, %{size: @default_subscribed_communities, category: "pl"})
122124

123-
with {:ok, home_community} <- ORM.find_by(CMS.Community, raw: "home"),
124-
{:ok, paged_communities} <- ORM.find_all(CMS.Community, filter) do
125+
with {:ok, home_community} <- ORM.find_by(Community, raw: "home"),
126+
{:ok, paged_communities} <- ORM.find_all(Community, filter) do
125127
%{
126128
entries: paged_communities.entries ++ [home_community],
127129
page_number: paged_communities.page_number,
@@ -149,7 +151,7 @@ defmodule GroupherServer.Accounts.Delegate.Profile do
149151
def subscribed_communities(%User{id: id} = user, %{page: page, size: size} = filter) do
150152
filter = filter |> Map.delete(:first)
151153
# TODO: merge customed index
152-
CMS.CommunitySubscriber
154+
CommunitySubscriber
153155
|> where([c], c.user_id == ^id)
154156
|> join(:inner, [c], cc in assoc(c, :community))
155157
|> select([c, cc], cc)

0 commit comments

Comments
 (0)