shuttlepro-shared 1.2.86 → 1.2.88

package/common/repositories/role.repository.js

@@ -188,28 +188,21 @@ const updateRoleById = async (id, updateData) => {
     }),
   };
   delete updateQuery.logs;
-
   const updatedRole = await Role.findByIdAndUpdate(id, updateQuery, {
     new: true,
   })
     .populate("permissionId")
     .lean()
     .exec();
-
   if (updatedRole) {
-    if (updatedRole.workspaceId) {
-      await updateCachedRoles(updatedRole.workspaceId);
-    }
-    // Update default roles cache if needed
-    if (!updatedRole.workspaceId) {
-      await updateCachedDefaultRoles();
-    }
+    await updateCachedRoles(updatedRole?.workspaceId);
   }
-
   return updatedRole;
 };
 
 const updateRoleByFilter = async (filter, updateData) => {
+  console.log(filter, "filter");
+  console.log(updateData, "updateData");
   const updatedRole = await Role.findOneAndUpdate(filter, updateData, {
     new: true,
   })
@@ -217,15 +210,15 @@ const updateRoleByFilter = async (filter, updateData) => {
     .lean()
     .exec();
 
-  if (updatedRole) {
-    if (updatedRole.workspaceId) {
-      await updateCachedRoles(updatedRole.workspaceId);
-    }
-    // Update default roles cache if needed
-    if (!updatedRole.workspaceId) {
-      await updateCachedDefaultRoles();
-    }
-  }
+  // if (updatedRole) {
+  //   if (updatedRole.workspaceId) {
+  //     await updateCachedRoles(updatedRole.workspaceId);
+  //   }
+  //   // Update default roles cache if needed
+  //   if (!updatedRole.workspaceId) {
+  //     await updateCachedDefaultRoles();
+  //   }
+  // }
 
   return updatedRole;
 };
@@ -316,56 +309,16 @@ const removePermissionFromRole = async (id, permission) => {
   return updatedRole;
 };
 
-const deleteRoleById = async (id) => {
-  const role = await Role.findById(id).lean().exec();
-  const workspaceId = role?.workspaceId;
-
-  const deletedRole = await Role.findByIdAndDelete(id).lean().exec();
-
-  if (deletedRole) {
-    if (workspaceId) {
-      await updateCachedRoles(workspaceId);
-    }
-    // Update default roles cache if needed
-    if (!deletedRole.workspaceId) {
-      await updateCachedDefaultRoles();
-    }
-  }
-
-  return deletedRole;
+const deleteRoleById = async (id, workspaceId) => {
+  return await Role.deleteOne({ _id: id }).exec();
 };
 
 const deleteSingleRole = async (filter) => {
-  const workspaceId = filter.workspaceId;
-  const deletedRole = await Role.findOneAndDelete(filter).lean().exec();
-
-  if (deletedRole) {
-    if (workspaceId) {
-      await updateCachedRoles(workspaceId);
-    }
-    // Update default roles cache if needed
-    if (!deletedRole.workspaceId) {
-      await updateCachedDefaultRoles();
-    }
-  }
-
-  return deletedRole;
+  return await Role.deleteOne(filter).exec();
 };
 
 const deleteManyRoles = async (filter) => {
-  const workspaceId = filter.workspaceId;
-  const includesDefaultRoles =
-    !filter.workspaceId || filter.workspaceId === null;
-  const result = await Role.deleteMany(filter);
-  if (result.deletedCount > 0) {
-    if (workspaceId) {
-      await updateCachedRoles(workspaceId);
-    }
-    if (includesDefaultRoles) {
-      await updateCachedDefaultRoles();
-    }
-  }
-  return result;
+  return await Role.deleteMany(filter);
 };
 
 module.exports = {

package/package.json

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