Skip to content
Snippets Groups Projects
Commit 1e4ee402 authored by Thibault Delavallée's avatar Thibault Delavallée
Browse files

[IMP] mail: use xmlid_to_res_id instead of ref to find subtype in message_format 

Deleting comment / note / activity subtypes make the whole system quite
impossible to use. Indeed the whole communication mechanism is based on
those subtypes that are hardcoded.

There are some use of env.ref() about subtypes to try to avoid having those
removed. As there is some work to make some xml ids impossible to delete we
can already update some code to use xmlid_to_res_id instead of env.ref(). This
leads to some gain in query count as there is no exists() that is performed.

Gain: 1 query on most tests implying post, because message_format is called
by bus notification. About 1.5K queries on community runbot
parent d4dcfb6c
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
addons/mail/models/mail_message.py
+ 6
− 3
View file @ 1e4ee402
......@@ -412,10 +412,13 @@ class Message(models.Model):
subtype_ids = [msg['subtype_id'][0] for msg in message_values if msg['subtype_id']]
subtypes = self.env['mail.message.subtype'].sudo().browse(subtype_ids).read(['internal', 'description','id'])
subtypes_dict = dict((subtype['id'], subtype) for subtype in subtypes)
xml_comment_id = self.env.ref('mail.mt_comment').id
com_id = self.env['ir.model.data'].xmlid_to_res_id('mail.mt_comment')
note_id = self.env['ir.model.data'].xmlid_to_res_id('mail.mt_note')
for message in message_values:
message['is_note'] = message['subtype_id'] and subtypes_dict[message['subtype_id'][0]]['internal']
message['is_discussion'] = message['subtype_id'] and subtypes_dict[message['subtype_id'][0]]['id'] == xml_comment_id
message['is_note'] = message['subtype_id'] and subtypes_dict[message['subtype_id'][0]]['id'] == note_id
message['is_discussion'] = message['subtype_id'] and subtypes_dict[message['subtype_id'][0]]['id'] == com_id
message['subtype_description'] = message['subtype_id'] and subtypes_dict[message['subtype_id'][0]]['description']
if message['model'] and self.env[message['model']]._original_module:
message['module_icon'] = modules.module.get_module_icon(self.env[message['model']]._original_module)
......
addons/test_mail/tests/test_performance.py
+ 14
− 14
View file @ 1e4ee402
......@@ -167,7 +167,7 @@ class TestAdvMailPerformance(TransactionCase):
'activity_type_id': self.env.ref('mail.mail_activity_data_todo').id,
})
with self.assertQueryCount(admin=59, emp=88): # test_mail only: 58 - 87
with self.assertQueryCount(admin=58, emp=87): # test_mail only: 57 - 86
activity.action_feedback(feedback='Zizisse Done !')
@users('admin', 'emp')
......@@ -181,7 +181,7 @@ class TestAdvMailPerformance(TransactionCase):
record.write({'name': 'Dupe write'})
with self.assertQueryCount(admin=59, emp=88): # test_mail only: 58 - 87
with self.assertQueryCount(admin=58, emp=87): # test_mail only: 57 - 86
record.action_close('Dupe feedback')
self.assertEqual(record.activity_ids, self.env['mail.activity'])
......@@ -193,7 +193,7 @@ class TestAdvMailPerformance(TransactionCase):
self.user_test.write({'notification_type': 'email'})
record = self.env['mail.test.track'].create({'name': 'Test'})
with self.assertQueryCount(admin=90, emp=117): # test_mail only: 88 - 115
with self.assertQueryCount(admin=89, emp=116): # test_mail only: 87 - 114
record.write({
'user_id': self.user_test.id,
})
......@@ -203,7 +203,7 @@ class TestAdvMailPerformance(TransactionCase):
def test_message_assignation_inbox(self):
record = self.env['mail.test.track'].create({'name': 'Test'})
with self.assertQueryCount(admin=50, emp=65): # test_mail only: 50 - 65
with self.assertQueryCount(admin=49, emp=64): # test_mail only: 49 - 64
record.write({
'user_id': self.user_test.id,
})
......@@ -223,7 +223,7 @@ class TestAdvMailPerformance(TransactionCase):
def test_message_log_with_post(self):
record = self.env['mail.test.simple'].create({'name': 'Test'})
with self.assertQueryCount(admin=28, emp=39): # test_mail only: 28 - 39
with self.assertQueryCount(admin=27, emp=38): # test_mail only: 27 - 38
record.message_post(
body='<p>Test message_post as log</p>',
subtype='mail.mt_note',
......@@ -234,7 +234,7 @@ class TestAdvMailPerformance(TransactionCase):
def test_message_post_no_notification(self):
record = self.env['mail.test.simple'].create({'name': 'Test'})
with self.assertQueryCount(admin=28, emp=39): # test_mail only: 28 - 39
with self.assertQueryCount(admin=27, emp=38): # test_mail only: 27 - 38
record.message_post(
body='<p>Test Post Performances basic</p>',
partner_ids=[],
......@@ -247,7 +247,7 @@ class TestAdvMailPerformance(TransactionCase):
def test_message_post_one_email_notification(self):
record = self.env['mail.test.simple'].create({'name': 'Test'})
with self.assertQueryCount(admin=79, emp=106): # com runbot 77 - 104 // test_mail only: 77 - 104
with self.assertQueryCount(admin=78, emp=105): # com runbot 76 - 103 // test_mail only: 76 - 103
record.message_post(
body='<p>Test Post Performances with an email ping</p>',
partner_ids=self.customer.ids,
......@@ -259,7 +259,7 @@ class TestAdvMailPerformance(TransactionCase):
def test_message_post_one_inbox_notification(self):
record = self.env['mail.test.simple'].create({'name': 'Test'})
with self.assertQueryCount(admin=41, emp=53): # com runbot 39 - 51 // test_mail only: 41 - 53
with self.assertQueryCount(admin=40, emp=52): # com runbot 38 - 50 // test_mail only: 40 - 52
record.message_post(
body='<p>Test Post Performances with an inbox ping</p>',
partner_ids=self.user_test.partner_id.ids,
......@@ -382,7 +382,7 @@ class TestHeavyMailPerformance(TransactionCase):
self.umbrella.message_subscribe(self.user_portal.partner_id.ids)
record = self.umbrella.sudo(self.env.user)
with self.assertQueryCount(admin=117, emp=148): # com runbot 115 - 146 // test_mail only: 113 - 144
with self.assertQueryCount(admin=116, emp=147): # com runbot 114 - 145 // test_mail only: 112 - 143
record.message_post(
body='<p>Test Post Performances</p>',
message_type='comment',
......@@ -399,7 +399,7 @@ class TestHeavyMailPerformance(TransactionCase):
record = self.umbrella.sudo(self.env.user)
template_id = self.env.ref('test_mail.mail_test_tpl').id
with self.assertQueryCount(admin=140, emp=185): # com runbot 138 - 183 // test_mail only: 136 - 181
with self.assertQueryCount(admin=139, emp=184): # com runbot 137 - 182 // test_mail only: 135 - 180
record.message_post_with_template(template_id, message_type='comment', composition_mode='comment')
self.assertEqual(record.message_ids[0].body, '<p>Adding stuff on %s</p>' % record.name)
......@@ -471,7 +471,7 @@ class TestHeavyMailPerformance(TransactionCase):
})
self.assertEqual(rec.message_partner_ids, self.partners | self.env.user.partner_id)
with self.assertQueryCount(admin=92, emp=121): # test_mail only: 90 - 119
with self.assertQueryCount(admin=91, emp=120): # test_mail only: 89 - 118
rec.write({'user_id': self.user_portal.id})
self.assertEqual(rec.message_partner_ids, self.partners | self.env.user.partner_id | self.user_portal.partner_id)
......@@ -494,7 +494,7 @@ class TestHeavyMailPerformance(TransactionCase):
customer_id = self.customer.id
user_id = self.user_portal.id
with self.assertQueryCount(admin=322, emp=383): # test_mail only: 315 - 376
with self.assertQueryCount(admin=320, emp=381): # test_mail only: 313 - 374
rec = self.env['mail.test.full'].create({
'name': 'Test',
'umbrella_id': umbrella_id,
......@@ -523,7 +523,7 @@ class TestHeavyMailPerformance(TransactionCase):
})
self.assertEqual(rec.message_partner_ids, self.user_portal.partner_id | self.env.user.partner_id)
with self.assertQueryCount(admin=228, emp=265): # test_mail only: 224 - 261
with self.assertQueryCount(admin=227, emp=264): # test_mail only: 223 - 260
rec.write({
'name': 'Test2',
'umbrella_id': self.umbrella.id,
......@@ -561,7 +561,7 @@ class TestHeavyMailPerformance(TransactionCase):
})
self.assertEqual(rec.message_partner_ids, self.user_portal.partner_id | self.env.user.partner_id)
with self.assertQueryCount(admin=231, emp=269): # test_mail only: 226 - 265
with self.assertQueryCount(admin=230, emp=268): # test_mail only: 225 - 264
rec.write({
'name': 'Test2',
'umbrella_id': umbrella_id,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment