feature/IO-3586-Socket-Reconnect-Issues - Fix

server/utils/redisHelpers.js

@@ -68,12 +68,33 @@ const fetchBodyshopFromDB = async (bodyshopId, logger) => {
  * @param logger
  */
 const applyRedisHelpers = ({ pubClient, app, logger }) => {
+  const toRedisJson = (value) => JSON.stringify(value === undefined ? null : value);
+
   // Store session data in Redis
   const setSessionData = async (socketId, key, value, ttl) => {
     try {
-      await pubClient.hset(`socket:${socketId}`, key, JSON.stringify(value)); // Use Redis pubClient
+      const sessionKey = `socket:${socketId}`;
+
+      // Supports both forms:
+      // 1) setSessionData(socketId, "field", value, ttl)
+      // 2) setSessionData(socketId, { fieldA: valueA, fieldB: valueB }, ttl)
+      if (key && typeof key === "object" && !Array.isArray(key)) {
+        const entries = Object.entries(key).flatMap(([field, fieldValue]) => [field, toRedisJson(fieldValue)]);
+
+        if (entries.length > 0) {
+          await pubClient.hset(sessionKey, ...entries);
+        }
+
+        const objectTtl = typeof value === "number" ? value : typeof ttl === "number" ? ttl : null;
+        if (objectTtl) {
+          await pubClient.expire(sessionKey, objectTtl);
+        }
+        return;
+      }
+
+      await pubClient.hset(sessionKey, key, toRedisJson(value)); // Use Redis pubClient
       if (ttl && typeof ttl === "number") {
-        await pubClient.expire(`socket:${socketId}`, ttl);
+        await pubClient.expire(sessionKey, ttl);
       }
     } catch (error) {
       logger.log(`Error Setting Session Data for socket ${socketId}: ${error}`, "ERROR", "redis");
@@ -88,7 +109,26 @@ const applyRedisHelpers = ({ pubClient, app, logger }) => {
    */
   const getSessionData = async (socketId, key) => {
     try {
-      const data = await pubClient.hget(`socket:${socketId}`, key);
+      const sessionKey = `socket:${socketId}`;
+
+      // Supports:
+      // 1) getSessionData(socketId, "field") -> parsed field value
+      // 2) getSessionData(socketId) -> parsed object of all fields
+      if (typeof key === "undefined") {
+        const raw = await pubClient.hgetall(sessionKey);
+        if (!raw || Object.keys(raw).length === 0) return null;
+
+        return Object.entries(raw).reduce((acc, [field, rawValue]) => {
+          try {
+            acc[field] = JSON.parse(rawValue);
+          } catch {
+            acc[field] = rawValue;
+          }
+          return acc;
+        }, {});
+      }
+
+      const data = await pubClient.hget(sessionKey, key);
       return data ? JSON.parse(data) : null;
     } catch (error) {
       logger.log(`Error Getting Session Data for socket ${socketId}: ${error}`, "ERROR", "redis");
@@ -106,7 +146,7 @@ const applyRedisHelpers = ({ pubClient, app, logger }) => {
    */
   const setSessionTransactionData = async (socketId, transactionType, key, value, ttl) => {
     try {
-      await pubClient.hset(getSocketTransactionkey({ socketId, transactionType }), key, JSON.stringify(value)); // Use Redis pubClient
+      await pubClient.hset(getSocketTransactionkey({ socketId, transactionType }), key, toRedisJson(value)); // Use Redis pubClient
       if (ttl && typeof ttl === "number") {
         await pubClient.expire(getSocketTransactionkey({ socketId, transactionType }), ttl);
       }
@@ -160,7 +200,17 @@ const applyRedisHelpers = ({ pubClient, app, logger }) => {
    */
   const clearSessionTransactionData = async (socketId, transactionType) => {
     try {
-      await pubClient.del(getSocketTransactionkey({ socketId, transactionType }));
+      if (transactionType) {
+        await pubClient.del(getSocketTransactionkey({ socketId, transactionType }));
+        return;
+      }
+
+      // If no transactionType is provided, clear all transaction namespaces for this socket.
+      const pattern = getSocketTransactionkey({ socketId, transactionType: "*" });
+      const keys = await pubClient.keys(pattern);
+      if (Array.isArray(keys) && keys.length > 0) {
+        await pubClient.del(...keys);
+      }
     } catch (error) {
       logger.log(
         `Error Clearing Session Transaction Data for socket ${socketId}:${transactionType}: ${error}`,