#9: enhance dataFilter local cache by making it BU specific

Author: JoernBerkefeld

lib/metadataTypes/DataFilter.js

@@ -110,8 +110,10 @@ class DataFilter extends MetadataType {
      */
     static async _getFilterFolderIds(recached = false) {
         const fromCache =
-            this.cache.folderFilter || cache.getCache().folder
-                ? Object.values(this.cache.folderFilter || cache.getCache().folder)
+            this.cache[this.buObject.mid]?.folderFilter || cache.getCache().folder
+                ? Object.values(
+                      this.cache[this.buObject.mid]?.folderFilter || cache.getCache().folder
+                  )
                       .filter((item) => item.ContentType === 'filterdefinition')
                       .filter(
                           (item) =>
@@ -135,7 +137,10 @@ class DataFilter extends MetadataType {
         Folder.client = this.client;
         Folder.buObject = this.buObject;
         Folder.properties = this.properties;
-        this.cache.folderFilter = (await Folder.retrieveForCache(null, subTypeArr)).metadata;
+        this.cache[this.buObject.mid] ||= {};
+        this.cache[this.buObject.mid].folderFilter = (
+            await Folder.retrieveForCache(null, subTypeArr)
+        ).metadata;
         return this._getFilterFolderIds(true);
     }
     /**
@@ -145,9 +150,9 @@ class DataFilter extends MetadataType {
      */
     static async _getMeasureFolderIds() {
         const fromCache =
-            this.cache.folderMeasure?.[this.buObject.mid] || cache.getCache().folder
+            this.cache[this.buObject.mid]?.folderMeasure || cache.getCache().folder
                 ? Object.values(
-                      this.cache.folderMeasure?.[this.buObject.mid] || cache.getCache().folder
+                      this.cache[this.buObject.mid]?.folderMeasure || cache.getCache().folder
                   )
                       .filter((item) => item.ContentType === 'measure')
                       .map((item) => item.ID)
@@ -163,8 +168,8 @@ class DataFilter extends MetadataType {
         Folder.client = this.client;
         Folder.buObject = this.buObject;
         Folder.properties = this.properties;
-        this.cache.folderMeasure ||= {};
-        this.cache.folderMeasure[this.buObject.mid] = (
+        this.cache[this.buObject.mid].folderMeasure ||= {};
+        this.cache[this.buObject.mid].folderMeasure = (
             await Folder.retrieveForCache(null, subTypeArr)
         ).metadata;
         return this._getMeasureFolderIds();
@@ -205,8 +210,8 @@ class DataFilter extends MetadataType {
                       .map((item) => item.r__source_dataExtension_key)
                       .filter(
                           (deKey) =>
-                              !this.cache.dataExtensionField ||
-                              !this.cache.dataExtensionField[deKey]
+                              !this.cache[this.buObject.mid]?.dataExtensionField ||
+                              !this.cache[this.buObject.mid]?.dataExtensionField[deKey]
                       )
                       .filter(Boolean);
         if (deKeys.length) {
@@ -246,7 +251,8 @@ class DataFilter extends MetadataType {
      * @param {DataExtensionFieldMap} deFieldCache -
      */
     static saveDataExtensionFieldCacheToMap(deFieldCache) {
-        this.cache.dataExtensionField ||= {};
+        this.cache[this.buObject.mid] ||= {};
+        this.cache[this.buObject.mid].dataExtensionField ||= {};
 
         if (!deFieldCache) {
             return;
@@ -255,11 +261,16 @@ class DataFilter extends MetadataType {
             if (!field?.DataExtension?.CustomerKey) {
                 continue;
             }
-            if (!this.cache.dataExtensionField[field.DataExtension.CustomerKey]) {
+            if (
+                !this.cache[this.buObject.mid].dataExtensionField[field.DataExtension.CustomerKey]
+            ) {
                 /** @type {Object.<string, DataExtensionFieldItem[]>} */
-                this.cache.dataExtensionField[field.DataExtension.CustomerKey] = [];
+                this.cache[this.buObject.mid].dataExtensionField[field.DataExtension.CustomerKey] =
+                    [];
             }
-            this.cache.dataExtensionField[field.DataExtension.CustomerKey].push(field);
+            this.cache[this.buObject.mid].dataExtensionField[field.DataExtension.CustomerKey].push(
+                field
+            );
         }
     }
     /**
@@ -268,7 +279,7 @@ class DataFilter extends MetadataType {
      * @param {DataFilterMap} metadataTypeMap -
      */
     static async _cacheContactAttributes(metadataTypeMap) {
-        if (this.cache.contactAttributes?.[this.buObject.mid]) {
+        if (this.cache[this.buObject.mid]?.contactAttributes) {
             return;
         }
         const subscriberFilters = Object.values(metadataTypeMap)
@@ -279,8 +290,8 @@ class DataFilter extends MetadataType {
             const response = await this.client.rest.get('/email/v1/Contacts/Attributes/');
             const keyFieldBackup = this.definition.keyField;
             this.definition.keyField = 'id';
-            this.cache.contactAttributes ||= {};
-            this.cache.contactAttributes[this.buObject.mid] = this.parseResponseBody(response);
+            this.cache[this.buObject.mid] ||= {};
+            this.cache[this.buObject.mid].contactAttributes = this.parseResponseBody(response);
             this.definition.keyField = keyFieldBackup;
         }
     }
@@ -290,7 +301,7 @@ class DataFilter extends MetadataType {
      * @param {DataFilterMap} metadataTypeMap -
      */
     static async _cacheMeasures(metadataTypeMap) {
-        if (this.cache.measures?.[this.buObject.mid]) {
+        if (this.cache[this.buObject.mid].measures) {
             return;
         }
         const subscriberFilters = Object.values(metadataTypeMap)
@@ -312,8 +323,8 @@ class DataFilter extends MetadataType {
 
             const keyFieldBackup = this.definition.keyField;
             this.definition.keyField = 'measureID';
-            this.cache.measures ||= {};
-            this.cache.measures[this.buObject.mid] = this.parseResponseBody(response);
+            this.cache[this.buObject.mid] ||= {};
+            this.cache[this.buObject.mid].measures = this.parseResponseBody(response);
             this.definition.keyField = keyFieldBackup;
         }
     }
@@ -439,7 +450,9 @@ class DataFilter extends MetadataType {
             return this._resolveFields(
                 metadata,
                 mode,
-                this.cache.dataExtensionField[metadata.r__source_dataExtension_key],
+                this.cache[this.buObject.mid].dataExtensionField[
+                    metadata.r__source_dataExtension_key
+                ],
                 metadata.c__filterDefinition?.ConditionSet
             );
         }
@@ -530,8 +543,8 @@ class DataFilter extends MetadataType {
                 metadata.c__filterDefinition?.ConditionSet
             );
         }
-        const contactAttributes = this.cache.contactAttributes[this.buObject.mid];
-        const measures = this.cache.measures[this.buObject.mid];
+        const contactAttributes = this.cache[this.buObject.mid]?.contactAttributes;
+        const measures = this.cache[this.buObject.mid]?.measures;
         const conditionsArr = Array.isArray(filter.Condition)
             ? filter.Condition
             : [filter.Condition];