[16.0][FIX] mail_composer_cc_bcc: fix duplicate key value error "unique_mail_message_id_res_partner_id_if_set"

mail_composer_cc_bcc/README.rst

@@ -106,6 +106,7 @@ Contributors
 
     * Hai N. Le <[email protected]>
     * Son Ho <[email protected]>
+    * Tris Doan <[email protected]>
 
 * `Therp BV <https://therp.nl>`_:
 

mail_composer_cc_bcc/models/mail_thread.py

@@ -26,10 +26,11 @@ def _notify_by_email_get_base_mail_values(self, message, additional_values=None)
         can be sent to those addresses.
         """
         context = self.env.context
-
         res = super()._notify_by_email_get_base_mail_values(
             message, additional_values=additional_values
         )
+        if context.get("skip_adding_cc_bcc", False):
+            return res
         partners_cc = context.get("partner_cc_ids", None)
         if partners_cc:
             res["email_cc"] = format_emails(partners_cc)
@@ -48,7 +49,8 @@ def _notify_get_recipients(self, message, msg_vals, **kwargs):
         rdata = super()._notify_get_recipients(message, msg_vals, **kwargs)
         context = self.env.context
         is_from_composer = context.get("is_from_composer", False)
-        if not is_from_composer:
+        skip_adding_cc_bcc = context.get("skip_adding_cc_bcc", False)
+        if not is_from_composer or skip_adding_cc_bcc:
             return rdata
         for pdata in rdata:
             pdata["type"] = "customer"
@@ -62,9 +64,13 @@ def _notify_get_recipients(self, message, msg_vals, **kwargs):
         recipients_cc_bcc = MailFollowers._get_recipient_data(
             None, message_type, subtype_id, partners_cc_bcc.ids
         )
+        partners_already_marked_as_recipient = [r.get("id", False) for r in rdata]
         for _, value in recipients_cc_bcc.items():
             for _, data in value.items():
-                if not data.get("id"):
+                if (
+                    not data.get("id")
+                    or data.get("id") in partners_already_marked_as_recipient
+                ):
                     continue
                 if not data.get(
                     "notif"
@@ -92,6 +98,9 @@ def _notify_by_email_get_final_mail_values(
             recipient_ids, base_mail_values, additional_values=additional_values
         )
         context = self.env.context
+        skip_adding_cc_bcc = context.get("skip_adding_cc_bcc", False)
+        if skip_adding_cc_bcc:
+            return res
         r_ids = list(recipient_ids)
         partners_cc = context.get("partner_cc_ids", None)
         if partners_cc:
@@ -110,7 +119,8 @@ def _notify_get_recipients_classify(
             recipient_data, model_name, msg_vals=msg_vals
         )
         is_from_composer = self.env.context.get("is_from_composer", False)
-        if not is_from_composer:
+        skip_adding_cc_bcc = self.env.context.get("skip_adding_cc_bcc", False)
+        if not is_from_composer or skip_adding_cc_bcc:
             return res
         ids = []
         customer_data = None
@@ -126,3 +136,8 @@ def _notify_get_recipients_classify(
         else:
             customer_data["recipients"] += ids
         return [customer_data]
+
+    def _notify_thread(self, message, msg_vals=False, **kwargs):
+        if message.message_type == "notification":
+            self = self.with_context(skip_adding_cc_bcc=True)
+        return super(MailThread, self)._notify_thread(message, msg_vals, **kwargs)

mail_composer_cc_bcc/readme/CONTRIBUTORS.rst

@@ -2,6 +2,7 @@
 
     * Hai N. Le <[email protected]>
     * Son Ho <[email protected]>
+    * Tris Doan <[email protected]>
 
 * `Therp BV <https://therp.nl>`_:
 

mail_composer_cc_bcc/static/description/index.html

@@ -452,6 +452,7 @@ <h1>Contributors</h1>
 <ul class="simple">
 <li>Hai N. Le &lt;<a class="reference external" href="mailto:hailn&#64;trobz.com">hailn&#64;trobz.com</a>&gt;</li>
 <li>Son Ho &lt;<a class="reference external" href="mailto:sonhd&#64;trobz.com">sonhd&#64;trobz.com</a>&gt;</li>
+<li>Tris Doan &lt;<a class="reference external" href="mailto:tridm&#64;trobz.com">tridm&#64;trobz.com</a>&gt;</li>
 </ul>
 </blockquote>
 </li>

mail_composer_cc_bcc/tests/test_mail_cc_bcc.py

@@ -85,12 +85,12 @@ def test_template_cc_bcc(self):
         # Company default values
         env.company.default_partner_cc_ids = self.partner_cc3
         env.company.default_partner_bcc_ids = self.partner_cc2
-        # Product template values
-        tmpl_model = env["ir.model"].search([("model", "=", "product.template")])
+        # Partner template values
+        tmpl_model = env["ir.model"].search([("model", "=", "res.partner")])
         partner_cc = self.partner_cc
         partner_bcc = self.partner_bcc
         vals = {
-            "name": "Product Template: Re: [E-COM11] Cabinet with Doors",
+            "name": "Test Template",
             "model_id": tmpl_model.id,
             "subject": "Re: [E-COM11] Cabinet with Doors",
             "body_html": """<p style="margin:0px 0 12px 0;box-sizing:border-box;">
@@ -102,18 +102,18 @@ def test_template_cc_bcc(self):
                 (partner_bcc.name or "False", partner_bcc.email or "False")
             ),
         }
-        prod_tmpl = env["mail.template"].create(vals)
+        partner_tmpl = env["mail.template"].create(vals)
         # Open mail composer form and check for default values from company
         form = self.open_mail_composer_form()
         composer = form.save()
         self.assertEqual(composer.partner_cc_ids, self.partner_cc3)
         self.assertEqual(composer.partner_bcc_ids, self.partner_cc2)
         # Change email template and check for values from it
-        form.template_id = prod_tmpl
+        form.template_id = partner_tmpl
         composer = form.save()
         # Beside existing Cc and Bcc, add template's ones
         form = Form(composer)
-        form.template_id = prod_tmpl
+        form.template_id = partner_tmpl
         composer = form.save()
         expecting = self.partner_cc3 + self.partner_cc
         self.assertEqual(composer.partner_cc_ids, expecting)
@@ -127,8 +127,8 @@ def test_template_cc_bcc(self):
         form = Form(composer)
         form.template_id = env["mail.template"]
         form.save()
-        self.assertFalse(form.template_id)
-        form.template_id = prod_tmpl
+        self.assertFalse(form.template_id)  # no template
+        form.template_id = partner_tmpl
         composer = form.save()
         expecting = self.partner_cc3 + self.partner_cc
         self.assertEqual(composer.partner_cc_ids, expecting)