shuttlepro-shared 1.2.40 → 1.2.43

package/common/repositories/descriptionTemplates.repository.js

@@ -79,6 +79,30 @@ const findTemplateByFilter = async (
     ) || null
   );
 };
+const findAllTemplateByFilter = async (
+  filter,
+  bodyFilter = {},
+  workspaceId = null
+) => {
+  const allTemplates = await getCachedAllDescriptionTemplates();
+
+  // Filter by workspaceId if provided
+  let filteredTemplates = workspaceId
+    ? allTemplates.filter((desc) => desc.workspaceId === workspaceId)
+    : allTemplates;
+
+  return (
+    filteredTemplates.filter(
+      (item) =>
+        // Check direct properties of item
+        Object.entries(filter).every(([key, value]) => item[key] === value) &&
+        // If bodyFilter is provided, check inside item.body
+        Object.entries(bodyFilter).every(
+          ([key, value]) => item.body?.[key] === value
+        )
+    ) || null
+  );
+};
 const createOrUpdateTemplate = async (filter, data) => {
   const template = await DescriptionTemplate.findOneAndUpdate(filter, data, {
     upsert: true,
@@ -201,4 +225,5 @@ module.exports = {
   findTemplateById,
   deleteTemplatesByFilter,
   insertManyTemplates,
+  findAllTemplateByFilter,
 };

package/common/repositories/userRole.repository.js

@@ -1,61 +1,12 @@
 const { UserRole } = require("../../models/UserRole");
-const { getRedisData, setRedisData } = require("../../config/redis");
 
-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 CACHE_KEY_USER_WORKSPACE_PREFIX = "userrole_workspace_";
-
-// Clear user workspace cache
-const clearUserWorkspaceCache = async (userId) => {
-  await setRedisData(
-    `${CACHE_KEY_USER_WORKSPACE_PREFIX}${userId}`,
-    null,
-    null,
-    0
-  );
-};
-
-// Get cached members
-const getCachedMembers = async (filter = {}) => {
-  const cacheKey =
-    Object.keys(filter).length > 0
-      ? `${CACHE_KEY_ALL_MEMBERS}_${JSON.stringify(filter)}`
-      : CACHE_KEY_ALL_MEMBERS;
-
-  let members = await getRedisData(cacheKey);
-
-  if (!members) {
-    members = await UserRole.find(filter)
-      .select("userId role userShift roleId")
-      .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",
-      })
-      .lean()
-      .exec();
-
-    await setRedisData(cacheKey, members, null, 0);
-  }
-
-  return members;
+const createUserRole = async (data) => {
+  const newRole = new UserRole(data);
+  const savedRole = await newRole.save();
+  return savedRole;
 };
 
-// Update the cache for all members
-const updateCachedMembers = async (filter = {}) => {
-  const cacheKey =
-    Object.keys(filter).length > 0
-      ? `${CACHE_KEY_ALL_MEMBERS}_${JSON.stringify(filter)}`
-      : CACHE_KEY_ALL_MEMBERS;
-
+const findUserRole = async (filter = {}) => {
   const members = await UserRole.find(filter)
     .select("userId role userShift roleId")
     .populate({
@@ -67,102 +18,28 @@ const updateCachedMembers = async (filter = {}) => {
       path: "userId",
       match: { isDeleted: false, suspended: false },
       select: "firstName lastName role email picture userShift",
-    })
-    .lean()
-    .exec();
+    });
 
-  await setRedisData(cacheKey, members, 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);
-  }
-
-  return savedRole;
-};
-
-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 updateCachedMembers();
-    if (updatedRole.userId) {
-      await clearUserWorkspaceCache(updatedRole.userId);
-    }
-  }
-
   return updatedRole;
 };
 
 const deleteUserRole = async (id) => {
-  const role = await UserRole.findById(id).exec();
-  const userId = role?.userId;
-
   const deletedRole = await UserRole.findByIdAndDelete(id).exec();
 
-  if (deletedRole) {
-    await updateCachedMembers();
-    if (userId) {
-      await clearUserWorkspaceCache(userId);
-    }
-  }
-
   return deletedRole;
 };
 
-const findUserWorkspaces = async (userId) => {
-  const cacheKey = `${CACHE_KEY_USER_WORKSPACE_PREFIX}${userId}`;
-  let userRoleWithWorkspaces = await getRedisData(cacheKey);
-  if (!userRoleWithWorkspaces.length) {
-    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.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;
-};
-
 module.exports = {
   createUserRole,
   findUserRole,
   updateUserRole,
   deleteUserRole,
-  findUserWorkspaces,
 };

package/config/redis.js

@@ -103,7 +103,6 @@ const addDataToRedisSet = async (key, value) => {
     return false;
   }
 };
-
 const removeDataFromRedisSet = async (key, value) => {
   try {
     await connectRedis();

package/package.json

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