From 668b5f7fb7a606f92401a9626c7cb44778dcf289 Mon Sep 17 00:00:00 2001 From: braisab Date: Wed, 27 Mar 2024 12:39:06 +0100 Subject: [PATCH] [IMP]14.0-pms_api_rest: document country field added to checkin partner datamodel & priority field in document type datamodel --- pms_api_rest/datamodels/pms_checkin_partner.py | 1 + pms_api_rest/datamodels/pms_id_category.py | 1 + pms_api_rest/services/pms_id_category_service.py | 3 ++- pms_api_rest/services/pms_partner_service.py | 1 + pms_api_rest/services/pms_reservation_service.py | 4 ++++ 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pms_api_rest/datamodels/pms_checkin_partner.py b/pms_api_rest/datamodels/pms_checkin_partner.py index 11181da5d..2b5a558bb 100644 --- a/pms_api_rest/datamodels/pms_checkin_partner.py +++ b/pms_api_rest/datamodels/pms_checkin_partner.py @@ -18,6 +18,7 @@ class PmsCheckinPartnerInfo(Datamodel): documentNumber = fields.String(required=False, allow_none=True) documentExpeditionDate = fields.String(required=False, allow_none=True) documentSupportNumber = fields.String(required=False, allow_none=True) + documentCountryId = fields.Integer(required=False, allow_none=True) gender = fields.String(required=False, allow_none=True) birthdate = fields.String(required=False, allow_none=True) residenceStreet = fields.String(required=False, allow_none=True) diff --git a/pms_api_rest/datamodels/pms_id_category.py b/pms_api_rest/datamodels/pms_id_category.py index 749fb3872..eeb1ab43b 100644 --- a/pms_api_rest/datamodels/pms_id_category.py +++ b/pms_api_rest/datamodels/pms_id_category.py @@ -8,3 +8,4 @@ class PmsIdCategoryInfo(Datamodel): id = fields.Integer(required=False, allow_none=True) documentType = fields.String(required=False, allow_none=True) code = fields.String(required=False, allow_none=True) + countryIds = fields.List(fields.Integer(), required=False, allow_none=True) diff --git a/pms_api_rest/services/pms_id_category_service.py b/pms_api_rest/services/pms_id_category_service.py index bcfe7f4a8..8568c0f36 100644 --- a/pms_api_rest/services/pms_id_category_service.py +++ b/pms_api_rest/services/pms_id_category_service.py @@ -27,13 +27,14 @@ class PmsIdCategoryService(Component): for id_category in ( self.env["res.partner.id_category"] .with_context(lang=self.env.user.lang) - .search([]) + .search([], order="priority asc") ): result_id_categories.append( PmsIdCategoryInfo( id=id_category.id, documentType=id_category.name, code=id_category.code, + countryIds=id_category.country_ids.mapped("id"), ) ) return result_id_categories diff --git a/pms_api_rest/services/pms_partner_service.py b/pms_api_rest/services/pms_partner_service.py index 87c9d7f10..488fc4f50 100644 --- a/pms_api_rest/services/pms_partner_service.py +++ b/pms_api_rest/services/pms_partner_service.py @@ -523,6 +523,7 @@ class PmsPartnerService(Component): doc_number.valid_from, datetime.min.time() ).isoformat() if doc_number.valid_from else None, documentSupportNumber=doc_number.support_number or None, + documentCountryId=doc_number.country_id.id or None, gender=partner.gender or None, birthdate=datetime.combine( partner.birthdate_date, datetime.min.time() diff --git a/pms_api_rest/services/pms_reservation_service.py b/pms_api_rest/services/pms_reservation_service.py index 26d3f1d5e..1ad3a0cd1 100644 --- a/pms_api_rest/services/pms_reservation_service.py +++ b/pms_api_rest/services/pms_reservation_service.py @@ -594,6 +594,9 @@ class PmsReservationService(Component): documentSupportNumber=checkin_partner.support_number if checkin_partner.support_number else None, + documentCountryId=checkin_partner.document_country_id.id + if checkin_partner.document_country_id + else None, gender=checkin_partner.gender if checkin_partner.gender else "", birthdate=datetime.combine( checkin_partner.birthdate_date, datetime.min.time() @@ -890,6 +893,7 @@ class PmsReservationService(Component): "mobile": pms_checkin_partner_info.mobile, "document_type": pms_checkin_partner_info.documentType, "document_number": pms_checkin_partner_info.documentNumber, + "document_country_id": pms_checkin_partner_info.documentCountryId, "support_number": pms_checkin_partner_info.documentSupportNumber, "gender": pms_checkin_partner_info.gender, "residence_street": pms_checkin_partner_info.residenceStreet,