shuttlepro-shared 1.2.74 → 1.2.76

package/common/repositories/userRole.repository.js

@@ -5,109 +5,43 @@ const defaultSelect =
   "iconUrl thumbUrl name productsCount ordersCount contact email address websiteUrl facebookUrl twitterUrl instagramUrl members defaultModule";
 
 // Cache keys
-const CACHE_KEY_ALL_MEMBERS = "userroles_all_members";
+const MEMBERS = "members";
 
-const getCachedMembers = async (filter = {}) => {
+// Update the cache for all members
+const updateCachedMembers = async (workspaceId) => {
   try {
-    let members = await getRedisData(CACHE_KEY_ALL_MEMBERS);
-
-    if (!members) {
-      members = await UserRole.find()
-        .select("userId role userShift roleId workspaceId")
-        .populate({
-          path: "roleId",
-          select: "id name userId userShift permissionId modulePermissions",
-          populate: [{ path: "permissionId", select: "id name" }],
-        })
-        .populate({
-          path: "userId",
-          match: { isDeleted: false, suspended: false },
-          select: "firstName lastName role email picture userShift _id",
-        })
-        .lean()
-        .exec();
-
-      members = members?.filter((m) => m?.userId && m?.roleId) || [];
-      await setRedisData(CACHE_KEY_ALL_MEMBERS, members);
-    }
-
-    const userIdFilter = filter.userId
-      ? new Set(
-          Array.isArray(filter.userId)
-            ? filter.userId.map((id) => id.toString())
-            : [filter.userId.toString()]
-        )
-      : null;
-
-    const roleIdFilter = filter.roleId
-      ? Array.isArray(filter.roleId)
-        ? new Set(filter.roleId.map((id) => id.toString()))
-        : typeof filter.roleId === "object"
-        ? filter.roleId
-        : new Set([filter.roleId.toString()])
-      : null;
-
-    return members.filter((member) => {
-      // Optimize userId filter
-      if (userIdFilter && !userIdFilter.has(member.userId?._id?.toString())) {
-        return false;
-      }
-
-      // Optimize roleId filter
-      if (roleIdFilter) {
-        if (roleIdFilter instanceof Set) {
-          const roleIdStr =
-            member.roleId?._id?.toString() ?? member.roleId?.id?.toString();
-          if (!roleIdFilter.has(roleIdStr)) return false;
-        } else if (typeof roleIdFilter === "object") {
-          for (const [key, value] of Object.entries(roleIdFilter)) {
-            const roleVal = key.includes(".")
-              ? key.split(".").reduce((obj, k) => obj?.[k], member.roleId)
-              : member.roleId?.[key];
-            if (Array.isArray(value)) {
-              if (!value.includes(roleVal)) return false;
-            } else if (roleVal !== value) {
-              return false;
-            }
-          }
-        }
-      }
-
-      // General filters
-      for (const [key, value] of Object.entries(filter)) {
-        if (key === "userId" || key === "roleId") continue;
-
-        const memberValue = key.includes(".")
-          ? key.split(".").reduce((obj, prop) => obj?.[prop], member)
-          : member[key];
-
-        if (Array.isArray(value)) {
-          if (!value.includes(memberValue)) return false;
-        } else if (typeof value === "object" && value !== null) {
-          for (const [subKey, subVal] of Object.entries(value)) {
-            if (memberValue?.[subKey] !== subVal) return false;
-          }
-        } else {
-          if (memberValue !== value) return false;
-        }
-      }
-
-      return true;
-    });
+    const members = await UserRole.find({ workspaceId })
+      .select("userId role userShift roleId isOwner workspaceId")
+      .populate({
+        path: "roleId",
+        select:
+          "id name userId userShift permissionId modulePermissions workspaceId",
+        populate: [{ path: "permissionId", select: "id name" }],
+      })
+      .populate({
+        path: "userId",
+        match: { isDeleted: false, suspended: false },
+        select: "firstName lastName role email picture userShift",
+      })
+      .lean()
+      .exec();
+    await setRedisData(workspaceId, members, MEMBERS, 3600);
+    return members;
   } catch (error) {
-    console.error("Error fetching cached members:", error);
+    console.error("Error updating cached members:", error);
     return [];
   }
 };
 
-// Update the cache for all members
-const updateCachedMembers = async (filter = {}) => {
-  try {
-    const members = await UserRole.find(filter)
-      .select("userId role userShift roleId")
+const getMembers = async (workspaceId) => {
+  let members = await getRedisData(workspaceId, MEMBERS);
+  if (!members || members?.length === 0) {
+    members = await UserRole.find({ workspaceId })
+      .select("userId role userShift roleId isOwner workspaceId")
       .populate({
         path: "roleId",
-        select: "id name userId userShift permissionId modulePermissions",
+        select:
+          "id name userId userShift permissionId modulePermissions workspaceId",
         populate: [{ path: "permissionId", select: "id name" }],
       })
       .populate({
@@ -117,62 +51,59 @@ const updateCachedMembers = async (filter = {}) => {
       })
       .lean()
       .exec();
+    await setRedisData(workspaceId, members, MEMBERS, 3600);
+  }
+  return members;
+};
 
-    const validMembers =
-      members?.filter((member) => member?.userId && member?.roleId) || [];
-
-    console.log(validMembers, "validMembers");
+const getMemberByWorkspaceIdAndUserId = async (workspaceId, userId) => {
+  const members = getMembers(workspaceId);
+  return (
+    members?.find(
+      (member) =>
+        member?.workspaceId === workspaceId && member?.userId?._id === userId
+    ) || null
+  );
+};
 
-    await setRedisData(CACHE_KEY_ALL_MEMBERS, validMembers, null, 3600);
+// Find single user role by filter
+const findSingleUserRoleByFilter = async ({ workspaceId, userId }) => {
+  return await getMemberByWorkspaceIdAndUserId(workspaceId, userId);
+};
 
-    return validMembers;
-  } catch (error) {
-    console.error("Error updating cached members:", error);
-    return [];
-  }
+const findUserRole = async ({ workspaceId, userId }) => {
+  return await getMemberByWorkspaceIdAndUserId(workspaceId, userId);
 };
 
-// Comprehensive cache update method
-const updateAllRelatedCaches = async (userId, workspaceId) => {
-  try {
-    await updateCachedMembers();
-  } catch (error) {
-    console.error("Error updating related caches:", error);
-  }
+const createUserRole = async (data) => {
+  const savedRole = await UserRole.create(data);
+  return await updateCachedMembers(savedRole?.workspaceId?.toString());
 };
 
-// Find single user role by filter
-const findSingleUserRoleByFilter = async (
-  filter = {},
-  populateOptions = {}
-) => {
-  const defaultPopulateOptions = {
-    rolePopulate: {
-      path: "roleId",
-      select: "id name userId userShift permissionId modulePermissions",
-      populate: [{ path: "permissionId", select: "id name" }],
-    },
-    userPopulate: {
-      path: "userId",
-      match: { isDeleted: false, suspended: false },
-      select: "firstName lastName role email picture userShift",
-    },
-  };
-  const mergedPopulateOptions = {
-    rolePopulate: {
-      ...defaultPopulateOptions.rolePopulate,
-      ...populateOptions.rolePopulate,
-    },
-    userPopulate: {
-      ...defaultPopulateOptions.userPopulate,
-      ...populateOptions.userPopulate,
-    },
-  };
-  return await UserRole.findOne(filter)
-    .populate(mergedPopulateOptions.rolePopulate)
-    .populate(mergedPopulateOptions.userPopulate)
+const findOneAndUpdateUserRole = async ({
+  workspaceId,
+  userId,
+  userShift,
+  role,
+}) => {
+  await UserRole.findOneAndUpdate(
+    { workspaceId, userId },
+    { $set: { userShift, role } },
+    { new: true, upsert: false }
+  )
     .lean()
     .exec();
+  return await updateCachedMembers(workspaceId);
+};
+
+const updateUserRole = async (filter, payload) => {
+  await UserRole.updateOne(filter, payload).exec();
+  return await updateCachedMembers(filter.workspaceId);
+};
+
+const deleteUserRoleByFilter = async (filter) => {
+  await UserRole.deleteOne(filter).exec();
+  return await updateCachedMembers(filter.workspaceId);
 };
 
 const convertPermissionsArrayToObject = (originalArray) => {
@@ -198,107 +129,13 @@ const convertPermissionsArrayToObject = (originalArray) => {
   }, {});
 };
 
-const createUserRole = async (data) => {
-  const savedRole = await UserRole.create(data);
-
-  console.log(savedRole, "savedRole");
-
-  // Update all related caches
-  await updateAllRelatedCaches(
-    savedRole?.userId?.toString(),
-    savedRole?.workspaceId?.toString()
-  );
-
-  return savedRole;
-};
-
-const findOneAndUpdateUserRole = async ({
-  workspaceId,
-  userId,
-  userShift,
-  role,
-}) => {
-  const updatedRole = await UserRole.findOneAndUpdate(
-    { workspaceId, userId },
-    { $set: { userShift, role } },
-    { new: true, upsert: false }
-  ).exec();
-  if (updatedRole) {
-    await updateAllRelatedCaches(userId, workspaceId);
-  }
-  return updatedRole;
-};
-
-const findUserRole = async (filter = {}) => {
-  return await getCachedMembers(filter);
-};
-
-const updateUserRole = async (id, data) => {
-  const updatedRole = await UserRole.findByIdAndUpdate(id, data, {
-    new: true,
-  }).exec();
-  if (updatedRole) {
-    await updateAllRelatedCaches(updatedRole.userId, updatedRole.workspaceId);
-  }
-  return updatedRole;
-};
-
-const deleteUserRoleByFilter = async (filter) => {
-  const deletedRole = await UserRole.findOneAndDelete(filter).exec();
-  if (deletedRole) {
-    await updateAllRelatedCaches(filter?.userId, filter?.workspaceId);
-  }
-  return deletedRole;
-};
-
-const deleteUserRole = async (id) => {
-  const role = await UserRole.findById(id).exec();
-  const userId = role?.userId;
-  const workspaceId = role?.workspaceId;
-  const deletedRole = await UserRole.findByIdAndDelete(id).exec();
-  if (deletedRole) {
-    await updateAllRelatedCaches(userId, workspaceId);
-  }
-  return deletedRole;
-};
-
-const findUserWorkspaces = async (userId) => {
-  let userRoleWithWorkspaces = await UserRole.find({ userId: userId })
-    .select("userId roleId workspaceId")
-    .populate({
-      path: "roleId",
-      select: "id name userId userShift permissionId modulePermissions",
-      populate: [{ path: "permissionId", select: "id name" }],
-    })
-    .populate({
-      path: "workspaceId",
-      select: defaultSelect,
-      match: { isDeleted: false },
-    })
-    .lean()
-    .exec();
-  userRoleWithWorkspaces = userRoleWithWorkspaces
-    ?.filter((userRole) => userRole?.workspaceId)
-    ?.filter((userRole) => userRole?.roleId)
-    ?.map((ur) => {
-      return {
-        ...ur?.workspaceId,
-        id: ur?.workspaceId?._id?.toString(),
-        _id: ur?.workspaceId?._id?.toString(),
-        role: ur?.roleId?.name || "",
-        permissions: ur?.roleId?.modulePermissions?.modules || [],
-      };
-    });
-  return userRoleWithWorkspaces || [];
-};
-
 const getUserPermissions = async (workspaceId, userId) => {
   try {
-    let members = await getCachedMembers({ workspaceId, userId });
-    if (members?.length) {
+    let data = await getMemberByWorkspaceIdAndUserId(workspaceId, userId);
+    if (data) {
       return (
         convertPermissionsArrayToObject(
-          members?.[0]?.roleId?.modulePermissions?.modules
+          data?.roleId?.modulePermissions?.modules
         ) || null
       );
     }
@@ -311,9 +148,8 @@ const getUserPermissions = async (workspaceId, userId) => {
 
 const getUserRoleWithPermissions = async (workspaceId, userId) => {
   try {
-    let members = await getCachedMembers({ workspaceId, userId });
-    if (members?.length) {
-      let data = members?.[0];
+    let data = await getMemberByWorkspaceIdAndUserId(workspaceId, userId);
+    if (data) {
       const roleWithPermissions = {
         ...data,
         roleId: data?.roleId?._id?.toString() || "",
@@ -337,9 +173,8 @@ const getUserRoleWithPermissions = async (workspaceId, userId) => {
 
 const getChannelsPermissions = async (workspaceId, userId) => {
   try {
-    let members = await getCachedMembers({ workspaceId, userId });
-    if (members?.length) {
-      let data = members?.[0];
+    let data = await getMemberByWorkspaceIdAndUserId(workspaceId, userId);
+    if (data) {
       return (
         convertPermissionsArrayToObject(
           data?.roleId?.modulePermissions?.modules
@@ -353,12 +188,41 @@ const getChannelsPermissions = async (workspaceId, userId) => {
   }
 };
 
+const findUserWorkspaces = async (userId) => {
+  let userRoleWithWorkspaces = await UserRole.find({ userId: userId })
+    .select("userId roleId workspaceId")
+    .populate({
+      path: "roleId",
+      select: "id name userId userShift permissionId modulePermissions",
+      populate: [{ path: "permissionId", select: "id name" }],
+    })
+    .populate({
+      path: "workspaceId",
+      select: defaultSelect,
+      match: { isDeleted: false },
+    })
+    .lean()
+    .exec();
+  userRoleWithWorkspaces = userRoleWithWorkspaces
+    ?.filter((userRole) => userRole?.workspaceId)
+    ?.filter((userRole) => userRole?.roleId)
+    ?.map((ur) => {
+      return {
+        ...ur?.workspaceId,
+        id: ur?.workspaceId?._id?.toString(),
+        _id: ur?.workspaceId?._id?.toString(),
+        role: ur?.roleId?.name || "",
+        permissions: ur?.roleId?.modulePermissions?.modules || [],
+      };
+    });
+  return userRoleWithWorkspaces || [];
+};
+
 module.exports = {
   createUserRole,
-  findUserRole,
   updateUserRole,
+  findUserRole,
   deleteUserRoleByFilter,
-  deleteUserRole,
   findUserWorkspaces,
   getUserRoleWithPermissions,
   getUserPermissions,

package/package.json

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