shuttlepro-shared 1.4.89 → 1.4.91

package/common/repositories/userPermission.repository.js

@@ -1,47 +1,11 @@
-const { getRedisData, setRedisData } = require("../../config/redis");
 const UserPermission = require("../../models/UserPermission");
 
-const CACHE_KEY_ALL = "user_permissions_all";
-
-/**
- * Get cached user permissions for all users.
- */
-const getCachedAllUserPermissions = async () => {
-  let permissions = await getRedisData(CACHE_KEY_ALL);
-  if (!permissions) {
-    permissions = await UserPermission.find({}).lean().exec();
-    await setRedisData(CACHE_KEY_ALL, permissions);
-  }
-  return permissions;
-};
-
-/**
- * Update cached user permissions for all users.
- */
-const updateCachedAllUserPermissions = async () => {
-  const permissions = await UserPermission.find({}).lean().exec();
-  await setRedisData(CACHE_KEY_ALL, permissions);
-};
-
 /**
- * Get cached user permissions for a specific user.
- * Uses the all permissions cache and filters by userId.
- */
-const getCachedUserPermissions = async (userId) => {
-  const allPermissions = await getCachedAllUserPermissions();
-  return allPermissions.filter((perm) => perm.userId === userId);
-};
-
-/**
- * Create a new user permission and update cache.
+ * Create a new user permission.
  */
 const createUserPermission = async (data) => {
   const newPermission = new UserPermission(data);
   const savedPermission = await newPermission.save();
-
-  // Update the main cache
-  await updateCachedAllUserPermissions();
-
   return savedPermission;
 };
 
