shuttlepro-shared 1.1.65 → 1.1.67

package/common/repositories/integration.repository.js

@@ -1,21 +1,8 @@
 const { getRedisData, setRedisData } = require("../../config/redis");
 const Integration = require("../../models/Integration");
 
-const CACHE_KEY_PREFIX = "integrations";
 const CACHE_KEY_ALL = "integrations_all";
 
-/**
- * Get cached integrations for a specific workspace.
- */
-const getCachedIntegrations = async (workspaceId) => {
-  let integrations = await getRedisData(workspaceId, CACHE_KEY_PREFIX);
-  if (!integrations) {
-    integrations = await Integration.find({ workspaceId }).exec();
-    await setRedisData(workspaceId, integrations, CACHE_KEY_PREFIX);
-  }
-  return integrations;
-};
-
 /**
  * Get cached integrations for all workspaces.
  */
@@ -28,14 +15,6 @@ const getCachedAllIntegrations = async () => {
   return integrations;
 };
 
-/**
- * Update cached integrations for a specific workspace.
- */
-const updateCachedIntegrations = async (workspaceId) => {
-  const integrations = await Integration.find({ workspaceId }).exec();
-  await setRedisData(workspaceId, integrations, CACHE_KEY_PREFIX);
-};
-
 /**
  * Update cached integrations for all workspaces.
  */
@@ -44,6 +23,15 @@ const updateCachedAllIntegrations = async () => {
   await setRedisData(CACHE_KEY_ALL, integrations);
 };
 
+/**
+ * Get cached integrations for a specific workspace.
+ * Now uses the all integrations cache and filters by workspaceId.
+ */
+const getCachedIntegrations = async (workspaceId) => {
+  const allIntegrations = await getCachedAllIntegrations();
+  return allIntegrations.filter((intg) => intg.workspaceId === workspaceId);
+};
+
 /**
  * Create a new integration and update cache.
  */
@@ -51,10 +39,7 @@ const createIntegration = async (data) => {
   const newIntegration = new Integration(data);
   const savedIntegration = await newIntegration.save();
 
-  // Update relevant caches
-  if (savedIntegration.workspaceId) {
-    await updateCachedIntegrations(savedIntegration.workspaceId);
-  }
+  // Update only the main cache
   await updateCachedAllIntegrations();
 
   return savedIntegration;
@@ -63,20 +48,20 @@ const createIntegration = async (data) => {
 /**
  * Find an integration by ID.
  */
-const findIntegrationById = async (id, workspaceId) => {
-  const integrations = workspaceId
-    ? await getCachedIntegrations(workspaceId)
-    : await getCachedAllIntegrations();
-  return integrations.find((intg) => intg._id.toString() === id) || null;
+const findIntegrationsByWorkspaceId = async (workspaceId) => {
+  return await getCachedIntegrations(workspaceId);
 };
 
 /**
  * Find integrations by workspace.
  */
 const findIntegrationsByWorkspace = async (workspaceId, filter = {}) => {
-  const integrations = await getCachedIntegrations(workspaceId);
-  return integrations.filter((intg) =>
-    Object.entries(filter).every(([key, value]) => intg[key] === value)
+  const allIntegrations = await getCachedIntegrations(workspaceId);
+
+  return allIntegrations.filter(
+    (intg) =>
+      intg.workspaceId === workspaceId &&
+      Object.entries(filter).every(([key, value]) => intg[key] === value)
   );
 };
 
@@ -84,13 +69,29 @@ const findIntegrationsByWorkspace = async (workspaceId, filter = {}) => {
  * Find integration by filter (supports both workspace & non-workspace).
  */
 const findIntegrationByFilter = async (filter, workspaceId = null) => {
-  const integrations = workspaceId
-    ? await getCachedIntegrations(workspaceId)
-    : await getCachedAllIntegrations();
+  const allIntegrations = await getCachedAllIntegrations();
+
+  let filteredIntegrations = allIntegrations;
+  if (workspaceId) {
+    filteredIntegrations = allIntegrations.filter(
+      (intg) => intg.workspaceId === workspaceId
+    );
+  }
+
+  console.log(filteredIntegrations, "filteredIntegrations");
+  console.log(filter, "filter");
+
+  console.log(
+    filteredIntegrations.find((item) =>
+      Object.entries(filter).every(
+        ([key, value]) => item?.body?.[key] === value
+      )
+    )
+  );
 
   return (
-    integrations.find((intg) =>
-      Object.entries(filter).every(([key, value]) => intg[key] === value)
+    filteredIntegrations.find((item) =>
+      Object.entries(filter).every(([key, value]) => item.body?.[key] === value)
     ) || null
   );
 };
@@ -111,10 +112,7 @@ const updateIntegration = async (id, data) => {
   }).exec();
 
   if (updatedIntegration) {
-    const { workspaceId } = updatedIntegration;
-    if (workspaceId) {
-      await updateCachedIntegrations(workspaceId);
-    }
+    // Update only the main cache
     await updateCachedAllIntegrations();
   }
 
@@ -125,14 +123,19 @@ const updateIntegration = async (id, data) => {
  * Update an integration by filter.
  */
 const updateIntegrationByFilter = async (filter, data, workspaceId = null) => {
-  const updatedIntegration = await Integration.findOneAndUpdate(filter, data, {
-    new: true,
-  }).exec();
+  // Add workspace filter if provided
+  const queryFilter = workspaceId ? { ...filter, workspaceId } : filter;
+
+  const updatedIntegration = await Integration.findOneAndUpdate(
+    queryFilter,
+    data,
+    {
+      new: true,
+    }
+  ).exec();
 
   if (updatedIntegration) {
-    if (workspaceId) {
-      await updateCachedIntegrations(workspaceId);
-    }
+    // Update only the main cache
     await updateCachedAllIntegrations();
   }
 
@@ -146,10 +149,7 @@ const deleteIntegration = async (id) => {
   const deletedIntegration = await Integration.findByIdAndDelete(id).exec();
 
   if (deletedIntegration) {
-    const { workspaceId } = deletedIntegration;
-    if (workspaceId) {
-      await updateCachedIntegrations(workspaceId);
-    }
+    // Update only the main cache
     await updateCachedAllIntegrations();
   }
 
@@ -161,13 +161,14 @@ const deleteIntegration = async (id) => {
  */
 const deleteAllIntegrationsByWorkspace = async (workspaceId) => {
   await Integration.deleteMany({ workspaceId }).exec();
-  await updateCachedIntegrations(workspaceId);
+
+  // Update only the main cache
   await updateCachedAllIntegrations();
 };
 
 module.exports = {
   createIntegration,
-  findIntegrationById,
+  findIntegrationsByWorkspaceId,
   findIntegrationsByWorkspace,
   findIntegrationByFilter,
   findAllIntegrations,

package/package.json

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