From e988239bddd9b24ee737043f973f6977bd3cdc1f Mon Sep 17 00:00:00 2001 From: Sara Date: Tue, 23 Aug 2022 12:17:35 +0200 Subject: [PATCH] [IMP] pms_api_rest: add partner datamodel and service --- pms_api_rest/datamodels/pms_partner.py | 2 ++ pms_api_rest/services/pms_partner_service.py | 7 ++++--- pms_api_rest/services/res_partner_category_service.py | 4 +--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pms_api_rest/datamodels/pms_partner.py b/pms_api_rest/datamodels/pms_partner.py index 136bf9110..cafb455ef 100644 --- a/pms_api_rest/datamodels/pms_partner.py +++ b/pms_api_rest/datamodels/pms_partner.py @@ -57,3 +57,5 @@ class PmsPartnerInfo(Datamodel): daysAutoInvoice = fields.Integer(required=False, allow_none=True) invoicingMonthDay = fields.Integer(required=False, allow_none=True) invoiceToAgency = fields.String(required=False, allow_none=True) + tagIds = fields.List(fields.Integer(required=False, allow_none=True)) + lastStay = fields.String(required=False, allow_none=True) diff --git a/pms_api_rest/services/pms_partner_service.py b/pms_api_rest/services/pms_partner_service.py index 9be1ad9bb..4b67d3baf 100644 --- a/pms_api_rest/services/pms_partner_service.py +++ b/pms_api_rest/services/pms_partner_service.py @@ -107,6 +107,7 @@ class PmsPartnerService(Component): invoiceToAgency=partner.invoice_to_agency if partner.invoice_to_agency else None, + tagIds=partner.category_id.ids if partner.category_id else [], ) ) return result_partners @@ -154,7 +155,7 @@ class PmsPartnerService(Component): "GET", ) ], - output_param=Datamodel("pms.checkin.partner.info", is_list=True), + output_param=Datamodel("pms.partner.info", is_list=True), auth="jwt_api_pms", ) def get_partner_by_doc_number(self, document_type, document_number): @@ -162,7 +163,7 @@ class PmsPartnerService(Component): [("name", "=", document_number), ("category_id", "=", int(document_type))] ) partners = [] - PmsCheckinPartnerInfo = self.env.datamodels["pms.checkin.partner.info"] + PmsPartnerInfo = self.env.datamodels["pms.partner.info"] if not doc_number: pass else: @@ -173,7 +174,7 @@ class PmsPartnerService(Component): "%d/%m/%Y" ) partners.append( - PmsCheckinPartnerInfo( + PmsPartnerInfo( # id=doc_number.partner_id.id, name=doc_number.partner_id.name if doc_number.partner_id.name diff --git a/pms_api_rest/services/res_partner_category_service.py b/pms_api_rest/services/res_partner_category_service.py index 76b4160bc..34f8af8d4 100644 --- a/pms_api_rest/services/res_partner_category_service.py +++ b/pms_api_rest/services/res_partner_category_service.py @@ -29,9 +29,7 @@ class PmsPartnerCategoriesService(Component): ResPartnerCategoryInfo( id=category.id, name=category.name, - parentId=category.parent_id.id - if category.parent_id.id - else 0, + parentId=category.parent_id.id if category.parent_id.id else 0, ) ) return result_categories