shuttlepro-shared 1.2.63 → 1.2.64

package/common/repositories/userRole.repository.js

@@ -9,6 +9,26 @@ const CACHE_KEY_ALL_MEMBERS = "userroles_all_members";
 const CACHE_KEY_USER_WORKSPACE_PREFIX = "userrole_workspace_";
 const CACHE_KEY_USER_PERMISSIONS_PREFIX = "user_permissions_";
 
+// Comprehensive cache update method
+const updateAllRelatedCaches = async (userId, workspaceId) => {
+  try {
+    // Update all members cache
+    await updateCachedMembers();
+
+    // Clear user workspace cache
+    if (userId) {
+      await clearUserWorkspaceCache(userId);
+    }
+
+    // Clear user permissions cache
+    if (workspaceId && userId) {
+      await clearUserPermissionsCache(workspaceId, userId);
+    }
+  } catch (error) {
+    console.error("Error updating related caches:", error);
+  }
+};
+
 // Clear user workspace cache
 const clearUserWorkspaceCache = async (userId) => {
   await setRedisData(
@@ -50,7 +70,12 @@ const getCachedMembers = async (filter = {}) => {
       .lean()
       .exec();
 
-    await setRedisData(cacheKey, members, null, 0);
+    await setRedisData(
+      cacheKey,
+      members?.filter((member) => member?.userId && member?.roleId),
+      null,
+      0
+    );
   }
 
   return members;
@@ -78,23 +103,23 @@ const updateCachedMembers = async (filter = {}) => {
     .lean()
     .exec();
 
-  await setRedisData(cacheKey, members, null, 0);
+  await setRedisData(
+    cacheKey,
+    members?.filter((member) => member?.userId && member?.roleId),
+    null,
+    0
+  );
   return members;
 };
 
 const createUserRole = async (data) => {
-  const newRole = new UserRole(data);
-  const savedRole = await newRole.save();
-
-  // Update cache
-  await updateCachedMembers();
-  if (data.userId) {
-    await clearUserWorkspaceCache(data.userId);
-    // Clear permissions cache if workspaceId exists
-    if (data.workspaceId) {
-      await clearUserPermissionsCache(data.workspaceId, data.userId);
-    }
-  }
+  const savedRole = await UserRole.create(data);
+
+  // Update all related caches
+  await updateAllRelatedCaches(
+    savedRole?.userId?.toString(),
+    savedRole?.workspaceId?.toString()
+  );
 
   return savedRole;
 };
@@ -109,24 +134,27 @@ const updateUserRole = async (id, data) => {
   }).exec();
 
   if (updatedRole) {
-    await updateCachedMembers();
-    if (updatedRole.userId) {
-      await clearUserWorkspaceCache(updatedRole.userId);
-      // Clear permissions cache if workspaceId exists
-      if (updatedRole.workspaceId) {
-        await clearUserPermissionsCache(
-          updatedRole.workspaceId,
-          updatedRole.userId
-        );
-      }
-    }
+    // Update all related caches
+    await updateAllRelatedCaches(updatedRole.userId, updatedRole.workspaceId);
   }
 
   return updatedRole;
 };
 
 const deleteUserRoleByFilter = async (filter) => {
+  // Find the role before deleting to get userId and workspaceId
+  const roleToDelete = await UserRole.findOne(filter).exec();
+
   const deletedRole = await UserRole.findOneAndDelete(filter).exec();
+
+  if (deletedRole) {
+    // Update all related caches
+    await updateAllRelatedCaches(
+      roleToDelete?.userId,
+      roleToDelete?.workspaceId
+    );
+  }
+
   return deletedRole;
 };
 
@@ -138,14 +166,8 @@ const deleteUserRole = async (id) => {
   const deletedRole = await UserRole.findByIdAndDelete(id).exec();
 
   if (deletedRole) {
-    await updateCachedMembers();
-    if (userId) {
-      await clearUserWorkspaceCache(userId);
-      // Clear permissions cache if workspaceId exists
-      if (workspaceId) {
-        await clearUserPermissionsCache(workspaceId, userId);
-      }
-    }
+    // Update all related caches
+    await updateAllRelatedCaches(userId, workspaceId);
   }
 
   return deletedRole;
@@ -360,11 +382,8 @@ const findOneAndUpdateUserRole = async ({
   ).exec();
 
   if (updatedRole) {
-    await updateCachedMembers();
-    await clearUserWorkspaceCache(userId);
-    if (workspaceId) {
-      await clearUserPermissionsCache(workspaceId, userId);
-    }
+    // Update all related caches
+    await updateAllRelatedCaches(userId, workspaceId);
   }
 
   return updatedRole;

package/package.json

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