feat: notifications improvements

AtelierdeParis · Jan 13, 2025 · 69c594a · 69c594a
1 parent b339897
commit 69c594a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/back/api/actuality/services/actuality.js b/back/api/actuality/services/actuality.js
@@ -18,11 +18,9 @@ const validateEmail = (email) => {
 
 module.exports = {
     async sendActualityEmails(actuality, emails) {
-        const converter = new showdown.Converter();
         const date = new Date().toLocaleDateString('fr-FR', { year: 'numeric', month: 'long', day: 'numeric' });
         const image = await strapi.query('file', 'upload').findOne({ id: actuality.image });
-
-
+        const converter = new showdown.Converter();
 
         for (const email of emails) {
             if (validateEmail(email)) {
@@ -46,7 +44,8 @@ module.exports = {
                         actuality_description: removeMd(actuality.content).split(' ').slice(0, 35).join(' ') + '...',
                         actuality_link: `${process.env.FRONT_URL}/actualites/${actuality.slug}`,
                         notification_link: `${process.env.FRONT_URL}/notifications?token=${encodeURIComponent(token)}`,
-                        email_message: actuality.notification_email_message ? converter.makeHtml(actuality.notification_email_message) : null,
+                        email_message: actuality.notification_email_message ? converter.makeHtml(actuality.notification_email_message).replace(/\n/g, '<br/>') : null,
+                        user_type: "actuality",
                     }
                 )
             }

diff --git a/back/config/functions/cron.js b/back/config/functions/cron.js
@@ -66,6 +66,7 @@ module.exports = {
       notification_email_broadcast_date_null: false,
       notification_email_broadcast_date_lte: new Date(),
       notification_email_sent_at_null: true,
+      published_at_null: false,
     });
 
     const users = await knex.raw(`
@@ -80,9 +81,7 @@ module.exports = {
   )
 `);
 
-
     for (const actuality of actualities) {
-
       try {
         const emails = [...new Set(users.rows.map(user => user.email))]
 

diff --git a/back/extensions/email/services/email.js b/back/extensions/email/services/email.js
@@ -4,6 +4,11 @@ const signature = `L'équipe de StudioD<br/><a href="${process.env.FRONT_URL}">s
 const signatureAdmin = `Bonne journée`;
 
 const getFooter = (type) => {
+  if (type === "actuality") {
+    return `Vous recevez cet email car vous êtes inscrit·e aux actualités de <a href="${process.env.FRONT_URL
+      }">studiod-danse.fr</a>.`;
+  }
+
   return `Vous recevez cet email car vous êtes inscrit·e en tant que ${type === "place" ? "lieu" : "compagnie"
     } sur la plateforme <a href="${process.env.FRONT_URL
     }">studiod-danse.fr</a>. En cas de souci, n'hésitez pas à <a href="${process.env.FRONT_URL