shuttlepro-shared 1.2.66 → 1.2.67

package/common/repositories/userRole.repository.js

@@ -1,6 +1,5 @@
 const { UserRole } = require("../../models/UserRole");
 const { getRedisData, setRedisData } = require("../../config/redis");
-const mongoose = require("mongoose");
 
 const defaultSelect =
   "iconUrl thumbUrl name productsCount ordersCount contact email address websiteUrl facebookUrl twitterUrl instagramUrl members defaultModule";
@@ -231,7 +230,7 @@ const deleteUserRole = async (id) => {
 };
 
 const findUserWorkspaces = async (userId) => {
-  return await UserRole.find({ userId: userId })
+  let userRoleWithWorkspaces = await UserRole.find({ userId: userId })
     .select("userId roleId workspaceId")
     .populate({
       path: "roleId",
@@ -257,6 +256,7 @@ const findUserWorkspaces = async (userId) => {
         permissions: ur?.roleId?.modulePermissions?.modules || [],
       };
     });
+  return userRoleWithWorkspaces || [];
 };
 
 const getUserRoleWithPermissions = async (workspaceId, userId) => {
@@ -311,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);
-
-    return permissions;
+    return permissions || null;
   } catch (err) {
     console.error("Error in getUserPermissions:", err);
     return null;

package/package.json

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