diff --git a/apps/establishment/transfer_data.py b/apps/establishment/transfer_data.py index 6e345e27..8366ed94 100644 --- a/apps/establishment/transfer_data.py +++ b/apps/establishment/transfer_data.py @@ -117,7 +117,9 @@ def transfer_establishment_addresses(): try: 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 establishment.address = location diff --git a/apps/transfer/serializers/establishment.py b/apps/transfer/serializers/establishment.py index c9979430..7c8ce97c 100644 --- a/apps/transfer/serializers/establishment.py +++ b/apps/transfer/serializers/establishment.py @@ -7,6 +7,7 @@ from location.models import Address from timetable.models import Timetable from utils.legacy_parser import parse_legacy_schedule_content from utils.slug_generator import generate_unique_slug +from pytz import timezone as ptz class EstablishmentSerializer(serializers.ModelSerializer): @@ -58,6 +59,7 @@ class EstablishmentSerializer(serializers.ModelSerializer): 'establishment_type_id': self.get_type(data), 'is_publish': data.get('state') == 'published', }) + data['tz'] = ptz(data['tz']) data.pop('location') data.pop('type') data.pop('state') diff --git a/celerybeat-schedule b/celerybeat-schedule index e1a56a15..42475a62 100644 Binary files a/celerybeat-schedule and b/celerybeat-schedule differ diff --git a/project/settings/base.py b/project/settings/base.py index 5b096020..d2cf7b49 100644 --- a/project/settings/base.py +++ b/project/settings/base.py @@ -159,9 +159,9 @@ DATABASES = { }, 'legacy': { 'ENGINE': 'django.db.backends.mysql', - # 'HOST': '172.17.0.1', + 'HOST': '172.17.0.1', # 'HOST': '172.23.0.1', - 'HOST': 'mysql_db', + # 'HOST': 'mysql_db', 'PORT': 3306, 'NAME': 'dev', 'USER': 'dev',