From c013ff194f224b59dda49a2413056016f91b716a Mon Sep 17 00:00:00 2001 From: Sara Lago Date: Mon, 25 Apr 2022 18:04:42 +0200 Subject: [PATCH] [IMP] pms_api_rest: change field names in pricelist datamodel --- pms_api_rest/datamodels/pms_pricelist_item.py | 21 ++++++++----------- .../services/pms_pricelist_service.py | 21 ++++++++----------- 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/pms_api_rest/datamodels/pms_pricelist_item.py b/pms_api_rest/datamodels/pms_pricelist_item.py index 8ec3c285f..351ed7ac5 100644 --- a/pms_api_rest/datamodels/pms_pricelist_item.py +++ b/pms_api_rest/datamodels/pms_pricelist_item.py @@ -12,17 +12,14 @@ class PmsPricelistItemSearchParam(Datamodel): class PmsPricelistItemInfo(Datamodel): _name = "pms.pricelist.item.info" - pricelist_item_id = fields.Integer(required=False, allow_none=True) - availability_rule_id = fields.Integer(required=False, allow_none=True) - fixed_price = fields.Float(required=False, allow_none=True) - min_stay = fields.Integer(required=False, allow_none=True) - min_stay_arrival = fields.Integer(required=False, allow_none=True) - max_stay = fields.Integer(required=False, allow_none=True) - max_stay_arrival = fields.Integer(required=False, allow_none=True) + pricelistItemId = fields.Integer(required=False, allow_none=True) + availabilityRuleId = fields.Integer(required=False, allow_none=True) + minStay = fields.Integer(required=False, allow_none=True) + minStayArrival = fields.Integer(required=False, allow_none=True) + maxStay = fields.Integer(required=False, allow_none=True) + maxStayArrival = fields.Integer(required=False, allow_none=True) closed = fields.Boolean(required=False, allow_none=True) - closed_departure = fields.Boolean(required=False, allow_none=True) - closed_arrival = fields.Boolean(required=False, allow_none=True) - quota = fields.Integer(required=False, allow_none=True) - max_avail = fields.Integer(required=False, allow_none=True) - room_type_id = fields.Integer(required=False, allow_none=True) + closedDeparture = fields.Boolean(required=False, allow_none=True) + closedArrival = fields.Boolean(required=False, allow_none=True) + roomTypeId = fields.Integer(required=False, allow_none=True) date = fields.String(required=False, allow_none=True) diff --git a/pms_api_rest/services/pms_pricelist_service.py b/pms_api_rest/services/pms_pricelist_service.py index 5835e68dd..19ad1a2b4 100644 --- a/pms_api_rest/services/pms_pricelist_service.py +++ b/pms_api_rest/services/pms_pricelist_service.py @@ -138,28 +138,25 @@ class PmsPricelistService(Component): if item or rule: pricelist_info = PmsPricelistItemInfo( - room_type_id=room_type.id, + roomTypeId=room_type.id, date=str( datetime.combine(date, datetime.min.time()).isoformat() ), ) if item: - pricelist_info.pricelist_item_id = item.id - pricelist_info.fixed_price = item.fixed_price + pricelist_info.pricelistItemId = item.id if rule: - pricelist_info.availability_rule_id = rule.id - pricelist_info.min_stay = rule.min_stay - pricelist_info.min_stay_arrival = rule.min_stay_arrival - pricelist_info.max_stay = rule.max_stay - pricelist_info.max_stay_arrival = rule.max_stay_arrival + pricelist_info.availabilityRuleId = rule.id + pricelist_info.minStay = rule.min_stay + pricelist_info.minStayArrival = rule.min_stay_arrival + pricelist_info.maxStay = rule.max_stay + pricelist_info.maxStayArrival = rule.max_stay_arrival pricelist_info.closed = rule.closed - pricelist_info.closed_departure = rule.closed_departure - pricelist_info.closed_arrival = rule.closed_arrival - pricelist_info.quota = rule.quota - pricelist_info.max_avail = rule.max_avail + pricelist_info.closedDeparture = rule.closed_departure + pricelist_info.closedArrival = rule.closed_arrival result.append(pricelist_info)