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

[FIX] calendar: optimize _compute_meeting

Browse Source 
__Current behavior before commit:__
`_compute_meeting` computes the meetings linked to the children of the
partners in `self`. To do so, it first retrieves all children partners
of `self`, then it loops through all of them to apply the meetings to
the parents.

This way of doing is inefficient because it is useless to iterate over
the children that don't have any meetings.

__Description of the fix:__
Loop only through the partners that have a meetings instead of all
children partners.

Improve `test_meeting_count` to test the case where only the child
partner has a meeting but the parent has initially none. This test
improvement is a forward port of [#144575][1].

__Benchmark:__

| len(all_partners) | w/o fix | with fix |
| ----------------- | ------- | -------- |
| 1k                | 32 ms   | 14 ms    |
| 100k              | 1500 ms | 800 ms   |

opw-3511371

[1]: https://github.com/odoo/odoo/pull/144575

closes odoo/odoo#146381

X-original-commit: e35949cdd09b4312a60383b79290008e78768b64
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Signed-off-by: Julien Launois (jula) <jula@odoo.com>
This commit is contained in:
Julien (jula)
2023-12-15 10:09:36 +00:00
parent 904b158723
commit b200b708ea
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/calendar/models/res_partner.py
+8 -8
View File
@@ -41,18 +41,18 @@ class Partner(models.Model):
meeting_data = self.env.cr.fetchall()
# Create a dict {partner_id: event_ids} and fill with events linked to the partner
meetings = {p.id: set() for p in all_partners}
for m in meeting_data:
meetings[m[0]].add(m[1])
meetings = {}
for p_id, m_id, _ in meeting_data:
meetings.setdefault(p_id, set()).add(m_id)
# Add the events linked to the children of the partner
for p in all_partners:
for p in self.browse(meetings.keys()):
partner = p
while partner:
if partner in self:
meetings[partner.id] |= meetings[p.id]
while partner.parent_id:
partner = partner.parent_id
return {p_id: list(meetings[p_id]) for p_id in self.ids}
if partner in self:
meetings[partner.id] = meetings.get(partner.id, set()) | meetings[p.id]
return {p_id: list(meetings.get(p_id, set())) for p_id in self.ids}
return {}
def get_attendee_detail(self, meeting_ids):
addons/calendar/tests/test_res_partner.py
+6 -1
View File
@@ -24,6 +24,8 @@ class TestResPartner(TransactionCase):
test_partner_3 = Partner.create({'name': 'test_partner_3', 'parent_id': test_partner_1.id})
test_partner_4 = Partner.create({'name': 'test_partner_4', 'parent_id': test_partner_3.id})
test_partner_5 = Partner.create({'name': 'test_partner_5'})
test_partner_6 = Partner.create({'name': 'test_partner_6'})
test_partner_7 = Partner.create({'name': 'test_partner_7', 'parent_id': test_partner_6.id})
Event.create({'name': 'event_1',
'partner_ids': [(6, 0, [test_partner_1.id,
@@ -48,7 +50,8 @@ class TestResPartner(TransactionCase):
Event.create({'name': 'event_7',
'partner_ids': [(6, 0, [test_partner_5.id])]})
Event.create({'name': 'event_8',
'partner_ids': [(6, 0, [test_partner_5.id])]})
'partner_ids': [(6, 0, [test_partner_5.id,
test_partner_7.id])]})
#Test rule to see if ir.rules are applied
calendar_event_model_id = self.env['ir.model']._get('calendar.event').id
@@ -71,3 +74,5 @@ class TestResPartner(TransactionCase):
self.assertEqual(test_partner_3.meeting_count, 6)
self.assertEqual(test_partner_4.meeting_count, 3)
self.assertEqual(test_partner_5.meeting_count, 2)
self.assertEqual(test_partner_6.meeting_count, 1)
self.assertEqual(test_partner_7.meeting_count, 1)