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

Fix location address transfer

Browse Source
This commit is contained in:
littlewolf 2019-12-16 15:37:29 +03:00
parent f542403b96
commit 4c27ad5d5a
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/location/transfer_data.py
View File

@ -125,19 +125,14 @@ def transfer_cities():
pprint(f"City serializer errors: {serialized_data.errors}") pprint(f"City serializer errors: {serialized_data.errors}")
@atomic
def transfer_addresses(): def transfer_addresses():
queryset = transfer_models.Locations.objects.raw("""SELECT locations.id, locations.zip_code, locations.longitude, queryset = transfer_models.Locations.objects.raw("""SELECT locations.id, locations.zip_code, locations.longitude,
locations.latitude, locations.address, locations.city_id locations.latitude, locations.address, locations.city_id
FROM locations WHERE FROM locations WHERE
locations.address != "" AND locations.address != "" AND
locations.address IS NOT NULL AND locations.address IS NOT NULL AND
locations.city_id IS NOT NULL AND locations.city_id IS NOT NULL""")
locations.city_id IN (SELECT cities.id
FROM cities WHERE
region_code IS NOT NULL AND
region_code != "" AND
country_code_2 IS NOT NULL AND
country_code_2 != "")""")
queryset = [vars(query) for query in queryset] queryset = [vars(query) for query in queryset]

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

@ -225,7 +225,7 @@ class AddressSerializer(serializers.ModelSerializer):
def set_city(self, data): def set_city(self, data):
try: try:
city = models.City.objects.filter(old_id=data['city_id']).first() city = models.City.objects.filter(mysql_id=data['city_id']).first()
except models.City.DoesNotExist as e: except models.City.DoesNotExist as e:
raise ValueError(f"City not found with {data}: {e}") raise ValueError(f"City not found with {data}: {e}")