feature/IO-3096-GlobalNotifications - Checkpoint - Fix user getting all bodyshop notifications (now by associationId), fix regression in 'Assigned To' scenario.

server/graphql-client/queries.js

@@ -2745,3 +2745,17 @@ query GET_NOTIFICATION_ASSOCIATIONS($emails: [String!]!, $shopid: uuid!) {
   }
 }
 `;
+
+exports.INSERT_NOTIFICATIONS_MUTATION = `  mutation INSERT_NOTIFICATIONS($objects: [notifications_insert_input!]!) {
+    insert_notifications(objects: $objects) {
+      affected_rows
+      returning {
+        id
+        jobid
+        associationid
+        scenario_text
+        fcm_text
+        scenario_meta
+      }
+    }
+  }`;

server/notifications/queues/appQueue.js

@@ -1,4 +1,5 @@
 const { Queue, Worker } = require("bullmq");
+const { INSERT_NOTIFICATIONS_MUTATION } = require("../../graphql-client/queries");
 const graphQLClient = require("../../graphql-client/graphql-client").client;
 
 // Base time-related constant in minutes, sourced from environment variable or defaulting to 1
@@ -20,23 +21,6 @@ const RATE_LIMITER_DURATION = APP_CONSOLIDATION_DELAY * 0.1; // 6 seconds (tenth
 let addQueue;
 let consolidateQueue;
 
-// Updated GraphQL mutation to insert notifications with the new schema
-const INSERT_NOTIFICATIONS_MUTATION = `
-  mutation INSERT_NOTIFICATIONS($objects: [notifications_insert_input!]!) {
-    insert_notifications(objects: $objects) {
-      affected_rows
-      returning {
-        id
-        jobid
-        associationid
-        scenario_text
-        fcm_text
-        scenario_meta
-      }
-    }
-  }
-`;
-
 /**
  * Builds the scenario_text, fcm_text, and scenario_meta for a batch of notifications.
  *
@@ -165,16 +149,16 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
 
             for (const [user, bodyShopData] of Object.entries(allNotifications)) {
               const userRecipients = recipients.filter((r) => r.user === user);
-              const employeeId = userRecipients[0]?.employeeId;
+              const associationId = userRecipients[0]?.associationId;
 
               for (const [bodyShopId, notifications] of Object.entries(bodyShopData)) {
                 const { scenario_text, fcm_text, scenario_meta } = buildNotificationContent(notifications);
                 notificationInserts.push({
                   jobid: jobId,
-                  associationid: employeeId || null,
-                  scenario_text: JSON.stringify(scenario_text), // JSONB requires stringified input
+                  associationid: associationId,
+                  scenario_text: JSON.stringify(scenario_text),
                   fcm_text: fcm_text,
-                  scenario_meta: JSON.stringify(scenario_meta) // JSONB requires stringified input
+                  scenario_meta: JSON.stringify(scenario_meta)
                 });
                 notificationIdMap.set(`${user}:${bodyShopId}`, null);
               }
@@ -200,9 +184,8 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
             // Emit notifications to users via Socket.io with notification ID
             for (const [user, bodyShopData] of Object.entries(allNotifications)) {
               const userMapping = await redisHelpers.getUserSocketMapping(user);
-              // Get all recipients for the user and extract the associationId (employeeId)
               const userRecipients = recipients.filter((r) => r.user === user);
-              const associationId = userRecipients[0]?.employeeId;
+              const associationId = userRecipients[0]?.associationId;
 
               for (const [bodyShopId, notifications] of Object.entries(bodyShopData)) {
                 const notificationId = notificationIdMap.get(`${user}:${bodyShopId}`);

server/notifications/scenarioBuilders.js

@@ -8,8 +8,8 @@ const { getJobAssignmentType } = require("./stringHelpers");
  */
 const populateWatchers = (data, result) => {
   data.scenarioWatchers.forEach((recipients) => {
-    const { user, app, fcm, email, firstName, lastName, employeeId } = recipients;
-    if (app === true) result.app.recipients.push({ user, bodyShopId: data.bodyShopId, employeeId });
+    const { user, app, fcm, email, firstName, lastName, employeeId, associationId } = recipients;
+    if (app === true) result.app.recipients.push({ user, bodyShopId: data.bodyShopId, employeeId, associationId });
     if (fcm === true) result.fcm.recipients.push(user);
     if (email === true) result.email.recipients.push({ user, firstName, lastName });
   });

server/notifications/scenarioParser.js

@@ -31,7 +31,7 @@ const scenarioParser = async (req, jobIdField) => {
   const { event, trigger, table } = req.body;
   const { logger } = req;
 
-  // Validate we know what user commited the action that fired the parser
+  // Validate we know what user committed the action that fired the parser
   const hasuraUserId = event?.session_variables?.["x-hasura-user-id"];
 
   // Bail if we don't know
@@ -140,9 +140,10 @@ const scenarioParser = async (req, jobIdField) => {
           email: settings.email,
           app: settings.app,
           fcm: settings.fcm,
-          firstName: matchingWatcher ? matchingWatcher.firstName : undefined,
-          lastName: matchingWatcher ? matchingWatcher.lastName : undefined,
-          employeeId: matchingWatcher ? assoc.id : undefined
+          firstName: matchingWatcher?.firstName,
+          lastName: matchingWatcher?.lastName,
+          employeeId: matchingWatcher?.employeeId,
+          associationId: assoc.id
         };
       })
   }));