Merge PR #1152 into 16.0

Signed-off-by pedrobaeza

Author: OCA-git-bot

announcement/models/announcement.py

@@ -228,8 +228,18 @@ def create(self, vals_list):
         return records
 
     def write(self, vals):
-        """Adjust attachments for being accesible to receivers of the announcement."""
+        """Adjust attachments for being accesible to receivers of the announcement.
+        Adjust unread_announcement_ids when specific users are modified
+        (if users are removed).
+        """
+        data = {}
+        for item in self:
+            data[self] = item.allowed_user_ids
         res = super().write(vals)
+        if vals.get("specific_user_ids"):
+            for item in self:
+                unlink_users = data[self] - item.allowed_user_ids
+                unlink_users.unread_announcement_ids -= item
         self._process_attachments(vals)
         return res
 

announcement/tests/__init__.py

@@ -0,0 +1 @@
+from . import test_announcement

announcement/tests/test_announcement.py

@@ -0,0 +1,94 @@
+# Copyright 2025 Tecnativa - Víctor Martínez
+# Copyright 2025 Tecnativa - David Bañón
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from datetime import datetime, timedelta
+
+from odoo import Command
+from odoo.tests import new_test_user, tagged, users
+
+from odoo.addons.base.tests.common import BaseCommon
+
+
+@tagged("-at_install", "post_install")
+class TestAnnouncement(BaseCommon):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.general_announcement = cls.env["announcement"].create(
+            {
+                "name": "Test announcement",
+                "content": "<p>Test content for test announcement</p>",
+                "is_general_announcement": True,
+                "notification_date": datetime.now() + timedelta(days=-1),
+                "notification_expiry_date": datetime.now() + timedelta(days=+1),
+                "active": True,
+            }
+        )
+        cls.expired_announcement = cls.env["announcement"].create(
+            {
+                "name": "Test expired announcement",
+                "content": "<p>Its gone</p>",
+                "is_general_announcement": True,
+                "notification_date": datetime.now() + timedelta(days=-2),
+                "notification_expiry_date": datetime.now() + timedelta(days=-1),
+                "active": True,
+            }
+        )
+        cls.user = new_test_user(cls.env, login="test-user")
+        cls.user_system = new_test_user(
+            cls.env, login="test-user-system", groups="base.group_system"
+        )
+        cls.admin_announcement = cls.env["announcement"].create(
+            {
+                "name": "Test admin only announcement",
+                "content": "<p>Test content for admins only</p>",
+                "announcement_type": "user_group",
+                "user_group_ids": cls.env.ref("base.group_system"),
+                "notification_date": datetime.now() + timedelta(days=-1),
+                "notification_expiry_date": datetime.now() + timedelta(days=+1),
+                "active": True,
+            }
+        )
+        cls.custom_announcement = cls.env["announcement"].create(
+            {
+                "name": "Test custom only announcement",
+                "content": "<p>Test content for custom users</p>",
+                "announcement_type": "specific_users",
+                "specific_user_ids": [
+                    Command.link(cls.user.id),
+                    Command.link(cls.user_system.id),
+                ],
+                "notification_date": datetime.now() + timedelta(days=-1),
+                "notification_expiry_date": datetime.now() + timedelta(days=+1),
+                "active": True,
+            }
+        )
+
+    @users("test-user-system")
+    def test_announcements_user_system(self):
+        res = self.env.user.get_announcements()
+        announcement_ids = [announcement["id"] for announcement in res["data"]]
+        self.assertIn(self.general_announcement.id, announcement_ids)
+        self.assertIn(self.admin_announcement.id, announcement_ids)
+        self.assertIn(self.custom_announcement.id, announcement_ids)
+        self.assertNotIn(self.expired_announcement.id, announcement_ids)
+
+    @users("test-user")
+    def test_announcements_user(self):
+        res = self.env.user.get_announcements()
+        announcement_ids = [announcement["id"] for announcement in res["data"]]
+        self.assertIn(self.general_announcement.id, announcement_ids)
+        self.assertIn(self.custom_announcement.id, announcement_ids)
+        self.assertNotIn(self.admin_announcement.id, announcement_ids)
+        self.assertNotIn(self.expired_announcement.id, announcement_ids)
+
+    def test_custom_anouncement_write(self):
+        self.assertIn(self.custom_announcement, self.user.unread_announcement_ids)
+        self.custom_announcement.write(
+            {"specific_user_ids": [Command.unlink(self.user.id)]}
+        )
+        self.assertNotIn(self.custom_announcement, self.user.unread_announcement_ids)
+        self.custom_announcement.write(
+            {"specific_user_ids": [Command.link(self.user.id)]}
+        )
+        self.assertIn(self.custom_announcement, self.user.unread_announcement_ids)