shuttlepro-shared 1.2.11 → 1.2.12

package/common/repositories/index.js

@@ -3,10 +3,13 @@ const integrationRepository = require("./integration.repository");
 const descriptionTemplateRepository = require("./descriptionTemplates.repository");
 const shipperRepository = require("./shipper.repository");
 const labelRepository = require("./label.repository");
+const userRepository = require("./user.repository");
+
 exports.module = {
   workspaceRepository,
   integrationRepository,
   descriptionTemplateRepository,
   shipperRepository,
   labelRepository,
+  userRepository,
 };

package/common/repositories/integration.repository.js

@@ -68,11 +68,7 @@ const findIntegrationsByWorkspace = async (workspaceId, filter = {}) => {
 /**
  * Find integration by filter (supports both workspace & non-workspace).
  */
-const findIntegrationByFilter = async (
-  filter,
-  bodyFilter = {},
-  workspaceId = null
-) => {
+const findIntegrationByFilter = async (filter, workspaceId = null) => {
   const allIntegrations = await getCachedAllIntegrations();
 
   let filteredIntegrations = allIntegrations;
@@ -83,12 +79,8 @@ const findIntegrationByFilter = async (
   }
 
   return (
-    filteredIntegrations.find(
-      (item) =>
-        Object.entries(filter).every(([key, value]) => item[key] === value) &&
-        Object.entries(bodyFilter).every(
-          ([key, value]) => item.body?.[key] === value
-        )
+    filteredIntegrations.find((item) =>
+      Object.entries(filter).every(([key, value]) => item.body?.[key] === value)
     ) || null
   );
 };

package/common/repositories/user.repository.js

@@ -0,0 +1,110 @@
+const { getRedisData, setRedisData } = require("../../config/redis");
+const mongoose = require("mongoose");
+const userSchema = require("../../models/User");
+const User = mongoose.models.User || mongoose.model("User", userSchema);
+
+const CACHE_KEY_ALL_USERS = "users_all";
+
+const getCachedUsers = async () => {
+  try {
+    let users = await getRedisData(CACHE_KEY_ALL_USERS);
+    if (!users) {
+      users = await User.find().lean().exec();
+      await setRedisData(CACHE_KEY_ALL_USERS, users);
+    }
+    return users;
+  } catch (error) {
+    console.error("Error fetching cached users:", error);
+    return [];
+  }
+};
+
+const updateCachedUsers = async () => {
+  try {
+    const users = await User.find().lean().exec();
+    await setRedisData(CACHE_KEY_ALL_USERS, users);
+  } catch (error) {
+    console.error("Error updating cached users:", error);
+  }
+};
+
+const createUser = async (data) => {
+  const newUser = new User(data);
+  const savedUser = await newUser.save();
+  await updateCachedUsers();
+  return savedUser;
+};
+
+const findUserById = async (id, select = []) => {
+  try {
+    let users = await getCachedUsers();
+    let user = users.find((u) => u._id.toString() === id) || null;
+
+    if (!user) {
+      user = await User.findById(id).lean().exec();
+      if (user) await updateCachedUsers(); // Refresh cache if outdated
+    }
+
+    if (user && select.length > 0) {
+      return select.reduce((result, field) => {
+        if (user[field] !== undefined) result[field] = user[field];
+        return result;
+      }, {});
+    }
+    return user;
+  } catch (error) {
+    console.error("Error finding user by ID:", error);
+    return null;
+  }
+};
+
+const findUser = async (filter) => {
+  const users = await getCachedUsers();
+  return (
+    users.find((u) =>
+      Object.entries(filter).every(([key, value]) => u[key] === value)
+    ) || null
+  );
+};
+
+const findAllUsers = async (filter = {}) => {
+  const users = await getCachedUsers();
+  return users.filter((u) =>
+    Object.entries(filter).every(([key, value]) => u[key] === value)
+  );
+};
+
+const getUserName = async (id) => {
+  const user = await findUserById(id, ["firstName", "lastName"]);
+  return user?.firstName || user?.lastName
+    ? `${user.firstName} ${user.lastName}`.trim()
+    : "Unknown User";
+};
+
+const updateUser = async (id, data) => {
+  const updatedUser = await User.findByIdAndUpdate(id, data, {
+    new: true,
+  }).exec();
+  if (updatedUser) {
+    await updateCachedUsers();
+  }
+  return updatedUser;
+};
+
+const deleteUser = async (id) => {
+  const deletedUser = await User.findByIdAndDelete(id).exec();
+  if (deletedUser) {
+    await updateCachedUsers();
+  }
+  return deletedUser;
+};
+
+module.exports = {
+  createUser,
+  findUserById,
+  findUser,
+  findAllUsers,
+  getUserName,
+  updateUser,
+  deleteUser,
+};

package/package.json

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