shuttlepro-shared 1.3.11 → 1.3.13

package/common/repositories/integration.repository.js

@@ -12,7 +12,12 @@ const getCachedAllIntegrations = async () => {
     integrations = await Integration.find({}).lean().exec();
     await setRedisData(CACHE_KEY_ALL, integrations);
   }
-  return integrations;
+  return integrations?.map((x) => {
+    return {
+      ...x,
+      _id: x?._id?.toString(),
+    };
+  });
 };
 
 /**

package/common/repositories/workspace.repository.js

@@ -74,6 +74,11 @@ const findAllWorkspaces = async (filter = {}) => {
     Object.entries(filter).every(([key, value]) => ws[key] === value)
   );
 };
+const updateWorkspaceCache = async (id = "") => {
+  const workspace = await Workspace.findById(id).lean().exec();
+  await updateCachedWorkspaces();
+  return workspace;
+};
 
 const updateWorkspace = async (id, data) => {
   const updatedWorkspace = await Workspace.findByIdAndUpdate(id, data, {
@@ -138,4 +143,5 @@ module.exports = {
   updateOneWorkspace,
   updateManyWorkspaces,
   deleteWorkspace,
+  updateWorkspaceCache,
 };

package/config/redis.js

@@ -8,51 +8,53 @@ const client = createClient({
   url: REDIS_URL,
   socket: { reconnectStrategy: (retries) => Math.min(retries * 50, 1000) }, // Exponential backoff
 });
+
+// ✅ Create separate Pub/Sub clients
 const publisher = client.duplicate();
 const subscriber = client.duplicate();
 
-// ✅ Redis Events
-const handleEvents = (client, label = "Redis") => {
-  client.on("error", (err) => console.error(`❌ ${label} Error:`, err));
-  client.on("connect", () => console.log(`✅ ${label} Connected`));
-  client.on("ready", () => console.log(`🚀 ${label} Ready to use`));
-  client.on("end", () => console.log(`❗ ${label} Connection Closed`));
-  client.on("reconnecting", () => console.warn(`🔄 ${label} Reconnecting...`));
-};
-
-handleEvents(client, "Main Redis");
-handleEvents(publisher, "Publisher Redis");
-handleEvents(subscriber, "Subscriber Redis");
+// ✅ Handle Redis Connection Events
+client.on("error", (err) => console.error("❌ Redis Error:", err));
+client.on("connect", () => console.log("✅ Redis Connected"));
+client.on("ready", () => console.log("🚀 Redis Ready to use"));
+client.on("end", () => console.log("❗ Redis Connection Closed"));
 
-// ✅ Ensure Redis is connected once during app startup
+// ✅ Ensure Redis is connected before performing operations
 const connectRedis = async () => {
-  try {
-    if (!client.isOpen) await client.connect();
-    if (!publisher.isOpen) await publisher.connect();
-    if (!subscriber.isOpen) await subscriber.connect();
-
-    // Set keyspace events only once
-    const config = await client.configGet("notify-keyspace-events");
-    if (!config["notify-keyspace-events"]?.includes("Ex")) {
-      await client.configSet("notify-keyspace-events", "Ex");
+  if (!client.isOpen) {
+    try {
+      await client.connect();
+      await publisher.connect();
+      await subscriber.connect();
+    } catch (err) {
+      console.error("❌ Failed to connect to Redis:", err);
     }
-  } catch (err) {
-    console.error("❌ Failed to connect to Redis:", err);
   }
+  await client.configSet("notify-keyspace-events", "Ex");
 };
 
-// ✅ Publish Data to a Channel
+/**
+ * ✅ Publish Data to a Channel
+ * @param {string} channel - The Redis Pub/Sub channel
+ * @param {any} message - The message to send
+ */
 const publishToChannel = async (channel, message) => {
   try {
+    await connectRedis();
     await publisher.publish(channel, JSON.stringify(message));
   } catch (err) {
     console.error("❌ Error publishing message:", err);
   }
 };
 
