Merge PR #42 into 13.0

Signed-off-by Yajo

resource_booking/models/resource_booking.py

@@ -532,12 +532,20 @@ def name_get(self):
             new.append((id_, name))
         return new
 
-    def message_get_suggested_recipients(self):
-        recipients = super().message_get_suggested_recipients()
-        for one in self:
-            if one.partner_id:
-                one._message_add_suggested_recipient(
-                    recipients, partner=one.partner_id, reason=_("Requesting partner")
+    def _message_get_suggested_recipients(self):
+        """Suggest related partners."""
+        recipients = super()._message_get_suggested_recipients()
+        for record in self:
+            record._message_add_suggested_recipient(
+                recipients,
+                partner=record.partner_id,
+                reason=self._fields["partner_id"].string,
+            )
+            for partner in record.combination_id.resource_ids.user_id.partner_id:
+                record._message_add_suggested_recipient(
+                    recipients,
+                    partner=partner,
+                    reason=self._fields["combination_id"].string,
                 )
         return recipients
 

resource_booking/tests/test_backend.py

@@ -7,7 +7,7 @@
 
 from odoo import fields
 from odoo.exceptions import ValidationError
-from odoo.tests.common import Form, SavepointCase
+from odoo.tests.common import Form, SavepointCase, new_test_user
 
 from .common import create_test_data
 
@@ -588,3 +588,40 @@ def test_attendee_not_autoassigned_autoconfirmed(self):
         )
         # Combination was handpicked, so resource attendees are auto-confirmed
         self.assertEqual(resource_attendees.state, "accepted")
+
+    def test_suggested_recipients(self):
+        # Create a booking as a new user
+        rb_user = new_test_user(
+            self.env, login="rbu", groups="base.group_user,resource_booking.group_user"
+        )
+        rb = (
+            self.env["resource.booking"]
+            .with_user(rb_user)
+            .create(
+                {
+                    "partner_id": self.partner.id,
+                    "type_id": self.rbt.id,
+                    "combination_auto_assign": False,
+                    "combination_id": self.rbcs[0].id,
+                    "user_id": self.users[1].id,
+                }
+            )
+        )
+        # Organizer and creator must already be following
+        self.assertEqual(
+            rb.message_partner_ids, rb_user.partner_id | self.users[1].partner_id
+        )
+        # Requester and combination must be suggested
+        self.assertEqual(
+            rb._message_get_suggested_recipients(),
+            {
+                rb.id: [
+                    (rb.partner_id.id, "some customer", "Requester"),
+                    (
+                        self.users[0].partner_id.id,
+                        "User 0<user_0@example.com>",
+                        "Resources combination",
+                    ),
+                ]
+            },
+        )