audrius/pms
1
0
Fork 1
mirror of https://github.com/OCA/pms.git synced 2025-01-29 00:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP] pms_api_rest: add room type class in room service

Browse Source
This commit is contained in:
Sara
2022-05-18 16:37:53 +02:00
committed by Darío Lodeiros
parent 7955d07c24
commit f02ac4c50c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pms_api_rest/datamodels/pms_room.py
View File

@@ -17,3 +17,4 @@ class PmsRoomInfo(Datamodel):
roomTypeId = fields.Integer(required=False, allow_none=True) roomTypeId = fields.Integer(required=False, allow_none=True)
capacity = fields.Integer(required=False, allow_none=True) capacity = fields.Integer(required=False, allow_none=True)
shortName = fields.String(required=False, allow_none=True) shortName = fields.String(required=False, allow_none=True)
roomTypeClassId = fields.Integer(required=False, allow_none=True)

1
pms_api_rest/services/pms_room_service.py
View File

@@ -51,6 +51,7 @@ class PmsRoomService(Component):
roomTypeId=room.room_type_id, roomTypeId=room.room_type_id,
capacity=room.capacity, capacity=room.capacity,
shortName=room.short_name, shortName=room.short_name,
roomTypeClassId=room.room_type_id.class_id,
) )
) )
return result_rooms return result_rooms

10
pms_api_rest/services/pms_ubication_service.py
View File

@@ -29,18 +29,16 @@ class PmsUbicationService(Component):
if ubication_search_param.pms_property_ids: if ubication_search_param.pms_property_ids:
ubication = set() ubication = set()
for index, prop in enumerate(ubication_search_param.pms_property_ids): for index, prop in enumerate(ubication_search_param.pms_property_ids):
ubication_with_query_property = self.env[ ubication_with_query_property = self.env["pms.ubication"].search(
"pms.ubication" [("pms_property_ids", "=", prop)]
].search([("pms_property_ids", "=", prop)]) )
if index == 0: if index == 0:
ubication = set(ubication_with_query_property.ids) ubication = set(ubication_with_query_property.ids)
else: else:
ubication = ubication.intersection( ubication = ubication.intersection(
set(ubication_with_query_property.ids) set(ubication_with_query_property.ids)
) )
ubication_total = list( ubication_total = list(set(list(ubication) + ubication_all_properties.ids))
set(list(ubication) + ubication_all_properties.ids)
)
else: else:
ubication_total = list(ubication_all_properties.ids) ubication_total = list(ubication_all_properties.ids)
domain = [ domain = [