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
1ff6c45b
Commit
1ff6c45b
authored
Feb 21, 2019
by
Florent Chehab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backend updated for #48
parent
364be4d4
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
22 additions
and
52 deletions
+22
-52
backend/backend_app/custom/DictModeViewSet.py
backend/backend_app/custom/DictModeViewSet.py
+0
-32
backend/backend_app/custom/__init__.py
backend/backend_app/custom/__init__.py
+1
-2
backend/backend_app/models/abstract/my_model/myModelViewSet.py
...nd/backend_app/models/abstract/my_model/myModelViewSet.py
+21
-2
backend/backend_app/models/campus/campusTaggedItem.py
backend/backend_app/models/campus/campusTaggedItem.py
+0
-2
backend/backend_app/models/city/cityTaggedItem.py
backend/backend_app/models/city/cityTaggedItem.py
+0
-2
backend/backend_app/models/country/countryDri.py
backend/backend_app/models/country/countryDri.py
+0
-2
backend/backend_app/models/country/countryScholarship.py
backend/backend_app/models/country/countryScholarship.py
+0
-2
backend/backend_app/models/country/countryTaggedItem.py
backend/backend_app/models/country/countryTaggedItem.py
+0
-2
backend/backend_app/models/university/universityDri.py
backend/backend_app/models/university/universityDri.py
+0
-2
backend/backend_app/models/university/universityScholarship.py
...nd/backend_app/models/university/universityScholarship.py
+0
-2
backend/backend_app/models/university/universityTaggedItem.py
...end/backend_app/models/university/universityTaggedItem.py
+0
-2
No files found.
backend/backend_app/custom/DictModeViewSet.py
deleted
100644 → 0
View file @
364be4d4
from
rest_framework
import
viewsets
class
DictModeViewSet
(
viewsets
.
ModelViewSet
):
"""
ViewSet that renders data as dict with keys corresponding to the model
primary key. Instead of list.
"""
BYPASS_DICT_MODE
=
False
LIST_SHOULD_BE_DETAIL
=
False
def
list
(
self
,
request
,
*
args
,
**
kwargs
):
response
=
super
(
viewsets
.
ModelViewSet
,
self
).
list
(
# pylint: disable=E1003
request
,
*
args
,
**
kwargs
)
# call the original 'list'
if
self
.
LIST_SHOULD_BE_DETAIL
:
if
len
(
response
.
data
)
==
0
:
response
.
data
=
dict
()
elif
len
(
response
.
data
)
==
1
:
response
.
data
=
response
.
data
[
0
]
else
:
raise
Exception
(
"There should be no more than one element here check your queryset !"
)
elif
not
self
.
BYPASS_DICT_MODE
:
pk_attr_name
=
self
.
serializer_class
.
Meta
.
model
.
_meta
.
pk
.
name
response
.
data
=
{
d
[
pk_attr_name
]:
d
for
d
in
response
.
data
}
return
response
backend/backend_app/custom/__init__.py
View file @
1ff6c45b
from
.DictModeViewSet
import
DictModeViewSet
from
.mySerializerWithJSON
import
MySerializerWithJSON
__all__
=
[
"
DictModeViewSet"
,
"
MySerializerWithJSON"
]
__all__
=
[
"MySerializerWithJSON"
]
backend/backend_app/models/abstract/my_model/myModelViewSet.py
View file @
1ff6c45b
from
.myModelSerializer
import
MyModelSerializer
from
backend_app.permissions
import
DEFAULT_VIEWSET_PERMISSIONS
from
backend_app.custom
import
DictModeViewSet
from
rest_framework
import
viewsets
class
MyModelViewSet
(
DictMode
ViewSet
):
class
MyModelViewSet
(
viewsets
.
Model
ViewSet
):
serializer_class
=
MyModelSerializer
permission_classes
=
DEFAULT_VIEWSET_PERMISSIONS
LIST_SHOULD_BE_DETAIL
=
False
def
list
(
self
,
request
,
*
args
,
**
kwargs
):
response
=
super
(
viewsets
.
ModelViewSet
,
self
).
list
(
# pylint: disable=E1003
request
,
*
args
,
**
kwargs
)
# call the original 'list'
if
self
.
LIST_SHOULD_BE_DETAIL
:
if
len
(
response
.
data
)
==
0
:
response
.
data
=
dict
()
elif
len
(
response
.
data
)
==
1
:
response
.
data
=
response
.
data
[
0
]
else
:
raise
Exception
(
"There should be no more than one element in the queryset, check it !"
)
return
response
def
get_queryset
(
self
):
"""
Extended default rest framework behavior
...
...
backend/backend_app/models/campus/campusTaggedItem.py
View file @
1ff6c45b
...
...
@@ -33,8 +33,6 @@ class CampusTaggedItemViewSet(TaggedItemViewSet):
queryset
=
CampusTaggedItem
.
objects
.
all
()
# pylint: disable=E1101
serializer_class
=
CampusTaggedItemSerializer
BYPASS_DICT_MODE
=
True
def
extend_queryset
(
self
):
campus_id
=
self
.
kwargs
[
"campus_id"
]
return
self
.
my_model_queryset
.
filter
(
campus
=
campus_id
).
distinct
()
backend/backend_app/models/city/cityTaggedItem.py
View file @
1ff6c45b
...
...
@@ -34,8 +34,6 @@ class CityTaggedItemViewSet(TaggedItemViewSet):
queryset
=
CityTaggedItem
.
objects
.
all
()
# pylint: disable=E1101
serializer_class
=
CityTaggedItemSerializer
BYPASS_DICT_MODE
=
True
def
extend_queryset
(
self
):
city_id
=
self
.
kwargs
[
"city_id"
]
return
self
.
my_model_queryset
.
filter
(
city
=
city_id
).
distinct
()
backend/backend_app/models/country/countryDri.py
View file @
1ff6c45b
...
...
@@ -30,8 +30,6 @@ class CountryDriViewSet(BasicModuleViewSet):
queryset
=
CountryDri
.
objects
.
all
()
# pylint: disable=E1101
serializer_class
=
CountryDriSerializer
BYPASS_DICT_MODE
=
True
def
extend_queryset
(
self
):
country_id
=
self
.
kwargs
[
"country_id"
]
return
self
.
my_model_queryset
.
filter
(
countries__pk
=
country_id
).
distinct
()
backend/backend_app/models/country/countryScholarship.py
View file @
1ff6c45b
...
...
@@ -28,8 +28,6 @@ class CountryScholarshipViewSet(ScholarshipViewSet):
queryset
=
CountryScholarship
.
objects
.
all
()
# pylint: disable=E1101
serializer_class
=
CountryScholarshipSerializer
BYPASS_DICT_MODE
=
True
def
extend_queryset
(
self
):
country_id
=
self
.
kwargs
[
"country_id"
]
return
self
.
my_model_queryset
.
filter
(
countries__pk
=
country_id
).
distinct
()
backend/backend_app/models/country/countryTaggedItem.py
View file @
1ff6c45b
...
...
@@ -33,8 +33,6 @@ class CountryTaggedItemViewSet(TaggedItemViewSet):
queryset
=
CountryTaggedItem
.
objects
.
all
()
# pylint: disable=E1101
serializer_class
=
CountryTaggedItemSerializer
BYPASS_DICT_MODE
=
True
def
extend_queryset
(
self
):
country_id
=
self
.
kwargs
[
"country_id"
]
return
self
.
my_model_queryset
.
filter
(
country
=
country_id
).
distinct
()
backend/backend_app/models/university/universityDri.py
View file @
1ff6c45b
...
...
@@ -30,8 +30,6 @@ class UniversityDriViewSet(BasicModuleViewSet):
queryset
=
UniversityDri
.
objects
.
all
()
# pylint: disable=E1101
serializer_class
=
UniversityDriSerializer
BYPASS_DICT_MODE
=
True
def
extend_queryset
(
self
):
univ_id
=
self
.
kwargs
[
"univ_id"
]
return
self
.
my_model_queryset
.
filter
(
universities__pk
=
univ_id
).
distinct
()
backend/backend_app/models/university/universityScholarship.py
View file @
1ff6c45b
...
...
@@ -32,8 +32,6 @@ class UniversityScholarshipViewSet(ScholarshipViewSet):
queryset
=
UniversityScholarship
.
objects
.
all
()
# pylint: disable=E1101
serializer_class
=
UniversityScholarshipSerializer
BYPASS_DICT_MODE
=
True
def
extend_queryset
(
self
):
univ_id
=
self
.
kwargs
[
"univ_id"
]
return
self
.
my_model_queryset
.
filter
(
universities__pk
=
univ_id
).
distinct
()
backend/backend_app/models/university/universityTaggedItem.py
View file @
1ff6c45b
...
...
@@ -33,8 +33,6 @@ class UniversityTaggedItemViewSet(TaggedItemViewSet):
queryset
=
UniversityTaggedItem
.
objects
.
all
()
# pylint: disable=E1101
serializer_class
=
UniversityTaggedItemSerializer
BYPASS_DICT_MODE
=
True
def
extend_queryset
(
self
):
univ_id
=
self
.
kwargs
[
"univ_id"
]
return
self
.
my_model_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