Merge pull request #1385 from Accenture/bug/1377-data-extension-folde…

…r-creation-bug-700 Bug/1377 data extension folder creation bug 700
Accenture · Jun 26, 2024 · 65ae7d1 · 65ae7d1
2 parents 9c8f436 + 2fd179a
commit 65ae7d1
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 21 deletions.
diff --git a/@types/lib/metadataTypes/Folder.d.ts b/@types/lib/metadataTypes/Folder.d.ts
@@ -115,6 +115,7 @@ declare namespace Folder {
         dependencies: any[];
         subTypes: string[];
         deployFolderTypes: string[];
+        deployFolderTypesRest: string[];
         deployFolderBlacklist: string[];
         folderTypesFromParent: string[];
         hasExtended: boolean;

diff --git a/@types/lib/metadataTypes/Folder.d.ts.map b/@types/lib/metadataTypes/Folder.d.ts.map
diff --git a/@types/lib/metadataTypes/definitions/Folder.definition.d.ts b/@types/lib/metadataTypes/definitions/Folder.definition.d.ts
@@ -3,6 +3,7 @@ declare namespace _default {
     let dependencies: any[];
     let subTypes: string[];
     let deployFolderTypes: string[];
+    let deployFolderTypesRest: string[];
     let deployFolderBlacklist: string[];
     let folderTypesFromParent: string[];
     let hasExtended: boolean;

diff --git a/lib/metadataTypes/Folder.js b/lib/metadataTypes/Folder.js
@@ -351,29 +351,42 @@ class Folder extends MetadataType {
         }
         const path = metadataEntry.Path;
         try {
-            // * We tried using the SOAP endpoint for creating folders but that did not support folders for automations nor journeys. This rest endpoint seems to cover everything though
-            const restPayload = {
-                parentCatId: metadataEntry.ParentFolder.ID,
-                name: metadataEntry.Name,
-                catType: metadataEntry.ContentType,
-            };
-            const response = await super.createREST(restPayload, '/email/v1/category', true);
-            if (response?.objectId) {
-                // convert the response to the same format as the SOAP response
-                metadataEntry.ID = response.objectId;
-                // the following is a bit of a hack to make the response look like the SOAP response; not sure if we actually need that anywhere like this --> future developers feel free to double check
-                const returnObject = {
-                    Results: [
-                        {
-                            Object: metadataEntry,
-                        },
-                    ],
+            if (this.definition.deployFolderTypesRest.includes(metadataEntry.ContentType)) {
+                // * The SOAP endpoint for creating folders does not support folders for automations nor journeys. The Rest endpoint on the other hand errors out on certain characters in the folder names that are actually valid. We therefore only use Rest for the folder types that are not supported by SOAP.
+                const restPayload = {
+                    parentCatId: metadataEntry.ParentFolder.ID,
+                    name: metadataEntry.Name,
+                    catType: metadataEntry.ContentType,
                 };
+                const response = await super.createREST(restPayload, '/email/v1/category', true);
+                if (response?.objectId) {
+                    // convert the response to the same format as the SOAP response
+                    metadataEntry.ID = response.objectId;
+                    // the following is a bit of a hack to make the response look like the SOAP response; not sure if we actually need that anywhere like this --> future developers feel free to double check
+                    const returnObject = {
+                        Results: [
+                            {
+                                Object: metadataEntry,
+                            },
+                        ],
+                    };
 
-                Util.logger.info(` - created folder: ${path}`);
-                return returnObject;
+                    Util.logger.info(` - created folder: ${path}`);
+                    return returnObject;
+                } else {
+                    throw new Error(response);
+                }
             } else {
-                throw new Error(response);
+                const response = await super.createSOAP(metadataEntry, true);
+                if (response) {
+                    response.Results[0].Object = metadataEntry;
+                    response.Results[0].Object.ID = response.Results[0].NewID;
+                    response.Results[0].Object.CustomerKey = metadataEntry.CustomerKey;
+                    delete response.Results[0].Object.$;
+
+                    Util.logger.info(` - created folder: ${path}`);
+                    return response;
+                }
             }
         } catch (ex) {
             if (ex?.results) {

diff --git a/lib/metadataTypes/definitions/Folder.definition.js b/lib/metadataTypes/definitions/Folder.definition.js
@@ -4,6 +4,7 @@ export default {
     subTypes: [
         'asset-shared',
         'asset',
+        'automations',
         'contextual_suppression_list',
         'dataextension',
         'filteractivity',
@@ -52,6 +53,7 @@ export default {
         'triggered_send_journeybuilder',
         'triggered_send',
     ],
+    deployFolderTypesRest: ['automations', 'journey', 'triggered_send_journeybuilder'],
     deployFolderBlacklist: [
         // lower-case values!
         'shared data extensions',