shuttlepro-shared 1.2.65 → 1.2.67

package/common/repositories/userRole.repository.js

@@ -1,407 +1,3 @@
-// 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";
-
-// // Cache keys
-// const CACHE_KEY_ALL_MEMBERS = "userroles_all_members";
-// const CACHE_KEY_USER_WORKSPACE_PREFIX = "userrole_workspace_";
-// const CACHE_KEY_USER_PERMISSIONS_PREFIX = "user_permissions_";
-
-// // Comprehensive cache update method
-// const updateAllRelatedCaches = async (userId, workspaceId) => {
-//   try {
-//     // Update all members cache
-//     await updateCachedMembers();
-
-//     // Clear user workspace cache
-//     if (userId) {
-//       await clearUserWorkspaceCache(userId);
-//     }
-
-//     // Clear user permissions cache
-//     if (workspaceId && userId) {
-//       await clearUserPermissionsCache(workspaceId, userId);
-//     }
-//   } catch (error) {
-//     console.error("Error updating related caches:", error);
-//   }
-// };
-
-// // Clear user workspace cache
-// const clearUserWorkspaceCache = async (userId) => {
-//   await setRedisData(
-//     `${CACHE_KEY_USER_WORKSPACE_PREFIX}${userId}`,
-//     null,
-//     null,
-//     0
-//   );
-// };
-
-// // Clear user permissions cache
-// const clearUserPermissionsCache = async (workspaceId, userId) => {
-//   const cacheKey = `${CACHE_KEY_USER_PERMISSIONS_PREFIX}${workspaceId}_${userId}`;
-//   await setRedisData(cacheKey, null, null, 0);
-// };
-
-// // Get cached members
-// const getCachedMembers = async (filter = {}) => {
-//   const cacheKey =
-//     Object.keys(filter).length > 0
-//       ? `${CACHE_KEY_ALL_MEMBERS}_${JSON.stringify(filter)}`
-//       : CACHE_KEY_ALL_MEMBERS;
-
-//   let members = await getRedisData(cacheKey);
-
-//   if (!members) {
-//     members = await UserRole.find(filter)
-//       .select("userId role userShift roleId")
-//       .populate({
-//         path: "roleId",
-//         select: "id name userId userShift permissionId modulePermissions",
-//         populate: [{ path: "permissionId", select: "id name" }],
-//       })
-//       .populate({
-//         path: "userId",
-//         match: { isDeleted: false, suspended: false },
-//         select: "firstName lastName role email picture userShift",
-//       })
-//       .lean()
-//       .exec();
-
-//     await setRedisData(
-//       cacheKey,
-//       members?.filter((member) => member?.userId && member?.roleId),
-//       null,
-//       0
-//     );
-//   }
-
-//   return members;
-// };
-
-// // Update the cache for all members
-// const updateCachedMembers = async (filter = {}) => {
-//   const cacheKey =
-//     Object.keys(filter).length > 0
-//       ? `${CACHE_KEY_ALL_MEMBERS}_${JSON.stringify(filter)}`
-//       : CACHE_KEY_ALL_MEMBERS;
-
-//   const members = await UserRole.find(filter)
-//     .select("userId role userShift roleId")
-//     .populate({
-//       path: "roleId",
-//       select: "id name userId userShift permissionId modulePermissions",
-//       populate: [{ path: "permissionId", select: "id name" }],
-//     })
-//     .populate({
-//       path: "userId",
-//       match: { isDeleted: false, suspended: false },
-//       select: "firstName lastName role email picture userShift",
-//     })
-//     .lean()
-//     .exec();
-
-//   await setRedisData(
-//     cacheKey,
-//     members?.filter((member) => member?.userId && member?.roleId),
-//     null,
-//     0
-//   );
-//   return members;
-// };
-
-// const createUserRole = async (data) => {
-//   const savedRole = await UserRole.create(data);
-
-//   // Update all related caches
-//   await updateAllRelatedCaches(
-//     savedRole?.userId?.toString(),
-//     savedRole?.workspaceId?.toString()
-//   );
-
-//   return savedRole;
-// };
-
-// const findUserRole = async (filter = {}) => {
-//   return await getCachedMembers(filter);
-// };
-
-// const updateUserRole = async (id, data) => {
-//   const updatedRole = await UserRole.findByIdAndUpdate(id, data, {
-//     new: true,
-//   }).exec();
-
-//   if (updatedRole) {
-//     // Update all related caches
-//     await updateAllRelatedCaches(updatedRole.userId, updatedRole.workspaceId);
-//   }
-
-//   return updatedRole;
-// };
-
-// const deleteUserRoleByFilter = async (filter) => {
-//   // Find the role before deleting to get userId and workspaceId
-//   const roleToDelete = await UserRole.findOne(filter).exec();
-
-//   const deletedRole = await UserRole.findOneAndDelete(filter).exec();
-
-//   if (deletedRole) {
-//     // Update all related caches
-//     await updateAllRelatedCaches(
-//       roleToDelete?.userId,
-//       roleToDelete?.workspaceId
-//     );
-//   }
-
-//   return deletedRole;
-// };
-
-// const deleteUserRole = async (id) => {
-//   const role = await UserRole.findById(id).exec();
-//   const userId = role?.userId;
-//   const workspaceId = role?.workspaceId;
-
-//   const deletedRole = await UserRole.findByIdAndDelete(id).exec();
-
-//   if (deletedRole) {
-//     // Update all related caches
-//     await updateAllRelatedCaches(userId, workspaceId);
-//   }
-
-//   return deletedRole;
-// };
-
-// const findUserWorkspaces = async (userId) => {
-//   const cacheKey = `${CACHE_KEY_USER_WORKSPACE_PREFIX}${userId}`;
-//   let userRoleWithWorkspaces = await getRedisData(cacheKey);
-//   if (!userRoleWithWorkspaces) {
-//     userRoleWithWorkspaces = await UserRole.find({
-//       userId: userId,
-//     })
-//       .select("userId roleId workspaceId")
-//       .populate({
-//         path: "roleId",
-//         select: "id name userId userShift permissionId modulePermissions",
-//         populate: [{ path: "permissionId", select: "id name" }],
-//       })
-//       .populate({
-//         path: "workspaceId",
-//         select: defaultSelect,
-//         match: { isDeleted: false },
-//       })
-//       .lean()
-//       .exec();
-//     userRoleWithWorkspaces = userRoleWithWorkspaces
-//       ?.filter((userRole) => userRole?.workspaceId)
-//       ?.map((ur) => {
-//         return {
-//           ...ur?.workspaceId,
-//           id: ur?.workspaceId?._id?.toString(),
-//           _id: ur?.workspaceId?._id?.toString(),
-//           role: ur?.roleId?.name || "",
-//           permissions: ur?.roleId?.modulePermissions?.modules || [],
-//         };
-//       });
-//     if (userRoleWithWorkspaces) {
-//       await setRedisData(cacheKey, userRoleWithWorkspaces, null, 0);
-//     }
-//   }
-//   return userRoleWithWorkspaces;
-// };
-
-// const convertPermissionsArrayToObject = (originalArray) => {
-//   return originalArray?.reduce((acc, item) => {
-//     const { id, actions, integrationPermissions, ...extras } = item;
-//     const formattedExtras = {};
-//     if (extras.deletable !== undefined) {
-//       formattedExtras.deletable = extras.deletable;
-//     }
-//     if (extras.createUpdateable !== undefined) {
-//       formattedExtras.createUpdateable = extras.createUpdateable;
-//     }
-//     acc[id] = {
-//       actions: Object.keys(actions).filter((action) => actions[action]),
-//       ...formattedExtras,
-//       ...(integrationPermissions && {
-//         integrationPermissions: Object.entries(integrationPermissions)
-//           .filter(([_, allowed]) => allowed)
-//           .map(([key]) => key),
-//       }),
-//     };
-//     return acc;
-//   }, {});
-// };
-
-// const getUserRoleWithPermissions = async (workspaceId, userId) => {
-//   const cacheKey = `${CACHE_KEY_USER_PERMISSIONS_PREFIX}${workspaceId}_${userId}`;
-//   let cachedData = await getRedisData(cacheKey);
-
-//   if (cachedData && cachedData.roleWithPermissions) {
-//     return cachedData.roleWithPermissions;
-//   }
-
-//   try {
-//     let data = await UserRole.findOne({
-//       workspaceId: workspaceId,
-//       userId: userId,
-//     })
-//       .populate({
-//         path: "roleId",
-//         select:
-//           "id name userId userShift permissionId modulePermissions defaultModule",
-//         populate: [{ path: "permissionId", select: "id name" }],
-//       })
-//       .lean()
-//       .exec();
-
-//     if (!data) {
-//       return null;
-//     }
-
-//     const roleWithPermissions = {
-//       ...data,
-//       roleId: data?.roleId?._id?.toString() || "",
-//       role: data?.roleId?.name || "",
-//       permissions:
-//         convertPermissionsArrayToObject(
-//           data?.roleId?.modulePermissions?.modules
-//         ) || [],
-//       parentRole: data?.roleId?.permissionId?.name || "",
-//       parentRoleId: data?.roleId?.permissionId?._id?.toString() || "",
-//       defaultModule: data?.roleId?.defaultModule || "",
-//     };
-
-//     // Store in cache with other permission data
-//     const permissionsData = cachedData || {};
-//     permissionsData.roleWithPermissions = roleWithPermissions;
-//     await setRedisData(cacheKey, permissionsData, null, 0);
-
-//     return roleWithPermissions;
-//   } catch (err) {
-//     console.error("Error in getUserRoleWithPermissions:", err);
-//     return null;
-//   }
-// };
-
-// const getUserPermissions = async (workspaceId, userId) => {
-//   const cacheKey = `${CACHE_KEY_USER_PERMISSIONS_PREFIX}${workspaceId}_${userId}`;
-//   let cachedData = await getRedisData(cacheKey);
-
-//   if (cachedData && cachedData.permissions) {
-//     return cachedData.permissions;
-//   }
-
-//   try {
-//     let data = await UserRole.findOne({
-//       workspaceId: workspaceId,
-//       userId: userId,
-//     })
-//       .select("roleId userId")
-//       .populate({
-//         path: "roleId",
-//         select: "modulePermissions",
-//       })
-//       .lean()
-//       .exec();
-
-//     if (!data) {
-//       return null;
-//     }
-
-//     const permissions =
-//       convertPermissionsArrayToObject(
-//         data?.roleId?.modulePermissions?.modules
-//       ) || null;
-
-//     // Store in cache with other permission data
-//     const permissionsData = cachedData || {};
-//     permissionsData.permissions = permissions;
-//     await setRedisData(cacheKey, permissionsData, null, 0);
-
-//     return permissions;
-//   } catch (err) {
-//     console.error("Error in getUserPermissions:", err);
-//     return null;
-//   }
-// };
-
-// const getChannelsPermissions = async (workspaceId, userId) => {
-//   const cacheKey = `${CACHE_KEY_USER_PERMISSIONS_PREFIX}${workspaceId}_${userId}`;
-//   let cachedData = await getRedisData(cacheKey);
-
-//   if (cachedData && cachedData.channelsPermissions) {
-//     return cachedData.channelsPermissions;
-//   }
-
-//   try {
-//     let data = await UserRole.findOne({
-//       workspaceId: workspaceId,
-//       userId: userId,
-//     })
-//       .select("roleId userId")
-//       .populate({
-//         path: "roleId",
-//         select: "modulePermissions",
-//       })
-//       .lean()
-//       .exec();
-
-//     if (!data) {
-//       return [];
-//     }
-
-//     const channelsPermissions =
-//       convertPermissionsArrayToObject(
-//         data?.roleId?.modulePermissions?.modules
-//       )?.["conversations"]?.["integrationPermissions"] || [];
-
-//     // Store in cache with other permission data
-//     const permissionsData = cachedData || {};
-//     permissionsData.channelsPermissions = channelsPermissions;
-//     await setRedisData(cacheKey, permissionsData, null, 0);
-
-//     return channelsPermissions;
-//   } catch (err) {
-//     console.error("Error in getChannelsPermissions:", err);
-//     return [];
-//   }
-// };
-
-// const findOneAndUpdateUserRole = async ({
-//   workspaceId,
-//   userId,
-//   userShift,
-//   role,
-// }) => {
-//   const updatedRole = await UserRole.findOneAndUpdate(
-//     { workspaceId, userId },
-//     { $set: { userShift, role } },
-//     { new: true, upsert: false }
-//   ).exec();
-
-//   if (updatedRole) {
-//     // Update all related caches
-//     await updateAllRelatedCaches(userId, workspaceId);
-//   }
-
-//   return updatedRole;
-// };
-
-// module.exports = {
-//   createUserRole,
-//   findUserRole,
-//   updateUserRole,
-//   deleteUserRoleByFilter,
-//   deleteUserRole,
-//   findUserWorkspaces,
-//   getUserRoleWithPermissions,
-//   getUserPermissions,
-//   getChannelsPermissions,
-//   findOneAndUpdateUserRole,
-// };
-
 const { UserRole } = require("../../models/UserRole");
 const { getRedisData, setRedisData } = require("../../config/redis");
 
