feature/IO-3096-GlobalNotifications - Checkpoint, fixed some email bugs in other files, consolidated the GetEndpoints on the backend, moved the consolidation delays for queues to ENV vars

server/email/tasksEmails.js

@@ -10,6 +10,7 @@ const generateEmailTemplate = require("./generateTemplate");
 const moment = require("moment-timezone");
 const { taskEmailQueue } = require("./tasksEmailsQueue");
 const mailer = require("./mailer");
+const { InstanceEndpoints } = require("../utils/instanceMgr");
 
 // Initialize the Tasks Email Queue
 const tasksEmailQueue = taskEmailQueue();
@@ -83,15 +84,8 @@ const formatPriority = (priority) => {
  * @param taskId
  * @returns {{header, body: string, subHeader: string}}
  */
-
-const getEndpoints = (bodyshop) =>
-  InstanceManager({
-    imex: process.env?.NODE_ENV === "test" ? "https://test.imex.online" : "https://imex.online",
-    rome: process.env?.NODE_ENV === "test" ? "https//test.romeonline.io" : "https://romeonline.io"
-  });
-
 const generateTemplateArgs = (title, priority, description, dueDate, bodyshop, job, taskId, dateLine, createdBy) => {
-  const endPoints = getEndpoints(bodyshop);
+  const endPoints = InstanceEndpoints();
   return {
     header: title,
     subHeader: `Body Shop: ${bodyshop.shopname} | Priority: ${formatPriority(priority)} ${formatDate(dueDate)} | Created By: ${createdBy || "N/A"}`,
@@ -108,9 +102,8 @@ const generateTemplateArgs = (title, priority, description, dueDate, bodyshop, j
  * @param html
  * @param taskIds
  * @param successCallback
- * @param requestInstance
  */
-const sendMail = (type, to, subject, html, taskIds, successCallback, requestInstance) => {
+const sendMail = (type, to, subject, html, taskIds, successCallback) => {
   const fromEmails = InstanceManager({
     imex: "ImEX Online <noreply@imex.online>",
     rome: "Rome Online <noreply@romeonline.io>"
@@ -136,7 +129,7 @@ const sendMail = (type, to, subject, html, taskIds, successCallback, requestInst
 };
 
 /**
- * Send an email to the assigned user.
+ * Email the assigned user.
  * @param req
  * @param res
  * @returns {Promise<*>}
@@ -186,7 +179,7 @@ const taskAssignedEmail = async (req, res) => {
 };
 
 /**
- * Send an email to remind the user of their tasks.
+ * Email remind the user of their tasks.
  * @param req
  * @param res
  * @returns {Promise<*>}
@@ -264,11 +257,6 @@ const tasksRemindEmail = async (req, res) => {
       }
       // There are multiple emails to send to this author.
       else {
-        const endPoints = InstanceManager({
-          imex: process.env?.NODE_ENV === "test" ? "https://test.imex.online" : "https://imex.online",
-          rome: process.env?.NODE_ENV === "test" ? "https//test.romeonline.io" : "https://romeonline.io"
-        });
-
         const allTasks = groupedTasks[recipient.email];
         emailData.subject = `New Tasks Reminder - ${allTasks.length} Tasks require your attention`;
         emailData.html = generateEmailTemplate({
@@ -278,7 +266,7 @@ const tasksRemindEmail = async (req, res) => {
           body: `<ul>
               ${allTasks
                 .map((task) =>
-                  `<li><a href="${endPoints}/manage/tasks/alltasks?taskid=${task.id}">${task.title} - Priority: ${formatPriority(task.priority)} ${task.due_date ? `${formatDate(task.due_date)}` : ""} | Bodyshop: ${task.bodyshop.shopname}</a></li>`.trim()
+                  `<li><a href="${InstanceEndpoints()}/manage/tasks/alltasks?taskid=${task.id}">${task.title} - Priority: ${formatPriority(task.priority)} ${task.due_date ? `${formatDate(task.due_date)}` : ""} | Bodyshop: ${task.bodyshop.shopname}</a></li>`.trim()
                 )
                 .join("")}
             </ul>`
@@ -338,6 +326,5 @@ const tasksRemindEmail = async (req, res) => {
 
 module.exports = {
   taskAssignedEmail,
-  tasksRemindEmail,
-  getEndpoints
+  tasksRemindEmail
 };