feature/IO-3096-GlobalNotifications - Checkpoint

server/notifications/queues/appQueue.js

@@ -77,11 +77,11 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
     const addWorker = new Worker(
       "notificationsAdd",
       async (job) => {
-        const { jobId, key, variables, recipients, body } = job.data;
+        const { jobId, key, variables, recipients, body, jobRoNumber } = job.data;
         logger.logger.info(`Adding notifications for jobId ${jobId}`);
 
         const redisKeyPrefix = `app:notifications:${jobId}`;
-        const notification = { key, variables, body, timestamp: Date.now() };
+        const notification = { key, variables, body, jobRoNumber, timestamp: Date.now() };
 
         for (const recipient of recipients) {
           const { user } = recipient;
@@ -206,14 +206,17 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
 
               for (const [bodyShopId, notifications] of Object.entries(bodyShopData)) {
                 const notificationId = notificationIdMap.get(`${user}:${bodyShopId}`);
+                const jobRoNumber = notifications[0]?.jobRoNumber;
+
                 if (userMapping && userMapping[bodyShopId]?.socketIds) {
                   userMapping[bodyShopId].socketIds.forEach((socketId) => {
                     ioRedis.to(socketId).emit("notification", {
                       jobId,
+                      jobRoNumber,
                       bodyShopId,
                       notifications,
                       notificationId,
-                      associationId // now included in the emit payload
+                      associationId
                     });
                   });
                   logger.logger.info(
@@ -281,10 +284,10 @@ const dispatchAppsToQueue = async ({ appsToDispatch, logger }) => {
   const appQueue = getQueue();
 
   for (const app of appsToDispatch) {
-    const { jobId, bodyShopId, key, variables, recipients, body } = app;
+    const { jobId, bodyShopId, key, variables, recipients, body, jobRoNumber } = app;
     await appQueue.add(
       "add-notification",
-      { jobId, bodyShopId, key, variables, recipients, body },
+      { jobId, bodyShopId, key, variables, recipients, body, jobRoNumber },
       { jobId: `${jobId}:${Date.now()}` }
     );
     logger.logger.info(`Added notification to queue for jobId ${jobId} with ${recipients.length} recipients`);

server/notifications/scenarioBuilders.js

@@ -24,6 +24,7 @@ const alternateTransportChangedBuilder = (data) => {
     app: {
       jobId: data.jobId,
       bodyShopId: data.bodyShopId,
+      jobRoNumber: data.jobRoNumber,
       key: "notifications.job.alternateTransportChanged",
       body, // Same as email body
       variables: {
@@ -54,6 +55,7 @@ const billPostedHandler = (data) => {
   const result = {
     app: {
       jobId: data.jobId,
+      jobRoNumber: data.jobRoNumber,
       bodyShopId: data.bodyShopId,
       key: "notifications.job.billPosted",
       body,
@@ -85,6 +87,7 @@ const criticalPartsStatusChangedBuilder = (data) => {
     app: {
       jobId: data.jobId,
       bodyShopId: data.bodyShopId,
+      jobRoNumber: data.jobRoNumber,
       key: "notifications.job.criticalPartsStatusChanged",
       body,
       variables: {
@@ -116,6 +119,7 @@ const intakeDeliveryChecklistCompletedBuilder = (data) => {
   const result = {
     app: {
       jobId: data.jobId,
+      jobRoNumber: data.jobRoNumber,
       bodyShopId: data.bodyShopId,
       key: "notifications.job.checklistCompleted",
       body,
@@ -147,6 +151,7 @@ const jobAssignedToMeBuilder = (data) => {
   const result = {
     app: {
       jobId: data.jobId,
+      jobRoNumber: data.jobRoNumber,
       bodyShopId: data.bodyShopId,
       key: "notifications.job.assigned",
       body,
@@ -177,6 +182,7 @@ const jobsAddedToProductionBuilder = (data) => {
   const result = {
     app: {
       jobId: data.jobId,
+      jobRoNumber: data.jobRoNumber,
       bodyShopId: data.bodyShopId,
       key: "notifications.job.addedToProduction",
       body,
@@ -205,6 +211,7 @@ const jobStatusChangeBuilder = (data) => {
   const result = {
     app: {
       jobId: data.jobId,
+      jobRoNumber: data.jobRoNumber,
       bodyShopId: data.bodyShopId,
       key: "notifications.job.statusChanged",
       body,
@@ -236,6 +243,7 @@ const newMediaAddedReassignedBuilder = (data) => {
   const result = {
     app: {
       jobId: data.jobId,
+      jobRoNumber: data.jobRoNumber,
       bodyShopId: data.bodyShopId,
       key: "notifications.job.newMediaAdded",
       body,
@@ -264,6 +272,7 @@ const newNoteAddedBuilder = (data) => {
   const result = {
     app: {
       jobId: data.jobId,
+      jobRoNumber: data.jobRoNumber,
       bodyShopId: data.bodyShopId,
       key: "notifications.job.newNoteAdded",
       body,
@@ -294,6 +303,7 @@ const newTimeTicketPostedBuilder = (data) => {
   const result = {
     app: {
       jobId: data.jobId,
+      jobRoNumber: data.jobRoNumber,
       bodyShopId: data.bodyShopId,
       key: "notifications.job.newTimeTicketPosted",
       body,
@@ -322,6 +332,7 @@ const partMarkedBackOrderedBuilder = (data) => {
   const result = {
     app: {
       jobId: data.jobId,
+      jobRoNumber: data.jobRoNumber,
       bodyShopId: data.bodyShopId,
       key: "notifications.job.partBackOrdered",
       body,
@@ -353,6 +364,7 @@ const paymentCollectedCompletedBuilder = (data) => {
   const result = {
     app: {
       jobId: data.jobId,
+      jobRoNumber: data.jobRoNumber,
       bodyShopId: data.bodyShopId,
       key: "notifications.job.paymentCollected",
       body,
@@ -383,6 +395,7 @@ const scheduledDatesChangedBuilder = (data) => {
   const result = {
     app: {
       jobId: data.jobId,
+      jobRoNumber: data.jobRoNumber,
       bodyShopId: data.bodyShopId,
       key: "notifications.job.scheduledDatesChanged",
       body,
@@ -418,6 +431,7 @@ const supplementImportedBuilder = (data) => {
   const result = {
     app: {
       jobId: data.jobId,
+      jobRoNumber: data.jobRoNumber,
       bodyShopId: data.bodyShopId,
       key: "notifications.job.supplementImported",
       body,
@@ -448,6 +462,7 @@ const tasksUpdatedCreatedBuilder = (data) => {
   const result = {
     app: {
       jobId: data.jobId,
+      jobRoNumber: data.jobRoNumber,
       bodyShopId: data.bodyShopId,
       key: data.isNew ? "notifications.job.taskCreated" : "notifications.job.taskUpdated",
       body,