- Tasks Email Queue

Signed-off-by: Dave Richer <dave@imexsystems.ca>

server/email/tasksEmails.js

@@ -11,7 +11,7 @@ const client = require("../graphql-client/graphql-client").client;
 const queries = require("../graphql-client/queries");
 const generateEmailTemplate = require("./generateTemplate");
 const moment = require("moment");
-const { UPDATE_TASKS_REMIND_AT_SENT } = require("../graphql-client/queries");
+const { taskEmailQueue } = require("./tasksEmailsQueue");
 
 const ses = new aws.SES({
   apiVersion: "latest",
@@ -27,6 +27,9 @@ const transporter = nodemailer.createTransport({
   sendingRate: 40 // 40 emails per second.
 });
 
+// Initialize the Tasks Email Queue
+const tasksEmailQueue = taskEmailQueue();
+
 const fromEmails = InstanceManager({
   imex: "ImEX Online <noreply@imex.online>",
   rome: "Rome Online <noreply@romeonline.io>",
@@ -76,25 +79,27 @@ const generateTemplateArgs = (title, createdBy, dueDate, taskId) => {
 const sendMail = (type, to, subject, html, taskIds, successCallback) => {
   // Push next messages to Nodemailer
   transporter.once("idle", () => {
-    if (transporter.isIdle()) {
-      transporter.sendMail(
-        {
-          from: fromEmails,
-          to,
-          subject,
-          html
-        },
-        (error, info) => {
-          if (info) {
-            if (typeof successCallback === "function" && taskIds && taskIds.length) {
-              successCallback(taskIds);
-            }
-          } else {
-            logger.log(`task-${type}-email-failure`, "error", null, null, error);
+    // Note: This is commented out because despite being in the documentation, it does not work
+    // and stackoverflow suggests it is not needed
+    // if (transporter.isIdle()) {
+    transporter.sendMail(
+      {
+        from: fromEmails,
+        to,
+        subject,
+        html
+      },
+      (error, info) => {
+        if (info) {
+          if (typeof successCallback === "function" && taskIds && taskIds.length) {
+            successCallback(taskIds);
           }
+        } else {
+          logger.log(`task-${type}-email-failure`, "error", null, null, error);
         }
-      );
-    }
+      }
+    );
+    // }
   });
 };
 
@@ -194,9 +199,8 @@ const tasksRemindEmail = async (req, res) => {
           subHeader: `Please sign in to your account to view the Task details.`,
           body: `<ul>
               ${allTasks
-                .map(
-                  (task) =>
-                    `<li><a href="${endPoints}/manage/tasks/alltasks?taskid=${task.id}">${task.title} - ${formatDate(task.due_date)}</a></li>`
+                .map((task) =>
+                  `<li><a href="${endPoints}/manage/tasks/alltasks?taskid=${task.id}">${task.title} ${task.due_date ? `- ${formatDate(task.due_date)}` : ""}</a></li>`.trim()
                 )
                 .join("")}
             </ul>`
@@ -206,10 +210,9 @@ const tasksRemindEmail = async (req, res) => {
       if (emailData?.subject && emailData?.html) {
         // Send Email
         sendMail("remind", emailData.to, emailData.subject, emailData.html, taskIds, (taskIds) => {
-          client.request(UPDATE_TASKS_REMIND_AT_SENT, {
-            taskIds,
-            now: moment().toISOString()
-          });
+          for (const taskId of taskIds) {
+            taskEmailQueue.push(taskId);
+          }
         });
       }
     });