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: added filter by state and checkin/checkout in folios get service

Browse Source
This commit is contained in:
braisab
2022-12-23 14:13:53 +01:00
committed by Darío Lodeiros
parent 0c916116b2
commit e81eb89adb
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pms_api_rest/datamodels/pms_folio.py
View File

@@ -10,6 +10,7 @@ class PmsFolioSearchParam(Datamodel):
dateFrom = fields.String(required=False, allow_none=True)
dateTo = fields.String(required=False, allow_none=True)
filter = fields.String(required=False, allow_none=True)
filterByState = fields.String(required=False, allow_none=True)
class PmsFolioInfo(Datamodel):

34
pms_api_rest/services/pms_folio_service.py
View File

@@ -109,7 +109,7 @@ class PmsFolioService(Component):
if folio_search_param.filter:
target = folio_search_param.filter
if "@" in target:
domain_filter.append(("email", "ilike", target))
domain_filter.append([("email", "ilike", target)])
else:
subdomains = [
[("name", "ilike", target)],
@@ -118,9 +118,39 @@ class PmsFolioService(Component):
[("external_reference", "ilike", target)],
]
domain_filter.append(expression.OR(subdomains))
domain = []
if folio_search_param.filterByState:
if folio_search_param.filterByState == "byCheckin":
subdomains = [
[("state", "in", ("confirm", "arrival_delayed"))],
[("checkin", "<=", fields.Date.today())],
]
domain_filter.append(expression.AND(subdomains))
elif folio_search_param.filterByState == "byCheckout":
subdomains = [
[("state", "in", ("onboard", "departure_delayed"))],
[("checkout", "=", fields.Date.today())],
]
domain_filter.append(expression.AND(subdomains))
else:
subdomain_checkin = [
[("state", "in", ("confirm", "arrival_delayed"))],
[("checkin", "<=", fields.Date.today())],
]
subdomain_checkin = expression.AND(subdomain_checkin)
subdomain_checkout = [
[("state", "in", ("onboard", "departure_delayed"))],
[("checkout", "=", fields.Date.today())],
]
subdomain_checkout = expression.AND(subdomain_checkout)
domain_filter.append(
expression.OR([subdomain_checkin, subdomain_checkout])
)
if domain_filter:
domain = expression.AND([domain_fields, domain_filter[0]])
if folio_search_param.filter and folio_search_param.filterByState:
domain = expression.AND(
[domain_fields, domain_filter[0], domain_filter[1]]
)
else:
domain = domain_fields
result_folios = []