From 03c3d440ae31baa0400b7adba7f6373556ff5c38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Theys?= <seb@odoo.com>
Date: Thu, 25 May 2023 14:23:33 +0000
Subject: [PATCH] [FIX] mail: apply multi-company when feching systray
activities
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
A raw query is not necessary to produce the desired result, found
activities need to be kept only if the corresponding record can be found
with standard search (which includes multi-company check).
Part of task-3266643
closes odoo/odoo#122354
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
addons/mail/models/res_users.py | 76 +++++++++----------
.../models/test_mail_corner_case_models.py | 9 +++
addons/test_mail/security/ir.model.access.csv | 2 +
.../test_mail/security/test_mail_security.xml | 7 ++
.../test_mail/tests/test_mail_multicompany.py | 42 ++++++++++
5 files changed, 98 insertions(+), 38 deletions(-)
diff --git a/addons/mail/models/res_users.py b/addons/mail/models/res_users.py
index bd4a3f5bfd3f..47647e47bb27 100644
--- a/addons/mail/models/res_users.py
+++ b/addons/mail/models/res_users.py
@@ -1,6 +1,8 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
+from collections import defaultdict
+
from odoo import _, api, exceptions, fields, models, modules
from odoo.addons.base.models.res_users import is_selection_groups
@@ -115,45 +117,43 @@ GROUP BY channel_moderator.res_users_id""", [tuple(self.ids)])
@api.model
def systray_get_activities(self):
- query = """SELECT m.id, count(*), act.res_model as model,
- CASE
- WHEN %(today)s::date - act.date_deadline::date = 0 Then 'today'
- WHEN %(today)s::date - act.date_deadline::date > 0 Then 'overdue'
- WHEN %(today)s::date - act.date_deadline::date < 0 Then 'planned'
- END AS states
- FROM mail_activity AS act
- JOIN ir_model AS m ON act.res_model_id = m.id
- WHERE user_id = %(user_id)s
- GROUP BY m.id, states, act.res_model;
- """
- self.env.cr.execute(query, {
- 'today': fields.Date.context_today(self),
- 'user_id': self.env.uid,
- })
- activity_data = self.env.cr.dictfetchall()
- model_ids = [a['id'] for a in activity_data]
- model_names = {n[0]: n[1] for n in self.env['ir.model'].browse(model_ids).name_get()}
-
+ activities = self.env["mail.activity"].search([("user_id", "=", self.env.uid)])
+ activities_by_record_by_model_name = defaultdict(lambda: defaultdict(lambda: self.env["mail.activity"]))
+ for activity in activities:
+ record = self.env[activity.res_model].browse(activity.res_id)
+ activities_by_record_by_model_name[activity.res_model][record] += activity
+ model_ids = list({self.env["ir.model"]._get(name).id for name in activities_by_record_by_model_name.keys()})
user_activities = {}
- for activity in activity_data:
- if not user_activities.get(activity['model']):
- module = self.env[activity['model']]._original_module
- icon = module and modules.module.get_module_icon(module)
- user_activities[activity['model']] = {
- 'name': model_names[activity['id']],
- 'model': activity['model'],
- 'type': 'activity',
- 'icon': icon,
- 'total_count': 0, 'today_count': 0, 'overdue_count': 0, 'planned_count': 0,
- }
- user_activities[activity['model']]['%s_count' % activity['states']] += activity['count']
- if activity['states'] in ('today', 'overdue'):
- user_activities[activity['model']]['total_count'] += activity['count']
-
- user_activities[activity['model']]['actions'] = [{
- 'icon': 'fa-clock-o',
- 'name': 'Summary',
- }]
+ for model_name, activities_by_record in activities_by_record_by_model_name.items():
+ domain = [("id", "in", list({r.id for r in activities_by_record.keys()}))]
+ allowed_records = self.env[model_name].search(domain)
+ if not allowed_records:
+ continue
+ module = self.env[model_name]._original_module
+ icon = module and modules.module.get_module_icon(module)
+ user_activities[model_name] = {
+ "name": self.env["ir.model"]._get(model_name).with_prefetch(model_ids).name,
+ "model": model_name,
+ "type": "activity",
+ "icon": icon,
+ "total_count": 0,
+ "today_count": 0,
+ "overdue_count": 0,
+ "planned_count": 0,
+ "actions": [
+ {
+ "icon": "fa-clock-o",
+ "name": "Summary",
+ }
+ ],
+ }
+ for record, activities in activities_by_record.items():
+ if record not in allowed_records:
+ continue
+ for activity in activities:
+ user_activities[model_name]["%s_count" % activity.state] += 1
+ if activity.state in ("today", "overdue"):
+ user_activities[model_name]["total_count"] += 1
return list(user_activities.values())
diff --git a/addons/test_mail/models/test_mail_corner_case_models.py b/addons/test_mail/models/test_mail_corner_case_models.py
index 66bd986ba4c8..6a34aad72857 100644
--- a/addons/test_mail/models/test_mail_corner_case_models.py
+++ b/addons/test_mail/models/test_mail_corner_case_models.py
@@ -74,6 +74,15 @@ class MailTestMultiCompany(models.Model):
name = fields.Char()
company_id = fields.Many2one('res.company')
+class MailTestMultiCompanyWithActivity(models.Model):
+ """ This model can be used in multi company tests with activity"""
+ _name = "mail.test.multi.company.with.activity"
+ _description = "Test Multi Company Mail With Activity"
+ _inherit = ["mail.thread", "mail.activity.mixin"]
+
+ name = fields.Char()
+ company_id = fields.Many2one("res.company")
+
class MailTestSelectionTracking(models.Model):
""" Test tracking for selection fields """
diff --git a/addons/test_mail/security/ir.model.access.csv b/addons/test_mail/security/ir.model.access.csv
index 974e7b593405..8db31d16d35d 100644
--- a/addons/test_mail/security/ir.model.access.csv
+++ b/addons/test_mail/security/ir.model.access.csv
@@ -21,6 +21,8 @@ access_mail_test_cc_portal,mail.test.cc.portal,model_mail_test_cc,base.group_por
access_mail_test_cc_user,mail.test.cc.user,model_mail_test_cc,base.group_user,1,1,1,1
access_mail_test_multi_company_user,mail.test.multi.company.user,model_mail_test_multi_company,base.group_user,1,1,1,1
access_mail_test_multi_company_portal,mail.test.multi.company.portal,model_mail_test_multi_company,base.group_portal,1,0,0,0
+access_mail_test_multi_company_with_activity_user,mail.test.multi.company.with.activity.user,model_mail_test_multi_company_with_activity,base.group_user,1,1,1,1
+access_mail_test_multi_company_with_activity_portal,mail.test.multi.company.with.activity.portal,model_mail_test_multi_company_with_activity,base.group_portal,1,0,0,0
access_mail_test_track_compute,mail.test.track.compute,model_mail_test_track_compute,base.group_user,1,1,1,1
access_mail_test_track_selection_portal,mail.test.track.selection.portal,model_mail_test_track_selection,base.group_portal,0,0,0,0
access_mail_test_track_selection_user,mail.test.track.selection.user,model_mail_test_track_selection,base.group_user,1,1,1,1
diff --git a/addons/test_mail/security/test_mail_security.xml b/addons/test_mail/security/test_mail_security.xml
index 296cbdc02da2..5e512f6e332e 100644
--- a/addons/test_mail/security/test_mail_security.xml
+++ b/addons/test_mail/security/test_mail_security.xml
@@ -8,4 +8,11 @@
<field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field>
</record>
+ <record id="mail_test_multi_company_with_activity_rule" model="ir.rule">
+ <field name="name">Mail Test Multi Company With Activity</field>
+ <field name="model_id" ref="test_mail.model_mail_test_multi_company_with_activity"/>
+ <field eval="True" name="global"/>
+ <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field>
+ </record>
+
</odoo>
diff --git a/addons/test_mail/tests/test_mail_multicompany.py b/addons/test_mail/tests/test_mail_multicompany.py
index c6b92bdc82ed..3b249a4d9075 100644
--- a/addons/test_mail/tests/test_mail_multicompany.py
+++ b/addons/test_mail/tests/test_mail_multicompany.py
@@ -108,3 +108,45 @@ class TestMultiCompanySetup(TestMailCommon, TestRecipients):
"%s %s" % (company_3.name, test_record.name),
"%s@%s" % (self.alias_catchall, self.alias_domain)))
)
+
+ def test_systray_get_activities(self):
+ self.env["mail.activity"].search([]).unlink()
+ user_admin = self.user_admin.with_user(self.user_admin)
+ test_records = self.env["mail.test.multi.company.with.activity"].create(
+ [
+ {"name": "Test1", "company_id": user_admin.company_id.id},
+ {"name": "Test2", "company_id": self.company_2.id},
+ ]
+ )
+ test_records[0].activity_schedule("test_mail.mail_act_test_todo", user_id=user_admin.id)
+ test_records[1].activity_schedule("test_mail.mail_act_test_todo", user_id=user_admin.id)
+ res_all = user_admin.systray_get_activities()
+ self.assertEqual(
+ res_all[0],
+ {
+ "actions": [{"icon": "fa-clock-o", "name": "Summary"}],
+ "icon": "/base/static/description/icon.png",
+ "model": "mail.test.multi.company.with.activity",
+ "name": "Test Multi Company Mail With Activity",
+ "overdue_count": 0,
+ "planned_count": 0,
+ "today_count": 2,
+ "total_count": 2,
+ "type": "activity",
+ }
+ )
+ res_c2 = user_admin.with_context(allowed_company_ids=[self.company_2.id]).systray_get_activities()
+ self.assertEqual(
+ res_c2[0],
+ {
+ "actions": [{"icon": "fa-clock-o", "name": "Summary"}],
+ "icon": "/base/static/description/icon.png",
+ "model": "mail.test.multi.company.with.activity",
+ "name": "Test Multi Company Mail With Activity",
+ "overdue_count": 0,
+ "planned_count": 0,
+ "today_count": 1,
+ "total_count": 1,
+ "type": "activity",
+ }
+ )
--
GitLab