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 one property in query params

Browse Source
This commit is contained in:
Sara Lago
2022-01-31 17:46:12 +01:00
committed by Darío Lodeiros
parent 76ee1ba48a
commit 45f69330a7
10 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pms_api_rest/datamodels/__init__.py
View File

@@ -18,3 +18,5 @@ from . import pms_user
from . import pms_pricelist
from . import pms_pricelist_item
from . import pms_search_param

2
pms_api_rest/datamodels/pms_calendar.py
View File

@@ -14,12 +14,14 @@ class PmsCalendarSwapInfo(Datamodel):
swapTo = fields.String(required=True, allow_none=False)
roomIdA = fields.Integer(required=True, allow_none=False)
roomIdB = fields.Integer(required=True, allow_none=False)
pms_property_id = fields.Integer(required=True, allow_none=False)
class PmsCalendarSearchParam(Datamodel):
_name = "pms.calendar.search.param"
date_from = fields.String(required=False, allow_none=True)
date_to = fields.String(required=False, allow_none=True)
pms_property_id = fields.Integer(required=True, allow_none=False)
class PmsCalendarInfo(Datamodel):

1
pms_api_rest/datamodels/pms_folio.py
View File

@@ -6,6 +6,7 @@ from odoo.addons.datamodel.core import Datamodel
class PmsFolioSearchParam(Datamodel):
_name = "pms.folio.search.param"
pms_property_id = fields.Integer(required=True, allow_none=True)
date_from = fields.String(required=False, allow_none=True)
date_to = fields.String(required=False, allow_none=True)

2
pms_api_rest/datamodels/pms_reservation.py
View File

@@ -21,7 +21,7 @@ class PmsReservationInfo(Datamodel):
pricelistId = fields.Integer(required=False, allow_none=True)
services = fields.List(fields.Dict(required=False, allow_none=True))
messages = fields.List(fields.Dict(required=False, allow_none=True))
property = fields.Integer(required=False, allow_none=True)
pms_property_id = fields.Integer(required=False, allow_none=True)
boardServiceId = fields.Integer(required=False, allow_none=True)
boardServiceName = fields.String(required=False, allow_none=True)
channelTypeId = fields.Integer(required=False, allow_none=True)

2
pms_api_rest/datamodels/pms_room.py
View File

@@ -7,7 +7,7 @@ class PmsRoomSearchParam(Datamodel):
_name = "pms.room.search.param"
id = fields.Integer(required=False, allow_none=True)
name = fields.String(required=False, allow_none=True)
pms_property_id = fields.Integer(required=False, allow_none=True)
pms_property_id = fields.Integer(required=True, allow_none=False)
class PmsRoomInfo(Datamodel):

9
pms_api_rest/datamodels/pms_search_param.py Normal file
View File

@@ -0,0 +1,9 @@
from marshmallow import fields
from odoo.addons.datamodel.core import Datamodel
class PmsSearchParam(Datamodel):
_name = "pms.search.param"
pms_property_id = fields.Integer(required=True, allow_none=False)

11
pms_api_rest/services/pms_calendar_service.py
View File

@@ -26,12 +26,9 @@ class PmsCalendarService(Component):
)
def get_calendar(self, calendar_search_param):
domain = list()
domain.append(
("date", ">", datetime.fromisoformat(calendar_search_param.date_from))
)
domain.append(
("date", "<=", datetime.fromisoformat(calendar_search_param.date_to))
)
domain.append(("date", ">=", calendar_search_param.date_from))
domain.append(("date", "<=", calendar_search_param.date_to))
domain.append(("pms_property_id", "=", calendar_search_param.pms_property_id))
result_lines = []
PmsCalendarInfo = self.env.datamodels["pms.calendar.info"]
for line in self.env["pms.reservation.line"].search(
@@ -83,6 +80,7 @@ class PmsCalendarService(Component):
("room_id", "=", room_id_a),
("date", ">=", swap_info.swapFrom),
("date", "<=", swap_info.swapTo),
("pms_property_id", "=", swap_info.pms_property_id),
]
)
@@ -91,6 +89,7 @@ class PmsCalendarService(Component):
("room_id", "=", room_id_b),
("date", ">=", swap_info.swapFrom),
("date", "<=", swap_info.swapTo),
("pms_property_id", "=", swap_info.pms_property_id),
]
)
lines_room_a.occupies_availability = False

