shuttlepro-shared 1.2.66 → 1.2.68

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,97 +256,50 @@ const findUserWorkspaces = async (userId) => {
         permissions: ur?.roleId?.modulePermissions?.modules || [],
       };
     });
+  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 cacheKey = `${CACHE_KEY_USER_PERMISSIONS_PREFIX}${workspaceId}_${userId}`;
-  let cachedData = await getRedisData(cacheKey);
-
-  if (cachedData && cachedData.permissions) {
-    return cachedData.permissions;
-  }
-
+const getUserRoleWithPermissions = async (workspaceId, userId) => {
   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) {
+      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;
     }
-
-    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 null;
   } catch (err) {
-    console.error("Error in getUserPermissions:", err);
+    console.error("Error in getUserRoleWithPermissions:", err);
     return null;
   }
 };

package/package.json

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