Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Rex Dri
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
32
Issues
32
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Rex Dri
Rex Dri
Commits
75bbbf1b
Commit
75bbbf1b
authored
Feb 26, 2019
by
Florent Chehab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed extend_queryset and my_model_queryset; use of standard super
parent
60184081
Pipeline
#35533
passed with stages
in 5 minutes and 15 seconds
Changes
10
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
19 additions
and
26 deletions
+19
-26
backend/backend_app/models/abstract/my_model/myModelViewSet.py
...nd/backend_app/models/abstract/my_model/myModelViewSet.py
+1
-8
backend/backend_app/models/abstract/taggedItem/taggedItem.py
backend/backend_app/models/abstract/taggedItem/taggedItem.py
+2
-2
backend/backend_app/models/campus/campusTaggedItem.py
backend/backend_app/models/campus/campusTaggedItem.py
+2
-2
backend/backend_app/models/city/cityTaggedItem.py
backend/backend_app/models/city/cityTaggedItem.py
+2
-2
backend/backend_app/models/country/countryDri.py
backend/backend_app/models/country/countryDri.py
+2
-2
backend/backend_app/models/country/countryScholarship.py
backend/backend_app/models/country/countryScholarship.py
+2
-2
backend/backend_app/models/country/countryTaggedItem.py
backend/backend_app/models/country/countryTaggedItem.py
+2
-2
backend/backend_app/models/university/universityDri.py
backend/backend_app/models/university/universityDri.py
+2
-2
backend/backend_app/models/university/universityScholarship.py
...nd/backend_app/models/university/universityScholarship.py
+2
-2
backend/backend_app/models/university/universityTaggedItem.py
...end/backend_app/models/university/universityTaggedItem.py
+2
-2
No files found.
backend/backend_app/models/abstract/my_model/myModelViewSet.py
View file @
75bbbf1b
...
...
@@ -40,13 +40,6 @@ class MyModelViewSet(viewsets.ModelViewSet):
Extended default rest framework behavior
to prefetch some table and enhance performances
"""
self
.
my_model_queryset
=
self
.
queryset
.
prefetch_related
(
return
self
.
queryset
.
prefetch_related
(
"moderated_by"
,
"updated_by"
,
"pending_moderation"
)
return
self
.
extend_queryset
()
def
extend_queryset
(
self
):
"""
Function to extend get_queryset when subclassing
"""
return
self
.
my_model_queryset
backend/backend_app/models/abstract/taggedItem/taggedItem.py
View file @
75bbbf1b
...
...
@@ -41,8 +41,8 @@ class TaggedItemViewSet(BasicModuleViewSet):
Tagged item viewset
"""
def
extend
_queryset
(
self
):
def
get
_queryset
(
self
):
"""
Extend the queryset for a bit of optimization
"""
return
s
elf
.
my_model_queryset
.
prefetch_related
(
"tag"
)
return
s
uper
().
get_queryset
()
.
prefetch_related
(
"tag"
)
backend/backend_app/models/campus/campusTaggedItem.py
View file @
75bbbf1b
...
...
@@ -33,6 +33,6 @@ class CampusTaggedItemViewSet(TaggedItemViewSet):
queryset
=
CampusTaggedItem
.
objects
.
all
()
# pylint: disable=E1101
serializer_class
=
CampusTaggedItemSerializer
def
extend
_queryset
(
self
):
def
get
_queryset
(
self
):
campus_id
=
self
.
kwargs
[
"campus_id"
]
return
s
elf
.
my_model_queryset
.
filter
(
campus
=
campus_id
).
distinct
()
return
s
uper
().
get_queryset
()
.
filter
(
campus
=
campus_id
).
distinct
()
backend/backend_app/models/city/cityTaggedItem.py
View file @
75bbbf1b
...
...
@@ -34,6 +34,6 @@ class CityTaggedItemViewSet(TaggedItemViewSet):
queryset
=
CityTaggedItem
.
objects
.
all
()
# pylint: disable=E1101
serializer_class
=
CityTaggedItemSerializer
def
extend
_queryset
(
self
):
def
get
_queryset
(
self
):
city_id
=
self
.
kwargs
[
"city_id"
]
return
s
elf
.
my_model_queryset
.
filter
(
city
=
city_id
).
distinct
()
return
s
uper
().
get_queryset
()
.
filter
(
city
=
city_id
).
distinct
()
backend/backend_app/models/country/countryDri.py
View file @
75bbbf1b
...
...
@@ -30,6 +30,6 @@ class CountryDriViewSet(BasicModuleViewSet):
queryset
=
CountryDri
.
objects
.
all
()
# pylint: disable=E1101
serializer_class
=
CountryDriSerializer
def
extend
_queryset
(
self
):
def
get
_queryset
(
self
):
country_id
=
self
.
kwargs
[
"country_id"
]
return
s
elf
.
my_model_queryset
.
filter
(
countries__pk
=
country_id
).
distinct
()
return
s
uper
().
get_queryset
()
.
filter
(
countries__pk
=
country_id
).
distinct
()
backend/backend_app/models/country/countryScholarship.py
View file @
75bbbf1b
...
...
@@ -28,6 +28,6 @@ class CountryScholarshipViewSet(ScholarshipViewSet):
queryset
=
CountryScholarship
.
objects
.
all
()
# pylint: disable=E1101
serializer_class
=
CountryScholarshipSerializer
def
extend
_queryset
(
self
):
def
get
_queryset
(
self
):
country_id
=
self
.
kwargs
[
"country_id"
]
return
s
elf
.
my_model_queryset
.
filter
(
countries__pk
=
country_id
).
distinct
()
return
s
uper
().
get_queryset
()
.
filter
(
countries__pk
=
country_id
).
distinct
()
backend/backend_app/models/country/countryTaggedItem.py
View file @
75bbbf1b
...
...
@@ -33,6 +33,6 @@ class CountryTaggedItemViewSet(TaggedItemViewSet):
queryset
=
CountryTaggedItem
.
objects
.
all
()
# pylint: disable=E1101
serializer_class
=
CountryTaggedItemSerializer
def
extend
_queryset
(
self
):
def
get
_queryset
(
self
):
country_id
=
self
.
kwargs
[
"country_id"
]
return
s
elf
.
my_model_queryset
.
filter
(
country
=
country_id
).
distinct
()
return
s
uper
().
get_queryset
()
.
filter
(
country
=
country_id
).
distinct
()
backend/backend_app/models/university/universityDri.py
View file @
75bbbf1b
...
...
@@ -30,6 +30,6 @@ class UniversityDriViewSet(BasicModuleViewSet):
queryset
=
UniversityDri
.
objects
.
all
()
# pylint: disable=E1101
serializer_class
=
UniversityDriSerializer
def
extend
_queryset
(
self
):
def
get
_queryset
(
self
):
univ_id
=
self
.
kwargs
[
"univ_id"
]
return
s
elf
.
my_model_queryset
.
filter
(
universities__pk
=
univ_id
).
distinct
()
return
s
uper
().
get_queryset
()
.
filter
(
universities__pk
=
univ_id
).
distinct
()
backend/backend_app/models/university/universityScholarship.py
View file @
75bbbf1b
...
...
@@ -32,6 +32,6 @@ class UniversityScholarshipViewSet(ScholarshipViewSet):
queryset
=
UniversityScholarship
.
objects
.
all
()
# pylint: disable=E1101
serializer_class
=
UniversityScholarshipSerializer
def
extend
_queryset
(
self
):
def
get
_queryset
(
self
):
univ_id
=
self
.
kwargs
[
"univ_id"
]
return
s
elf
.
my_model_queryset
.
filter
(
universities__pk
=
univ_id
).
distinct
()
return
s
uper
().
get_queryset
()
.
filter
(
universities__pk
=
univ_id
).
distinct
()
backend/backend_app/models/university/universityTaggedItem.py
View file @
75bbbf1b
...
...
@@ -33,6 +33,6 @@ class UniversityTaggedItemViewSet(TaggedItemViewSet):
queryset
=
UniversityTaggedItem
.
objects
.
all
()
# pylint: disable=E1101
serializer_class
=
UniversityTaggedItemSerializer
def
extend
_queryset
(
self
):
def
get
_queryset
(
self
):
univ_id
=
self
.
kwargs
[
"univ_id"
]
return
s
elf
.
my_model_queryset
.
filter
(
university__pk
=
univ_id
).
distinct
()
return
s
uper
().
get_queryset
()
.
filter
(
university__pk
=
univ_id
).
distinct
()
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