11
pms_api_rest/services/pms_folio_service.py
View File

@@ -28,6 +28,7 @@ class PmsFolioService(Component):
domain = list()
domain.append(("checkin", ">=", folio_search_param.date_from))
domain.append(("checkout", "<", folio_search_param.date_to))
domain.append(("pms_property_id", "=", folio_search_param.pms_property_id))
result_folios = []
reservations_result = (
@@ -119,11 +120,15 @@ class PmsFolioService(Component):
"GET",
)
],
input_param=Datamodel("pms.search.param"),
output_param=Datamodel("pms.payment.info", is_list=True),
auth="jwt_api_pms",
)
def get_folio_payments(self, folio_id):
folio = self.env["pms.folio"].search([("id", "=", folio_id)])
def get_folio_payments(self, folio_id, pms_search_param):
domain = list()
domain.append(("id", "=", folio_id))
domain.append(("pms_property_id", "=", pms_search_param.pms_property_id))
folio = self.env["pms.folio"].search(domain)
payments = []
PmsPaymentInfo = self.env.datamodels["pms.payment.info"]
if not folio:
@@ -174,7 +179,7 @@ class PmsFolioService(Component):
reservation = self.env["pms.reservation"].create(
{
"partner_name": pms_reservation_info.partner,
"pms_property_id": pms_reservation_info.property,
"pms_property_id": pms_reservation_info.pms_property_id,
"room_type_id": pms_reservation_info.roomTypeId,
"pricelist_id": pms_reservation_info.pricelistId,
"checkin": pms_reservation_info.checkin,

7
pms_api_rest/services/pms_property_service.py
View File

@@ -18,16 +18,11 @@ class PmsPropertyService(Component):
"GET",
)
],
input_param=Datamodel("pms.property.search.param"),
output_param=Datamodel("pms.property.info", is_list=True),
auth="jwt_api_pms",
)
def get_properties(self, property_search_param):
def get_properties(self):
domain = []
if property_search_param.name:
domain.append(("name", "like", property_search_param.name))
if property_search_param.id:
domain.append(("id", "=", property_search_param.id))
result_properties = []
PmsPropertyInfo = self.env.datamodels["pms.property.info"]
for prop in self.env["pms.property"].search(

20
pms_api_rest/services/pms_reservation_service.py
View File

@@ -20,11 +20,15 @@ class PmsReservationService(Component):
"GET",
)
],
output_param=Datamodel("pms.reservation.info"),
input_param=Datamodel("pms.search.param", is_list=False),
output_param=Datamodel("pms.reservation.info", is_list=False),
auth="jwt_api_pms",
)
def get_reservation(self, reservation_id):
reservation = self.env["pms.reservation"].search([("id", "=", reservation_id)])
def get_reservation(self, reservation_id, pms_search_param):
domain = list()
domain.append(("id", "=", reservation_id))
domain.append(("pms_property_id", "=", pms_search_param.pms_property_id))
reservation = self.env["pms.reservation"].search(domain)
res = []
PmsReservationInfo = self.env.datamodels["pms.reservation.info"]
if not reservation:
@@ -59,7 +63,7 @@ class PmsReservationService(Component):
)
res = PmsReservationInfo(
id=reservation.id,
partner=reservation.partner_id.name,
partner=reservation.partner_id.name if reservation.partner_id else "",
checkin=str(reservation.checkin),
checkout=str(reservation.checkout),
preferredRoomId=reservation.preferred_room_id.id
@@ -175,11 +179,15 @@ class PmsReservationService(Component):
"GET",
)
],
input_param=Datamodel("pms.search.param"),
output_param=Datamodel("pms.checkin.partner.info", is_list=True),
auth="jwt_api_pms",
)
def get_checkin_partners(self, reservation_id):
reservation = self.env["pms.reservation"].search([("id", "=", reservation_id)])
def get_checkin_partners(self, reservation_id, pms_search_param):
domain = list()
domain.append(("id", "=", reservation_id))
domain.append(("pms_property_id", "=", pms_search_param.pms_property_id))
reservation = self.env["pms.reservation"].search(domain)
checkin_partners = []
PmsCheckinPartnerInfo = self.env.datamodels["pms.checkin.partner.info"]
if not reservation: