Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
rp
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
14
Issues
14
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
La Quadrature du Net
rpteam
rp
Commits
4f13cfe3
Commit
4f13cfe3
authored
Apr 30, 2019
by
Okhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Using the article title seems a better way to test the search for now
parent
6b5e39e3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
apps/rp/api/views.py
apps/rp/api/views.py
+2
-0
apps/rp/tests/test_article.py
apps/rp/tests/test_article.py
+2
-1
No files found.
apps/rp/api/views.py
View file @
4f13cfe3
...
@@ -13,6 +13,7 @@ class ArticleViewSet(ArticleMixin, viewsets.ModelViewSet):
...
@@ -13,6 +13,7 @@ class ArticleViewSet(ArticleMixin, viewsets.ModelViewSet):
queryset
=
Article
.
objects
.
all
()
queryset
=
Article
.
objects
.
all
()
serializer_class
=
ArticleSerializer
serializer_class
=
ArticleSerializer
class
ArticleSearch
(
viewsets
.
ModelViewSet
,
mixins
.
ListModelMixin
):
class
ArticleSearch
(
viewsets
.
ModelViewSet
,
mixins
.
ListModelMixin
):
queryset
=
Article
.
objects
.
all
()
queryset
=
Article
.
objects
.
all
()
serializer_class
=
ArticleSerializer
serializer_class
=
ArticleSerializer
...
@@ -22,6 +23,7 @@ class ArticleSearch(viewsets.ModelViewSet, mixins.ListModelMixin):
...
@@ -22,6 +23,7 @@ class ArticleSearch(viewsets.ModelViewSet, mixins.ListModelMixin):
|
Q
(
extracts__icontains
=
kwargs
[
'search_keywords'
]))
|
Q
(
extracts__icontains
=
kwargs
[
'search_keywords'
]))
return
super
().
list
(
request
,
args
,
kwargs
)
return
super
().
list
(
request
,
args
,
kwargs
)
class
ArticleTag
(
viewsets
.
ModelViewSet
,
mixins
.
ListModelMixin
):
class
ArticleTag
(
viewsets
.
ModelViewSet
,
mixins
.
ListModelMixin
):
queryset
=
Article
.
objects
.
all
()
queryset
=
Article
.
objects
.
all
()
serializer_class
=
ArticleSerializer
serializer_class
=
ArticleSerializer
...
...
apps/rp/tests/test_article.py
View file @
4f13cfe3
...
@@ -116,7 +116,8 @@ class TestArticleApi(TestCase):
...
@@ -116,7 +116,8 @@ class TestArticleApi(TestCase):
assert
r
.
data
[
'count'
]
==
0
assert
r
.
data
[
'count'
]
==
0
def
test_api_filter_search
(
self
):
def
test_api_filter_search
(
self
):
text
=
' '
.
join
(
self
.
articles
[
0
].
extracts
.
split
(
' '
))
#text = ' '.join(self.articles[0].extracts.split(' ')[:10])
text
=
self
.
articles
[
0
].
title
r
=
self
.
client
.
get
(
'/api/articles-search/{}/'
.
format
(
text
))
r
=
self
.
client
.
get
(
'/api/articles-search/{}/'
.
format
(
text
))
assert
r
.
status_code
==
200
assert
r
.
status_code
==
200
assert
r
.
data
[
'count'
]
==
1
assert
r
.
data
[
'count'
]
==
1
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment