shuttlepro-shared 1.3.24 → 1.3.26

package/common/repositories/userRole.repository.js

@@ -2,7 +2,7 @@ const { UserRole } = require("../../models/UserRole");
 const { getRedisData, setRedisData } = require("../../config/redis");
 
 const defaultSelect =
-  "iconUrl thumbUrl name productsCount ordersCount contact email address websiteUrl facebookUrl twitterUrl instagramUrl members defaultModule";
+  "iconUrl thumbUrl name productsCount ordersCount contact email address websiteUrl facebookUrl twitterUrl instagramUrl members defaultModule allowedModules";
 
 // Cache keys
 const MEMBERS = "members";
@@ -35,6 +35,7 @@ const updateCachedMembers = async (workspaceId) => {
 
 const getMembers = async (workspaceId) => {
   let members = await getRedisData(workspaceId, MEMBERS);
+  console.log(members, "inside members");
   if (!members || members?.length === 0) {
     members = await UserRole.find({ workspaceId })
       .select("userId role userShift roleId isOwner workspaceId")
@@ -53,6 +54,7 @@ const getMembers = async (workspaceId) => {
       .exec();
     await setRedisData(workspaceId, members, MEMBERS, 3600);
   }
+  console.log(members, "inside after members");
   return members;
 };
 
@@ -61,7 +63,8 @@ const getMemberByWorkspaceIdAndUserId = async (workspaceId, userId) => {
   return (
     members?.find(
       (member) =>
-        member?.workspaceId === workspaceId && member?.userId?._id === userId
+        member?.workspaceId?.toString() === workspaceId?.toString() &&
+        member?.userId?._id?.toString() === userId?.toString()
     ) || null
   );
 };

package/config/redis.js

@@ -8,53 +8,51 @@ 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();
 
-// ✅ 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"));
+// ✅ 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");
 
-// ✅ Ensure Redis is connected before performing operations
+// ✅ Ensure Redis is connected once during app startup
 const connectRedis = async () => {
-  if (!client.isOpen) {
-    try {
-      await client.connect();
-      await publisher.connect();
-      await subscriber.connect();
-    } catch (err) {
-      console.error("❌ Failed to connect to Redis:", err);
+  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");
     }
+  } catch (err) {
+    console.error("❌ Failed to connect to Redis:", err);
   }
-  await client.configSet("notify-keyspace-events", "Ex");
 };
 
-/**
- * ✅ Publish Data to a Channel
- * @param {string} channel - The Redis Pub/Sub channel
- * @param {any} message - The message to send
- */
+// ✅ Publish Data to a Channel
 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
- * @param {string} channel - The Redis Pub/Sub channel
- * @param {function} callback - Callback function to handle messages
- */
+// ✅ Subscribe & Listen for 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));
@@ -64,13 +62,7 @@ const subscribeToChannel = async (channel, callback, expiry = false) => {
   }
 };
 
-/**
- * ✅ 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)
- */
+// ✅ Set Data in Redis (Supports String & Hash)
 const setRedisData = async (
   key,
   value,
@@ -78,7 +70,6 @@ const setRedisData = async (
   expiryInSeconds = 3600
 ) => {
   try {
-    await connectRedis();
     const stringifiedValue = JSON.stringify(value);
     let result;
 
@@ -99,43 +90,27 @@ const setRedisData = async (
   }
 };
 
-const addDataToRedisSet = async (key, value) => {
-  try {
-    await connectRedis();
-    await client.sAdd(key, value);
-    return true;
-  } catch (err) {
-    return false;
-  }
-};
-
-const removeDataFromRedisSet = async (key, value) => {
-  try {
-    await connectRedis();
-    await client.sRem(key, value);
-    return true;
-  } catch (err) {
-    return false;
-  }
-};
-const isMemberOfRedisSet = async (key, value) => {
+// ✅ Get Data from Redis (Supports String & Hash)
+const getRedisData = async (key, field = null) => {
   try {
-    await connectRedis();
-    return await client.sIsMember(key, value);
+    const result = field
+      ? await client.hGet(key, field)
+      : await client.get(key);
+    return result ? JSON.parse(result) : null;
   } catch (err) {
-    console.log(err, "err");
-    return false;
+    console.error("❌ Error getting Redis data:", err);
+    return null;
   }
 };
 /**
- * ✅ Get Data from Redis (Supports String & Hash)
+ * ✅ Get Expiry Time from Redis
  * @param {string} key - The Redis key
  * @param {string|null} field - Optional field for Hash retrieval
  */
-const getRedisData = async (key, field = null) => {
+const getRedisDataTime = async (key) => {
   try {
     await connectRedis();
-    let result = field ? await client.hGet(key, field) : await client.get(key);
+    let result = await client.ttl(key);
     return result ? JSON.parse(result) : null;
   } catch (err) {
     console.error("❌ Error getting Redis data:", err);
@@ -143,14 +118,9 @@ const getRedisData = async (key, field = null) => {
   }
 };
 
-/**
- * ✅ Delete Data from Redis (Supports String & Hash)
- * @param {string} key - The Redis key
- * @param {string|null} field - Optional field for Hash deletion
- */
+// ✅ Delete Data from Redis (Supports String & Hash)
 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);
@@ -158,9 +128,37 @@ const deleteRedisData = async (key, field = null) => {
   }
 };
 
-/**
- * ✅ Graceful Shutdown Handling
- */
+// ✅ Redis Set Operations
+const addDataToRedisSet = async (key, value) => {
+  try {
+    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 client.sRem(key, value);
+    return true;
+  } catch (err) {
+    console.error("❌ Error removing from Redis set:", err);
+    return false;
+  }
+};
+
+const isMemberOfRedisSet = async (key, value) => {
+  try {
+    return await client.sIsMember(key, value);
+  } catch (err) {
+    console.error("❌ Error checking membership in Redis set:", err);
+    return false;
+  }
+};
+
+// ✅ Graceful Shutdown
 const closeClients = async () => {
   if (client.isOpen) await client.quit();
   if (publisher.isOpen) await publisher.quit();
@@ -184,12 +182,13 @@ module.exports = {
   client,
   publisher,
   subscriber,
+  connectRedis,
   setRedisData,
+  getRedisDataTime,
   getRedisData,
   deleteRedisData,
   publishToChannel,
   subscribeToChannel,
-  connectRedis,
   addDataToRedisSet,
   removeDataFromRedisSet,
   isMemberOfRedisSet,

package/middlewares/checkPermission/index.js

@@ -31,29 +31,42 @@ exports.checkPermission = async (req, res, next, values) => {
       const accessToken = token.split(" ")[1];
       const body = getBodyFromDecodeToken(accessToken);
       if (body) {
-        const { module, action } = values;
-        const moduleObj = getModule(body, module);
-        if (moduleObj && moduleObj.includes(action)) {
-          req.user = {
-            id: body.id,
-            type: body.type,
-            email: body.email,
-            firstName: body.firstName,
-            lastName: body.lastName,
-            suspended: body.suspended,
-            isVerified: body.isVerified,
-            role: body.role,
-            isMember: body.isMember,
-            uuid: body.uuid,
-          };
-          req.currentModulePermission = moduleObj;
-          return next();
-        } else {
-          return res.status(HttpStatusCode.UNAUTHORIZED).json({
-            code: HttpStatusCode.UNAUTHORIZED,
-            message: GenericMessages.PERMISSION_DENIED,
-          });
-        }
+        req.user = {
+          id: body.id,
+          type: body.type,
+          email: body.email,
+          firstName: body.firstName,
+          lastName: body.lastName,
+          suspended: body.suspended,
+          isVerified: body.isVerified,
+          role: body.role,
+          isMember: body.isMember,
+          uuid: body.uuid,
+        };
+        return next();
+        // const { module, action } = values;
+        // const moduleObj = getModule(body, module);
+        // if (moduleObj && moduleObj.includes(action)) {
+        //   req.user = {
+        //     id: body.id,
+        //     type: body.type,
+        //     email: body.email,
+        //     firstName: body.firstName,
+        //     lastName: body.lastName,
+        //     suspended: body.suspended,
+        //     isVerified: body.isVerified,
+        //     role: body.role,
+        //     isMember: body.isMember,
+        //     uuid: body.uuid,
+        //   };
+        //   req.currentModulePermission = moduleObj;
+        //   return next();
+        // } else {
+        //   return res.status(HttpStatusCode.UNAUTHORIZED).json({
+        //     code: HttpStatusCode.UNAUTHORIZED,
+        //     message: GenericMessages.PERMISSION_DENIED,
+        //   });
+        // }
       }
       return res.status(HttpStatusCode.UNAUTHORIZED).json({
         code: HttpStatusCode.UNAUTHORIZED,

package/models/Customer.js

@@ -11,6 +11,7 @@ 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,6 +136,14 @@ 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: "" },
@@ -159,6 +167,9 @@ const OrderSchema = new Schema(
     },
     orderName: { type: String, default: "" },
     totalWeight: { type: String, default: "" },
+    currency: {},
+    presentedCurrency: {},
+    exchangeRate: { type: Number, default: 0 },
   },
   { timestamps: true, toJSON: { virtuals: true }, toObject: { virtuals: true } }
 );

package/models/Workspace.js

@@ -292,6 +292,16 @@ const workspaceSchema = new mongoose.Schema(
       default: "everyone",
     },
     defaultShift: { type: String, default: "" },
+    automationManager: {
+      delayThreshold: {
+        type: Number,
+        default: 5,
+      },
+      messageCount: {
+        type: Number,
+        default: 3,
+      },
+    },
   },
   { timestamps: true, toJSON: { virtuals: true }, toObject: { virtuals: true } }
 );

package/package.json

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