phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'origin/feature/migrate-etablishment' into develop

Browse Source
This commit is contained in:
littlewolf 2019-10-31 08:50:59 +03:00
commit d1f1337640
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/establishment/transfer_data.py
View File

@ -117,7 +117,9 @@ def transfer_establishment_addresses():
try: try:
location = Address.objects.get(old_id=old_establishment.location_id) location = Address.objects.get(old_id=old_establishment.location_id)
except Establishment.DoesNotExist: except Address.MultipleObjectsReturned:
location = Address.objects.filter(old_id=old_establishment.location_id).first()
except Address.DoesNotExist:
continue continue
establishment.address = location establishment.address = location

2
apps/transfer/serializers/establishment.py
View File

@ -7,6 +7,7 @@ from location.models import Address
from timetable.models import Timetable from timetable.models import Timetable
from utils.legacy_parser import parse_legacy_schedule_content from utils.legacy_parser import parse_legacy_schedule_content
from utils.slug_generator import generate_unique_slug from utils.slug_generator import generate_unique_slug
from pytz import timezone as ptz
class EstablishmentSerializer(serializers.ModelSerializer): class EstablishmentSerializer(serializers.ModelSerializer):
@ -58,6 +59,7 @@ class EstablishmentSerializer(serializers.ModelSerializer):
'establishment_type_id': self.get_type(data), 'establishment_type_id': self.get_type(data),
'is_publish': data.get('state') == 'published', 'is_publish': data.get('state') == 'published',
}) })
data['tz'] = ptz(data['tz'])
data.pop('location') data.pop('location')
data.pop('type') data.pop('type')
data.pop('state') data.pop('state')

BIN
celerybeat-schedule
View File

Binary file not shown.

4
project/settings/base.py
View File

@ -159,9 +159,9 @@ DATABASES = {
}, },
'legacy': { 'legacy': {
'ENGINE': 'django.db.backends.mysql', 'ENGINE': 'django.db.backends.mysql',
# 'HOST': '172.17.0.1', 'HOST': '172.17.0.1',
# 'HOST': '172.23.0.1', # 'HOST': '172.23.0.1',
'HOST': 'mysql_db', # 'HOST': 'mysql_db',
'PORT': 3306, 'PORT': 3306,
'NAME': 'dev', 'NAME': 'dev',
'USER': 'dev', 'USER': 'dev',