Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Rex Dri
Rex Dri
Commits
42992788
Commit
42992788
authored
Sep 09, 2018
by
Florent Chehab
Browse files
Backend completely reorganized to limit cyclic imports
parent
c776e24f
Pipeline
#27073
passed with stages
in 2 minutes and 27 seconds
Changes
47
Pipelines
1
Show whitespace changes
Inline
Side-by-side
backend/load_data/loading_scripts/loadCountries.py
View file @
42992788
from
backend.models.
location
import
Country
from
backend.models.
country
import
Country
import
os
import
os
import
pandas
as
pd
import
pandas
as
pd
from
.loadGeneric
import
LoadGeneric
from
.loadGeneric
import
LoadGeneric
...
...
backend/load_data/loading_scripts/loadCurrencies.py
View file @
42992788
from
backend.models.
location
import
Currency
from
backend.models.
currency
import
Currency
import
os
import
os
import
csv
import
csv
from
.loadGeneric
import
LoadGeneric
from
.loadGeneric
import
LoadGeneric
...
...
backend/load_data/loading_scripts/loadUniversities.py
View file @
42992788
from
backend.models.location
import
City
,
Country
from
backend.models.country
import
Country
from
backend.models.university
import
University
,
Campus
from
backend.models.city
import
City
from
backend.models.university
import
University
from
backend.models.campus
import
Campus
import
os
import
os
import
pandas
as
pd
import
pandas
as
pd
...
...
backend/migrations/0003_auto_20180909_1547.py
0 → 100644
View file @
42992788
# Generated by Django 2.0.3 on 2018-09-09 13:47
import
backend.models.tools.jSONField
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'backend'
,
'0002_auto_20180909_1455'
),
]
operations
=
[
migrations
.
AddField
(
model_name
=
'campustaggeditem'
,
name
=
'comment'
,
field
=
models
.
TextField
(
blank
=
True
),
),
migrations
.
AddField
(
model_name
=
'campustaggeditem'
,
name
=
'importance_level'
,
field
=
models
.
CharField
(
choices
=
[(
'-'
,
'normal'
),
(
'+'
,
'important'
),
(
'++'
,
'IMPORTANT'
)],
default
=
'-'
,
max_length
=
2
),
),
migrations
.
AddField
(
model_name
=
'campustaggeditem'
,
name
=
'usefull_links'
,
field
=
backend
.
models
.
tools
.
jSONField
.
JSONField
(
default
=
list
),
),
migrations
.
AddField
(
model_name
=
'citytaggeditem'
,
name
=
'comment'
,
field
=
models
.
TextField
(
blank
=
True
),
),
migrations
.
AddField
(
model_name
=
'citytaggeditem'
,
name
=
'importance_level'
,
field
=
models
.
CharField
(
choices
=
[(
'-'
,
'normal'
),
(
'+'
,
'important'
),
(
'++'
,
'IMPORTANT'
)],
default
=
'-'
,
max_length
=
2
),
),
migrations
.
AddField
(
model_name
=
'citytaggeditem'
,
name
=
'usefull_links'
,
field
=
backend
.
models
.
tools
.
jSONField
.
JSONField
(
default
=
list
),
),
migrations
.
AddField
(
model_name
=
'countrytaggeditem'
,
name
=
'comment'
,
field
=
models
.
TextField
(
blank
=
True
),
),
migrations
.
AddField
(
model_name
=
'countrytaggeditem'
,
name
=
'importance_level'
,
field
=
models
.
CharField
(
choices
=
[(
'-'
,
'normal'
),
(
'+'
,
'important'
),
(
'++'
,
'IMPORTANT'
)],
default
=
'-'
,
max_length
=
2
),
),
migrations
.
AddField
(
model_name
=
'countrytaggeditem'
,
name
=
'usefull_links'
,
field
=
backend
.
models
.
tools
.
jSONField
.
JSONField
(
default
=
list
),
),
migrations
.
AddField
(
model_name
=
'universitytaggeditem'
,
name
=
'comment'
,
field
=
models
.
TextField
(
blank
=
True
),
),
migrations
.
AddField
(
model_name
=
'universitytaggeditem'
,
name
=
'importance_level'
,
field
=
models
.
CharField
(
choices
=
[(
'-'
,
'normal'
),
(
'+'
,
'important'
),
(
'++'
,
'IMPORTANT'
)],
default
=
'-'
,
max_length
=
2
),
),
migrations
.
AddField
(
model_name
=
'universitytaggeditem'
,
name
=
'usefull_links'
,
field
=
backend
.
models
.
tools
.
jSONField
.
JSONField
(
default
=
list
),
),
]
backend/models/basic_module/__init__.py
0 → 100644
View file @
42992788
from
.basicModule
import
BasicModule
,
BasicModuleSerializer
,
BasicModuleViewSet
# noqa: F401
backend/models/module/basicModule.py
→
backend/models/
basic_
module/basicModule.py
View file @
42992788
from
django.db
import
models
from
django.db
import
models
from
backend.models.my_model
import
MyModelVersionned
,
MyModelVersionnedSerializer
,
MyModelVersionnedViewSet
from
backend.models.my_model
import
MyModelVersionned
,
MyModelVersionnedSerializer
,
MyModelVersionnedViewSet
from
backend.models.tools
import
JSONField
from
backend.models.tools
import
JSONField
from
backend.
models.tag.tagged_item_validation
import
validate_content_against_config
from
backend.
validators.tag
import
validate_content_against_config
from
backend.
model
s.tag.tags_config
import
USEFULL_LINKS_CONFIG
from
backend.
validator
s.tag.tags_config
import
USEFULL_LINKS_CONFIG
IMPORTANCE_LEVEL
=
(
IMPORTANCE_LEVEL
=
(
(
'-'
,
'normal'
),
(
'-'
,
'normal'
),
...
...
backend/models/campus/__init__.py
0 → 100644
View file @
42992788
from
.campus
import
Campus
,
CampusViewSet
,
CampusSerializer
,
MainCampusViewSet
# noqa: F401
from
.campusTaggedItem
import
CampusTaggedItem
,
CampusTaggedItemSerializer
,
CampusTaggedItemViewSet
# noqa: F401
backend/models/
university
/campus.py
→
backend/models/
campus
/campus.py
View file @
42992788
from
django.db
import
models
from
django.db
import
models
from
backend.models.module
import
BasicModule
,
BasicModuleSerializer
,
BasicModuleViewSet
from
backend.models.
basic_
module
import
BasicModule
,
BasicModuleSerializer
,
BasicModuleViewSet
from
backend.models.
location
import
City
from
backend.models.
city
import
City
from
backend.models.university
import
University
from
backend.models.university
import
University
from
django.core.validators
import
MinValueValidator
,
MaxValueValidator
from
django.core.validators
import
MinValueValidator
,
MaxValueValidator
from
backend.utils
import
get_model_config
,
get_viewset_permissions
from
backend.utils
import
get_model_config
,
get_viewset_permissions
...
...
backend/models/
university
/campusTaggedItem.py
→
backend/models/
campus
/campusTaggedItem.py
View file @
42992788
from
django.db
import
models
from
django.db
import
models
from
backend.models.
university
import
Campus
from
backend.models.
campus
import
Campus
from
backend.models.tag
import
TaggedItem
,
TaggedItemSerializer
,
TaggedItemViewSet
from
backend.models.tag
import
TaggedItem
,
TaggedItemSerializer
,
TaggedItemViewSet
from
backend.utils
import
get_model_config
,
get_viewset_permissions
from
backend.utils
import
get_model_config
,
get_viewset_permissions
...
...
backend/models/city/__init__.py
0 → 100644
View file @
42992788
from
.city
import
City
,
CitySerializer
,
CityViewSet
# noqa: F401
from
.cityTaggedItem
import
CityTaggedItem
,
CityTaggedItemSerializer
,
CityTaggedItemViewSet
# noqa: F401
backend/models/
location
/city.py
→
backend/models/
city
/city.py
View file @
42992788
from
django.db
import
models
from
django.db
import
models
from
backend.models.
location
import
Country
from
backend.models.
country
import
Country
from
backend.models.my_model
import
MyModel
,
MyModelSerializer
,
MyModelVersionnedViewSet
from
backend.models.my_model
import
MyModel
,
MyModelSerializer
,
MyModelVersionnedViewSet
from
backend.utils
import
get_model_config
,
get_viewset_permissions
from
backend.utils
import
get_model_config
,
get_viewset_permissions
...
...
backend/models/
location
/cityTaggedItem.py
→
backend/models/
city
/cityTaggedItem.py
View file @
42992788
from
django.db
import
models
from
django.db
import
models
from
backend.models.tag
import
TaggedItem
,
TaggedItemSerializer
,
TaggedItemViewSet
from
backend.models.tag
import
TaggedItem
,
TaggedItemSerializer
,
TaggedItemViewSet
from
backend.models.
location
import
City
from
backend.models.
city
import
City
from
backend.utils
import
get_model_config
,
get_viewset_permissions
from
backend.utils
import
get_model_config
,
get_viewset_permissions
...
...
backend/models/
location
/__init__.py
→
backend/models/
country
/__init__.py
View file @
42992788
from
.currency
import
Currency
,
CurrencyViewSet
,
CurrencySerializer
# noqa: F401
from
.country
import
Country
,
CountrySerializer
,
CountryViewSet
# noqa: F401
from
.country
import
Country
,
CountrySerializer
,
CountryViewSet
# noqa: F401
from
.countryScholarship
import
CountryScholarship
,
CountryScholarshipViewSet
# noqa: F401
from
.countryScholarship
import
CountryScholarship
,
CountryScholarshipViewSet
# noqa: F401
from
.countryDri
import
CountryDri
,
CountryDriViewSet
# noqa: F401
from
.countryDri
import
CountryDri
,
CountryDriViewSet
# noqa: F401
from
.countryTaggedItem
import
CountryTaggedItem
,
CountryTaggedItemSerializer
,
CountryTaggedItemViewSet
# noqa: F401
from
.countryTaggedItem
import
CountryTaggedItem
,
CountryTaggedItemSerializer
,
CountryTaggedItemViewSet
# noqa: F401
from
.city
import
City
,
CitySerializer
,
CityViewSet
# noqa: F401
from
.cityTaggedItem
import
CityTaggedItem
,
CityTaggedItemSerializer
,
CityTaggedItemViewSet
# noqa: F401
backend/models/
location
/country.py
→
backend/models/
country
/country.py
View file @
42992788
File moved
backend/models/
location
/countryDri.py
→
backend/models/
country
/countryDri.py
View file @
42992788
from
django.db
import
models
from
django.db
import
models
from
backend.models.
location
import
Country
from
backend.models.
country
import
Country
from
backend.models.module
import
DriRestrictedModule
,
DriRestricted
ModuleSerializer
,
DriRestricted
ModuleViewSet
from
backend.models.
basic_
module
import
BasicModule
,
Basic
ModuleSerializer
,
Basic
ModuleViewSet
from
backend.utils
import
get_model_config
,
get_viewset_permissions
from
backend.utils
import
get_model_config
,
get_viewset_permissions
class
CountryDri
(
DriRestricted
Module
):
class
CountryDri
(
Basic
Module
):
model_config
=
get_model_config
(
"CountryDri"
)
model_config
=
get_model_config
(
"CountryDri"
)
country
=
models
.
ManyToManyField
(
country
=
models
.
ManyToManyField
(
Country
,
related_name
=
"country_dri"
)
Country
,
related_name
=
"country_dri"
)
...
@@ -14,14 +14,14 @@ class CountryDri(DriRestrictedModule):
...
@@ -14,14 +14,14 @@ class CountryDri(DriRestrictedModule):
return
CountryDriSerializer
return
CountryDriSerializer
class
CountryDriSerializer
(
DriRestricted
ModuleSerializer
):
class
CountryDriSerializer
(
Basic
ModuleSerializer
):
class
Meta
:
class
Meta
:
model
=
CountryDri
model
=
CountryDri
fields
=
'__all__'
fields
=
'__all__'
class
CountryDriViewSet
(
DriRestricted
ModuleViewSet
):
class
CountryDriViewSet
(
Basic
ModuleViewSet
):
permission_classes
=
get_viewset_permissions
(
"CountryDriViewSet"
)
permission_classes
=
get_viewset_permissions
(
"CountryDriViewSet"
)
queryset
=
CountryDri
.
objects
.
all
()
# pylint: disable=E1101
queryset
=
CountryDri
.
objects
.
all
()
# pylint: disable=E1101
serializer_class
=
CountryDriSerializer
serializer_class
=
CountryDriSerializer
backend/models/
location
/countryScholarship.py
→
backend/models/
country
/countryScholarship.py
View file @
42992788
from
django.db
import
models
from
django.db
import
models
from
backend.models.
location
import
Country
from
backend.models.
country
import
Country
from
backend.models.
module
import
Scholarship
,
ScholarshipSerializer
,
ScholarshipViewSet
from
backend.models.
scholarship
import
Scholarship
,
ScholarshipSerializer
,
ScholarshipViewSet
from
backend.utils
import
get_model_config
,
get_viewset_permissions
from
backend.utils
import
get_model_config
,
get_viewset_permissions
...
...
backend/models/
location
/countryTaggedItem.py
→
backend/models/
country
/countryTaggedItem.py
View file @
42992788
from
django.db
import
models
from
django.db
import
models
from
backend.models.tag
import
TaggedItem
,
TaggedItemSerializer
,
TaggedItemViewSet
from
backend.models.tag
import
TaggedItem
,
TaggedItemSerializer
,
TaggedItemViewSet
from
backend.models.
location
import
Country
from
backend.models.
country
import
Country
from
backend.utils
import
get_model_config
,
get_viewset_permissions
from
backend.utils
import
get_model_config
,
get_viewset_permissions
...
...
backend/models/currency/__init__.py
0 → 100644
View file @
42992788
from
.currency
import
Currency
,
CurrencyViewSet
,
CurrencySerializer
# noqa: F401
backend/models/
location
/currency.py
→
backend/models/
currency
/currency.py
View file @
42992788
File moved
backend/models/module/__init__.py
deleted
100644 → 0
View file @
c776e24f
from
.basicModule
import
BasicModule
,
BasicModuleSerializer
,
BasicModuleViewSet
# noqa: F401
from
.scholarship
import
Scholarship
,
ScholarshipSerializer
,
ScholarshipViewSet
# noqa: F401
from
.driRestrictedModule
import
DriRestrictedModule
,
DriRestrictedModuleSerializer
,
DriRestrictedModuleViewSet
# noqa: F401
Prev
1
2
3
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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