From da4176a2979ae68f74ad557d11875104322f150e Mon Sep 17 00:00:00 2001 From: Ernesto Ruge Date: Tue, 21 Jan 2025 08:01:02 +0100 Subject: [PATCH] None database fields --- CHANGELOG.md | 9 +++++++++ .../import_service/generic/generic_import_service.py | 10 ++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dadcfd9..4aa7747 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## 0.17.1 + +Released 2025-01-21 + +### Fixes + +* Fix issue with database fields which can be None + + ## 0.17.0 Released 2025-01-21 diff --git a/webapp/services/import_service/generic/generic_import_service.py b/webapp/services/import_service/generic/generic_import_service.py index 4741480..d354ef0 100644 --- a/webapp/services/import_service/generic/generic_import_service.py +++ b/webapp/services/import_service/generic/generic_import_service.py @@ -301,18 +301,20 @@ def _save_realtime_parking_site_input(self, source: Source, realtime_parking_sit realtime_free_capacity = getattr(realtime_parking_site_input, f'realtime_free_{capacity_field}') realtime_capacity = getattr(realtime_parking_site_input, f'realtime_{capacity_field}') parking_site_capacity = getattr(parking_site, capacity_field) + if parking_site_capacity is None: + continue - if realtime_capacity == UnsetValue and realtime_free_capacity > parking_site_capacity: + if realtime_capacity is UnsetValue and realtime_free_capacity > parking_site_capacity: setattr(realtime_parking_site_input, realtime_free_capacity, parking_site_capacity) - self.logger.warn( + self.logger.warning( LogMessageType.FAILED_PARKING_SITE_HANDLING, f'At {parking_site.original_uid} from {source.id}, ' f'realtime_free_{capacity_field} {realtime_free_capacity} ' f'was higher than {capacity_field} {parking_site_capacity}', ) - elif realtime_capacity != UnsetValue and realtime_free_capacity > realtime_capacity: + elif realtime_capacity is not UnsetValue and realtime_free_capacity > realtime_capacity: setattr(realtime_parking_site_input, realtime_free_capacity, realtime_capacity) - self.logger.warn( + self.logger.warning( LogMessageType.FAILED_PARKING_SITE_HANDLING, f'At {parking_site.original_uid} from {source.id}, ' f'realtime_free_{capacity_field} {realtime_free_capacity} '