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
0
Issues
0
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
Julien Jerphanion
Rex Dri
Commits
9895a8ab
Commit
9895a8ab
authored
Sep 03, 2018
by
Florent Chehab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated University model and related
parent
44a6c5fc
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
144 additions
and
106 deletions
+144
-106
backend/load_data/assets/destinations_extracted.csv
backend/load_data/assets/destinations_extracted.csv
+69
-69
backend/load_data/loading_scripts/loadUniversities.py
backend/load_data/loading_scripts/loadUniversities.py
+11
-6
backend/migrations/0003_auto_20180903_0953.py
backend/migrations/0003_auto_20180903_0953.py
+30
-0
backend/models/tag/tags_config/photos.py
backend/models/tag/tags_config/photos.py
+3
-6
backend/models/university/__init__.py
backend/models/university/__init__.py
+1
-2
backend/models/university/university.py
backend/models/university/university.py
+28
-6
backend/models/university/universityAPI.py
backend/models/university/universityAPI.py
+0
-16
backend/tests/test_moderation.py
backend/tests/test_moderation.py
+1
-1
general/settings.py
general/settings.py
+1
-0
No files found.
backend/load_data/assets/destinations_extracted.csv
View file @
9895a8ab
This diff is collapsed.
Click to expand it.
backend/load_data/loading_scripts/loadUniversities.py
View file @
9895a8ab
...
...
@@ -21,11 +21,11 @@ class LoadUniversities(LoadGeneric):
dtype
=
object
)
for
index
,
row
in
data
.
iterrows
():
u
niv_name
,
city_name
,
country_code
,
lat
,
lon
=
row
u
tc_id
,
univ_name
,
city_name
,
country_code
,
lat
,
lon
,
acronym
,
website
,
logo
=
row
lat
=
round
(
float
(
lat
),
6
)
lon
=
round
(
float
(
lon
),
6
)
country
=
Country
.
objects
.
filter
(
pk
=
country_code
)[
0
]
country
=
Country
.
objects
.
get
(
pk
=
country_code
)
city
=
City
(
name
=
city_name
,
country
=
country
...
...
@@ -33,10 +33,15 @@ class LoadUniversities(LoadGeneric):
city
.
save
()
self
.
add_info
(
city
,
self
.
admin
)
univ
=
University
(
name
=
univ_name
)
univ
.
save
()
univ
=
University
.
objects
.
update_or_create
(
utc_id
=
utc_id
,
defaults
=
{
"name"
:
univ_name
,
"acronym"
:
acronym
,
"website"
:
website
,
"logo"
:
logo
}
)[
0
]
self
.
add_info
(
univ
,
self
.
admin
)
main_campus
=
Campus
(
...
...
backend/migrations/0003_auto_20180903_0953.py
0 → 100644
View file @
9895a8ab
# Generated by Django 2.0.3 on 2018-09-03 07:53
import
backend.models.university.university
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'backend'
,
'0002_auto_20180902_1716'
),
]
operations
=
[
migrations
.
AddField
(
model_name
=
'university'
,
name
=
'utc_id'
,
field
=
models
.
IntegerField
(
default
=
1
,
unique
=
True
),
preserve_default
=
False
,
),
migrations
.
AlterField
(
model_name
=
'university'
,
name
=
'logo'
,
field
=
models
.
URLField
(
blank
=
True
,
null
=
True
,
validators
=
[
backend
.
models
.
university
.
university
.
validate_extension_django
]),
),
migrations
.
AlterField
(
model_name
=
'university'
,
name
=
'website'
,
field
=
models
.
URLField
(
blank
=
True
,
null
=
True
),
),
]
backend/models/tag/tags_config/photos.py
View file @
9895a8ab
from
django.conf
import
settings
PHOTOS_TAG_GONFIG
=
{
"type"
:
"array"
,
"required"
:
True
,
...
...
@@ -6,12 +8,7 @@ PHOTOS_TAG_GONFIG = {
"type"
:
"url"
,
"required"
:
True
,
"validators"
:
{
"extension"
:
[
"jpg"
,
"jpeg"
,
"png"
,
"svg"
]
"extension"
:
settings
.
ALLOWED_PHOTOS_EXTENSION
}
},
"title"
:
{
...
...
backend/models/university/__init__.py
View file @
9895a8ab
from
.university
import
University
# noqa: F401
from
.university
import
University
,
UniversitySerializer
,
UniversityViewSet
# noqa: F401
from
.universityAPI
import
UniversitySerializer
,
UniversityViewSet
# noqa: F401
from
.universityScholarship
import
UniversityScholarship
,
UniversityScholarshipSerializer
,
UniversityScholarshipViewSet
# noqa: F401
from
.universityDri
import
UniversityDri
,
UniversityDriSerializer
,
UniversityDriViewSet
# noqa: F401
from
.universityInfo
import
UniversityInfo
,
UniversityInfoSerializer
,
UniversityInfoViewSet
# noqa: F401
...
...
backend/models/university/university.py
View file @
9895a8ab
from
django.db
import
models
from
backend.models.my_model
import
MyModel
from
backend.utils.friendly_path
import
friendly_path
from
backend.utils
import
get_model_config
from
django.core.exceptions
import
ValidationError
from
rest_framework.validators
import
ValidationError
as
RFValidationError
from
backend.models.tag.validators.url
import
validate_extension
from
django.conf
import
settings
from
backend.models.my_model
import
MyModelSerializer
,
MyModelViewSet
from
backend.utils
import
get_viewset_permissions
path_and_rename
=
friendly_path
(
"uploads/universities/logos/"
,
'name'
)
def
validate_extension_django
(
url
):
try
:
validate_extension
(
settings
.
ALLOWED_PHOTOS_EXTENSION
,
url
)
except
RFValidationError
:
raise
ValidationError
(
"Extension in URL doesn't correspond to an image"
)
class
University
(
MyModel
):
...
...
@@ -14,9 +25,20 @@ class University(MyModel):
name
=
models
.
CharField
(
max_length
=
200
)
acronym
=
models
.
CharField
(
max_length
=
20
,
null
=
True
,
blank
=
True
)
logo
=
models
.
ImageField
(
upload_to
=
path_and_rename
,
max_length
=
250
,
default
=
'path/to/my/default/image.jpg'
)
# TODO CHANGE !
website
=
models
.
URLField
(
null
=
True
)
logo
=
models
.
URLField
(
null
=
True
,
blank
=
True
,
validators
=
[
validate_extension_django
])
website
=
models
.
URLField
(
null
=
True
,
blank
=
True
)
utc_id
=
models
.
IntegerField
(
unique
=
True
)
class
UniversitySerializer
(
MyModelSerializer
):
class
Meta
:
model
=
University
exclude
=
(
'utc_id'
,)
# Rest API related stuff are in universityAPI.py to prevent circular depedencies
class
UniversityViewSet
(
MyModelViewSet
):
permission_classes
=
get_viewset_permissions
(
"UniversityViewSet"
)
serializer_class
=
UniversitySerializer
queryset
=
University
.
objects
.
all
()
# pylint: disable=E1101
backend/models/university/universityAPI.py
deleted
100644 → 0
View file @
44a6c5fc
from
backend.models.university
import
University
from
backend.models.my_model
import
MyModelSerializer
,
MyModelViewSet
from
backend.utils
import
get_viewset_permissions
class
UniversitySerializer
(
MyModelSerializer
):
class
Meta
:
model
=
University
fields
=
'__all__'
class
UniversityViewSet
(
MyModelViewSet
):
permission_classes
=
get_viewset_permissions
(
"UniversityViewSet"
)
serializer_class
=
UniversitySerializer
queryset
=
University
.
objects
.
all
()
# pylint: disable=E1101
backend/tests/test_moderation.py
View file @
9895a8ab
...
...
@@ -216,7 +216,7 @@ class ModerationTestCase(WithUserTestCase):
Test to check that when moderation IS activated
no error regarding saving occures with foreing key
"""
c
=
University
(
name
=
"Univ de test"
)
c
=
University
(
name
=
"Univ de test"
,
utc_id
=
100
)
c
.
save
()
data
=
{
...
...
general/settings.py
View file @
9895a8ab
...
...
@@ -52,6 +52,7 @@ MIDDLEWARE = [
# If we want to activate the moderation functionnalities
MODERATION_ACTIVATED
=
True
TESTING
=
"pytest"
in
sys
.
modules
ALLOWED_PHOTOS_EXTENSION
=
[
"jpg"
,
"jpeg"
,
"png"
,
"svg"
]
INTERNAL_IPS
=
[
'127.0.0.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