shuttlepro-shared 1.2.67 → 1.2.69

package/common/repositories/userRole.repository.js

@@ -8,13 +8,11 @@ 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({
@@ -25,30 +23,78 @@ const getCachedMembers = async (filter = {}) => {
         .populate({
           path: "userId",
           match: { isDeleted: false, suspended: false },
-          select: "firstName lastName role email picture userShift",
+          select: "firstName lastName role email picture userShift _id",
         })
         .lean()
         .exec();
 
-      // Filter out invalid members
-      members =
-        members?.filter((member) => member?.userId && member?.roleId) || [];
-
-      // Cache the result
+      members = members?.filter((m) => m?.userId && m?.roleId) || [];
       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 userIdFilter = filter.userId
+      ? new Set(
+          Array.isArray(filter.userId)
+            ? filter.userId.map((id) => id.toString())
+            : [filter.userId.toString()]
+        )
+      : null;
+
+    const roleIdFilter = filter.roleId
+      ? Array.isArray(filter.roleId)
+        ? new Set(filter.roleId.map((id) => id.toString()))
+        : typeof filter.roleId === "object"
+        ? filter.roleId
+        : new Set([filter.roleId.toString()])
+      : null;
+
+    return members.filter((member) => {
+      // Optimize userId filter
+      if (userIdFilter && !userIdFilter.has(member.userId?._id?.toString())) {
+        return false;
+      }
+
+      // Optimize roleId filter
+      if (roleIdFilter) {
+        if (roleIdFilter instanceof Set) {
+          const roleIdStr =
+            member.roleId?._id?.toString() ?? member.roleId?.id?.toString();
+          if (!roleIdFilter.has(roleIdStr)) return false;
+        } else if (typeof roleIdFilter === "object") {
+          for (const [key, value] of Object.entries(roleIdFilter)) {
+            const roleVal = key.includes(".")
+              ? key.split(".").reduce((obj, k) => obj?.[k], member.roleId)
+              : member.roleId?.[key];
+            if (Array.isArray(value)) {
+              if (!value.includes(roleVal)) return false;
+            } else if (roleVal !== value) {
+              return false;
+            }
+          }
+        }
+      }
+
+      // General filters
+      for (const [key, value] of Object.entries(filter)) {
+        if (key === "userId" || key === "roleId") continue;
+
         const memberValue = key.includes(".")
           ? key.split(".").reduce((obj, prop) => obj?.[prop], member)
           : member[key];
 
-        return memberValue === value;
-      })
-    );
+        if (Array.isArray(value)) {
+          if (!value.includes(memberValue)) return false;
+        } else if (typeof value === "object" && value !== null) {
+          for (const [subKey, subVal] of Object.entries(value)) {
+            if (memberValue?.[subKey] !== subVal) return false;
+          }
+        } else {
+          if (memberValue !== value) return false;
+        }
+      }
+
+      return true;
+    });
   } catch (error) {
     console.error("Error fetching cached members:", error);
     return [];
@@ -259,106 +305,64 @@ const findUserWorkspaces = async (userId) => {
   return userRoleWithWorkspaces || [];
 };
 
-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;
-  }
-
+const getUserPermissions = async (workspaceId, userId) => {
   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:
+    let members = await getCachedMembers({ workspaceId, userId });
+    console.log(members, "members");
+    if (members?.length) {
+      return (
         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);
-
-    return roleWithPermissions;
+          members?.[0]?.roleId?.modulePermissions?.modules
+        ) || null
+      );
+    }
+    return null;
   } catch (err) {
-    console.error("Error in getUserRoleWithPermissions:", err);
+    console.error("Error in getUserPermissions:", err);
     return null;
   }
 };
 
-const getUserPermissions = async (workspaceId, userId) => {
+const getUserRoleWithPermissions = async (workspaceId, userId) => {
   try {
     let members = await getCachedMembers({ workspaceId, userId });
     console.log(members, "members");
     if (members?.length) {
-      const permissions =
-        convertPermissionsArrayToObject(
-          members?.[0]?.roleId?.modulePermissions?.modules
-        ) || null;
+      let data = members?.[0];
+      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 || "",
+      };
+      return roleWithPermissions || null;
     }
-    return permissions || null;
+    return null;
   } catch (err) {
-    console.error("Error in getUserPermissions:", err);
+    console.error("Error in getUserRoleWithPermissions:", 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 [];
+    let members = await getCachedMembers({ workspaceId, userId });
+    console.log(members, "members");
+    if (members?.length) {
+      let data = members?.[0];
+      return (
+        convertPermissionsArrayToObject(
+          data?.roleId?.modulePermissions?.modules
+        )?.["conversations"]?.["integrationPermissions"] || []
+      );
     }
-    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);
-
-    return channelsPermissions;
+    return [];
   } catch (err) {
     console.error("Error in getChannelsPermissions:", err);
     return [];

package/package.json

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