shuttlepro-shared 1.2.61 → 1.2.62

package/common/repositories/user.repository.js

@@ -59,15 +59,46 @@ const findUserById = async (id, select = []) => {
 };
 
 const findUser = async (filter) => {
-  const users = await getCachedUsers();
-  return users.filter((u) =>
-    Object.entries(filter).every(([key, value]) => {
-      if (Array.isArray(value)) {
-        return value.includes(u[key]);
-      }
-      return u[key] === value;
-    })
-  );
+  try {
+    const users = await getCachedUsers();
+    const user = users.find((u) =>
+      Object.entries(filter).every(([key, value]) => {
+        if (Array.isArray(value)) {
+          return value.includes(u[key]);
+        }
+        return u[key] === value;
+      })
+    );
+
+    if (!user) {
+      // Fallback to database if not found in cache
+      const dbUser = await User.findOne(filter).lean().exec();
+      if (dbUser) await updateCachedUsers(); // Refresh cache if outdated
+      return dbUser;
+    }
+
+    return user;
+  } catch (error) {
+    console.error("Error finding user:", error);
+    return null;
+  }
+};
+
+const findUsersByFilter = async (filter = {}) => {
+  try {
+    const users = await getCachedUsers();
+    return users.filter((u) =>
+      Object.entries(filter).every(([key, value]) => {
+        if (Array.isArray(value)) {
+          return value.includes(u[key]);
+        }
+        return u[key] === value;
+      })
+    );
+  } catch (error) {
+    console.error("Error finding users by filter:", error);
+    return [];
+  }
 };
 
 const findAllUsers = async (filter = {}) => {
@@ -111,6 +142,7 @@ module.exports = {
   createUser,
   findUserById,
   findUser,
+  findUsersByFilter,
   findAllUsers,
   getUserName,
   updateUser,

package/common/repositories/userRole.repository.js

@@ -171,15 +171,17 @@ const findUserWorkspaces = async (userId) => {
       })
       .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 || [],
-      };
-    });
+    userRoleWithWorkspaces = userRoleWithWorkspaces
+      ?.filter((userRole) => userRole?.workspaceId)
+      ?.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) {
       await setRedisData(cacheKey, userRoleWithWorkspaces, null, 0);
     }

package/config/database.js

@@ -1,7 +1,4 @@
 /* eslint-disable no-undef */
 module.exports = {
-  url:
-    process.env.NODE_ENV === "test"
-      ? process.env.TEST_DB_URL
-      : process.env.DB_URL,
+  url: process.env.DB_URL,
 };

package/models/Card.js

@@ -76,7 +76,7 @@ const cardSchema = new mongoose.Schema(
       default: Date.now,
     },
     ticketId: {
-      type: String,
+      type: Number,
     },
     category: {
       type: String,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shuttlepro-shared",
-  "version": "1.2.61",
+  "version": "1.2.62",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -25,4 +25,4 @@
     "redis": "^4.6.14",
     "socket.io": "^4.8.1"
   }
-}
+}