shuttlepro-shared 1.2.9 → 1.2.11

package/common/repositories/chatMember.repository.js

@@ -0,0 +1,9 @@
+const ChatMember = require("../../models/ChatMember");
+
+const findChatMemberById = async (id) => {
+  return await ChatMember.findById(id).select("userName phoneNo email");
+};
+
+module.exports = {
+  findChatMemberById,
+};

package/common/repositories/integration.repository.js

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

package/common/repositories/label.repository.js

@@ -1,90 +1,3 @@
-// const { getRedisData, setRedisData } = require("../../config/redis");
-// const Label = require("../../models/Label");
-
-// const CACHE_KEY_ALL = "labels_all";
-
-// const getCachedLabels = async () => {
-//   let labels = await getRedisData(CACHE_KEY_ALL);
-//   if (!labels) {
-//     labels = await Label.find().lean().exec();
-//     await setRedisData(CACHE_KEY_ALL, JSON.stringify(labels));
-//   } else {
-//     labels = JSON.parse(labels);
-//   }
-//   return labels;
-// };
-
-// const updateCachedLabels = async () => {
-//   const labels = await Label.find().lean().exec();
-//   await setRedisData(CACHE_KEY_ALL, JSON.stringify(labels));
-// };
-
-// const createLabel = async (data) => {
-//   const newLabel = new Label(data);
-//   const savedLabel = await newLabel.save();
-//   await updateCachedLabels();
-//   return savedLabel;
-// };
-
-// const findLabelById = async (id) => {
-//   const labels = await getCachedLabels();
-//   return labels.find((l) => l._id.toString() === id) || null;
-// };
-
-// const findLabel = async (filter) => {
-//   const labels = await getCachedLabels();
-//   return (
-//     labels.find((l) =>
-//       Object.entries(filter).every(([key, value]) => l[key] === value)
-//     ) || null
-//   );
-// };
-
-// const findAllLabels = async (filter = {}) => {
-//   const labels = await getCachedLabels();
-//   return labels.filter((l) =>
-//     Object.entries(filter).every(([key, value]) => l[key] === value)
-//   );
-// };
-
-// const updateLabelById = async (id, data) => {
-//   const updatedLabel = await Label.findByIdAndUpdate(id, data, {
-//     new: true,
-//   }).exec();
-//   if (updatedLabel) {
-//     await updateCachedLabels();
-//   }
-//   return updatedLabel;
-// };
-// const updateLabel = async (filter, data) => {
-//   const updatedLabel = await Label.findOneAndUpdate(filter, data, {
-//     new: true,
-//   }).exec();
-//   if (updatedLabel) {
-//     await updateCachedLabels();
-//   }
-//   return updatedLabel;
-// };
-
-// const deleteLabel = async (id) => {
-//   const deletedLabel = await Label.findByIdAndDelete(id).exec();
-//   if (deletedLabel) {
-//     await updateCachedLabels();
-//   }
-//   return deletedLabel;
-// };
-
-// module.exports = {
-//   createLabel,
-//   findLabelById,
-//   findLabel,
-//   findAllLabels,
-//   updateLabel,
-//   deleteLabel,
-//   updateLabelById,
-// };
-
-const R = require("ramda");
 const Label = require("../../models/Label");
 const {
   setRedisData,
@@ -143,6 +56,16 @@ const findAllLabels = async (query = {}) => {
   return await withCache(JSON.stringify(query), () => Label.find(query).exec());
 };
 
+const findLabelById = async (labelId) => {
+  return await withCache(CACHE_KEYS.LABEL_DETAILS(labelId), () =>
+    Label.findById(labelId).exec()
+  );
+};
+
+const findLabel = async (query = {}) => {
+  return await Label.findOne(query).exec();
+};
+
 const updateLabel = async (labelId, updateData) => {
   const updatedLabel = await Label.findByIdAndUpdate(labelId, updateData, {
     new: true,
@@ -165,7 +88,8 @@ module.exports = {
   createLabel,
   findLabels,
   findAllLabels,
+  findLabelById,
+  findLabel,
   updateLabel,
   deleteLabel,
 };
-

package/models/ChatMember.js

@@ -0,0 +1,17 @@
+const { Schema, model } = require("mongoose");
+
+const ChatMemberSchema = new Schema(
+  {
+    userName: { type: String, default: "" },
+    phoneNo: { type: String, default: "" },
+    email: { type: String, default: "" },
+    workspaceId: {
+      type: Schema.Types.ObjectId,
+      ref: "Workspace",
+      default: null,
+    },
+  },
+  { timestamps: true, toJSON: { virtuals: true }, toObject: { virtuals: true } }
+);
+
+module.exports = model("ChatMember", ChatMemberSchema);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shuttlepro-shared",
-  "version": "1.2.9",
+  "version": "1.2.11",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -22,7 +22,6 @@
     "helmet": "^8.0.0",
     "jsonwebtoken": "^9.0.2",
     "mongoose": "^8.7.1",
-    "ramda": "^0.30.1",
     "redis": "^4.6.14",
     "socket.io": "^4.8.1"
   }