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

Commit 3cc9159

Browse files
committed
refactor: xx_type -> xx_thread
1 parent a69b3b7 commit 3cc9159

File tree

7 files changed

+34
-46
lines changed

7 files changed

+34
-46
lines changed

lib/mastani_server_web/resolvers/cms_resolver.ex

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -54,35 +54,23 @@ defmodule MastaniServerWeb.Resolvers.CMS do
5454
# #######################
5555
# content flag ..
5656
# #######################
57-
def pin_content(_root, ~m(id type community_id)a, %{context: %{cur_user: _user}}) do
58-
with {:ok, content} <- match_action(type, :self) do
59-
content.target
60-
|> struct(%{id: id})
61-
|> CMS.set_community_flags(community_id, %{pin: true})
62-
end
63-
end
57+
def pin_content(_root, ~m(id thread community_id)a, _info),
58+
do: set_community_flags(community_id, thread, id, %{pin: true})
6459

65-
def undo_pin_content(_root, ~m(id type community_id)a, %{context: %{cur_user: _user}}) do
66-
with {:ok, content} <- match_action(type, :self) do
67-
content.target
68-
|> struct(%{id: id})
69-
|> CMS.set_community_flags(community_id, %{pin: false})
70-
end
71-
end
60+
def undo_pin_content(_root, ~m(id thread community_id)a, _info),
61+
do: set_community_flags(community_id, thread, id, %{pin: false})
7262

73-
def trash_content(_root, ~m(id type community_id)a, %{context: %{cur_user: _user}}) do
74-
with {:ok, content} <- match_action(type, :self) do
75-
content.target
76-
|> struct(%{id: id})
77-
|> CMS.set_community_flags(community_id, %{trash: true})
78-
end
79-
end
63+
def trash_content(_root, ~m(id thread community_id)a, _info),
64+
do: set_community_flags(community_id, thread, id, %{trash: true})
65+
66+
def undo_trash_content(_root, ~m(id thread community_id)a, _info),
67+
do: set_community_flags(community_id, thread, id, %{trash: false})
8068

81-
def undo_trash_content(_root, ~m(id type community_id)a, %{context: %{cur_user: _user}}) do
82-
with {:ok, content} <- match_action(type, :self) do
69+
defp set_community_flags(community_id, thread, id, flag) do
70+
with {:ok, content} <- match_action(thread, :self) do
8371
content.target
8472
|> struct(%{id: id})
85-
|> CMS.set_community_flags(community_id, %{trash: false})
73+
|> CMS.set_community_flags(community_id, flag)
8674
end
8775
end
8876

lib/mastani_server_web/schema/cms/cms_misc.ex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ defmodule MastaniServerWeb.Schema.CMS.Misc do
77

88
@default_inner_page_size 5
99

10-
enum(:post_type, do: value(:post))
11-
enum(:job_type, do: value(:job))
12-
enum(:video_type, do: value(:video))
13-
enum(:repo_type, do: value(:repo))
10+
enum(:post_thread, do: value(:post))
11+
enum(:job_thread, do: value(:job))
12+
enum(:video_thread, do: value(:video))
13+
enum(:repo_thread, do: value(:repo))
1414

1515
enum(:community_type, do: value(:community))
1616
enum(:comment_replies_type, do: value(:comment_replies_type))

lib/mastani_server_web/schema/cms/cms_types.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,15 +199,15 @@ defmodule MastaniServerWeb.Schema.CMS.Types do
199199

200200
field :favorited_count, :integer do
201201
arg(:count, :count_type, default_value: :count)
202-
arg(:type, :post_type, default_value: :post)
202+
arg(:type, :post_thread, default_value: :post)
203203
# middleware(M.SeeMe)
204204
resolve(dataloader(CMS, :favorites))
205205
middleware(M.ConvertToInt)
206206
end
207207

208208
field :starred_count, :integer do
209209
arg(:count, :count_type, default_value: :count)
210-
arg(:type, :post_type, default_value: :post)
210+
arg(:type, :post_thread, default_value: :post)
211211

212212
resolve(dataloader(CMS, :stars))
213213
middleware(M.ConvertToInt)

lib/mastani_server_web/schema/cms/mutations/job.ex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Job do
2828
@desc "pin a job"
2929
field :pin_job, :job do
3030
arg(:id, non_null(:id))
31-
arg(:type, :job_type, default_value: :job)
31+
arg(:thread, :job_thread, default_value: :job)
3232
arg(:community_id, non_null(:id))
3333

3434
middleware(M.Authorize, :login)
@@ -40,7 +40,7 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Job do
4040
@desc "unpin a job"
4141
field :undo_pin_job, :job do
4242
arg(:id, non_null(:id))
43-
arg(:type, :job_type, default_value: :job)
43+
arg(:thread, :job_thread, default_value: :job)
4444
arg(:community_id, non_null(:id))
4545

4646
middleware(M.Authorize, :login)
@@ -52,7 +52,7 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Job do
5252
@desc "trash a job, not delete"
5353
field :trash_job, :job do
5454
arg(:id, non_null(:id))
55-
arg(:type, :job_type, default_value: :job)
55+
arg(:thread, :job_thread, default_value: :job)
5656
arg(:community_id, non_null(:id))
5757

