set up email notifications for user self and admins

Author: sshugsc

app/config.js

@@ -1,5 +1,6 @@
 const nconf = require('nconf');
 const {merge} = require('lodash');
+require('dotenv').config();
 
 const ENV = process.env.NODE_ENV || 'local';
 

app/libs/email.js

@@ -35,14 +35,15 @@ const getEmailList = async (triggers) => {
   const emailList = [];
   for (const notif of notifs) {
     if (notif.user) {
-      if (!emailList.includes(notif.user.email)
+      if (!emailList.some((el) => {return el.toEmail === notif.user.email;})
           && notif.user.email.endsWith(domain)
           && notif.user.allowNotifications) {
         emailList.push({toEmail: notif.user.email, notifId: notif.id, eventType: notif.eventType});
       }
-    } else if (notif.userGroup) {
+    }
+    if (notif.userGroup) {
       for (const groupUser of notif.userGroup.users) {
-        if (!emailList.includes(groupUser.email)
+        if (!emailList.some((el) => {return el.toEmail === groupUser.email;})
             && groupUser.email.endsWith(domain)
             && groupUser.allowNotifications) {
           emailList.push({toEmail: groupUser.email, notifId: notif.id, eventType: notif.eventType});

app/queue.js

@@ -44,13 +44,13 @@ const addJobToEmailQueue = async (data) => {
     logger.info('adding email to queue: ', data);
     const job = await emailQueue.add('job', data, EMAIL_REMOVE_CONFIG);
     try {
-      await db.models.notificationTrack.create({
+      await db.models.notificationTrack.findOrCreate({where: {
         notificationId: data.notifId,
         jobId: job.id,
         recipient: data.mailOptions.to,
         reason: data.eventType,
         outcome: 'created',
-      });
+      }});
     } catch (error) {
       logger.error(`Unable to create notification track ${error}`);
       throw new Error(error);
@@ -152,20 +152,6 @@ const emailProcessor = async (job) => {
   });
 
   try {
-    try {
-      const notification = await db.models.notificationTrack.findOne({
-        where: {
-          notificationId: job.data.notifId,
-          jobId: job.id,
-        },
-      });
-      await notification.update({
-        outcome: 'processing',
-      });
-    } catch (error) {
-      logger.error(`Unable to add process notification track ${error}`);
-      throw new Error(error);
-    }
     await transporter.sendMail(job.data.mailOptions);
   } catch (err) {
     logger.error(JSON.stringify(job.data.mailOptions));

app/routes/report/report.js

@@ -332,13 +332,15 @@ router.route('/')
       report.projects.forEach((project) => {
         projectIdArray.push(project.project_id);
       });
+      const userGroup = await db.models.userGroup.findOne({where: {name: 'admin'}});
 
-      await db.models.notification.findOrCreate({
+      const notify = await db.models.notification.findOrCreate({
         where: {
           userId: req.user.id,
           eventType: NOTIFICATION_EVENT.REPORT_CREATED,
           templateId: report.templateId,
           projectId: report.projects[0].project_id,
+          userGroupId: userGroup.id,
         },
       });
 
@@ -351,9 +353,7 @@ router.route('/')
         Template: ${req.body.template}
         Patient: ${req.body.patientId}`,
         {
-          eventType: NOTIFICATION_EVENT.REPORT_CREATED,
-          templateId: report.templateId,
-          projectId: projectIdArray,
+          id: notify[0].id,
         },
       );
 

app/routes/report/reportUser.js

@@ -132,30 +132,44 @@ router.route('/')
 
       const report = await db.models.report.findOne({where: {id: req.report.id}});
       const reportProject = await db.models.reportProject.findOne({where: {report_id: req.report.id}});
-      const notif = await db.models.notification.findOrCreate({
+      const project = await db.models.project.findOne({where: {id: reportProject.project_id}});
+      const template = await db.models.template.findOne({where: {id: report.templateId}});
+      const userGroup = await db.models.userGroup.findOne({where: {name: 'admin'}});
+
+      const notifyReq = await db.models.notification.findOrCreate({
         where: {
           userId: req.user.id,
           eventType: NOTIFICATION_EVENT.USER_BOUND,
           templateId: report.templateId,
           projectId: reportProject.project_id,
+          userGroupId: userGroup.id,
+        },
+      });
+
+      const notifyBinding = await db.models.notification.findOrCreate({
+        where: {
+          userId: bindUser.id,
+          eventType: NOTIFICATION_EVENT.USER_BOUND,
+          templateId: report.templateId,
+          projectId: reportProject.project_id,
+          userGroupId: userGroup.id,
         },
       });
 
       // Try sending email
       try {
         await email.notifyUsers(
           `${bindUser.firstName} ${bindUser.lastName} has been bound to a report`,
-          `User ${bindUser.firstName} ${bindUser.lastName} has been bound to report ${req.report.ident} as ${role}`,
+          `User ${bindUser.firstName} ${bindUser.lastName} has been bound to report ${req.report.ident} as ${role}.
+          Report Type: ${template.name}
+          Patient Id: ${report.patientId}
+          Project: ${project.name}`,
           {
-            eventType: NOTIFICATION_EVENT.USER_BOUND,
-            templateId: req.report.templateId,
+            id: [notifyReq[0].id, notifyBinding[0].id],
           },
         );
-
-        await notif[0].update({status: 'Success'}, {userId: req.user.id});
         logger.info('Email sent successfully');
       } catch (error) {
-        await notif[0].update({status: 'Unsuccess'}, {userId: req.user.id});
         logger.error(`Email not sent successfully: ${error}`);
       }
 

package-lock.json

@@ -21,6 +21,7 @@
     "bullmq": "^5.1.11",
     "compression": "^1.7.4",
     "cors": "~2.8.5",
+    "dotenv": "^16.5.0",
     "exceljs": "^4.3.0",
     "express": "^4.18.1",
     "express-fileupload": "^1.4.0",