@@ -49,37 +13,27 @@ const createUserPermission = async (data) => {
  * Find user permissions by user ID.
  */
 const findUserPermissionsByUserId = async (userId) => {
-  return await getCachedUserPermissions(userId);
+  return await UserPermission.find({ userId }).lean().exec();
 };
 
 /**
  * Find user permissions by user ID and workspace ID.
  */
 const fetchUserPermissionsByWorkspaceId = async (userId, workspaceId) => {
-  const allPermissions = await getCachedAllUserPermissions();
-  return allPermissions.filter(
-    (perm) => perm.userId === userId && perm.workspaceId === workspaceId
-  );
+  return await UserPermission.find({
+    userId,
+    workspaceId,
+  })
+    .lean()
+    .exec();
 };
 
 /**
  * Find a single user permission by filter.
  */
 const findUserPermission = async (filter, workspaceId = null) => {
-  const allPermissions = await getCachedAllUserPermissions();
-
-  let filteredPermissions = allPermissions;
-  if (workspaceId) {
-    filteredPermissions = allPermissions.filter(
-      (perm) => perm.workspaceId === workspaceId
-    );
-  }
-
-  return (
-    filteredPermissions.find((perm) =>
-      Object.entries(filter).every(([key, value]) => perm[key] === value)
-    ) || null
-  );
+  const queryFilter = workspaceId ? { ...filter, workspaceId } : filter;
+  return await UserPermission.findOne(queryFilter).lean().exec();
 };
 
 /**
@@ -89,27 +43,15 @@ const findAllUserPermissionsByFilter = async (
   filter = {},
   workspaceId = null
 ) => {
-  const allPermissions = await getCachedAllUserPermissions();
-
-  let filteredPermissions = allPermissions;
-  if (workspaceId) {
-    filteredPermissions = allPermissions.filter(
-      (perm) => perm.workspaceId === workspaceId
-    );
-  }
-
-  return (
-    filteredPermissions.filter((perm) =>
-      Object.entries(filter).every(([key, value]) => perm[key] === value)
-    ) || []
-  );
+  const queryFilter = workspaceId ? { ...filter, workspaceId } : filter;
+  return await UserPermission.find(queryFilter).lean().exec();
 };
 
 /**
  * Find all user permissions (without filtering).
  */
 const findAllUserPermissions = async () => {
-  return await getCachedAllUserPermissions();
+  return await UserPermission.find({}).lean().exec();
 };
 
 /**
@@ -119,12 +61,6 @@ const updateUserPermission = async (id, data) => {
   const updatedPermission = await UserPermission.findByIdAndUpdate(id, data, {
     new: true,
   }).exec();
-
-  if (updatedPermission) {
-    // Update the main cache
-    await updateCachedAllUserPermissions();
-  }
-
   return updatedPermission;
 };
 
@@ -147,11 +83,6 @@ const updateUserPermissionByFilter = async (
     }
   ).exec();
 
-  if (updatedPermission) {
-    // Update the main cache
-    await updateCachedAllUserPermissions();
-  }
-
   return updatedPermission;
 };
 
@@ -160,12 +91,6 @@ const updateUserPermissionByFilter = async (
  */
 const deleteUserPermission = async (id) => {
   const deletedPermission = await UserPermission.findByIdAndDelete(id).exec();
-
-  if (deletedPermission) {
-    // Update the main cache
-    await updateCachedAllUserPermissions();
-  }
-
   return deletedPermission;
 };
 
@@ -174,12 +99,6 @@ const deleteUserPermission = async (id) => {
  */
 const deleteUserPermissionsByFilter = async (filter) => {
   const result = await UserPermission.deleteMany(filter).exec();
-
-  if (result.deletedCount > 0) {
-    // Update the main cache
-    await updateCachedAllUserPermissions();
-  }
-
   return result;
 };
 
@@ -187,27 +106,23 @@ const deleteUserPermissionsByFilter = async (filter) => {
  * Delete all user permissions for a specific workspace.
  */
 const deleteAllUserPermissionsByWorkspace = async (workspaceId) => {
-  await UserPermission.deleteMany({ workspaceId }).exec();
-
-  // Update the main cache
-  await updateCachedAllUserPermissions();
+  const result = await UserPermission.deleteMany({ workspaceId }).exec();
+  return result;
 };
 
 /**
  * Bulk create or update user permissions.
  */
 const bulkCreateAndUpdateUserPermissions = async (operations) => {
-  await UserPermission.bulkWrite(operations);
-  await updateCachedAllUserPermissions();
-  return operations;
+  const result = await UserPermission.bulkWrite(operations);
+  return result;
 };
 
 /**
- * Insert multiple user permissions and update cache.
+ * Insert multiple user permissions.
  */
 const insertManyUserPermissions = async (permissionsArray) => {
   const inserted = await UserPermission.insertMany(permissionsArray);
-  await updateCachedAllUserPermissions();
   return inserted;
 };
 

package/models/Profile.js

@@ -36,13 +36,21 @@ const addOrUpdateProfilesInRedis = async (profile) => {
 
 const fetchProfiles = async (workspaceId) => {
   try {
-    let profiles = await getRedisData(`${workspaceId}-profiles`);
-    if (!profiles || profiles.length === 0) {
-      profiles = await Profile.find({ workspaceId }).lean().exec();
-      setRedisData(`${workspaceId}-profiles`, profiles);
+    if (!workspaceId) {
+      return [];
     }
-    return profiles;
+    
+    // Direct database query with proper indexing on workspaceId
+    // Using lean() for faster plain object retrieval
+    // Sorting by createdAt for consistency
+    const profiles = await Profile.find({ workspaceId })
+      .sort({ createdAt: -1 })
+      .lean()
+      .exec();
+    
+    return profiles || [];
   } catch (err) {
+    console.error("Error in fetchProfiles:", err);
     return [];
   }
 };
@@ -69,15 +77,14 @@ const fetchProfileByEmailAndWorkspaceId = async (
   userName = ""
 ) => {
   try {
-    let profiles = await fetchProfiles(workspaceId);
-    let profile = profiles.find(
-      (p) =>
-        p?.userName === userName &&
-        p?.workspaceId?.toString() === workspaceId?.toString()
-    );
+    // Direct database fetch without Redis (to avoid Redis issues)
+    const profile = await Profile.findOne({
+      userName: userName,
+      workspaceId: workspaceId
+    }).lean().exec();
     return profile || null;
   } catch (err) {
-    console.log(err, "err");
+    console.log(err, "err in fetchProfileByEmailAndWorkspaceId");
     return null;
   }
 };
@@ -85,7 +92,7 @@ const fetchProfileByEmailAndWorkspaceId = async (
 const createProfile = async (obj) => {
   try {
     let profile = await Profile.create(obj);
-    await addOrUpdateProfilesInRedis(profile);
+    // await addOrUpdateProfilesInRedis(profile);
     return profile;
   } catch (err) {
     console.log(err, "err");
@@ -102,7 +109,7 @@ const createUpdateProfileModified = async (filter, obj) => {
         upsert: true,
       }
     );
-    await addOrUpdateProfilesInRedis(profile);
+    // await addOrUpdateProfilesInRedis(profile);
     return profile;
   } catch (err) {
     console.log(err, "err");
@@ -114,7 +121,7 @@ const updateProfile = async (query, payload) => {
     const profile = await Profile.findOneAndUpdate(query, payload, {
       new: true,
     });
-    await addOrUpdateProfilesInRedis(profile);
+    // await addOrUpdateProfilesInRedis(profile);
     return profile;
   } catch (err) {
     return null;
@@ -130,3 +137,5 @@ module.exports = {
   Profile,
   createUpdateProfileModified,
 };
+
+

package/package.json

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