[IMP] mail_activity_team: Improve test using standard methods

test

Author: etobella

mail_activity_team/models/mail_activity.py

@@ -38,7 +38,7 @@ def _onchange_user_id(self):
         if self.team_id and self.user_id in self.team_id.member_ids:
             return res
         self.team_id = self.with_context(
-            default_res_model=self.res_model_id.id
+            default_res_model=self.res_model_id.model
         )._get_default_team_id(user_id=self.user_id.id)
         return res
 

mail_activity_team/models/res_users.py

@@ -1,4 +1,4 @@
-# Copyright 2018 ForgeFlow S.L.
+# Copyright 2018 ForgeFlow, S.L.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from odoo import api, fields, models, modules
 
@@ -17,35 +17,34 @@ def systray_get_activities(self):
         if not self._context.get("team_activities", False):
             return super().systray_get_activities()
         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, act.user_id as user_id
-                    FROM mail_activity AS act
-                    JOIN ir_model AS m ON act.res_model_id = m.id
-                    WHERE team_id in (
-                        SELECT mail_activity_team_id
-                        FROM mail_activity_team_users_rel
-                        WHERE res_users_id = %(user_id)s
-                    )
-                    GROUP BY m.id, states, act.res_model, act.user_id;"""
+                                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, act.user_id as user_id
+                            FROM mail_activity AS act
+                            JOIN ir_model AS m ON act.res_model_id = m.id
+                            WHERE team_id in (
+                                SELECT mail_activity_team_id
+                                FROM mail_activity_team_users_rel
+                                WHERE res_users_id =
+                            %(user_id)s
+                            )
+                            GROUP BY m.id, states, act.res_model, act.user_id;
+                            """
         user = self.env.uid
         self.env.cr.execute(
-            query,
-            {
-                "today": fields.Date.context_today(self),
-                "user_id": user,
-            },
+            query, {"today": fields.Date.context_today(self), "user_id": user}
         )
         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()
         }
+
         user_activities = {}
         for activity in activity_data:
             if not user_activities.get(activity["model"]):
@@ -64,11 +63,9 @@ def systray_get_activities(self):
             user_activities[activity["model"]][
                 "%s_count" % activity["states"]
             ] += activity["count"]
