TudbuT/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

feat(topic): search keyword by splitting provided values by , (#4939)

Browse source
This commit is contained in:
Bo-Yi Wu 2018-10-18 11:14:28 +08:00 committed by techknowlogick
parent e79e9248fd
commit 486e989a39
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
models/repo_list.go
View file

@ -205,11 +205,14 @@ func SearchRepositoryByName(opts *SearchRepoOptions) (RepositoryList, int64, err
if opts.Keyword != "" { if opts.Keyword != "" {
var keywordCond = builder.NewCond() var keywordCond = builder.NewCond()
if opts.TopicOnly { // separate keyword
keywordCond = keywordCond.Or(builder.Like{"topic.name", strings.ToLower(opts.Keyword)}) for _, v := range strings.Split(opts.Keyword, ",") {
} else { if opts.TopicOnly {
keywordCond = keywordCond.Or(builder.Like{"lower_name", strings.ToLower(opts.Keyword)}) keywordCond = keywordCond.Or(builder.Like{"topic.name", strings.ToLower(v)})
keywordCond = keywordCond.Or(builder.Like{"topic.name", strings.ToLower(opts.Keyword)}) } else {
keywordCond = keywordCond.Or(builder.Like{"lower_name", strings.ToLower(v)})
keywordCond = keywordCond.Or(builder.Like{"topic.name", strings.ToLower(v)})
}
} }
cond = cond.And(keywordCond) cond = cond.And(keywordCond)
} }

3
models/repo_list_test.go
View file

@ -237,6 +237,9 @@ func TestSearchRepositoryByTopicName(t *testing.T) {
{name: "AllPublic/OnlySearchPublicRepositoriesFromTopic", {name: "AllPublic/OnlySearchPublicRepositoriesFromTopic",
opts: &SearchRepoOptions{OwnerID: 21, AllPublic: true, Keyword: "graphql", TopicOnly: true}, opts: &SearchRepoOptions{OwnerID: 21, AllPublic: true, Keyword: "graphql", TopicOnly: true},
count: 1}, count: 1},
{name: "AllPublic/OnlySearchMultipleKeywordPublicRepositoriesFromTopic",
opts: &SearchRepoOptions{OwnerID: 21, AllPublic: true, Keyword: "graphql,golang", TopicOnly: true},
count: 3},
} }
for _, testCase := range testCases { for _, testCase := range testCases {