shuttlepro-shared 1.3.46 → 1.3.47

package/common/repositories/customerProfile.repository.js

@@ -1,103 +1,42 @@
-const { getRedisData, setRedisData } = require("../../config/redis");
 const CustomerProfile = require("../../models/CustomerProfile");
 
-const CACHE_KEY_ALL = "customer_profiles_all";
-
-const getCachedAllCustomerProfiles = async () => {
-  let profiles = await getRedisData(CACHE_KEY_ALL);
-  if (!profiles) {
-    profiles = await CustomerProfile.find({}).lean().exec();
-    await setRedisData(CACHE_KEY_ALL, profiles);
-  }
-  return profiles;
-};
-
-const updateCachedAllCustomerProfiles = async () => {
-  const profiles = await CustomerProfile.find({}).lean().exec();
-  await setRedisData(CACHE_KEY_ALL, profiles);
-};
-
-const getCachedCustomerProfiles = async (workspaceId) => {
-  const allProfiles = await getCachedAllCustomerProfiles();
-  return allProfiles.filter((profile) => profile.workspaceId === workspaceId);
-};
-
 const createCustomerProfile = async (data) => {
   const newProfile = new CustomerProfile(data);
   const savedProfile = await newProfile.save();
-
-  updateCachedAllCustomerProfiles();
   return savedProfile;
 };
 
 const findCustomerProfilesByWorkspaceId = async (workspaceId) => {
-  return await getCachedCustomerProfiles(workspaceId);
+  return await CustomerProfile.find({ workspaceId }).lean().exec();
 };
 
 const findCustomerProfilesByWorkspace = async (workspaceId, filter = {}) => {
-  const profiles = await getCachedCustomerProfiles(workspaceId);
-  return profiles.filter((profile) =>
-    Object.entries(filter).every(([key, value]) => profile[key] === value)
-  );
+  return await CustomerProfile.find({ workspaceId, ...filter })
+    .lean()
+    .exec();
 };
 
 const findCustomerProfileByFilter = async (
   filter = {},
-  bodyFilter = {},
+
   workspaceId = null
 ) => {
-  const allProfiles = await getCachedAllCustomerProfiles();
-
-  const filtered = workspaceId
-    ? allProfiles.filter((p) => p.workspaceId === workspaceId)
-    : allProfiles;
-
-  return (
-    filtered.find(
-      (profile) =>
-        Object.entries(filter).every(
-          ([key, value]) => profile[key] === value
-        ) &&
-        Object.entries(bodyFilter).every(
-          ([key, value]) => profile.body?.[key] === value
-        )
-    ) || null
-  );
+  const query = workspaceId ? { ...filter, workspaceId } : filter;
+  return await CustomerProfile.findOne(query).lean().exec();
 };
 
 const findAllCustomerProfilesByFilter = async (
   filter = {},
-  bodyFilter = {},
   workspaceId = null
 ) => {
-  const allProfiles = await getCachedAllCustomerProfiles();
-
-  const filtered = workspaceId
-    ? allProfiles.filter((p) => p.workspaceId === workspaceId)
-    : allProfiles;
-
-  return (
-    filtered.filter(
-      (profile) =>
-        Object.entries(filter).every(
-          ([key, value]) => profile[key] === value
-        ) &&
-        Object.entries(bodyFilter).every(
-          ([key, value]) => profile.body?.[key] === value
-        )
-    ) || []
-  );
+  const query = workspaceId ? { ...filter, workspaceId } : filter;
+  return await CustomerProfile.find(query).lean().exec();
 };
 
 const updateCustomerProfile = async (id, data) => {
   const updated = await CustomerProfile.findByIdAndUpdate(id, data, {
     new: true,
   }).exec();
-
-  if (updated) {
-    updateCachedAllCustomerProfiles();
-  }
-
   return updated;
 };
 
@@ -107,33 +46,24 @@ const updateCustomerProfileByFilter = async (
   workspaceId = null
 ) => {
   const query = workspaceId ? { ...filter, workspaceId } : filter;
-
   const updated = await CustomerProfile.findOneAndUpdate(query, data, {
     new: true,
   }).exec();
-
-  if (updated) {
-    updateCachedAllCustomerProfiles();
-  }
-
   return updated;
 };
 
 const deleteCustomerProfile = async (id) => {
   const deleted = await CustomerProfile.findByIdAndDelete(id).exec();
-
-  if (deleted) {
-    updateCachedAllCustomerProfiles();
-  }
-
   return deleted;
 };
 
 const deleteAllCustomerProfilesByWorkspace = async (workspaceId) => {
   await CustomerProfile.deleteMany({ workspaceId }).exec();
-  await updateCachedAllCustomerProfiles();
 };
-
+const findAllCustomerProfilesByFilterFromDb = async (filter = {}) => {
+  const profiles = await CustomerProfile.find(filter).lean().exec();
+  return profiles ?? [];
+};
 module.exports = {
   createCustomerProfile,
   findCustomerProfilesByWorkspaceId,
@@ -144,4 +74,5 @@ module.exports = {
   deleteCustomerProfile,
   deleteAllCustomerProfilesByWorkspace,
   findAllCustomerProfilesByFilter,
+  findAllCustomerProfilesByFilterFromDb,
 };

package/models/AgentActivity.js

@@ -47,6 +47,8 @@ const activitySchema = new mongoose.Schema({
   remarks: { type: String, required: false },
   avgAccuracy: { type: Number, required: false, default: 10 },
   sender: { type: String, required: "" },
+  members: [],
+  closedBy: {},
 });
 
 const totalActivitySchema = new mongoose.Schema({

package/models/Automation.js

@@ -141,6 +141,7 @@ const AutomationCondition = new Schema({
         "label",
         "orderAutomation",
         "post",
+        "shift",
       ],
     },
     keyValue: {
@@ -159,6 +160,8 @@ const AutomationCondition = new Schema({
         "openTicket",
         "publishedPosts",
         "label",
+        "withInShift",
+        "afterShift",
         "orderConfirmation",
         "orderPublish",
       ],

package/package.json

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