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
6d7d3f44
Commit
6d7d3f44
authored
Mar 10, 2019
by
Florent Chehab
Browse files
Migrated from standard Django model to a custom one for optmization concerns
parent
e8f37050
Changes
28
Expand all
Hide whitespace changes
Inline
Side-by-side
backend/backend_app/load_data/loading_scripts/loadAdminUser.py
View file @
6d7d3f44
from
django.contrib.auth
.models
import
User
from
base_app
.models
import
User
import
os
...
...
backend/backend_app/load_data/loading_scripts/loadCountries.py
View file @
6d7d3f44
import
os
from
django.contrib.auth
.models
import
User
from
base_app
.models
import
User
import
pandas
as
pd
from
backend_app.models.country
import
Country
...
...
backend/backend_app/load_data/loading_scripts/loadCurrencies.py
View file @
6d7d3f44
...
...
@@ -2,7 +2,7 @@ import csv
import
os
from
decimal
import
Decimal
from
django.contrib.auth
.models
import
User
from
base_app
.models
import
User
from
backend_app.models.currency
import
Currency
...
...
backend/backend_app/load_data/loading_scripts/loadGeneric.py
View file @
6d7d3f44
from
django.contrib.auth
.models
import
User
from
base_app
.models
import
User
from
django.utils
import
timezone
import
reversion
...
...
backend/backend_app/load_data/loading_scripts/loadTags.py
View file @
6d7d3f44
import
json
import
os
from
django.contrib.auth
.models
import
User
from
base_app
.models
import
User
from
backend_app.models.tag
import
Tag
...
...
backend/backend_app/load_data/loading_scripts/loadUniversities.py
View file @
6d7d3f44
import
os
from
django.contrib.auth
.models
import
User
from
base_app
.models
import
User
import
pandas
as
pd
from
backend_app.models.campus
import
Campus
...
...
backend/backend_app/load_data/loading_scripts/loadUniversityEx.py
View file @
6d7d3f44
from
datetime
import
datetime
from
django.contrib.auth
.models
import
User
from
base_app
.models
import
User
from
backend_app.models.country
import
Country
,
CountryScholarship
from
backend_app.models.currency
import
Currency
...
...
backend/backend_app/migrations/0001_initial.py
View file @
6d7d3f44
This diff is collapsed.
Click to expand it.
backend/backend_app/migrations/0002_auto_20180916_1555.py
deleted
100644 → 0
View file @
e8f37050
# Generated by Django 2.0.3 on 2018-09-16 13:55
import
backend_app.models.university.university
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[(
"backend_app"
,
"0001_initial"
)]
operations
=
[
migrations
.
AlterField
(
model_name
=
"campus"
,
name
=
"comment"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
5000
),
),
migrations
.
AlterField
(
model_name
=
"campus"
,
name
=
"name"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
200
),
),
migrations
.
AlterField
(
model_name
=
"campus"
,
name
=
"title"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
150
),
),
migrations
.
AlterField
(
model_name
=
"campustaggeditem"
,
name
=
"comment"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
5000
),
),
migrations
.
AlterField
(
model_name
=
"campustaggeditem"
,
name
=
"title"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
150
),
),
migrations
.
AlterField
(
model_name
=
"city"
,
name
=
"area"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
200
),
),
migrations
.
AlterField
(
model_name
=
"city"
,
name
=
"local_name"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
200
),
),
migrations
.
AlterField
(
model_name
=
"citytaggeditem"
,
name
=
"comment"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
5000
),
),
migrations
.
AlterField
(
model_name
=
"citytaggeditem"
,
name
=
"title"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
150
),
),
migrations
.
AlterField
(
model_name
=
"country"
,
name
=
"intermediate_region_name"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
200
),
),
migrations
.
AlterField
(
model_name
=
"country"
,
name
=
"intermediate_region_un_code"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
3
),
),
migrations
.
AlterField
(
model_name
=
"country"
,
name
=
"iso_alpha3_code"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
3
,
unique
=
True
),
),
migrations
.
AlterField
(
model_name
=
"country"
,
name
=
"sub_region_name"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
200
),
),
migrations
.
AlterField
(
model_name
=
"country"
,
name
=
"sub_region_un_code"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
3
),
),
migrations
.
AlterField
(
model_name
=
"countrydri"
,
name
=
"comment"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
5000
),
),
migrations
.
AlterField
(
model_name
=
"countrydri"
,
name
=
"title"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
150
),
),
migrations
.
AlterField
(
model_name
=
"countryscholarship"
,
name
=
"comment"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
5000
),
),
migrations
.
AlterField
(
model_name
=
"countryscholarship"
,
name
=
"other_advantages"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
5000
),
),
migrations
.
AlterField
(
model_name
=
"countryscholarship"
,
name
=
"title"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
150
),
),
migrations
.
AlterField
(
model_name
=
"countrytaggeditem"
,
name
=
"comment"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
5000
),
),
migrations
.
AlterField
(
model_name
=
"countrytaggeditem"
,
name
=
"title"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
150
),
),
migrations
.
AlterField
(
model_name
=
"currency"
,
name
=
"symbol"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
30
),
),
migrations
.
AlterField
(
model_name
=
"previousdeparturefeedback"
,
name
=
"adequation_comment"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
5000
),
),
migrations
.
AlterField
(
model_name
=
"previousdeparturefeedback"
,
name
=
"integration_comment"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
5000
),
),
migrations
.
AlterField
(
model_name
=
"recommendation"
,
name
=
"comment"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
5000
),
),
migrations
.
AlterField
(
model_name
=
"university"
,
name
=
"acronym"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
20
),
),
migrations
.
AlterField
(
model_name
=
"university"
,
name
=
"logo"
,
field
=
models
.
URLField
(
blank
=
True
,
default
=
""
,
validators
=
[
backend_app
.
models
.
university
.
university
.
validate_extension_django
],
),
),
migrations
.
AlterField
(
model_name
=
"university"
,
name
=
"website"
,
field
=
models
.
URLField
(
blank
=
True
,
default
=
""
,
max_length
=
300
),
),
migrations
.
AlterField
(
model_name
=
"universitydri"
,
name
=
"comment"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
5000
),
),
migrations
.
AlterField
(
model_name
=
"universitydri"
,
name
=
"title"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
150
),
),
migrations
.
AlterField
(
model_name
=
"universityinfo"
,
name
=
"comment"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
5000
),
),
migrations
.
AlterField
(
model_name
=
"universityinfo"
,
name
=
"title"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
150
),
),
migrations
.
AlterField
(
model_name
=
"universityscholarship"
,
name
=
"comment"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
5000
),
),
migrations
.
AlterField
(
model_name
=
"universityscholarship"
,
name
=
"other_advantages"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
5000
),
),
migrations
.
AlterField
(
model_name
=
"universityscholarship"
,
name
=
"title"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
150
),
),
migrations
.
AlterField
(
model_name
=
"universitysemestersdates"
,
name
=
"comment"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
5000
),
),
migrations
.
AlterField
(
model_name
=
"universitysemestersdates"
,
name
=
"title"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
150
),
),
migrations
.
AlterField
(
model_name
=
"universitytaggeditem"
,
name
=
"comment"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
5000
),
),
migrations
.
AlterField
(
model_name
=
"universitytaggeditem"
,
name
=
"title"
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
""
,
max_length
=
150
),
),
]
backend/backend_app/migrations/0003_auto_20180916_1624.py
deleted
100644 → 0
View file @
e8f37050
# Generated by Django 2.0.3 on 2018-09-16 14:24
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[(
"backend_app"
,
"0002_auto_20180916_1555"
)]
operations
=
[
migrations
.
AlterField
(
model_name
=
"countryscholarship"
,
name
=
"frequency"
,
field
=
models
.
CharField
(
blank
=
True
,
choices
=
[
(
"w"
,
"week"
),
(
"m"
,
"month"
),
(
"s"
,
"semester"
),
(
"y"
,
"year"
),
(
"o"
,
"one_shot"
),
],
default
=
"m"
,
max_length
=
1
,
null
=
True
,
),
),
migrations
.
AlterField
(
model_name
=
"universityscholarship"
,
name
=
"frequency"
,
field
=
models
.
CharField
(
blank
=
True
,
choices
=
[
(
"w"
,
"week"
),
(
"m"
,
"month"
),
(
"s"
,
"semester"
),
(
"y"
,
"year"
),
(
"o"
,
"one_shot"
),
],
default
=
"m"
,
max_length
=
1
,
null
=
True
,
),
),
]
backend/backend_app/migrations/0004_auto_20190310_1151.py
deleted
100644 → 0
View file @
e8f37050
# Generated by Django 2.1.7 on 2019-03-10 10:51
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[(
"backend_app"
,
"0003_auto_20180916_1624"
)]
operations
=
[
migrations
.
RemoveField
(
model_name
=
"semester"
,
name
=
"moderated_by"
),
migrations
.
RemoveField
(
model_name
=
"semester"
,
name
=
"updated_by"
),
migrations
.
RemoveField
(
model_name
=
"userdata"
,
name
=
"black_list"
),
migrations
.
AddField
(
model_name
=
"offer"
,
name
=
"year"
,
field
=
models
.
PositiveIntegerField
(
default
=
2018
),
),
migrations
.
AddField
(
model_name
=
"previousdeparture"
,
name
=
"year"
,
field
=
models
.
PositiveIntegerField
(
default
=
2018
),
),
migrations
.
AlterField
(
model_name
=
"offer"
,
name
=
"semester"
,
field
=
models
.
CharField
(
choices
=
[(
"a"
,
"autumn"
),
(
"p"
,
"spring"
)],
default
=
"a"
,
max_length
=
2
),
),
migrations
.
AlterField
(
model_name
=
"previousdeparture"
,
name
=
"semester"
,
field
=
models
.
CharField
(
choices
=
[(
"a"
,
"autumn"
),
(
"p"
,
"spring"
)],
default
=
"a"
,
max_length
=
2
),
),
migrations
.
AlterUniqueTogether
(
name
=
"offer"
,
unique_together
=
set
()),
migrations
.
DeleteModel
(
name
=
"Semester"
),
]
backend/backend_app/models/abstract/my_model/myModel.py
View file @
6d7d3f44
from
django.contrib.auth
.models
import
User
from
base_app
.models
import
User
from
django.contrib.contenttypes.fields
import
GenericRelation
from
django.core.exceptions
import
ValidationError
from
django.core.validators
import
MinValueValidator
...
...
backend/backend_app/models/abstract/my_model/pendingModeration.py
View file @
6d7d3f44
from
django.contrib.auth
.models
import
User
from
base_app
.models
import
User
from
django.contrib.contenttypes.fields
import
GenericForeignKey
from
django.contrib.contenttypes.models
import
ContentType
from
django.db
import
models
...
...
backend/backend_app/models/user/previousDeparture.py
View file @
6d7d3f44
from
django.db
import
models
from
backend_app.models.other_core.specialty
import
Specialty
from
backend_app.models.university
import
University
from
django.contrib.auth
.models
import
User
from
base_app
.models
import
User
from
backend_app.fields
import
JSONField
from
backend_app.models.abstract.my_model
import
(
MyModel
,
...
...
backend/backend_app/models/user/userData.py
View file @
6d7d3f44
from
django.contrib.auth
.models
import
User
from
base_app
.models
import
User
from
django.db
import
models
from
backend_app.fields
import
JSONField
from
backend_app.models.abstract.my_model
import
(
...
...
backend/backend_app/models/user/userRestrictedModule.py
View file @
6d7d3f44
from
django.db
import
models
from
rest_framework
import
serializers
from
django.contrib.auth
.models
import
User
from
base_app
.models
import
User
from
backend_app.models.abstract.my_model
import
(
MyModel
,
MyModelSerializer
,
...
...
backend/backend_app/permissions/__list_user_post_permission.py
View file @
6d7d3f44
from
typing
import
List
from
django.contrib.auth
.models
import
User
from
base_app
.models
import
User
from
shared
import
get_api_objs
...
...
backend/backend_app/signals/__create_user_modules_post_create.py
View file @
6d7d3f44
from
django.db.models.signals
import
post_save
from
django.contrib.auth
.models
import
User
from
base_app
.models
import
User
from
backend_app.models.user
import
UserData
...
...
backend/backend_app/tests/test_signals_post_create.py
View file @
6d7d3f44
from
django.test
import
TestCase
from
django.contrib.auth
.models
import
User
from
base_app
.models
import
User
from
backend_app.models.user
import
UserData
from
backend_app.models.university
import
University
...
...
backend/backend_app/tests/withUserTestCase.py
View file @
6d7d3f44
from
rest_framework.test
import
APIClient
from
django.contrib.auth
.models
import
User
from
base_app
.models
import
User
from
django.contrib.auth.models
import
Group
from
django.test
import
TestCase
...
...
Prev
1
2
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