shuttlepro-shared 1.3.41 → 1.3.42

package/common/repositories/customerProfile.repository.js

@@ -1,42 +1,103 @@
+const { getRedisData, setRedisData } = require("../../config/redis");
 const CustomerProfile = require("../../models/CustomerProfile");
 
+const CACHE_KEY_ALL = "customer_profiles_all";
+
+const getCachedAllCustomerProfiles = async () => {
+  let profiles = await getRedisData(CACHE_KEY_ALL);
+  if (!profiles) {
+    profiles = await CustomerProfile.find({}).lean().exec();
+    await setRedisData(CACHE_KEY_ALL, profiles);
+  }
+  return profiles;
+};
+
+const updateCachedAllCustomerProfiles = async () => {
+  const profiles = await CustomerProfile.find({}).lean().exec();
+  await setRedisData(CACHE_KEY_ALL, profiles);
+};
+
+const getCachedCustomerProfiles = async (workspaceId) => {
+  const allProfiles = await getCachedAllCustomerProfiles();
+  return allProfiles.filter((profile) => profile.workspaceId === workspaceId);
+};
+
 const createCustomerProfile = async (data) => {
   const newProfile = new CustomerProfile(data);
   const savedProfile = await newProfile.save();
+
+  updateCachedAllCustomerProfiles();
   return savedProfile;
 };
 
 const findCustomerProfilesByWorkspaceId = async (workspaceId) => {
-  return await CustomerProfile.find({ workspaceId }).lean().exec();
+  return await getCachedCustomerProfiles(workspaceId);
 };
 
 const findCustomerProfilesByWorkspace = async (workspaceId, filter = {}) => {
-  return await CustomerProfile.find({ workspaceId, ...filter })
-    .lean()
-    .exec();
+  const profiles = await getCachedCustomerProfiles(workspaceId);
+  return profiles.filter((profile) =>
+    Object.entries(filter).every(([key, value]) => profile[key] === value)
+  );
 };
 
 const findCustomerProfileByFilter = async (
   filter = {},
-
+  bodyFilter = {},
   workspaceId = null
 ) => {
-  const query = workspaceId ? { ...filter, workspaceId } : filter;
-  return await CustomerProfile.findOne(query).lean().exec();
+  const allProfiles = await getCachedAllCustomerProfiles();
+
+  const filtered = workspaceId
+    ? allProfiles.filter((p) => p.workspaceId === workspaceId)
+    : allProfiles;
+
+  return (
+    filtered.find(
+      (profile) =>
+        Object.entries(filter).every(
+          ([key, value]) => profile[key] === value
+        ) &&
+        Object.entries(bodyFilter).every(
+          ([key, value]) => profile.body?.[key] === value
+        )
+    ) || null
+  );
 };
 
 const findAllCustomerProfilesByFilter = async (
   filter = {},
+  bodyFilter = {},
   workspaceId = null
 ) => {
-  const query = workspaceId ? { ...filter, workspaceId } : filter;
-  return await CustomerProfile.find(query).lean().exec();
+  const allProfiles = await getCachedAllCustomerProfiles();
+
+  const filtered = workspaceId
+    ? allProfiles.filter((p) => p.workspaceId === workspaceId)
+    : allProfiles;
+
+  return (
+    filtered.filter(
+      (profile) =>
+        Object.entries(filter).every(
+          ([key, value]) => profile[key] === value
+        ) &&
+        Object.entries(bodyFilter).every(
+          ([key, value]) => profile.body?.[key] === value
+        )
+    ) || []
+  );
 };
 
 const updateCustomerProfile = async (id, data) => {
   const updated = await CustomerProfile.findByIdAndUpdate(id, data, {
     new: true,
   }).exec();
+
+  if (updated) {
+    updateCachedAllCustomerProfiles();
+  }
+
   return updated;
 };
 
@@ -46,24 +107,33 @@ const updateCustomerProfileByFilter = async (
   workspaceId = null
 ) => {
   const query = workspaceId ? { ...filter, workspaceId } : filter;
+
   const updated = await CustomerProfile.findOneAndUpdate(query, data, {
     new: true,
   }).exec();
+
+  if (updated) {
+    updateCachedAllCustomerProfiles();
+  }
+
   return updated;
 };
 
 const deleteCustomerProfile = async (id) => {
   const deleted = await CustomerProfile.findByIdAndDelete(id).exec();
+
+  if (deleted) {
+    updateCachedAllCustomerProfiles();
+  }
+
   return deleted;
 };
 
 const deleteAllCustomerProfilesByWorkspace = async (workspaceId) => {
   await CustomerProfile.deleteMany({ workspaceId }).exec();
+  await updateCachedAllCustomerProfiles();
 };
-const findAllCustomerProfilesByFilterFromDb = async (filter = {}) => {
-  const profiles = await CustomerProfile.find(filter).lean().exec();
-  return profiles ?? [];
-};
+
 module.exports = {
   createCustomerProfile,
   findCustomerProfilesByWorkspaceId,
@@ -74,5 +144,4 @@ module.exports = {
   deleteCustomerProfile,
   deleteAllCustomerProfilesByWorkspace,
   findAllCustomerProfilesByFilter,
-  findAllCustomerProfilesByFilterFromDb,
 };

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);
+  
   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);
   }
+
   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/Activity.js