-// ✅ Subscribe & Listen for Messages
+/**
+ * ✅ Subscribe & Listen for Messages
+ * @param {string} channel - The Redis Pub/Sub channel
+ * @param {function} callback - Callback function to handle messages
+ */
 const subscribeToChannel = async (channel, callback, expiry = false) => {
   try {
+    await connectRedis();
     await subscriber.subscribe(channel, (message) => {
       if (expiry) callback(message);
       else callback(JSON.parse(message));
@@ -62,7 +64,13 @@ const subscribeToChannel = async (channel, callback, expiry = false) => {
   }
 };
 
-// ✅ Set Data in Redis (Supports String & Hash)
+/**
+ * ✅ Set Data in Redis (Supports String & Hash)
+ * @param {string} key - The Redis key
+ * @param {any} value - The value to store
+ * @param {string|null} field - Optional field for Hash storage
+ * @param {number} expiryInSeconds - Expiry time in seconds (default: 3600)
+ */
 const setRedisData = async (
   key,
   value,
@@ -70,6 +78,7 @@ const setRedisData = async (
   expiryInSeconds = 3600
 ) => {
   try {
+    await connectRedis();
     const stringifiedValue = JSON.stringify(value);
     let result;
 
@@ -90,60 +99,68 @@ const setRedisData = async (
   }
 };
 
-// ✅ Get Data from Redis (Supports String & Hash)
-const getRedisData = async (key, field = null) => {
-  try {
-    const result = field
-      ? await client.hGet(key, field)
-      : await client.get(key);
-    return result ? JSON.parse(result) : null;
-  } catch (err) {
-    console.error("❌ Error getting Redis data:", err);
-    return null;
-  }
-};
-
-// ✅ Delete Data from Redis (Supports String & Hash)
-const deleteRedisData = async (key, field = null) => {
-  try {
-    return field ? await client.hDel(key, field) : await client.del(key);
-  } catch (err) {
-    console.error("❌ Error deleting Redis data:", err);
-    return null;
-  }
-};
-
-// ✅ Redis Set Operations
 const addDataToRedisSet = async (key, value) => {
   try {
+    await connectRedis();
     await client.sAdd(key, value);
     return true;
   } catch (err) {
-    console.error("❌ Error adding to Redis set:", err);
     return false;
   }
 };
 
 const removeDataFromRedisSet = async (key, value) => {
   try {
+    await connectRedis();
     await client.sRem(key, value);
     return true;
   } catch (err) {
-    console.error("❌ Error removing from Redis set:", err);
     return false;
   }
 };
-
 const isMemberOfRedisSet = async (key, value) => {
   try {
+    await connectRedis();
     return await client.sIsMember(key, value);
   } catch (err) {
-    console.error("❌ Error checking membership in Redis set:", err);
+    console.log(err, "err");
     return false;
   }
 };
+/**
+ * ✅ Get Data from Redis (Supports String & Hash)
+ * @param {string} key - The Redis key
+ * @param {string|null} field - Optional field for Hash retrieval
+ */
+const getRedisData = async (key, field = null) => {
+  try {
+    await connectRedis();
+    let result = field ? await client.hGet(key, field) : await client.get(key);
+    return result ? JSON.parse(result) : null;
+  } catch (err) {
+    console.error("❌ Error getting Redis data:", err);
+    return null;
+  }
+};
 
-// ✅ Graceful Shutdown
+/**
+ * ✅ Delete Data from Redis (Supports String & Hash)
+ * @param {string} key - The Redis key
+ * @param {string|null} field - Optional field for Hash deletion
+ */
+const deleteRedisData = async (key, field = null) => {
+  try {
+    await connectRedis();
+    return field ? await client.hDel(key, field) : await client.del(key);
+  } catch (err) {
+    console.error("❌ Error deleting Redis data:", err);
+    return null;
+  }
+};
+
+/**
+ * ✅ Graceful Shutdown Handling
+ */
 const closeClients = async () => {
   if (client.isOpen) await client.quit();
   if (publisher.isOpen) await publisher.quit();
@@ -167,12 +184,12 @@ module.exports = {
   client,
   publisher,
   subscriber,
-  connectRedis,
   setRedisData,
   getRedisData,
   deleteRedisData,
   publishToChannel,
   subscribeToChannel,
+  connectRedis,
   addDataToRedisSet,
   removeDataFromRedisSet,
   isMemberOfRedisSet,

package/models/Customer.js

@@ -11,7 +11,6 @@ const CustomerSchema = new Schema(
     defaultAddress: { type: String, default: "" },
     currentShippingAddress: {},
     addresses: [],
-    webCustomerId: { type: String, default: "" },
     workspaceId: {
       type: Schema.Types.ObjectId,
       ref: "Workspace",

package/models/Order.js

@@ -136,14 +136,6 @@ const OrderSchema = new Schema(
       paymentDate: { type: String, default: "" },
       paymentDetails: {},
     },
-    merged: {
-      status: { type: String, default: "open" },
-      webOrderNumbers: [],
-      orderNumbers: [],
-      localOrderIds: [],
-      webOrderIds: [],
-      details: [],
-    },
     credentials: {},
     ticketId: { type: String, default: "" },
     sender: { type: String, default: "" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shuttlepro-shared",
-  "version": "1.3.11",
+  "version": "1.3.13",
   "description": "",
   "main": "index.js",
   "scripts": {