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.

Commitecda6ca

Browse files
committed
refactor(search): differ community and article search
1 parentcdbb40c commitecda6ca

File tree

5 files changed

+24
-23
lines changed

5 files changed

+24
-23
lines changed

‎lib/groupher_server/cms/cms.ex‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,8 @@ defmodule GroupherServer.CMS do
181181
defdelegatedelete_passport(user),to:PassportCURD
182182

183183
# search
184-
defdelegatesearch_contents(part,args),to:Search
184+
defdelegatesearch_articles(thread,args),to:Search
185+
defdelegatesearch_communities(args),to:Search
185186

186187
# seeds
187188
defdelegateseed_communities(opt),to:Seeds

‎lib/groupher_server/cms/delegates/search.ex‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ defmodule GroupherServer.CMS.Delegate.Search do
1515
@doc"""
1616
search community by title
1717
"""
18-
defsearch_contents(:community,%{title:title}=_args)do
18+
defsearch_communities(%{title:title}=_args)do
1919
Community
2020
|>where([c],ilike(c.title,^"%#{title}%")orilike(c.raw,^"%#{title}%"))
2121
|>ORM.paginater(page:1,size:@search_items_count)
@@ -25,7 +25,7 @@ defmodule GroupherServer.CMS.Delegate.Search do
2525
@doc"""
2626
search article by title
2727
"""
28-
defsearch_contents(thread,%{title:title})do
28+
defsearch_articles(thread,%{title:title})do
2929
with{:ok,info}<-match(thread)do
3030
info.model
3131
# |> where([c], ilike(c.title, ^"%#{title}%") or ilike(c.digest, ^"%#{title}%"))

‎lib/groupher_server_web/resolvers/cms_resolver.ex‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -375,11 +375,11 @@ defmodule GroupherServerWeb.Resolvers.CMS do
375375
end
376376

377377
defsearch_communities(_root,%{title:title},_info)do
378-
CMS.search_contents(:community,%{title:title})
378+
CMS.search_communities(community,%{title:title})
379379
end
380380

381-
defsearch_contents(_root,%{thread:thread,title:title},_info)do
382-
CMS.search_contents(thread,%{title:title})
381+
defsearch_articles(_root,%{thread:thread,title:title},_info)do
382+
CMS.search_articles(thread,%{title:title})
383383
end
384384

385385
# ##############################################

‎lib/groupher_server_web/schema/Helper/queries.ex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ defmodule GroupherServerWeb.Schema.Helper.Queries do
1818
arg(:title,non_null(:string))
1919
arg(:thread,unquote(:"#{thread}_thread"),default_value:unquote(thread))
2020

21-
resolve(&R.CMS.search_contents/3)
21+
resolve(&R.CMS.search_articles/3)
2222
end
2323
end
2424
end)

‎test/groupher_server/cms/search_test.exs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,76 +23,76 @@ defmodule GroupherServer.Test.CMS.Search do
2323

2424
describe"[cms search post]"do
2525
test"search post by full title should valid paged posts"do
26-
{:ok,searched}=CMS.search_contents(:post,%{title:"react"})
26+
{:ok,searched}=CMS.search_articles(:post,%{title:"react"})
2727

2828
assertsearched|>is_valid_pagination?(:raw)
2929
assertsearched.total_count==1
3030
assertsearched.entries|>Enum.at(0)|>Map.get(:title)=="react"
3131
end
3232

3333
test"search post blur title should return valid communities"do
34-
{:ok,searched}=CMS.search_contents(:post,%{title:"reac"})
34+
{:ok,searched}=CMS.search_articles(:post,%{title:"reac"})
3535
assertsearched.entries|>Enum.at(0)|>Map.get(:title)=="react"
3636

37-
{:ok,searched}=CMS.search_contents(:post,%{title:"rea"})
37+
{:ok,searched}=CMS.search_articles(:post,%{title:"rea"})
3838
assertsearched.entries|>Enum.at(0)|>Map.get(:title)=="react"
3939