5858
middleware(M.Authorize, :login)
@@ -65,7 +65,7 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Job do
6565
@desc "trash a job, not delete"
6666
field :undo_trash_job, :job do
6767
arg(:id, non_null(:id))
68-
arg(:type, :job_type, default_value: :job)
68+
arg(:thread, :job_thread, default_value: :job)
6969
arg(:community_id, non_null(:id))
7070

7171
middleware(M.Authorize, :login)

lib/mastani_server_web/schema/cms/mutations/post.ex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Post do
2525
@desc "pin a post"
2626
field :pin_post, :post do
2727
arg(:id, non_null(:id))
28-
arg(:type, :post_type, default_value: :post)
28+
arg(:thread, :post_thread, default_value: :post)
2929
arg(:community_id, non_null(:id))
3030

3131
middleware(M.Authorize, :login)
@@ -37,7 +37,7 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Post do
3737
@desc "unpin a post"
3838
field :undo_pin_post, :post do
3939
arg(:id, non_null(:id))
40-
arg(:type, :post_type, default_value: :post)
40+
arg(:thread, :post_thread, default_value: :post)
4141
arg(:community_id, non_null(:id))
4242

4343
middleware(M.Authorize, :login)
@@ -49,7 +49,7 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Post do
4949
@desc "trash a post, not delete"
5050
field :trash_post, :post do
5151
arg(:id, non_null(:id))
52-
arg(:type, :post_type, default_value: :post)
52+
arg(:thread, :post_thread, default_value: :post)
5353
arg(:community_id, non_null(:id))
5454

5555
middleware(M.Authorize, :login)
@@ -62,7 +62,7 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Post do
6262
@desc "trash a post, not delete"
6363
field :undo_trash_post, :post do
6464
arg(:id, non_null(:id))
65-
arg(:type, :post_type, default_value: :post)
65+
arg(:thread, :post_thread, default_value: :post)
6666
arg(:community_id, non_null(:id))
6767

6868
middleware(M.Authorize, :login)

lib/mastani_server_web/schema/cms/mutations/repo.ex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Repo do
2626
@desc "pin a repo"
2727
field :pin_repo, :repo do
2828
arg(:id, non_null(:id))
29-
arg(:type, :repo_type, default_value: :repo)
29+
arg(:thread, :repo_thread, default_value: :repo)
3030
arg(:community_id, non_null(:id))
3131

3232
middleware(M.Authorize, :login)
@@ -38,7 +38,7 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Repo do
3838
@desc "unpin a repo"
3939
field :undo_pin_repo, :repo do
4040
arg(:id, non_null(:id))
41-
arg(:type, :repo_type, default_value: :repo)
41+
arg(:thread, :repo_thread, default_value: :repo)
4242
arg(:community_id, non_null(:id))
4343

4444
middleware(M.Authorize, :login)
@@ -50,7 +50,7 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Repo do
5050
@desc "trash a repo, not delete"
5151
field :trash_repo, :repo do
5252
arg(:id, non_null(:id))
53-
arg(:type, :repo_type, default_value: :repo)
53+
arg(:thread, :repo_thread, default_value: :repo)
5454
arg(:community_id, non_null(:id))
5555

5656
middleware(M.Authorize, :login)
@@ -63,7 +63,7 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Repo do
6363
@desc "trash a repo, not delete"
6464
field :undo_trash_repo, :repo do
6565
arg(:id, non_null(:id))
66-
arg(:type, :repo_type, default_value: :repo)
66+
arg(:thread, :repo_thread, default_value: :repo)
6767
arg(:community_id, non_null(:id))
6868

6969
middleware(M.Authorize, :login)

lib/mastani_server_web/schema/cms/mutations/video.ex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Video do
2525
@desc "pin a video"
2626
field :pin_video, :video do
2727
arg(:id, non_null(:id))
28-
arg(:type, :video_type, default_value: :video)
28+
arg(:thread, :video_thread, default_value: :video)
2929
arg(:community_id, non_null(:id))
3030

3131
middleware(M.Authorize, :login)
@@ -37,7 +37,7 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Video do
3737
@desc "unpin a video"
3838
field :undo_pin_video, :video do
3939
arg(:id, non_null(:id))
40-
arg(:type, :video_type, default_value: :video)
40+
arg(:thread, :video_thread, default_value: :video)
4141
arg(:community_id, non_null(:id))
4242

4343
middleware(M.Authorize, :login)
@@ -49,7 +49,7 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Video do
4949
@desc "trash a video, not delete"
5050
field :trash_video, :video do
5151
arg(:id, non_null(:id))
52-
arg(:type, :video_type, default_value: :video)
52+
arg(:thread, :video_thread, default_value: :video)
5353
arg(:community_id, non_null(:id))
5454

5555
middleware(M.Authorize, :login)
@@ -62,7 +62,7 @@ defmodule MastaniServerWeb.Schema.CMS.Mutations.Video do
6262
@desc "trash a video, not delete"
6363
field :undo_trash_video, :video do
6464
arg(:id, non_null(:id))
65-
arg(:type, :video_type, default_value: :video)
65+
arg(:thread, :video_thread, default_value: :video)
6666
arg(:community_id, non_null(:id))
6767

6868
middleware(M.Authorize, :login)

0 commit comments

Comments
 (0)