@@ -0,0 +1,28 @@
+const mongoose = require("mongoose");
+const { Schema } = mongoose;
+
+const ActivitySchema = new Schema(
+  {
+    trackingId: { type: String, default: "" },
+    date: { type: String, default: "" },
+    name: { type: String, default: "" },
+    type: { type: String, default: "" },
+    orderId: { type: String, default: "" },
+    emailId: { type: Schema.Types.ObjectId, ref: "Email" },
+    mailGroupId: { type: Schema.Types.ObjectId, ref: "MailGroup" },
+    templateId: { type: Schema.Types.ObjectId, ref: "DescriptionTemplate" },
+    message: { type: String, default: "" },
+    status: { type: String, default: "" },
+    customerName: { type: String, default: "" },
+    contact: { type: String, default: "" },
+    notificationTimer: { type: String, default: "" },
+    scheduledTime: { type: String, default: "" },
+    workspaceId: { type: String, default: "" },
+    subject: { type: String, default: "" },
+    userName: { type: String, default: "" },
+  },
+  { timestamps: true, toJSON: { virtuals: true }, toObject: { virtuals: true } }
+);
+
+const Activity = mongoose.model("Activity", ActivitySchema);
+module.exports = Activity;

package/models/ActivityLogs.js

@@ -28,6 +28,7 @@ const ActivityLogsSchema = new Schema(
       type: String,
       default: "",
     },
+    body: {},
   },
   { timestamps: true, toJSON: { virtuals: true }, toObject: { virtuals: true } }
 );

package/models/AgentActivity.js

@@ -47,8 +47,6 @@ const activitySchema = new mongoose.Schema({
   remarks: { type: String, required: false },
   avgAccuracy: { type: Number, required: false, default: 10 },
   sender: { type: String, required: "" },
-  members: [],
-  closedBy: {},
 });
 
 const totalActivitySchema = new mongoose.Schema({
@@ -166,7 +164,9 @@ const findOneAndUpdateAgentActivity = async (
     );
 
     if (bsonSize <= 1000000) {
-      return await AgentActivity.findOneAndUpdate(findQuery, updateQuery);
+      return await AgentActivity.findOneAndUpdate(findQuery, updateQuery, {
+        new: true,
+      });
     } else {
       const { breaks, activities, totalActivities, ...restData } =
         agentActivityForActivitiesUpdated.toObject();
@@ -177,7 +177,8 @@ const findOneAndUpdateAgentActivity = async (
 
       const agentActivityRecord = await AgentActivity.findOneAndUpdate(
         { ...findQuery, _id: newAgentActivity._id },
-        updateQuery
+        updateQuery,
+        { new: true }
       );
 
       return agentActivityRecord;

package/models/Attribute.js

@@ -0,0 +1,130 @@
+const mongoose = require("mongoose");
+const { Schema } = mongoose;
+const AttributeSchema = new Schema(
+  {
+    name: { type: String, default: "" },
+    webAttributeId: { type: Number, default: null },
+    parentId: { type: Schema.Types.ObjectId, ref: "Attribute", default: null },
+    workspaceId: {
+      type: Schema.Types.ObjectId,
+      ref: "Workspace",
+      default: null,
+    },
+    oldId: { type: String, default: "" },
+    createdBy: { type: Schema.Types.ObjectId, ref: "User", default: null },
+    updatedBy: { type: Schema.Types.ObjectId, ref: "User", default: null },
+    isDeleted: { type: Boolean, default: false },
+    isDefault: { type: Boolean, default: false },
+  },
+  { timestamps: true, toJSON: { virtuals: true }, toObject: { virtuals: true } }
+);
+AttributeSchema.virtual("values", {
+  ref: "Attribute",
+  localField: "_id",
+  foreignField: "parentId",
+});
+
+const Attribute = mongoose.model("Attribute", AttributeSchema);
+
+const createNewAttribute = async (attributeData) => {
+  try {
+    return await Attribute.create(attributeData);
+  } catch (error) {
+    console.log(error);
+    return null;
+  }
+};
+
+const attributesInsertMany = async (data) => {
+  try {
+    return await Attribute.insertMany(data);
+  } catch (error) {
+    return [];
+  }
+};
+
+const findAttributeById = async (attributeId) => {
+  try {
+    return await Attribute.findById(attributeId);
+  } catch (error) {
+    console.log(error);
+    return null;
+  }
+};
+
+const updateAttributeById = async (criteria, updateData, options = {}) => {
+  try {
+    return await Attribute.findByIdAndUpdate(criteria, updateData, options);
+  } catch (error) {
+    console.log(error);
+    return null;
+  }
+};
+
+const deleteAttributeById = async (attributeId) => {
+  try {
+    return await Attribute.findByIdAndDelete(attributeId);
+  } catch (error) {
+    console.log(error);
+    return null;
+  }
+};
+
+const findAttribute = async (criteria) => {
+  try {
+    return await Attribute.findOne(criteria);
+  } catch (error) {
+    console.log(error);
+    return null;
+  }
+};
+
+const findAttributes = async (criteria) => {
+  try {
+    return await Attribute.find(criteria);
+  } catch (error) {
+    console.log(error);
+    return null;
+  }
+};
+
+const attributesByAggregation = async (pipeline) => {
+  try {
+    return await Attribute.aggregate(pipeline);
+  } catch (error) {
+    console.log(error);
+    return null;
+  }
+};
+
+const attributesUpdateMany = async (criteria, updateData, options = {}) => {
+  try {
+    return await Attribute.updateMany(criteria, updateData, options);
+  } catch (error) {
+    console.log(error);
+    return null;
+  }
+};
+
+const findAttributesWithPopulate = async (criteria, populate) => {
+  try {
+    return await Attribute.find(criteria).populate(populate);
+  } catch (error) {
+    console.log(error);
+    return null;
+  }
+};
+
+module.exports = {
+  Attribute,
+  createNewAttribute,
+  findAttributeById,
+  updateAttributeById,
+  deleteAttributeById,
+  findAttribute,
+  findAttributes,
+  attributesByAggregation,
+  attributesInsertMany,
+  attributesUpdateMany,
+  findAttributesWithPopulate,
+};