40-
{:ok,searched}=CMS.search_contents(:post,%{title:"eac"})
40+
{:ok,searched}=CMS.search_articles(:post,%{title:"eac"})
4141
assertsearched.entries|>Enum.at(0)|>Map.get(:title)=="react"
4242

43-
{:ok,searched}=CMS.search_contents(:post,%{title:"每日"})
43+
{:ok,searched}=CMS.search_articles(:post,%{title:"每日"})
4444
assertsearched.entries|>Enum.at(0)|>Map.get(:title)=="每日妹子"
4545

46-
{:ok,searched}=CMS.search_contents(:post,%{title:"javasc"})
46+
{:ok,searched}=CMS.search_articles(:post,%{title:"javasc"})
4747
assertsearched.total_count==1
4848
assertsearched.entries|>Enum.at(0)|>Map.get(:title)=="javascript"
4949

50-
{:ok,searched}=CMS.search_contents(:post,%{title:"java"})
50+
{:ok,searched}=CMS.search_articles(:post,%{title:"java"})
5151
assertsearched.total_count==2
5252
assertsearched.entries|>Enum.any?(&(&1.title=="java"))
5353
assertsearched.entries|>Enum.any?(&(&1.title=="javascript"))
5454
end
5555

5656
test"search non exsit community should get empty pagi data"do
57-
{:ok,searched}=CMS.search_contents(:community,%{title:"non-exsit"})
57+
{:ok,searched}=CMS.search_communities(%{title:"non-exsit"})
5858
assertsearched|>is_valid_pagination?(:raw,:empty)
5959
end
6060
end
6161

6262
describe"[cms search community]"do
6363
test"search community by full title should valid paged communities"do
64-
{:ok,searched}=CMS.search_contents(:community,%{title:"react"})
64+
{:ok,searched}=CMS.search_communities(%{title:"react"})
6565

6666
assertsearched|>is_valid_pagination?(:raw)
6767
assertsearched.total_count==1
6868
assertsearched.entries|>Enum.at(0)|>Map.get(:title)=="react"
6969
end
7070

7171
test"search community blur title should return valid communities"do
72-
{:ok,searched}=CMS.search_contents(:community,%{title:"reac"})
72+
{:ok,searched}=CMS.search_communities(%{title:"reac"})
7373
assertsearched.entries|>Enum.at(0)|>Map.get(:title)=="react"
7474

75-
{:ok,searched}=CMS.search_contents(:community,%{title:"rea"})
75+
{:ok,searched}=CMS.search_communities(%{title:"rea"})
7676
assertsearched.entries|>Enum.at(0)|>Map.get(:title)=="react"
7777

78-
{:ok,searched}=CMS.search_contents(:community,%{title:"eac"})
78+
{:ok,searched}=CMS.search_communities(%{title:"eac"})
7979
assertsearched.entries|>Enum.at(0)|>Map.get(:title)=="react"
8080

81-
{:ok,searched}=CMS.search_contents(:community,%{title:"每日"})
81+
{:ok,searched}=CMS.search_communities(%{title:"每日"})
8282
assertsearched.entries|>Enum.at(0)|>Map.get(:title)=="每日妹子"
8383

84-
{:ok,searched}=CMS.search_contents(:community,%{title:"javasc"})
84+
{:ok,searched}=CMS.search_communities(%{title:"javasc"})
8585
assertsearched.total_count==1
8686
assertsearched.entries|>Enum.at(0)|>Map.get(:title)=="javascript"
8787

88-
{:ok,searched}=CMS.search_contents(:community,%{title:"java"})
88+
{:ok,searched}=CMS.search_communities(%{title:"java"})
8989
assertsearched.total_count==2
9090
assertsearched.entries|>Enum.any?(&(&1.title=="java"))
9191
assertsearched.entries|>Enum.any?(&(&1.title=="javascript"))
9292
end
9393

9494
test"search non exsit community should get empty pagi data"do
95-
{:ok,searched}=CMS.search_contents(:community,%{title:"non-exsit"})
95+
{:ok,searched}=CMS.search_communities(%{title:"non-exsit"})
9696
assertsearched|>is_valid_pagination?(:raw,:empty)
9797
end
9898
end

0 commit comments

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