From eaab071a1e4541cc1158a6668f5e10866f84a26e Mon Sep 17 00:00:00 2001 From: SDE Date: Mon, 7 Aug 2023 23:45:10 +0300 Subject: [PATCH] 0.1.42 not parse airports wo city --- BaseModels/OpenStreetMap/osm_api.py | 4 ++-- ReferenceDataApp/funcs.py | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/BaseModels/OpenStreetMap/osm_api.py b/BaseModels/OpenStreetMap/osm_api.py index a7c9a63..67f47a8 100644 --- a/BaseModels/OpenStreetMap/osm_api.py +++ b/BaseModels/OpenStreetMap/osm_api.py @@ -266,8 +266,8 @@ def osm_get_country_w_cities_n_airports(country_Dict, area_id): country_Dict['parsing_status'] = 'finished' airports_wo_city = [] - if airports_Dict and None in airports_Dict: - airports_wo_city = airports_Dict[None] + # if airports_Dict and None in airports_Dict: + # airports_wo_city = airports_Dict[None] return country_Dict, airports_wo_city diff --git a/ReferenceDataApp/funcs.py b/ReferenceDataApp/funcs.py index a5ed13e..49e8c0e 100644 --- a/ReferenceDataApp/funcs.py +++ b/ReferenceDataApp/funcs.py @@ -57,6 +57,8 @@ def create_airports_by_airportsList(airportsList, city=None): if airport_Dict['iata']: kwargs.update({'iata_code': airport_Dict['iata']}) airport = Airport.objects.get(**kwargs) + except Airport.DoesNotExist: + print(f'{airport_Dict["int_name"]} не найден в БД > добавляем') except Exception as e: print(f'error = {str(e)}') @@ -122,7 +124,7 @@ def parse_data(): continue except Country.DoesNotExist: - pass + print(f'{country_item["ISO3166-1"]} не найдена в БД > добавляем') except Exception as e: print(f'error = {str(e)}') @@ -181,6 +183,8 @@ def parse_data(): try: city = City.objects.get(**kwargs) + except City.DoesNotExist: + print(f'{city_Dict["name:en"]} не найдена в БД > добавляем') except Exception as e: print(f'error = {str(e)}')