From f259319ade299874b786c81538325e3c23a9f097 Mon Sep 17 00:00:00 2001 From: littlewolf Date: Thu, 31 Oct 2019 08:42:52 +0300 Subject: [PATCH] Fix exception --- apps/establishment/transfer_data.py | 2 +- apps/transfer/serializers/establishment.py | 2 ++ celerybeat-schedule | Bin 12845 -> 16384 bytes project/settings/base.py | 4 ++-- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/establishment/transfer_data.py b/apps/establishment/transfer_data.py index 6e345e27..2b45c388 100644 --- a/apps/establishment/transfer_data.py +++ b/apps/establishment/transfer_data.py @@ -117,7 +117,7 @@ def transfer_establishment_addresses(): try: location = Address.objects.get(old_id=old_establishment.location_id) - except Establishment.DoesNotExist: + 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 e1a56a152b845b38540fb26180e00295cb3cb2b1..42475a623430ec365e9741260cf2c026a509b8e1 100644 GIT binary patch delta 481 zcmZ3R($K&-L5G!@0SG2DDu_$*f>1MI)8JL!a80)m^eF7TAXpSoSp=;Q)*sGQD$m!19NR5Lxdqv zBDJ_AF)1grI3pJ*rB{+zoL#I}l$unUnUfNaA{U>Tmy(&BT0Gg$P+@Yjfh-4?Jd3#u z=h-)tR~T5-ds{~^0!`B@AAurGu XAg}P(77COU3I-Jl73*y@+{yz0WLSbc delta 243 zcmZo@U|gFrL1$x0FaN{_kIjq%|M?kNCmM=RmQYZT`py6WW`+>@GB1SIHJVr`wK+#& z2`?Xm0Yr!$NU