Merge pull request #1694 from Accenture/bug/1177-test-for-addedupdate…

…d-fields-faulty-during-update bug/1177 make field add/update check case insensitive and remove redundant caching
Accenture · Sep 11, 2024 · 9076243 · 9076243
2 parents 5c12146 + 122c70c
commit 9076243
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 24 deletions.
diff --git a/@types/lib/metadataTypes/DataExtension.d.ts.map b/@types/lib/metadataTypes/DataExtension.d.ts.map
diff --git a/@types/lib/metadataTypes/DataExtensionField.d.ts.map b/@types/lib/metadataTypes/DataExtensionField.d.ts.map
diff --git a/lib/metadataTypes/DataExtension.js b/lib/metadataTypes/DataExtension.js
@@ -46,19 +46,6 @@ class DataExtension extends MetadataType {
      * @returns {Promise.<MetadataTypeMap>} keyField => metadata map
      */
     static async upsert(metadataMap, deployDir) {
-        // get existing DE-fields for DE-keys in deployment package to properly handle add/update/delete of fields
-        // we need to use IN here because it would fail otherwise if we try to deploy too many DEs at the same time
-        /** @type {SoapRequestParams} */
-        const fieldOptions = {
-            filter: {
-                leftOperand: 'DataExtension.CustomerKey',
-                operator: 'IN',
-                rightOperand: Object.keys(metadataMap),
-            },
-        };
-        Util.logger.info(` - Caching dependent Metadata: dataExtensionField`);
-        await this.#attachFields(metadataMap, fieldOptions);
-
         /** @type {object[]} */
         const metadataToCreate = [];
         /** @type {object[]} */

diff --git a/lib/metadataTypes/DataExtensionField.js b/lib/metadataTypes/DataExtensionField.js
@@ -149,11 +149,13 @@ class DataExtensionField extends MetadataType {
         const existingFieldByName = {};
 
         for (const key of Object.keys(fieldsObj)) {
-            existingFieldByName[fieldsObj[key].Name] = fieldsObj[key];
+            // make sure we stringify the name in case it looked numeric and then lowercase it for easy comparison as the server is comparing field names case-insensitive
+            existingFieldByName[(fieldsObj[key].Name + '').toLowerCase()] = fieldsObj[key];
         }
         for (let i = deployColumns.length - 1; i >= 0; i--) {
             const item = deployColumns[i];
-            const itemOld = existingFieldByName[item.Name];
+            // make sure we stringify the name in case it looked numeric and then lowercase it for easy comparison as the server is comparing field names case-insensitive
+            const itemOld = existingFieldByName[(item.Name + '').toLowerCase()];
             if (itemOld) {
                 // field is getting updated ---
 

diff --git a/test/general.test.js b/test/general.test.js
@@ -569,7 +569,7 @@ describe('GENERAL', () => {
                 );
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    14,
+                    13,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
             });
@@ -632,7 +632,7 @@ describe('GENERAL', () => {
                 );
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    15,
+                    14,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
             });
@@ -697,7 +697,7 @@ describe('GENERAL', () => {
                 );
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    12,
+                    11,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
             });
@@ -2251,7 +2251,7 @@ describe('GENERAL', () => {
                 );
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    14,
+                    13,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
             });

diff --git a/test/type.dataExtension.test.js b/test/type.dataExtension.test.js
@@ -133,7 +133,7 @@ describe('type: dataExtension', () => {
             );
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                11,
+                10,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
@@ -182,7 +182,7 @@ describe('type: dataExtension', () => {
             );
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                8,
+                7,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
@@ -233,7 +233,7 @@ describe('type: dataExtension', () => {
             );
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                12,
+                11,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;