shuttlepro-shared 1.2.38 → 1.2.40

package/common/repositories/userRole.repository.js

@@ -1,8 +1,5 @@
 const { UserRole } = require("../../models/UserRole");
-const {
-  getDataFromRedisSet,
-  addArrayToRedisSet,
-} = require("../../config/redis");
+const { getRedisData, setRedisData } = require("../../config/redis");
 
 const defaultSelect =
   "iconUrl thumbUrl name productsCount ordersCount contact email address websiteUrl facebookUrl twitterUrl instagramUrl members defaultModule";
@@ -13,7 +10,12 @@ const CACHE_KEY_USER_WORKSPACE_PREFIX = "userrole_workspace_";
 
 // Clear user workspace cache
 const clearUserWorkspaceCache = async (userId) => {
-  await addArrayToRedisSet(`${CACHE_KEY_USER_WORKSPACE_PREFIX}${userId}`, null);
+  await setRedisData(
+    `${CACHE_KEY_USER_WORKSPACE_PREFIX}${userId}`,
+    null,
+    null,
+    0
+  );
 };
 
 // Get cached members
@@ -23,7 +25,7 @@ const getCachedMembers = async (filter = {}) => {
       ? `${CACHE_KEY_ALL_MEMBERS}_${JSON.stringify(filter)}`
       : CACHE_KEY_ALL_MEMBERS;
 
-  let members = await getDataFromRedisSet(cacheKey);
+  let members = await getRedisData(cacheKey);
 
   if (!members) {
     members = await UserRole.find(filter)
@@ -41,7 +43,7 @@ const getCachedMembers = async (filter = {}) => {
       .lean()
       .exec();
 
-    await addArrayToRedisSet(cacheKey, members);
+    await setRedisData(cacheKey, members, null, 0);
   }
 
   return members;
@@ -69,7 +71,7 @@ const updateCachedMembers = async (filter = {}) => {
     .lean()
     .exec();
 
-  await addArrayToRedisSet(cacheKey, members);
+  await setRedisData(cacheKey, members, null, 0);
   return members;
 };
 
@@ -123,9 +125,7 @@ const deleteUserRole = async (id) => {
 
 const findUserWorkspaces = async (userId) => {
   const cacheKey = `${CACHE_KEY_USER_WORKSPACE_PREFIX}${userId}`;
-  console.log(cacheKey, "cacheKey");
-  let userRoleWithWorkspaces = await getDataFromRedisSet(cacheKey);
-  console.log(userRoleWithWorkspaces, "from cache");
+  let userRoleWithWorkspaces = await getRedisData(cacheKey);
   if (!userRoleWithWorkspaces.length) {
     userRoleWithWorkspaces = await UserRole.find({
       userId: userId,
@@ -143,16 +143,17 @@ const findUserWorkspaces = async (userId) => {
       })
       .lean()
       .exec();
-    if (userRoleWithWorkspaces) {
-      await addArrayToRedisSet(
-        cacheKey,
-        userRoleWithWorkspaces?.map((x) => {
-          return {
-            ...x,
-            _id: x?._id?.toString(),
-          };
-        })
-      );
+    userRoleWithWorkspaces = userRoleWithWorkspaces.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.length) {
+      await setRedisData(cacheKey, userRoleWithWorkspaces, null, 0);
     }
   }
   return userRoleWithWorkspaces;

package/config/redis.js

@@ -104,46 +104,6 @@ const addDataToRedisSet = async (key, value) => {
   }
 };
 
-const addArrayToRedisSet = async (key, value) => {
-  try {
-    await connectRedis();
-
-    const arr = Array.isArray(value) ? value : [value];
-
-    console.log(arr, "arr");
-
-    // Convert each item to string (usually JSON)
-    const stringifiedArr = arr.map((item) => JSON.stringify(item));
-
-    console.log(stringifiedArr, "stringifiedArr");
-
-    await client.sAdd(key, ...stringifiedArr);
-    return true;
-  } catch (err) {
-    console.error("Add Error:", err);
-    return false;
-  }
-};
-
-const getDataFromRedisSet = async (key) => {
-  try {
-    await connectRedis();
-    const values = await client.sMembers(key);
-
-    // Parse each stringified JSON back to object
-    return values.map((item) => {
-      try {
-        return JSON.parse(item);
-      } catch (e) {
-        return item; // fallback in case it's not JSON
-      }
-    });
-  } catch (err) {
-    console.error("Get Error:", err);
-    return [];
-  }
-};
-
 const removeDataFromRedisSet = async (key, value) => {
   try {
     await connectRedis();
@@ -228,6 +188,4 @@ module.exports = {
   addDataToRedisSet,
   removeDataFromRedisSet,
   isMemberOfRedisSet,
-  getDataFromRedisSet,
-  addArrayToRedisSet,
 };

package/package.json

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