#1470: improve folder loading - part 2

Accenture · Jul 22, 2024 · f5a0f22 · f5a0f22
1 parent a445f46
commit f5a0f22
Show file tree

Hide file tree

Showing 17 changed files with 1,013 additions and 55 deletions.
diff --git a/@types/lib/Deployer.d.ts.map b/@types/lib/Deployer.d.ts.map
diff --git a/lib/Deployer.js b/lib/Deployer.js
@@ -298,13 +298,6 @@ class Deployer {
             }
         }
 
-        if (!Util.OPTIONS.fromRetrieve) {
-            await Deployer.createFolderDefinitions(
-                this.deployDir,
-                this.metadata,
-                Object.keys(this.metadata)
-            );
-        }
         const foundDeployTypes = Object.keys(this.metadata)
             // remove empty types
             .filter((type) => Object.keys(this.metadata[type]).length)
@@ -318,6 +311,15 @@ class Deployer {
             throw new Error('No metadata found for deployment');
         }
         const deployOrder = Util.getMetadataHierachy(foundDeployTypes);
+
+        if (!Util.OPTIONS.fromRetrieve) {
+            // run this AFTER identifying deployOrder or else ALL folders will be cached
+            await Deployer.createFolderDefinitions(
+                this.deployDir,
+                this.metadata,
+                Object.keys(this.metadata)
+            );
+        }
         // build cache, including all metadata types which will be deployed (Avoids retrieve later)
         for (const metadataType in deployOrder) {
             const type = metadataType;

diff --git a/lib/metadataTypes/definitions/Folder.definition.js b/lib/metadataTypes/definitions/Folder.definition.js
@@ -63,7 +63,6 @@ export default {
     folderTypesFromParent: [
         'asset-shared',
         'asset',
-        'hidden',
         'shared_content',
         'shared_data',
         'shared_dataextension',

diff --git a/test/general.test.js b/test/general.test.js
@@ -61,7 +61,7 @@ describe('GENERAL', () => {
 
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    38,
+                    36,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
                 return;
@@ -110,7 +110,7 @@ describe('GENERAL', () => {
 
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    38,
+                    36,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
                 return;
@@ -159,7 +159,7 @@ describe('GENERAL', () => {
 
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    38,
+                    36,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
                 return;
@@ -226,7 +226,7 @@ describe('GENERAL', () => {
 
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    88,
+                    83,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
                 return;
@@ -287,7 +287,7 @@ describe('GENERAL', () => {
 
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    88,
+                    83,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
                 return;
@@ -348,7 +348,7 @@ describe('GENERAL', () => {
 
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    88,
+                    83,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
                 return;
@@ -695,7 +695,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU', ['automation', 'query']);
 
-                const expectedApiCallsRetrieve = 25;
+                const expectedApiCallsRetrieve = 24;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -800,7 +800,7 @@ describe('GENERAL', () => {
             });
 
             it('buildTemplate + buildDefinition for multiple types with keys and --retrieve', async () => {
-                const expectedApiCallsRetrieve = 28;
+                const expectedApiCallsRetrieve = 27;
 
                 // preparation
                 const argvMetadata = [
@@ -1158,7 +1158,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU', ['automation', 'query']);
 
-                const expectedApiCallsRetrieve = 25;
+                const expectedApiCallsRetrieve = 24;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1350,7 +1350,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU', ['automation', 'query']);
 
-                const expectedApiCallsRetrieve = 25;
+                const expectedApiCallsRetrieve = 24;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1658,7 +1658,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU', ['automation', 'query']);
 
-                const expectedApiCallsRetrieve = 25;
+                const expectedApiCallsRetrieve = 24;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -2284,7 +2284,7 @@ describe('GENERAL', () => {
                 );
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    9,
+                    8,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
             });

diff --git a/...ynchronizeddataextension-QAA-response.xml → ...on,synchronizeddataextension-response.xml b/...ynchronizeddataextension-QAA-response.xml → ...on,synchronizeddataextension-response.xml
@@ -293,29 +293,6 @@
                 <IsEditable>false</IsEditable>
                 <AllowChildren>false</AllowChildren>
             </Results>
-            <Results xsi:type="DataFolder">
-                <Client>
-                    <ID>1111111</ID>
-                </Client>
-                <PartnerKey xsi:nil="true" />
-                <CreatedDate>2021-02-07T10:44:01.413</CreatedDate>
-                <ModifiedDate>2021-12-16T03:43:33.38</ModifiedDate>
-                <ID>639967</ID>
-                <ObjectID xsi:nil="true" />
-                <CustomerKey />
-                <ParentFolder>
-                    <PartnerKey xsi:nil="true" />
-                    <ID>89355</ID>
-                    <ObjectID xsi:nil="true" />
-                    <CustomerKey>dataextension_default</CustomerKey>
-                </ParentFolder>
-                <Name>TestAudiences</Name>
-                <Description />
-                <ContentType>dataextension</ContentType>
-                <IsActive>true</IsActive>
-                <IsEditable>true</IsEditable>
-                <AllowChildren>true</AllowChildren>
-            </Results>
             <Results xsi:type="DataFolder">
                 <Client>
                     <ID>1111111</ID>