From 630664d338c9bb070d2ecd509e51bae6201e805e Mon Sep 17 00:00:00 2001 From: miguelpadin Date: Wed, 2 Nov 2022 19:51:07 +0100 Subject: [PATCH] [FIX] pms-api-rest: fix precommit --- pms_api_rest/datamodels/pms_calendar.py | 1 + pms_api_rest/services/pms_calendar_service.py | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pms_api_rest/datamodels/pms_calendar.py b/pms_api_rest/datamodels/pms_calendar.py index cb3575313..9e54796ae 100644 --- a/pms_api_rest/datamodels/pms_calendar.py +++ b/pms_api_rest/datamodels/pms_calendar.py @@ -71,6 +71,7 @@ class PmsCalendarInfo(Datamodel): priceDayTotal = fields.Number(required=False, allow_none=True) priceDayTotalServices = fields.Number(required=False, allow_none=True) + class PmsCalendarAlertsPerDay(Datamodel): _name = "pms.calendar.alerts.per.day" date = fields.String(required=True, allow_none=False) diff --git a/pms_api_rest/services/pms_calendar_service.py b/pms_api_rest/services/pms_calendar_service.py index 3222318b8..f4476dd48 100644 --- a/pms_api_rest/services/pms_calendar_service.py +++ b/pms_api_rest/services/pms_calendar_service.py @@ -30,12 +30,14 @@ class PmsCalendarService(Component): count_nights = (date_to - date_from).days + 1 target_dates = [date_from + timedelta(days=x) for x in range(count_nights)] pms_property_id = calendar_search_param.pmsPropertyId - subselect_sum_services_price = "(" \ - " SELECT COALESCE(SUM(s.price_day_total),0) price_day_total_services " \ - " FROM pms_service_line s " \ - " WHERE s.reservation_id = night.reservation_id " \ - " AND s.date = night.date AND NOT s.is_board_service " \ - " ) " + subselect_sum_services_price = ( + "(" + " SELECT COALESCE(SUM(s.price_day_total),0) price_day_total_services " + " FROM pms_service_line s " + " WHERE s.reservation_id = night.reservation_id " + " AND s.date = night.date AND NOT s.is_board_service " + " ) " + ) selected_fields_mapper = { "id": "night.id", "state": "night.state", @@ -56,7 +58,7 @@ class PmsCalendarService(Component): "folio_pending_amount": "folio.pending_amount", "adults": "reservation.adults", "price_day_total": "night.price_day_total", - "price_day_total_services": subselect_sum_services_price + "price_day_total_services": subselect_sum_services_price, } selected_fields_sql = list(selected_fields_mapper.values()) selected_fields = list(selected_fields_mapper.keys())