@@ -412,6 +8,83 @@ const defaultSelect =
 const CACHE_KEY_ALL_MEMBERS = "userroles_all_members";
 const CACHE_KEY_USER_PERMISSIONS_PREFIX = "user_permissions_";
 
+// Comprehensive cache get method
+const getCachedMembers = async (filter = {}) => {
+  try {
+    let members = await getRedisData(CACHE_KEY_ALL_MEMBERS);
+
+    if (!members) {
+      // Fetch from database if not in cache
+      members = await UserRole.find()
+        .select("userId role userShift roleId workspaceId")
+        .populate({
+          path: "roleId",
+          select: "id name userId userShift permissionId modulePermissions",
+          populate: [{ path: "permissionId", select: "id name" }],
+        })
+        .populate({
+          path: "userId",
+          match: { isDeleted: false, suspended: false },
+          select: "firstName lastName role email picture userShift",
+        })
+        .lean()
+        .exec();
+
+      // Filter out invalid members
+      members =
+        members?.filter((member) => member?.userId && member?.roleId) || [];
+
+      // Cache the result
+      await setRedisData(CACHE_KEY_ALL_MEMBERS, members);
+    }
+
+    // Apply filter in memory
+    return members.filter((member) =>
+      Object.entries(filter).every(([key, value]) => {
+        // Handle nested property access and comparison
+        const memberValue = key.includes(".")
+          ? key.split(".").reduce((obj, prop) => obj?.[prop], member)
+          : member[key];
+
+        return memberValue === value;
+      })
+    );
+  } catch (error) {
+    console.error("Error fetching cached members:", error);
+    return [];
+  }
+};
+
+// Update the cache for all members
+const updateCachedMembers = async (filter = {}) => {
+  try {
+    const members = await UserRole.find(filter)
+      .select("userId role userShift roleId")
+      .populate({
+        path: "roleId",
+        select: "id name userId userShift permissionId modulePermissions",
+        populate: [{ path: "permissionId", select: "id name" }],
+      })
+      .populate({
+        path: "userId",
+        match: { isDeleted: false, suspended: false },
+        select: "firstName lastName role email picture userShift",
+      })
+      .lean()
+      .exec();
+
+    const validMembers =
+      members?.filter((member) => member?.userId && member?.roleId) || [];
+
+    await setRedisData(CACHE_KEY_ALL_MEMBERS, validMembers);
+
+    return validMembers;
+  } catch (error) {
+    console.error("Error updating cached members:", error);
+    return [];
+  }
+};
+
 // Comprehensive cache update method
 const updateAllRelatedCaches = async (userId, workspaceId) => {
   try {
@@ -467,64 +140,27 @@ const findSingleUserRoleByFilter = async (
     .exec();
 };
 
-// Get cached members
-const getCachedMembers = async (filter = {}) => {
-  let members = await getRedisData(CACHE_KEY_ALL_MEMBERS);
-  if (!members) {
-    members = await UserRole.find(filter)
-      .select("userId role userShift roleId")
-      .populate({
-        path: "roleId",
-        select: "id name userId userShift permissionId modulePermissions",
-        populate: [{ path: "permissionId", select: "id name" }],
-      })
-      .populate({
-        path: "userId",
-        match: { isDeleted: false, suspended: false },
-        select: "firstName lastName role email picture userShift",
-      })
-      .lean()
-      .exec();
-
-    await setRedisData(
-      CACHE_KEY_ALL_MEMBERS,
-      members?.filter((member) => member?.userId && member?.roleId),
-      null,
-      3600
-    );
-  }
-
-  // Apply filter in memory if needed
-  return filter && Object.keys(filter).length > 0
-    ? members.filter((member) =>
-        Object.entries(filter).every(([key, value]) => member[key] === value)
-      )
-    : members;
-};
-
-// Update the cache for all members
-const updateCachedMembers = async (filter = {}) => {
-  const members = await UserRole.find(filter)
-    .select("userId role userShift roleId")
-    .populate({
-      path: "roleId",
-      select: "id name userId userShift permissionId modulePermissions",
-      populate: [{ path: "permissionId", select: "id name" }],
-    })
-    .populate({
-      path: "userId",
-      match: { isDeleted: false, suspended: false },
-      select: "firstName lastName role email picture userShift",
-    })
-    .lean()
-    .exec();
-  await setRedisData(
-    CACHE_KEY_ALL_MEMBERS,
-    members?.filter((member) => member?.userId && member?.roleId),
-    null,
-    3600
-  );
-  return members;
+const convertPermissionsArrayToObject = (originalArray) => {
+  return originalArray?.reduce((acc, item) => {
+    const { id, actions, integrationPermissions, ...extras } = item;
+    const formattedExtras = {};
+    if (extras.deletable !== undefined) {
+      formattedExtras.deletable = extras.deletable;
+    }
+    if (extras.createUpdateable !== undefined) {
+      formattedExtras.createUpdateable = extras.createUpdateable;
+    }
+    acc[id] = {
+      actions: Object.keys(actions).filter((action) => actions[action]),
+      ...formattedExtras,
+      ...(integrationPermissions && {
+        integrationPermissions: Object.entries(integrationPermissions)
+          .filter(([_, allowed]) => allowed)
+          .map(([key]) => key),
+      }),
+    };
+    return acc;
+  }, {});
 };
 
 const createUserRole = async (data) => {
@@ -564,29 +200,21 @@ const updateUserRole = async (id, data) => {
   const updatedRole = await UserRole.findByIdAndUpdate(id, data, {
     new: true,
   }).exec();
-
   if (updatedRole) {
-    // Update all related caches
     await updateAllRelatedCaches(updatedRole.userId, updatedRole.workspaceId);
   }
-
   return updatedRole;
 };
 
 const deleteUserRoleByFilter = async (filter) => {
-  // Find the role before deleting to get userId and workspaceId
   const roleToDelete = await UserRole.findOne(filter).exec();
-
   const deletedRole = await UserRole.findOneAndDelete(filter).exec();
-
   if (deletedRole) {
-    // Update all related caches
     await updateAllRelatedCaches(
       roleToDelete?.userId,
       roleToDelete?.workspaceId
     );
   }
-
   return deletedRole;
 };
 
@@ -594,85 +222,41 @@ const deleteUserRole = async (id) => {
   const role = await UserRole.findById(id).exec();
   const userId = role?.userId;
   const workspaceId = role?.workspaceId;
-
   const deletedRole = await UserRole.findByIdAndDelete(id).exec();
-
   if (deletedRole) {
-    // Update all related caches
     await updateAllRelatedCaches(userId, workspaceId);
   }
-
   return deletedRole;
 };
 
 const findUserWorkspaces = async (userId) => {
-  let userRoleWithWorkspaces = await getRedisData(CACHE_KEY_ALL_MEMBERS);
-
-  if (!userRoleWithWorkspaces) {
-    userRoleWithWorkspaces = await UserRole.find()
-      .select("userId roleId workspaceId")
-      .populate({
-        path: "roleId",
-        select: "id name userId userShift permissionId modulePermissions",
-        populate: [{ path: "permissionId", select: "id name" }],
-      })
-      .populate({
-        path: "workspaceId",
-        select: defaultSelect,
-        match: { isDeleted: false },
-      })
-      .lean()
-      .exec();
-
-    userRoleWithWorkspaces = userRoleWithWorkspaces
-      ?.filter((userRole) => userRole?.workspaceId)
-      ?.map((ur) => {
-        return {
-          ...ur?.workspaceId,
-          id: ur?.workspaceId?._id?.toString(),
-          _id: ur?.workspaceId?._id?.toString(),
-          role: ur?.roleId?.name || "",
-          permissions: ur?.roleId?.modulePermissions?.modules || [],
-        };
-      });
-
-    if (userRoleWithWorkspaces) {
-      await setRedisData(
-        CACHE_KEY_ALL_MEMBERS,
-        userRoleWithWorkspaces,
-        null,
-        3600
-      );
-    }
-  }
-
-  // Filter workspaces for specific user
-  return userRoleWithWorkspaces?.filter(
-    (workspace) => workspace.userId?.toString() === userId.toString()
-  );
-};
-
-const convertPermissionsArrayToObject = (originalArray) => {
-  return originalArray?.reduce((acc, item) => {
-    const { id, actions, integrationPermissions, ...extras } = item;
-    const formattedExtras = {};
-    if (extras.deletable !== undefined) {
-      formattedExtras.deletable = extras.deletable;
-    }
-    if (extras.createUpdateable !== undefined) {
-      formattedExtras.createUpdateable = extras.createUpdateable;
-    }
-    acc[id] = {
-      actions: Object.keys(actions).filter((action) => actions[action]),
-      ...formattedExtras,
-      ...(integrationPermissions && {
-        integrationPermissions: Object.entries(integrationPermissions)
-          .filter(([_, allowed]) => allowed)
-          .map(([key]) => key),
-      }),
-    };
-    return acc;
-  }, {});
+  let userRoleWithWorkspaces = await UserRole.find({ userId: userId })
+    .select("userId roleId workspaceId")
+    .populate({
+      path: "roleId",
+      select: "id name userId userShift permissionId modulePermissions",
+      populate: [{ path: "permissionId", select: "id name" }],
+    })
+    .populate({
+      path: "workspaceId",
+      select: defaultSelect,
+      match: { isDeleted: false },
+    })
+    .lean()
+    .exec();
+  userRoleWithWorkspaces = userRoleWithWorkspaces
+    ?.filter((userRole) => userRole?.workspaceId)
+    ?.filter((userRole) => userRole?.roleId)
+    ?.map((ur) => {
+      return {
+        ...ur?.workspaceId,
+        id: ur?.workspaceId?._id?.toString(),
+        _id: ur?.workspaceId?._id?.toString(),
+        role: ur?.roleId?.name || "",
+        permissions: ur?.roleId?.modulePermissions?.modules || [],
+      };
+    });
+  return userRoleWithWorkspaces || [];
 };
 
 const getUserRoleWithPermissions = async (workspaceId, userId) => {
@@ -717,7 +301,7 @@ const getUserRoleWithPermissions = async (workspaceId, userId) => {
     // Store in cache with other permission data
     const permissionsData = cachedData || {};
     permissionsData.roleWithPermissions = roleWithPermissions;
-    await setRedisData(cacheKey, permissionsData, null, 0);
+    await setRedisData(cacheKey, permissionsData);
 
     return roleWithPermissions;
   } catch (err) {
@@ -727,41 +311,16 @@ const getUserRoleWithPermissions = async (workspaceId, userId) => {
 };
 
 const getUserPermissions = async (workspaceId, userId) => {
-  const cacheKey = `${CACHE_KEY_USER_PERMISSIONS_PREFIX}${workspaceId}_${userId}`;
-  let cachedData = await getRedisData(cacheKey);
-
-  if (cachedData && cachedData.permissions) {
-    return cachedData.permissions;
-  }
-
   try {
-    let data = await UserRole.findOne({
-      workspaceId: workspaceId,
-      userId: userId,
-    })
-      .select("roleId userId")
-      .populate({
-        path: "roleId",
-        select: "modulePermissions",
-      })
-      .lean()
-      .exec();
-
-    if (!data) {
-      return null;
+    let members = await getCachedMembers({ workspaceId, userId });
+    console.log(members, "members");
+    if (members?.length) {
+      const permissions =
+        convertPermissionsArrayToObject(
+          members?.[0]?.roleId?.modulePermissions?.modules
+        ) || null;
     }
-
-    const permissions =
-      convertPermissionsArrayToObject(
-        data?.roleId?.modulePermissions?.modules
-      ) || null;
-
-    // Store in cache with other permission data
-    const permissionsData = cachedData || {};
-    permissionsData.permissions = permissions;
-    await setRedisData(cacheKey, permissionsData, null, 0);
-
-    return permissions;
+    return permissions || null;
   } catch (err) {
     console.error("Error in getUserPermissions:", err);
     return null;
@@ -771,11 +330,9 @@ const getUserPermissions = async (workspaceId, userId) => {
 const getChannelsPermissions = async (workspaceId, userId) => {
   const cacheKey = `${CACHE_KEY_USER_PERMISSIONS_PREFIX}${workspaceId}_${userId}`;
   let cachedData = await getRedisData(cacheKey);
-
   if (cachedData && cachedData.channelsPermissions) {
     return cachedData.channelsPermissions;
   }
-
   try {
     let data = await UserRole.findOne({
       workspaceId: workspaceId,
@@ -788,11 +345,9 @@ const getChannelsPermissions = async (workspaceId, userId) => {
       })
       .lean()
       .exec();
-
     if (!data) {
       return [];
     }
-
     const channelsPermissions =
       convertPermissionsArrayToObject(
         data?.roleId?.modulePermissions?.modules
@@ -801,7 +356,7 @@ const getChannelsPermissions = async (workspaceId, userId) => {
     // Store in cache with other permission data
     const permissionsData = cachedData || {};
     permissionsData.channelsPermissions = channelsPermissions;
-    await setRedisData(cacheKey, permissionsData, 3600);
+    await setRedisData(cacheKey, permissionsData);
 
     return channelsPermissions;
   } catch (err) {
@@ -822,4 +377,6 @@ module.exports = {
   getChannelsPermissions,
   findOneAndUpdateUserRole,
   findSingleUserRoleByFilter,
+  getCachedMembers,
+  updateCachedMembers,
 };

package/package.json

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