Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit1bde043

Browse files
committed
refactor(user-reaction): mutaion of collect folder wip
1 parent6710cae commit1bde043

File tree

7 files changed

+309
-321
lines changed

7 files changed

+309
-321
lines changed

‎lib/groupher_server/accounts/accounts.ex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ defmodule GroupherServer.Accounts do
2828
defdelegatelist_collect_folder_articles(folder_id,filter),to:CollectFolder
2929

3030
defdelegatecreate_collect_folder(attrs,user),to:CollectFolder
31-
defdelegateupdate_collect_folder(attrs,user),to:CollectFolder
31+
defdelegateupdate_collect_folder(id,attrs),to:CollectFolder
3232
defdelegatedelete_collect_folder(id),to:CollectFolder
3333
defdelegateadd_to_collect(thread,article_id,folder_id,user),to:CollectFolder
3434
defdelegateremove_from_collect(thread,article_id,folder_id,user),to:CollectFolder

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ defmodule GroupherServer.Accounts.Delegate.CollectFolder do
104104
end
105105
end
106106

107-
defupdate_collect_folder(%{id:id}=attrs,%User{id:user_id})do
108-
with{:ok,folder}<-ORM.find_by(CollectFolder,~m(id user_id)a)do
107+
defupdate_collect_folder(folder_id,attrs)do
108+
with{:ok,folder}<-ORM.find(CollectFolder,folder_id)do
109109
last_updated=Timex.today()|>Timex.to_datetime()
110110
folder|>ORM.update(Map.merge(~m(last_updated)a,attrs))
111111
end

‎lib/groupher_server_web/resolvers/accounts_resolver.ex‎

Lines changed: 28 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -75,40 +75,6 @@ defmodule GroupherServerWeb.Resolvers.Accounts do
7575
{:error,[message:"need login",code:ecode(:account_login)]}
7676
end
7777

78-
deflist_favorite_categories(_root,%{filter:filter},%{context:%{cur_user:cur_user}})do
79-
Accounts.list_favorite_categories(cur_user,%{private:true},filter)
80-
end
81-
82-
deflist_favorite_categories(_root,%{user_id:user_id,filter:filter},_info)
83-
whennotis_nil(user_id)do
84-
Accounts.list_favorite_categories(%User{id:user_id},%{private:false},filter)
85-
end
86-
87-
# guest user
88-
deflist_favorite_categories(_root,_args,_info)do
89-
{:ok,Utils.empty_pagi_data()}
90-
end
91-
92-
defcreate_favorite_category(_root,attrs,%{context:%{cur_user:cur_user}})do
93-
Accounts.create_favorite_category(cur_user,attrs)
94-
end
95-
96-
defupdate_favorite_category(_root,%{id:_id}=args,%{context:%{cur_user:cur_user}})do
97-
Accounts.update_favorite_category(cur_user,args)
98-
end
99-
100-
defdelete_favorite_category(_root,%{id:id},%{context:%{cur_user:cur_user}})do
101-
Accounts.delete_favorite_category(cur_user,id)
102-
end
103-
104-
defset_favorites(_root,~m(id thread category_id)a,%{context:%{cur_user:cur_user}})do
105-
Accounts.set_favorites(cur_user,thread,id,category_id)
106-
end
107-
108-
defunset_favorites(_root,~m(id thread category_id)a,%{context:%{cur_user:cur_user}})do
109-
Accounts.unset_favorites(cur_user,thread,id,category_id)
110-
end
111-
11278
deffollow(_root,~m(user_id)a,%{context:%{cur_user:cur_user}})do
11379
Accounts.follow(cur_user,%User{id:user_id})
11480
end
@@ -122,6 +88,7 @@ defmodule GroupherServerWeb.Resolvers.Accounts do
12288
end
12389

12490
defpaged_followers(_root,~m(filter)a,%{context:%{cur_user:cur_user}})do
91+
# TODO: rename to list_follower_users
12592
Accounts.fetch_followers(cur_user,filter)
12693
end
12794

@@ -130,9 +97,36 @@ defmodule GroupherServerWeb.Resolvers.Accounts do
13097
end
13198

13299
defpaged_followings(_root,~m(filter)a,%{context:%{cur_user:cur_user}})do
100+
# TODO: rename to list_following_users
133101
Accounts.fetch_followings(cur_user,filter)
134102
end
135103

