T3374 scheduled actions

message_center_compassion/tools/onramp_connector.py

@@ -22,6 +22,11 @@
 
 _logger = logging.getLogger(__name__)
 
+# requests has no default timeout: without this a non-responding GMC blocks the
+# worker until the Odoo time limit kills it (up to 8h), holding its queue channel.
+# (connect, read) seconds.
+GMC_TIMEOUT = (10, 60)
+
 
 class OnrampConnector:
     """Singleton class to connect to U.S. Onramp in order to send
@@ -113,14 +118,26 @@ def send_message(
         while not isinstance(r, requests.Response) and count < 5:
             try:
                 if message_type in ("GET", "GET_RAW"):
-                    r = self._session.get(url, headers=headers, params=params)
+                    r = self._session.get(
+                        url, headers=headers, params=params, timeout=GMC_TIMEOUT
+                    )
                 elif message_type == "POST":
                     r = self._session.post(
-                        url, headers=headers, json=body, params=params, data=data
+                        url,
+                        headers=headers,
+                        json=body,
+                        params=params,
+                        data=data,
+                        timeout=GMC_TIMEOUT,
                     )
                 elif message_type == "PUT":
                     r = self._session.put(
-                        url, headers=headers, json=body, params=params, data=data
+                        url,
+                        headers=headers,
+                        json=body,
+                        params=params,
+                        data=data,
+                        timeout=GMC_TIMEOUT,
                     )
                 else:
                     return {"code": 404, "Error": "No valid HTTP verb used"}
@@ -181,7 +198,11 @@ def get_gmc_token(cls, env):
             "Content-type": "application/x-www-form-urlencoded",
         }
         response = requests.post(
-            provider, data=params_post, auth=(client, secret), headers=header_post
+            provider,
+            data=params_post,
+            auth=(client, secret),
+            headers=header_post,
+            timeout=GMC_TIMEOUT,
         )
         try:
             token = response.json()

partner_communication/models/communication_attachment.py

@@ -92,7 +92,9 @@ def create(self, vals):
     def unlink(self):
         attachments = self.mapped("attachment_id")
         super().unlink()
-        attachments.unlink()
+        # Deleting the ir.attachment is internal to deleting its wrapper record,
+        # which was already access-checked.
+        attachments.sudo().unlink()
         return True
 
     def print_attachments(self, output_tray=None):

partner_communication/models/communication_job.py

@@ -968,8 +968,8 @@ def _send_by_sms_asynchronous(self):
     def _notify_get_reply_to(
         self, default=None, records=None, company=None, doc_names=None
     ):
-        res = dict.fromkeys(self.ids)
-        for job in self:
+        res = dict.fromkeys(self.ids, default)
+        for job in self.filtered("email_template_id"):
             res.update(job.email_template_id._render_field("reply_to", job.ids))
         return res