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

fix city transfer

Browse Source
This commit is contained in:
Anatoly 2020-02-03 11:03:15 +03:00
parent 2dc1674f81
commit 227b3746ca
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -29,3 +29,4 @@ celerybeat.pid
/docker-compose.dump.yml /docker-compose.dump.yml
/gm_production_20191029.sql /gm_production_20191029.sql
/apps/transfer/log /apps/transfer/log
/gm_production_*.sql

2
apps/location/ruby_data.py
View File

File diff suppressed because one or more lines are too long

9
apps/location/transfer_data.py
View File

@ -275,8 +275,7 @@ def get_ruby_data():
city_name = mysql_city.name.strip() city_name = mysql_city.name.strip()
ruby_data[mysql_city.id] = { ruby_data[mysql_city.id] = {
"mysql_id": mysql_city.id, "mysql_id": mysql_city.id,
"name": city_name.strip(), "name": {'en-GB': city_name.strip()},
"name_translated": {'en-GB': city_name.strip()},
"map1": mysql_city.map1, "map1": mysql_city.map1,
"map2": mysql_city.map2, "map2": mysql_city.map2,
@ -334,17 +333,17 @@ def get_unused_data():
def add_correct_location_models(ruby_data): def add_correct_location_models(ruby_data):
for mysql_id, city_object in tqdm(ruby_data.items()): for mysql_id, city_object in tqdm(ruby_data.items()):
country_data = city_object["country"] country_data = city_object["country"]
try:
country_code = country_data['code'] # i.e. fr country_code = country_data['code'] # i.e. fr
try:
country = Country.objects.get( country = Country.objects.get(
code=country_code, code=country_code,
mysql_ids__isnull=False, mysql_ids__isnull=False,
calling_code=settings.COUNTRY_CALLING_CODES.get(country_code)
) )
country.mysql_ids.append(mysql_id) country.mysql_ids.append(mysql_id)
country.save() country.save()
except Country.DoesNotExist: except Country.DoesNotExist:
country_data['mysql_ids'] = [mysql_id] country_data['mysql_ids'] = [mysql_id]
country_data['calling_code'] = settings.COUNTRY_CALLING_CODES.get(country_code)
country = Country.objects.create(**country_data) country = Country.objects.create(**country_data)
city_object['country'] = country city_object['country'] = country
@ -691,7 +690,7 @@ def add_fake_country():
city_data['region'] = region city_data['region'] = region
city_data['name_translated'] = '{"en-GB": "' + city_data['name'] + '"}' city_data['name'] = '{"en-GB": "' + city_data['name'] + '"}'
city_data['is_island'] = True if int(city_data['is_island']) > 0 else False city_data['is_island'] = True if int(city_data['is_island']) > 0 else False