shuttlepro-shared 1.2.33 → 1.2.35

package/common/repositories/userRole.repository.js

@@ -1,7 +1,7 @@
 const { UserRole } = require("../../models/UserRole");
 const {
   getDataFromRedisSet,
-  addDataToRedisSet,
+  addArrayToRedisSet,
 } = require("../../config/redis");
 
 const defaultSelect =
@@ -13,7 +13,7 @@ const CACHE_KEY_USER_WORKSPACE_PREFIX = "userrole_workspace_";
 
 // Clear user workspace cache
 const clearUserWorkspaceCache = async (userId) => {
-  await addDataToRedisSet(`${CACHE_KEY_USER_WORKSPACE_PREFIX}${userId}`, null);
+  await addArrayToRedisSet(`${CACHE_KEY_USER_WORKSPACE_PREFIX}${userId}`, null);
 };
 
 // Get cached members
@@ -41,7 +41,7 @@ const getCachedMembers = async (filter = {}) => {
       .lean()
       .exec();
 
-    await addDataToRedisSet(cacheKey, members);
+    await addArrayToRedisSet(cacheKey, members);
   }
 
   return members;
@@ -69,7 +69,7 @@ const updateCachedMembers = async (filter = {}) => {
     .lean()
     .exec();
 
-  await addDataToRedisSet(cacheKey, members);
+  await addArrayToRedisSet(cacheKey, members);
   return members;
 };
 
@@ -123,12 +123,8 @@ 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, "userRoleWithWorkspaces");
-
-  if (!userRoleWithWorkspaces) {
+  if (!userRoleWithWorkspaces.length) {
     userRoleWithWorkspaces = await UserRole.find({
       userId: userId,
     })
@@ -145,12 +141,11 @@ const findUserWorkspaces = async (userId) => {
       })
       .lean()
       .exec();
-    console.log(userRoleWithWorkspaces, "userRoleWithWorkspaces");
+    console.log(userRoleWithWorkspaces, "through db");
     if (userRoleWithWorkspaces) {
-      await addDataToRedisSet(cacheKey, userRoleWithWorkspaces);
+      await addArrayToRedisSet(cacheKey, userRoleWithWorkspaces);
     }
   }
-
   return userRoleWithWorkspaces;
 };
 

package/config/redis.js

@@ -103,13 +103,30 @@ const addDataToRedisSet = async (key, value) => {
     return false;
   }
 };
+
+const addArrayToRedisSet = async (key, value) => {
+  try {
+    await connectRedis();
+    console.log(key, "key");
+    const arr = Array.isArray(value) ? value : [value];
+    console.log(arr, "arr");
+    await client.sAdd(key, ...arr); // spread values
+    return true;
+  } catch (err) {
+    console.error("Add Error:", err);
+    return false;
+  }
+};
+
 const getDataFromRedisSet = async (key) => {
   try {
     await connectRedis();
+    console.log(key, "key");
     const values = await client.sMembers(key);
-    return values; // returns an array of values
+    console.log(values, "values");
+    return values;
   } catch (err) {
-    console.error("Redis Error:", err);
+    console.error("Get Error:", err);
     return [];
   }
 };
@@ -199,4 +216,5 @@ module.exports = {
   removeDataFromRedisSet,
   isMemberOfRedisSet,
   getDataFromRedisSet,
+  addArrayToRedisSet,
 };

package/package.json

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