-            if activity["states"] in ("today", "overdue"):
-                user_activities[activity["model"]]["total_count"] += activity["count"]
-            if activity["user_id"] == user and activity["states"] in (
-                "today",
-                "overdue",
+            if (
+                activity["states"] in ("today", "overdue")
+                and activity["user_id"] != user
             ):
-                user_activities[activity["model"]]["total_count"] -= activity["count"]
+                user_activities[activity["model"]]["total_count"] += activity["count"]
         return list(user_activities.values())

mail_activity_team/tests/test_mail_activity_team.py

@@ -1,13 +1,14 @@
 # Copyright 2018 ForgeFlow, S.L.
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from odoo.exceptions import ValidationError
-from odoo.tests.common import TransactionCase
+from odoo.tests.common import Form, SavepointCase
 
 
-class TestMailActivityTeam(TransactionCase):
-    def setUp(self):
-        super(TestMailActivityTeam, self).setUp()
-
+class TestMailActivityTeam(SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        self = cls
         self.env["mail.activity.team"].search([]).unlink()
 
         self.employee = self.env["res.users"].create(
@@ -125,6 +126,18 @@ def setUp(self):
             }
         )
 
+    def test_activity_members(self):
+        self.team1.member_ids |= self.employee2
+        self.partner_client.refresh()
+        self.assertIn(self.employee2, self.partner_client.activity_team_user_ids)
+        self.assertIn(self.employee, self.partner_client.activity_team_user_ids)
+        self.assertEqual(
+            self.partner_client,
+            self.env["res.partner"].search(
+                [("activity_team_user_ids", "=", self.employee.id)]
+            ),
+        )
+
     def test_team_and_user_onchange(self):
         with self.assertRaises(ValidationError):
             self.team1.member_ids = [(3, self.employee.id)]
@@ -139,46 +152,88 @@ def test_missing_activities(self):
         self.assertEqual(self.team1.count_missing_activities, 0)
         self.assertEqual(self.act1.team_id, self.team1)
 
-    def test_team_onchanges(self):
-        self.assertFalse(
-            self.team2.user_id, "Error: Team 2 should not have a Team Leader yet."
-        )
-        self.team2.user_id = self.employee
-        self.team2.member_ids = [(3, self.employee.id)]
-        self.team2._onchange_member_ids()
-        self.assertFalse(self.team2.user_id)
-
     def test_leader_onchange(self):
         self.team2.user_id = self.employee3
         self.team2._onchange_user_id()
         self.assertTrue(self.employee3 in self.team2.member_ids)
 
-    def test_activity_onchanges(self):
+    def test_activity_onchanges_keep_user(self):
+        self.assertEqual(
+            self.act2.team_id, self.team1, "Error: Activity 2 should have Team 1."
+        )
+        with Form(self.act2) as form:
+            form.team_id = self.env["mail.activity.team"]
+            self.assertEqual(form.user_id, self.employee)
+
+    def test_activity_onchanges_user_no_member_team(self):
+        self.assertEqual(
+            self.act2.team_id, self.team1, "Error: Activity 2 should have Team 1."
+        )
+        with Form(self.act2) as form:
+            form.user_id = self.employee2
+            self.assertEqual(form.team_id, self.team2)
+
+    def test_activity_onchanges_user_no_team(self):
+        self.assertEqual(
+            self.act2.team_id, self.team1, "Error: Activity 2 should have Team 1."
+        )
+        with Form(self.act2) as form:
+            form.team_id = self.env["mail.activity.team"]
+            form.user_id = self.employee2
+            self.assertEqual(form.team_id, self.team2)
+
+    def test_activity_onchanges_team_no_member(self):
+        self.assertEqual(
+            self.act2.team_id, self.team1, "Error: Activity 2 should have Team 1."
+        )
+        self.team2.user_id = False
+        self.team2.member_ids = False
+        with Form(self.act2) as form:
+            form.team_id = self.team2
+            self.assertFalse(form.user_id)
+
+    def test_activity_onchanges_team_different_member(self):
+        self.assertEqual(
+            self.act2.team_id, self.team1, "Error: Activity 2 should have Team 1."
+        )
+        self.team2.user_id = self.employee2
+        self.team2.member_ids = self.employee2
+        with Form(self.act2) as form:
+            form.team_id = self.team2
+            self.assertEqual(form.user_id, self.employee2)
+
+    def test_activity_onchanges_team_different_member_no_leader(self):
+        self.assertEqual(
+            self.act2.team_id, self.team1, "Error: Activity 2 should have Team 1."
+        )
+        self.team2.user_id = False
+        self.team2.member_ids = self.employee2
+        with Form(self.act2) as form:
+            form.team_id = self.team2
+            self.assertEqual(form.user_id, self.employee2)
+
+    def test_activity_onchanges_activity_type_set_team(self):
+        self.assertEqual(
+            self.act2.team_id, self.team1, "Error: Activity 2 should have Team 1."
+        )
+        self.activity1.default_team_id = self.team2
+        self.assertEqual(self.act2.activity_type_id, self.activity2)
+        with Form(self.act2) as form:
+            form.activity_type_id = self.activity1
+            self.assertEqual(form.team_id, self.team2)
+
+    def test_activity_onchanges_activity_type_no_team(self):
         self.assertEqual(
             self.act2.team_id, self.team1, "Error: Activity 2 should have Team 1."
         )
-        self.act2.team_id = False
-        self.act2._onchange_team_id()
-        self.assertEqual(self.act2.user_id, self.employee)
-        self.act2.team_id = self.team2
-        self.act2._onchange_team_id()
-        self.assertEqual(self.act2.user_id, self.employee)
-        self.act2.user_id = self.employee2
-        self.act2._onchange_user_id()
-        self.assertEqual(self.act2.team_id, self.team2)
+        self.assertEqual(self.act2.activity_type_id, self.activity2)
+        with Form(self.act2) as form:
+            form.activity_type_id = self.activity1
+            self.assertEqual(form.team_id, self.team1)
+
+    def test_activity_constrain(self):
         with self.assertRaises(ValidationError):
             self.act2.write({"user_id": self.employee2.id, "team_id": self.team1.id})
-        self.team1.user_id = False
-        self.act2.user_id = False
-        self.act2._onchange_user_id()
-        self.team2.member_ids = [(4, self.employee3.id)]
-        self.act2.team_id = self.team1
-        self.act2.team_id = False
-        self.act2.user_id = self.employee3
-        self.act2._onchange_user_id()
-        self.act2.team_id = self.team2
-        self.team2.member_ids = [(3, self.act2.user_id.id)]
-        self.act2._onchange_team_id()
 
     def test_schedule_activity(self):
         """Correctly assign teams to auto scheduled activities. Those won't
@@ -222,6 +277,23 @@ def test_activity_count(self):
             .systray_get_activities()
         )
         self.assertEqual(res[0]["total_count"], 0)
+        self.assertEqual(res[0]["today_count"], 1)
+        partner_record = self.employee.partner_id.with_user(self.employee.id)
+        self.activity2.default_team_id = self.team2
+        activity = partner_record.activity_schedule(
+            activity_type_id=self.activity2.id, user_id=self.employee2.id
+        )
+        activity.flush()
+        res = (
+            self.env["res.users"]
+            .with_user(self.employee.id)
+            .with_context({"team_activities": True})
+            .systray_get_activities()
+        )
+        self.assertEqual(res[0]["total_count"], 1)
+        self.assertEqual(res[0]["today_count"], 2)
+        res = self.env["res.users"].with_user(self.employee.id).systray_get_activities()
+        self.assertEqual(res[0]["total_count"], 2)
 
     def test_activity_schedule_next(self):
         self.activity1.write(