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] Improve get pricelist performance

Browse Source
This commit is contained in:
Alexandre Díaz
2019-01-15 03:39:44 +01:00
parent 03ff5e3871
commit 69efca6a85
1 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
hotel_calendar/models/inherited_hotel_reservation.py
View File

@@ -197,7 +197,8 @@ class HotelReservation(models.Model):
LEFT JOIN product_product AS pp ON hrt.product_id = pp.id LEFT JOIN product_product AS pp ON hrt.product_id = pp.id
LEFT JOIN product_template AS pt ON pp.product_tmpl_id = pt.id LEFT JOIN product_template AS pt ON pp.product_tmpl_id = pt.id
LEFT JOIN res_partner AS rp ON hf.partner_id = rp.id LEFT JOIN res_partner AS rp ON hf.partner_id = rp.id
LEFT JOIN room_closure_reason as rcr ON hf.closure_reason_id = rcr.id LEFT JOIN room_closure_reason as rcr
ON hf.closure_reason_id = rcr.id
WHERE room_id IN %s AND ( WHERE room_id IN %s AND (
(checkin <= %s AND checkout >= %s AND checkout <= %s) (checkin <= %s AND checkout >= %s AND checkout <= %s)
OR (checkin >= %s AND checkout <= %s) OR (checkin >= %s AND checkout <= %s)
@@ -211,7 +212,6 @@ class HotelReservation(models.Model):
rdfrom_str, dto_str)) rdfrom_str, dto_str))
return self._hcalendar_reservation_data(self.env.cr.dictfetchall()) return self._hcalendar_reservation_data(self.env.cr.dictfetchall())
# Expensive if no data in cache model
@api.model @api.model
def get_hcalendar_pricelist_data(self, dfrom_dt, dto_dt): def get_hcalendar_pricelist_data(self, dfrom_dt, dto_dt):
pricelist_id = self.env['ir.default'].sudo().get( pricelist_id = self.env['ir.default'].sudo().get(
@@ -219,44 +219,49 @@ class HotelReservation(models.Model):
if pricelist_id: if pricelist_id:
pricelist_id = int(pricelist_id) pricelist_id = int(pricelist_id)
date_diff = abs((dfrom_dt - dto_dt).days) + 1 room_types_ids = self.env['hotel.room.type'].search([])
# Get Prices
json_rooms_prices = {pricelist_id: []}
room_typed_ids = self.env['hotel.room.type'].search(
[],
order='hcal_sequence ASC')
room_pr_cached_obj = self.env['room.pricelist.cached']
prod_price_ids = room_pr_cached_obj.search([ dfrom_str = dfrom_dt.strftime(DEFAULT_SERVER_DATE_FORMAT)
('room_id', 'in', room_typed_ids.ids), dto_str = dto_dt.strftime(DEFAULT_SERVER_DATE_FORMAT)
('date', '>=', dfrom_dt),
('date', '<=', dto_dt)
], order='date ASC')
for room_type_id in room_typed_ids: self.env.cr.execute('''
days = {} WITH RECURSIVE gen_table_days AS (
prod_price_room_ids = prod_price_ids.filtered( SELECT hrt.id, %s::Date AS date
lambda x: x.room_id == room_type_id) FROM hotel_room_type AS hrt
prod_price_ids = prod_price_ids - prod_price_room_ids UNION ALL
for offsetDay in range(0, date_diff): SELECT hrt.id, (td.date + INTERVAL '1 day')::Date
ndate = dfrom_dt+timedelta(days=offsetDay) FROM gen_table_days as td
strndate = ndate.strftime(DEFAULT_SERVER_DATE_FORMAT) LEFT JOIN hotel_room_type AS hrt ON hrt.id=td.id
prod_price_id = prod_price_room_ids.filtered( WHERE td.date < %s
lambda x: x.date == strndate) )
prod_price_room_ids = prod_price_room_ids - prod_price_id SELECT
days.update({ TO_CHAR(gtd.date, 'DD/MM/YYYY') AS date, gtd.date AS o_date,
ndate.strftime("%d/%m/%Y"): prod_price_id gtd.id AS room_type_id, pt.name, rpc.price, pt.list_price
and prod_price_id.price FROM gen_table_days AS gtd
or room_type_id.product_id.with_context( LEFT JOIN room_pricelist_cached AS rpc
quantity=1, ON rpc.date = gtd.date AND rpc.room_id = gtd.id
date=prod_price_id.date, LEFT JOIN hotel_room_type AS hrt ON hrt.id = gtd.id
pricelist=pricelist_id).price LEFT JOIN product_product AS pp ON pp.id = hrt.product_id
LEFT JOIN product_template AS pt ON pt.id = pp.product_tmpl_id
WHERE gtd.id IN %s
ORDER BY gtd.id ASC, gtd.date ASC
''', (dfrom_str, dto_str, tuple(room_types_ids.ids)))
query_results = self.env.cr.dictfetchall()
json_data = {}
for results in query_results:
if results['room_type_id'] not in json_data:
json_data.setdefault(results['room_type_id'], {}).update({
'title': results['name'],
'room': results['room_type_id'],
}) })
json_rooms_prices[pricelist_id].append({ json_data[results['room_type_id']].setdefault('days', {}).update({
'room': room_type_id.id, results['date']: results['price'] or results['list_price']
'days': days,
'title': room_type_id.name,
}) })
json_rooms_prices = {}
for prices in list(json_data.values()):
json_rooms_prices.setdefault(pricelist_id, []).append(prices)
return json_rooms_prices return json_rooms_prices
@api.model @api.model