diff --git a/pms_api_rest/services/pms_availability_plan_service.py b/pms_api_rest/services/pms_availability_plan_service.py index e68b68f54..18651bfa1 100644 --- a/pms_api_rest/services/pms_availability_plan_service.py +++ b/pms_api_rest/services/pms_availability_plan_service.py @@ -120,7 +120,11 @@ class PmsAvailabilityPlanService(Component): record_availability_plan_id.id, ), ("room_type_id", "=", room_type.id), - ("pms_property_id", "=", availability_plan_rule_search_param.pmsPropertyId) + ( + "pms_property_id", + "=", + availability_plan_rule_search_param.pmsPropertyId, + ), ] ) if rule: diff --git a/pms_api_rest/services/pms_cancelation_rule_service.py b/pms_api_rest/services/pms_cancelation_rule_service.py index 8bf2cb60a..e169e634a 100644 --- a/pms_api_rest/services/pms_cancelation_rule_service.py +++ b/pms_api_rest/services/pms_cancelation_rule_service.py @@ -34,7 +34,11 @@ class PmsCancelationRuleService(Component): ) if cancelation_rule_search_param.pmsPropertyId: domain.append( - ("pms_property_ids", "in", [cancelation_rule_search_param.pmsPropertyId]) + ( + "pms_property_ids", + "in", + [cancelation_rule_search_param.pmsPropertyId], + ) ) result_cancelation_rules = [] diff --git a/pms_api_rest/services/pms_partner_service.py b/pms_api_rest/services/pms_partner_service.py index 394a8522a..83c51a1cf 100644 --- a/pms_api_rest/services/pms_partner_service.py +++ b/pms_api_rest/services/pms_partner_service.py @@ -48,7 +48,12 @@ class PmsPartnerService(Component): [("lastname", "ilike", search)], ] domain_filter.append(expression.OR(subdomains)) - domain = [] + if pms_partner_search_params.vatNumber: + domain_fields = [ + "|", + ("vat", "ilike", pms_partner_search_params.vatNumber), + ("aeat_identification", "ilike", pms_partner_search_params.vatNumber), + ] if domain_filter: domain = expression.AND([domain_fields, domain_filter[0]]) else: @@ -165,7 +170,8 @@ class PmsPartnerService(Component): ) def create_partner(self, partner_info): vals = self.mapping_partner_values(partner_info) - self.env["res.partner"].create(vals) + partner = self.env["res.partner"].create(vals) + return partner.id @restapi.method( [ @@ -364,26 +370,18 @@ class PmsPartnerService(Component): [ ( [ - "/partner", + "/", ], "GET", ) ], - input_param=Datamodel("pms.partner.search.param", is_list=False), output_param=Datamodel("pms.partner.info", is_list=False), auth="jwt_api_pms", ) - def get_partner(self, pms_partner_search_params): - domain = [] + def get_partner(self, partner_id): PmsPartnerInfo = self.env.datamodels["pms.partner.info"] - if pms_partner_search_params.vatNumber: - domain = [ - "|", - ("vat", "=", pms_partner_search_params.vatNumber), - ("aeat_identification", "=", pms_partner_search_params.vatNumber), - ] - partner = self.env["res.partner"].search(domain) - if not partner or len(partner) > 1: + partner = self.env["res.partner"].browse(partner_id) + if not partner: return PmsPartnerInfo() else: return PmsPartnerInfo(