pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] resource: Improve _leave_intervals_batch performances

Browse Source 
On N elements resource.calendar.leave and M elements resource.resource recordsets,
the __get__ calls to 4 leave fields were done M time per loop, aka 4*N*M times.

This commit reduces the number of call to 4*N times, reducing the method executing
time for grid_unavailability from 9 seconds to +- 4.5 on odoo.com while displaying
all timesheets on Month view.

closes odoo/odoo#150408

Related: odoo/enterprise#54830
Signed-off-by: Xavier Bol (xbo) <xbo@odoo.com>
This commit is contained in:
Yannick Tivisse
2024-01-26 12:45:40 +00:00
committed by Xavier Bol (xbo)
parent dc64c1a768
commit 39d3da451c
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/resource/models/resource_calendar.py
+9 -4
View File
@@ -399,9 +399,14 @@ class ResourceCalendar(models.Model):
# retrieve leave intervals in (start_dt, end_dt)
result = defaultdict(lambda: [])
tz_dates = {}
for leave in self.env['resource.calendar.leaves'].search(domain):
all_leaves = self.env['resource.calendar.leaves'].search(domain)
for leave in all_leaves:
leave_resource = leave.resource_id
leave_company = leave.company_id
leave_date_from = leave.date_from
leave_date_to = leave.date_to
for resource in resources_list:
if leave.resource_id.id not in [False, resource.id] or (not leave.resource_id and resource and resource.company_id != leave.company_id):
if leave_resource.id not in [False, resource.id] or (not leave_resource and resource and resource.company_id != leave_company):
continue
tz = tz if tz else timezone((resource or self).tz)
if (tz, start_dt) in tz_dates:
@@ -414,8 +419,8 @@ class ResourceCalendar(models.Model):
else:
end = end_dt.astimezone(tz)
tz_dates[(tz, end_dt)] = end
dt0 = string_to_datetime(leave.date_from).astimezone(tz)
dt1 = string_to_datetime(leave.date_to).astimezone(tz)
dt0 = string_to_datetime(leave_date_from).astimezone(tz)
dt1 = string_to_datetime(leave_date_to).astimezone(tz)
result[resource.id].append((max(start, dt0), min(end, dt1), leave))
return {r.id: Intervals(result[r.id]) for r in resources_list}