104+
defpaged_upvoted_articles(_root,~m(user_login filter)a,_info)do
105+
with{:ok,user_id}<-Accounts.get_userid_and_cache(user_login)do
106+
Accounts.list_upvoted_articles(user_id,filter)
107+
end
108+
end
109+
110+
defcreate_collect_folder(_root,attrs,%{context:%{cur_user:cur_user}})do
111+
Accounts.create_collect_folder(attrs,cur_user)
112+
end
113+
114+
defupdate_collect_folder(_root,%{id:id}=attrs,_)do
115+
Accounts.update_collect_folder(id,attrs)
116+
end
117+
118+
defdelete_collect_folder(_root,%{id:id},_)do
119+
Accounts.delete_collect_folder(id)
120+
end
121+
122+
# def set_favorites(_root, ~m(id thread category_id)a, %{context: %{cur_user: cur_user}}) do
123+
# Accounts.set_favorites(cur_user, thread, id, category_id)
124+
# end
125+
126+
# def unset_favorites(_root, ~m(id thread category_id)a, %{context: %{cur_user: cur_user}}) do
127+
# Accounts.unset_favorites(cur_user, thread, id, category_id)
128+
# end
129+
136130
defpaged_collect_folders(_root,~m(user_login filter)a,%{context:%{cur_user:cur_user}})do
137131
with{:ok,user_id}<-Accounts.get_userid_and_cache(user_login)do
138132
Accounts.list_collect_folders(user_id,filter,cur_user)
@@ -153,12 +147,6 @@ defmodule GroupherServerWeb.Resolvers.Accounts do
153147
Accounts.list_collect_folder_articles(folder_id,filter)
154148
end
155149

156-
defpaged_upvoted_articles(_root,~m(user_login filter)a,_info)do
157-
with{:ok,user_id}<-Accounts.get_userid_and_cache(user_login)do
158-
Accounts.list_upvoted_articles(user_id,filter)
159-
end
160-
end
161-
162150
# published contents
163151
defpublished_contents(_root,~m(user_id filter thread)a,_info)do
164152
Accounts.published_contents(%User{id:user_id},thread,filter)

‎lib/groupher_server_web/schema/account/account_mutations.ex‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,24 +40,24 @@ defmodule GroupherServerWeb.Schema.Account.Mutations do
4040
end
4141

4242
@desc"create a favorites category"
43-
field:create_favorite_category,:favorites_categorydo
43+
field:create_collect_folder,:collect_folderdo
4444
arg(:title,non_null(:string))
4545
arg(:private,:boolean)
4646
arg(:desc,:string)
4747

4848
middleware(M.Authorize,:login)
49-
resolve(&R.Accounts.create_favorite_category/3)
49+
resolve(&R.Accounts.create_collect_folder/3)
5050
end
5151

5252
@desc"update a favorites category"
53-
field:update_favorite_category,:favorites_categorydo
53+
field:update_collect_folder,:collect_folderdo
5454
arg(:id,non_null(:id))
5555
arg(:title,:string)
5656
arg(:private,:boolean)
5757
arg(:desc,:string)
5858

5959
middleware(M.Authorize,:login)
60-
resolve(&R.Accounts.update_favorite_category/3)
60+
resolve(&R.Accounts.update_collect_folder/3)
6161
end
6262

6363
@desc"delete a favorites category"

‎test/groupher_server/accounts/collect_folder_test.exs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,17 +113,17 @@ defmodule GroupherServer.Test.Accounts.CollectFolder do
113113
assertresult.total_count==2
114114
end
115115

116-
@tag:wip3
116+
@tag:wip2
117117
test"user can update a collect folder",~m(user)ado
118118
{:ok,folder}=Accounts.create_collect_folder(%{title:"test folder",private:true},user)
119119

120-
args=%{id:folder.id,title:"new title",desc:"new desc"}
121-
{:ok,updated}=Accounts.update_collect_folder(args,user)
120+
args=%{title:"new title",desc:"new desc"}
121+
{:ok,updated}=Accounts.update_collect_folder(folder.id,args)
122122

123123
assertupdated.desc=="new desc"
124124
assertupdated.title=="new title"
125125

126-
{:ok,updated}=Accounts.update_collect_folder(%{id:folder.id,private:true},user)
126+
{:ok,updated}=Accounts.update_collect_folder(folder.id,%{private:true})
127127
assertupdated.private==true
128128
end
129129

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp