sysadminix/tripwithbonus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.2.13

Browse Source 
chat v2
fix parse cities
This commit is contained in:
SDE
2023-08-11 13:04:54 +03:00
parent 41d8cb50dc
commit 85db13c885
1 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
ReferenceDataApp/funcs.py
View File

@@ -178,8 +178,6 @@ def parse_data():
kwargs = {}
if city_Dict['name:en']:
kwargs.update({'name_en': city_Dict['name:en']})
if city_Dict['name:ru']:
kwargs.update({'name_ru': city_Dict['name:ru']})
if country:
kwargs.update({'country': country})
@@ -189,27 +187,36 @@ def parse_data():
except City.DoesNotExist:
print(f' - {city_Dict["name:en"]} не найдена в БД > добавляем')
except Exception as e:
print(f'error = {str(e)}')
cities = City.objects.filter(**kwargs)
if cities:
city = cities[0]
cities.exclude(id=city.id).delete()
else:
print(f'error = {str(e)}')
# собираем данные
city_kwargs = {
'country': country,
# 'name_ru': city_Dict['name:ru'],
# 'name_en': city_Dict['name:en'],
'geo_lat': str(city_Dict['@lat']),
'geo_lon': str(city_Dict['@lon']),
}
if city_Dict['name:ru']:
kwargs.update({'name_ru': city_Dict['name:ru']})
city_kwargs.update(kwargs)
if 'area_id' in city_Dict:
city_kwargs.update({'area_id': city_Dict['area_id']})
if not city:
city_kwargs = {
'country': country,
# 'name_ru': city_Dict['name:ru'],
# 'name_en': city_Dict['name:en'],
'geo_lat': str(city_Dict['@lat']),
'geo_lon': str(city_Dict['@lon']),
}
city_kwargs.update(kwargs)
if 'area_id' in city_Dict:
city_kwargs.update({'area_id': city_Dict['area_id']})
city = City.objects.create(**city_kwargs)
else:
City.objects.filter(id=city.id).update(**city_kwargs)
if 'airports' in city_Dict: