From a2117185633c83f2417c1996af3d07e8ddd5e72c Mon Sep 17 00:00:00 2001 From: Sara Lago Date: Mon, 19 Jun 2023 11:36:05 +0200 Subject: [PATCH] [IMP][DEMO] pms_api_rest: add fields in reservation datamodel and rmv filtered in get_checkin_partners --- pms_api_rest/datamodels/pms_reservation.py | 1 + pms_api_rest/services/pms_reservation_service.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pms_api_rest/datamodels/pms_reservation.py b/pms_api_rest/datamodels/pms_reservation.py index ae116abc8..98a14b71e 100644 --- a/pms_api_rest/datamodels/pms_reservation.py +++ b/pms_api_rest/datamodels/pms_reservation.py @@ -62,6 +62,7 @@ class PmsReservationInfo(Datamodel): stateDescription = fields.String(required=False, allow_none=True) children = fields.Integer(required=False, allow_none=True) readyForCheckin = fields.Boolean(required=False, allow_none=True) + checkinPartnerCount = fields.Integer(required=False, allow_none=True) allowedCheckout = fields.Boolean(required=False, allow_none=True) isSplitted = fields.Boolean(required=False, allow_none=True) pendingCheckinData = fields.Integer(required=False, allow_none=True) diff --git a/pms_api_rest/services/pms_reservation_service.py b/pms_api_rest/services/pms_reservation_service.py index 575619ab7..cd7468545 100644 --- a/pms_api_rest/services/pms_reservation_service.py +++ b/pms_api_rest/services/pms_reservation_service.py @@ -98,6 +98,7 @@ class PmsReservationService(Component): )[reservation.state], children=reservation.children if reservation.children else 0, readyForCheckin=reservation.ready_for_checkin, + checkinPartnerCount=reservation.checkin_partner_count, allowedCheckout=reservation.allowed_checkout, isSplitted=reservation.splitted, pendingCheckinData=reservation.pending_checkin_data, @@ -537,9 +538,10 @@ class PmsReservationService(Component): pass else: # TODO Review state draft - for checkin_partner in reservation.checkin_partner_ids.filtered( - lambda ch: ch.state != "dummy" - ): + #.filtered( + # lambda ch: ch.state != "dummy" + # ) + for checkin_partner in reservation.checkin_partner_ids: if checkin_partner.document_expedition_date: document_expedition_date = ( checkin_partner.document_expedition_date.strftime("%d/%m/%Y") @@ -599,6 +601,7 @@ class PmsReservationService(Component): checkinPartnerState=checkin_partner.state, ) ) + print(checkin_partners) return checkin_partners @restapi.method(