fix async support

RegioneER · May 24, 2024 · 50b0d72 · 50b0d72
1 parent a1930f6
commit 50b0d72
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 44 deletions.
diff --git a/src/rer/newsletter/adapter/sender.py b/src/rer/newsletter/adapter/sender.py
@@ -78,7 +78,7 @@ def _getMessage(self, message, footer):
                 <tr>
                     <td align="left" colspan="2">
                       <div class="newsletterTitle">
-                        <h1>{self.context.title}</h1>
+                        <h1>{message.title}</h1>
                       </div>
                     </td>
                 </tr>""",
@@ -124,23 +124,66 @@ def set_end_send_infos(self, send_uid, completed=True):
         send_info = [x for x in details if x["uid"] == send_uid]
         if not send_info:
             return SEND_UID_NOT_FOUND
-        send_info[0]["send_date_end"] = datetime.today().strftime("%d/%m/%Y %H:%M:%S")
+        send_info[0]["send_date_end"] = datetime.today().strftime(
+            "%d/%m/%Y %H:%M:%S"
+        )
         send_info[0]["completed"] = completed
         send_info[0]["running"] = False
         return OK
 
     def prepare_body(self, message):
-        unsubscribe_footer_template = self.context.restrictedTraverse(
-            "@@unsubscribe_channel_template"
+        # unsubscribe_footer_template = self.context.restrictedTraverse(
+        #     "@@unsubscribe_channel_template"
+        # )
+        # parameters = {
+        #     "portal_name": get_site_title(),
+        #     "channel_name": self.context.title,
+        #     "unsubscribe_link": self.context.absolute_url(),
+        #     "enabled": self.context.standard_unsubscribe,
+        # }
+        # footer = unsubscribe_footer_template(**parameters)
+        # return self._getMessage(message=message, footer=footer)
+        unsubscribe_footer_template = api.content.get_view(
+            name="unsubscribe_channel_template",
+            context=self.context,
+            request=self.request,
         )
         parameters = {
             "portal_name": get_site_title(),
             "channel_name": self.context.title,
             "unsubscribe_link": self.context.absolute_url(),
             "enabled": self.context.standard_unsubscribe,
         }
-        footer = unsubscribe_footer_template(**parameters)
-        return self._getMessage(message=message, footer=footer)
+
+        message_template = api.content.get_view(
+            context=message, name="messagepreview_view", request=self.request
+        )
+        parameters = {
+            "message_subheader": f"""
+                <tr>
+                    <td align="left" colspan="2">
+                      <div class="newsletterTitle">
+                        <h1>{message.title}</h1>
+                      </div>
+                    </td>
+                </tr>""",
+            "message_unsubscribe_default": f"""
+                <tr>
+                    <td align="left" colspan="2">
+                    <div class="newsletter-unsubscribe">
+                        {unsubscribe_footer_template(**parameters)}
+                    </div>
+                    </td>
+                </tr>
+            """,
+        }
+
+        body = message_template(**parameters)
+        # passo la mail per il transform
+        portal = api.portal.get()
+        body = portal.portal_transforms.convertTo("text/mail", body)
+
+        return body
 
     def sendMessage(self, message):
         """This is the primary method to send emails for the channel."""
@@ -149,7 +192,9 @@ def sendMessage(self, message):
         subscribers = self.get_annotations_for_channel(key=SUBSCRIBERS_KEY)
 
         nl_subject = (
-            " - " + self.context.subject_email if self.context.subject_email else ""
+            " - " + self.context.subject_email
+            if self.context.subject_email
+            else ""
         )
         sender = (
             self.context.sender_name
@@ -195,7 +240,9 @@ def doSend(self, body, subject, subscribers, sender):
     def addToHistory(self, message):
         """Add to history that message is sent"""
 
-        list_history = [x for x in message.workflow_history.get("message_workflow")]
+        list_history = [
+            x for x in message.workflow_history.get("message_workflow")
+        ]
         current = api.user.get_current()
         entry = dict(
             action="Invio",

diff --git a/src/rer/newsletter/browser/channel/templates/mail_templates/active_user.pt b/src/rer/newsletter/browser/channel/templates/mail_templates/active_user.pt
@@ -38,28 +38,19 @@
              style="width:100%;border:0;border-spacing:0;color:#000"
       >
         <span tal:replace="structure header"></span>
-        <tr>
-          <td align="left"
-              colspan="2"
-          >
-            <div class="newsletterTitle">
-              <h1>${title}</h1>
-            </div>
-          </td>
-        </tr>
         <tr>
           <td align="left"
               colspan="2"
           >
             <p class="message_core">Per confermare la tua richiesta di iscrizione a Newsletter ${title}, &egrave; necessario collegarsi entro 48 ore al seguente link:
               <br />
               <a href="${activationUrl}">${activationUrl}</a>
-              <br />
-            Cordiali saluti
-              <br />
-            Redazione del portale ${portal_name}
             </p>
-            <br />
+            <p>
+              Cordiali saluti
+                <br />
+              Redazione del portale ${portal_name}
+            </p>
           </td>
         </tr>
         <span tal:replace="structure footer"></span>

diff --git a/src/rer/newsletter/browser/channel/templates/mail_templates/active_user_confirm.pt b/src/rer/newsletter/browser/channel/templates/mail_templates/active_user_confirm.pt
@@ -36,15 +36,6 @@
              style="width:100%;border:0;border-spacing:0;color:#000"
       >
         <span tal:replace="structure header"></span>
-        <tr>
-          <td align="left"
-              colspan="2"
-          >
-            <div class="newsletterTitle">
-              <h1>${channel_name}</h1>
-            </div>
-          </td>
-        </tr>
         <tr>
           <td align="left"
               colspan="2"

diff --git a/src/rer/newsletter/browser/channel/templates/mail_templates/asynch_send_success.pt b/src/rer/newsletter/browser/channel/templates/mail_templates/asynch_send_success.pt
@@ -10,9 +10,9 @@
   <style tal:content="style"></style>
   <br />
   <p class="message_core">
-  L'invio del messaggio ${message_title}
+  L'invio del messaggio <b>${message_title}</b>
     <tal:subscribers condition="subscribers">a ${subscribers} iscritti</tal:subscribers>
-  del canale ${channel_name} &egrave; andato a buon fine.
+  del canale <b>${channel_name}</b> &egrave; andato a buon fine.
   </p>
   <br />
   <span tal:replace="structure footer"></span>

diff --git a/src/rer/newsletter/browser/channel/templates/mail_templates/delete_user.pt b/src/rer/newsletter/browser/channel/templates/mail_templates/delete_user.pt
@@ -37,15 +37,6 @@
              style="width:100%;border:0;border-spacing:0;color:#000"
       >
         <span tal:replace="structure header"></span>
-        <tr>
-          <td align="left"
-              colspan="2"
-          >
-            <div class="newsletterTitle">
-              <h1>${title}</h1>
-            </div>
-          </td>
-        </tr>
         <tr>
           <td align="left"
               colspan="2"

diff --git a/src/rer/newsletter/queue/view.py b/src/rer/newsletter/queue/view.py
@@ -43,7 +43,9 @@ def _sendNotification(self, status, channel, message):
                 "message_title": message.title,
             }
             mail_text = message_template(**parameters)
-            mail_text = portal.portal_transforms.convertTo("text/mail", mail_text)
+            mail_text = portal.portal_transforms.convertTo(
+                "text/mail", mail_text
+            )
 
             # response_email = None
             # if channel.response_email:
@@ -95,7 +97,9 @@ def __call__(self):
 
         status = UNHANDLED
         message = self._getMessage()
-        channel = getMultiAdapter((self._getChannel(), self.request), IChannelSender)
+        channel = getMultiAdapter(
+            (self._getChannel(), self.request), IChannelSender
+        )
 
         unsubscribe_footer_template = message.restrictedTraverse(
             "@@unsubscribe_channel_template"