feature/IO-3357-Reynolds-and-Reynolds-DMS-API-Integration - Checkpoint

server/web-sockets/redisSocketEvents.js

@@ -1,16 +1,12 @@
 const { admin } = require("../firebase/firebase-handler");
 const FortellisLogger = require("../fortellis/fortellis-logger");
-const RRLogger = require("../rr/rr-logger");
 const { FortellisJobExport, FortellisSelectedCustomer } = require("../fortellis/fortellis");
 const CdkCalculateAllocations = require("../cdk/cdk-calculate-allocations").default;
+const registerRREvents = require("./rr-register-socket-events");
 
-const lookupApi = require("../rr/rr-lookup");
-const { SelectedCustomer } = require("../rr/rr-selected-customer");
-const { QueryJobData } = require("../rr/rr-job-helpers");
-
-const redisSocketEvents = ({
-  io,
-  redisHelpers: {
+const redisSocketEvents = ({ io, redisHelpers, ioHelpers, logger }) => {
+  // Destructure helpers locally, but keep full objects available for downstream modules
+  const {
     setSessionData,
     getSessionData,
     addUserSocketMapping,
@@ -20,10 +16,10 @@ const redisSocketEvents = ({
     setSessionTransactionData,
     getSessionTransactionData,
     clearSessionTransactionData
-  },
-  ioHelpers: { getBodyshopRoom, getBodyshopConversationRoom },
-  logger
-}) => {
+  } = redisHelpers;
+
+  const { getBodyshopRoom, getBodyshopConversationRoom } = ioHelpers;
+
   // Logging helper functions
   const createLogEvent = (socket, level, message) => {
     logger.log("ioredis-log-event", level, socket?.user?.email, null, { wsmessage: message });
@@ -53,6 +49,15 @@ const redisSocketEvents = ({
         socket.handshake.auth.token = token;
         socket.handshake.auth.bodyshopId = bodyshopId;
       }
+
+      // NEW: seed a base session for this socket so downstream handlers can read it
+      await setSessionData(socket.id, {
+        bodyshopId,
+        email: user.email,
+        uid: user.user_id || user.uid,
+        seededAt: Date.now()
+      });
+
       await addUserSocketMapping(user.email, socket.id, bodyshopId);
       next();
     } catch (error) {
@@ -91,6 +96,15 @@ const redisSocketEvents = ({
             socket.handshake.auth.token = token;
             socket.handshake.auth.bodyshopId = bodyshopId;
           }
+
+          // NEW: refresh (or create) the base session with the latest info
+          await setSessionData(socket.id, {
+            bodyshopId,
+            email: user.email,
+            uid: user.user_id || user.uid,
+            refreshedAt: Date.now()
+          });
+
           await refreshUserSocketTTL(user.email, bodyshopId);
           socket.emit("token-updated", { success: true });
         } catch (error) {
@@ -147,6 +161,10 @@ const redisSocketEvents = ({
         if (socket.user?.email) {
           await removeUserSocketMapping(socket.user.email, socket.id);
         }
+        // Optional: clear transactional session
+        try {
+          await clearSessionTransactionData(socket.id);
+        } catch {}
         // Leave all rooms except the default room (socket.id)
         const rooms = Array.from(socket.rooms).filter((room) => room !== socket.id);
         for (const room of rooms) {
@@ -251,7 +269,7 @@ const redisSocketEvents = ({
       });
     };
 
-    //Fortellis/CDK Handlers
+    // Fortellis/CDK Handlers
     const registerFortellisEvents = (socket) => {
       socket.on("fortellis-export-job", async ({ jobid, txEnvelope }) => {
         try {
@@ -280,6 +298,7 @@ const redisSocketEvents = ({
           });
         }
       });
+
       socket.on("fortellis-selected-customer", async ({ jobid, selectedCustomerId }) => {
         try {
           await FortellisSelectedCustomer({
@@ -307,6 +326,7 @@ const redisSocketEvents = ({
           });
         }
       });
+
       socket.on("fortellis-calculate-allocations", async (jobid, callback) => {
         try {
           const allocations = await CdkCalculateAllocations(socket, jobid);
@@ -342,94 +362,6 @@ const redisSocketEvents = ({
       });
     };
 
-    // Reynolds & Reynolds socket events (uses new client-backed ops)
-    function registerRREvents(socket) {
-      const logger = require("../utils/logger");
-      const log = RRLogger(socket);
-      const {
-        redisHelpers // { setSessionData, getSessionData, ... setSessionTransactionData, getSessionTransactionData }
-      } = require("../utils/ioHelpers").getHelpers?.() || { redisHelpers: {} };
-
-      const resolveJobId = (maybeId, packet, fallback) => maybeId || packet?.jobid || fallback;
-
-      // Lookups
-      socket.on("rr-get-advisors", async (params = {}, cb) => {
-        try {
-          const bodyshopId = params.bodyshopId || socket?.user?.bodyshopid;
-          const res = await lookupApi.getAdvisors({ bodyshopId, ...(params || {}) });
-          cb?.({ data: res?.data ?? res });
-        } catch (e) {
-          log("error", `RR get advisors error: ${e.message}`);
-          cb?.({ error: e.message });
-        }
-      });
-
-      socket.on("rr-get-parts", async (params = {}, cb) => {
-        try {
-          const bodyshopId = params.bodyshopId || socket?.user?.bodyshopid;
-          const res = await lookupApi.getParts({ bodyshopId, ...(params || {}) });
-          cb?.({ data: res?.data ?? res });
-        } catch (e) {
-          log("error", `RR get parts error: ${e.message}`);
-          cb?.({ error: e.message });
-        }
-      });
-
-      /**
-       * NEW: QueryJobData — return the canonical job payload used for DMS exports
-       * payload: { jobid }
-       */
-      socket.on("rr-query-job-data", async ({ jobid } = {}, cb) => {
-        try {
-          const resolvedJobId = resolveJobId(jobid, { jobid }, null);
-          const job = await QueryJobData({ socket, jobid: resolvedJobId });
-          cb?.({ jobid: resolvedJobId, job });
-        } catch (e) {
-          log("error", `RR query job data error: ${e.message}`, { jobid });
-          cb?.({ jobid, error: e.message });
-        }
-      });
-
-      /**
-       * NEW: Selected Customer — cache the chosen DMS customer (or upsert from job if not provided)
-       * payload: { jobid, selectedCustomerId?, bodyshopId? }
-       */
-      socket.on("rr-selected-customer", async ({ jobid, selectedCustomerId, bodyshopId } = {}, cb) => {
-        try {
-          const resolvedJobId = resolveJobId(jobid, { jobid }, null);
-          const result = await SelectedCustomer({
-            socket,
-            jobid: resolvedJobId,
-            bodyshopId,
-            selectedCustomerId,
-            redisHelpers
-          });
-          cb?.({ jobid: resolvedJobId, selectedCustomerId: result.selectedCustomerId });
-        } catch (e) {
-          log("error", `RR selected customer error: ${e.message}`, { jobid });
-          cb?.({ jobid, error: e.message });
-        }
-      });
-
-      // Calculate allocations (unchanged)
-      socket.on("rr-calculate-allocations", async (jobid, callback) => {
-        try {
-          const resolvedJobId = resolveJobId(jobid, { jobid }, null);
-          const allocations = await CdkCalculateAllocations(socket, resolvedJobId);
-          callback?.({ jobid: resolvedJobId, allocations });
-        } catch (error) {
-          log("error", `Error during RR calculate allocations: ${error.message}`, { jobid, stack: error.stack });
-          logger.log("rr-calc-allocations-error", "error", null, null, {
-            jobid,
-            message: error.message,
-            stack: error.stack
-          });
-          callback?.({ jobid, error: error.message });
-        }
-      });
-    }
-
-    module.exports = { registerRREvents };
     // Call Handlers
     registerRoomAndBroadcastEvents(socket);
     registerUpdateEvents(socket);
@@ -438,7 +370,14 @@ const redisSocketEvents = ({
     registerSyncEvents(socket);
     registerTaskEvents(socket);
     registerFortellisEvents(socket);
-    registerRREvents(socket);
+
+    // Reynolds & Reynolds socket handlers
+    registerRREvents({
+      socket,
+      redisHelpers,
+      ioHelpers,
+      logger
+    });
   };
 
   // Associate Middleware and Handlers