mcdev 7.10.0 → 7.10.1

package/lib/metadataTypes/Query.js

@@ -466,17 +466,17 @@ class Query extends MetadataType {
     /**
      * Delete a metadata item from the specified business unit
      *
-     * @param {string} customerKey Identifier of data extension
+     * @param {string} key Identifier of data extension
      * @returns {Promise.<boolean>} deletion success flag
      */
-    static async deleteByKey(customerKey) {
+    static async deleteByKey(key) {
         // delete only works with the query's object id
-        const objectId = customerKey ? await this._getObjectIdForSingleRetrieve(customerKey) : null;
+        const objectId = key ? await this._getObjectIdForSingleRetrieve(key) : null;
         if (!objectId) {
-            Util.logger.error(` - query ${customerKey} not found`);
+            await this.deleteNotFound(key);
             return false;
         }
-        return super.deleteByKeyREST('/automation/v1/queries/' + objectId, customerKey);
+        return super.deleteByKeyREST('/automation/v1/queries/' + objectId, key);
     }
 
     /**

package/lib/metadataTypes/Script.js

@@ -372,17 +372,17 @@ class Script extends MetadataType {
     /**
      * Delete a metadata item from the specified business unit
      *
-     * @param {string} customerKey Identifier of data extension
+     * @param {string} key Identifier of data extension
      * @returns {Promise.<boolean>} deletion success flag
      */
-    static async deleteByKey(customerKey) {
+    static async deleteByKey(key) {
         // delete only works with the query's object id
-        const objectId = customerKey ? await this._getObjectIdForSingleRetrieve(customerKey) : null;
+        const objectId = key ? await this._getObjectIdForSingleRetrieve(key) : null;
         if (!objectId) {
-            Util.logger.error(` - ${this.definition.type} ${customerKey} not found`);
+            await this.deleteNotFound(key);
             return false;
         }
-        return super.deleteByKeyREST('/automation/v1/scripts/' + objectId, customerKey);
+        return super.deleteByKeyREST('/automation/v1/scripts/' + objectId, key);
     }
 
     /**

package/lib/metadataTypes/SendClassification.js

@@ -87,11 +87,11 @@ class SendClassification extends MetadataType {
     /**
      * Delete a metadata item from the specified business unit
      *
-     * @param {string} customerKey Identifier of data extension
+     * @param {string} key Identifier of data extension
      * @returns {Promise.<boolean>} deletion success status
      */
-    static deleteByKey(customerKey) {
-        return super.deleteByKeySOAP(customerKey);
+    static deleteByKey(key) {
+        return super.deleteByKeySOAP(key, undefined, 24100);
     }
 
     /**

package/lib/metadataTypes/SenderProfile.js

@@ -73,11 +73,11 @@ class SenderProfile extends MetadataType {
     /**
      * Delete a metadata item from the specified business unit
      *
-     * @param {string} customerKey Identifier of data extension
+     * @param {string} key Identifier of data extension
      * @returns {Promise.<boolean>} deletion success status
      */
-    static deleteByKey(customerKey) {
-        return super.deleteByKeySOAP(customerKey);
+    static deleteByKey(key) {
+        return super.deleteByKeySOAP(key, undefined, 40100);
     }
 
     /**

package/lib/metadataTypes/TransactionalEmail.js

@@ -285,7 +285,7 @@ class TransactionalEmail extends TransactionalMessage {
         const isDeleted = await super.deleteByKeyREST(
             '/messaging/v1/' + this.subType + '/definitions/' + key,
             key,
-            false
+            30003
         );
         if (isDeleted && journeyKey) {
             Util.logger.info(

package/lib/metadataTypes/TransactionalMessage.js

@@ -128,7 +128,7 @@ class TransactionalMessage extends MetadataType {
         return super.deleteByKeyREST(
             '/messaging/v1/' + this.subType + '/definitions/' + key,
             key,
-            false
+            30003
         );
     }
 }

package/lib/metadataTypes/TriggeredSend.js

@@ -91,11 +91,11 @@ class TriggeredSend extends MetadataType {
     /**
      * Delete a metadata item from the specified business unit
      *
-     * @param {string} customerKey Identifier of data extension
+     * @param {string} key Identifier of data extension
      * @returns {Promise.<boolean>} deletion success status
      */
-    static deleteByKey(customerKey) {
-        return super.deleteByKeySOAP(customerKey);
+    static deleteByKey(key) {
+        return super.deleteByKeySOAP(key, undefined, 17015);
     }
 
     /**

package/lib/metadataTypes/Verification.js

@@ -293,7 +293,7 @@ class Verification extends MetadataType {
      * @returns {Promise.<boolean>} deletion success status
      */
     static deleteByKey(key) {
-        return super.deleteByKeyREST('/automation/v1/dataverifications/' + key, key);
+        return super.deleteByKeyREST('/automation/v1/dataverifications/' + key, key, 400);
     }
 }
 

package/lib/metadataTypes/definitions/Automation.definition.js

@@ -53,10 +53,10 @@ export default {
     keyField: 'key',
     nameField: 'name',
     folderIdField: 'categoryId',
-    createdDateField: 'createdDate', // only returned by upsert
-    createdNameField: 'createdByName', // only returned by upsert
-    lastmodDateField: 'lastSavedDate', // only returned by upsert
-    lastmodNameField: 'lastSavedByName', // only returned by upsert
+    createdDateField: 'createdDate', // only returned by upsert & legacy
+    createdNameField: 'createdName', // only returned by upsert & legacy
+    lastmodDateField: 'modifiedDate', // only returned by upsert & legacy
+    lastmodNameField: 'modifiedName', // only returned by upsert & legacy
     restPagination: true,
     maxKeyLength: 200, // confirmed max length
     scheduleTypeMapping: {
@@ -371,16 +371,46 @@ export default {
             retrieving: false, // only returned by upsert
             template: false,
         },
-        createdDate: {
+        createdByName: {
             isCreateable: false,
             isUpdateable: false,
             retrieving: false, // only returned by upsert
             template: false,
         },
-        createdByName: {
+        createdDate: {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: true, // only returned by upsert + legacy
+            template: false,
+        },
+        createdName: {
             isCreateable: false,
             isUpdateable: false,
-            retrieving: false, // only returned by upsertt
+            retrieving: true, // only returned by legacy
+            template: false,
+        },
+        modifiedDate: {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: true, // only returned by legacy
+            template: false,
+        },
+        modifiedName: {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: true, // only returned by legacy
+            template: false,
+        },
+        pausedDate: {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: true, // only returned by legacy
+            template: false,
+        },
+        pausedName: {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: true, // only returned by legacy
             template: false,
         },
         updateInProgress: {
@@ -515,6 +545,12 @@ export default {
             retrieving: false,
             template: false,
         },
+        'schedule.scheduleTypeId': {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: false,
+            template: false,
+        },
         status: {
             isCreateable: true,
             isUpdateable: true,

package/lib/metadataTypes/definitions/DataExtract.definition.js

@@ -1,7 +1,9 @@
 export default {
     bodyIteratorField: 'items',
-    dependencies: ['dataExtractType', 'user'],
-    dependencyGraph: null, // dataExtractType cannot be deployed
+    dependencies: ['dataExtension', 'dataExtractType', 'user'],
+    dependencyGraph: {
+        dataExtension: ['r__dataExtension_key'],
+    },
     hasExtended: true,
     idField: 'dataExtractDefinitionId',
     keyIsFixed: false,
@@ -100,6 +102,17 @@ export default {
             retrieving: true,
             template: true,
         },
-        r__dataExtractType_name: { skipValidation: true },
+        r__dataExtractType_name: {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: true,
+            template: true,
+        },
+        r__dataExtension_key: {
+            isCreateable: false,
+            isUpdateable: false,
+            retrieving: true,
+            template: true,
+        },
     },
 };

package/lib/metadataTypes/definitions/DomainVerification.definition.js

@@ -16,7 +16,7 @@ export default {
     type: 'domainVerification',
     typeDescription: 'Domains emails that are verified for sending',
     typeRetrieveByDefault: true,
-    typeCdpByDefault: false,
+    typeCdpByDefault: true,
     typeName: 'Domain Verification',
     fields: {
         domain: {

package/lib/metadataTypes/definitions/SenderProfile.definition.js

@@ -1,7 +1,9 @@
 export default {
     bodyIteratorField: 'Results',
     dependencies: ['user', 'domainVerification'],
-    dependencyGraph: null,
+    dependencyGraph: {
+        domainVerification: ['FallbackFromAddress', 'FromAddress'],
+    },
     filter: {},
     hasExtended: false,
     idField: 'ObjectID',

package/lib/util/util.js

@@ -1317,6 +1317,18 @@ export const Util = {
                 return acc;
             }, {});
     },
+    /**
+     * helper for MetadataType class to issue a similar error message for unsupported methods
+     *
+     * @param {any} definition type definition object
+     * @param {string} method name of the method thats not supported
+     * @param {MetadataTypeItem} [item] metadata item
+     */
+    notSupportedError: function (definition, method, item) {
+        Util.logger.error(
+            ` ☇ skipping ${item ? Util.getTypeKeyName(definition, item) : definition.type}: ${method} is not supported yet for ${definition.type}`
+        );
+    },
 };
 
 Util.startLogger(false, true);

package/lib/util/validations.js

@@ -111,7 +111,9 @@ export default async function validation(definition, item, targetDir, codeExtrac
                 const doNotEvaluate = ['automation', 'attributeSet', 'list'];
                 if (
                     doNotEvaluate.includes(definition.type) ||
-                    (definition.type === 'asset' && item?.assetType?.name === 'webpage')
+                    (definition.type === 'asset' && item?.assetType?.name === 'webpage') ||
+                    (definition.type === 'dataExtension' &&
+                        item.r__folder_Path === 'Synchronized Data Extensions')
                 ) {
                     // this subtype is not visible in the interface and hence always technically sits in the root
                     return true;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mcdev",
-    "version": "7.10.0",
+    "version": "7.10.1",
     "description": "Accenture Salesforce Marketing Cloud DevTools",
     "author": "Accenture: joern.berkefeld, douglas.midgley, robert.zimmermann, maciej.barnas",
     "license": "MIT",

package/test/general.test.js

@@ -378,7 +378,7 @@ describe('GENERAL', () => {
                 );
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    6,
+                    9,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
             });
@@ -512,7 +512,7 @@ describe('GENERAL', () => {
                 assert.equal(deployedTypes[0], 'dataExtract', 'deploy should have returned 1 type');
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    10,
+                    13,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
             });
@@ -777,7 +777,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU', ['automation', 'query']);
 
-                const expectedApiCallsRetrieve = 31;
+                const expectedApiCallsRetrieve = 35;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -882,7 +882,7 @@ describe('GENERAL', () => {
             });
 
             it('buildTemplate + buildDefinition for multiple types with keys and --retrieve', async () => {
-                const expectedApiCallsRetrieve = 31;
+                const expectedApiCallsRetrieve = 32;
 
                 // preparation
                 const argvMetadata = [
@@ -987,7 +987,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU');
 
-                const expectedApiCallsRetrieve = 93;
+                const expectedApiCallsRetrieve = 97;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1025,15 +1025,16 @@ describe('GENERAL', () => {
                     Object.keys(templateResult),
                     [
                         'automation',
-                        'query',
+                        'dataExtension',
                         'dataExtract',
+                        'domainVerification',
                         'emailSend',
-                        'dataExtension',
-                        'sendClassification',
-                        'senderProfile',
                         'fileTransfer',
                         'importFile',
+                        'query',
                         'script',
+                        'sendClassification',
+                        'senderProfile',
                         'verification',
                     ],
                     'did not create deployment packages for all relevant types'
@@ -1145,15 +1146,16 @@ describe('GENERAL', () => {
                     Object.keys(templateResult),
                     [
                         'automation',
-                        'query',
+                        'dataExtension',
                         'dataExtract',
+                        'domainVerification',
                         'emailSend',
-                        'dataExtension',
-                        'sendClassification',
-                        'senderProfile',
                         'fileTransfer',
                         'importFile',
+                        'query',
                         'script',
+                        'sendClassification',
+                        'senderProfile',
                         'verification',
                     ],
                     'did not create deployment packages for all relevant types'
@@ -1227,7 +1229,7 @@ describe('GENERAL', () => {
                     await testUtils.getActualDeployFile('testTemplated_query', 'query', 'sql')
                 ).to.equal(await testUtils.getExpectedFile('9999999', 'query', 'build', 'sql'));
 
-                const expectedApiCallsRetrieve = 97;
+                const expectedApiCallsRetrieve = 101;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1239,7 +1241,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU', ['automation', 'query']);
 
-                const expectedApiCallsRetrieve = 31;
+                const expectedApiCallsRetrieve = 35;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1431,7 +1433,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU', ['automation', 'query']);
 
-                const expectedApiCallsRetrieve = 31;
+                const expectedApiCallsRetrieve = 35;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1502,7 +1504,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU', ['automation', 'query']);
 
-                const expectedApiCallsRetrieve = 31;
+                const expectedApiCallsRetrieve = 35;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1601,7 +1603,7 @@ describe('GENERAL', () => {
                 // download everything before we test buildTemplate
                 await handler.retrieve('testInstance/testBU');
 
-                const expectedApiCallsRetrieve = 93;
+                const expectedApiCallsRetrieve = 97;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1660,15 +1662,16 @@ describe('GENERAL', () => {
                     Object.keys(definitionResult),
                     [
                         'automation',
-                        'query',
+                        'dataExtension',
                         'dataExtract',
+                        'domainVerification',
                         'emailSend',
-                        'dataExtension',
-                        'sendClassification',
-                        'senderProfile',
                         'fileTransfer',
                         'importFile',
+                        'query',
                         'script',
+                        'sendClassification',
+                        'senderProfile',
                         'verification',
                     ],
                     'did not create deployment packages for all relevant types'
@@ -1767,15 +1770,16 @@ describe('GENERAL', () => {
                     Object.keys(definitionResult),
                     [
                         'automation',
-                        'query',
+                        'dataExtension',
                         'dataExtract',
+                        'domainVerification',
                         'emailSend',
-                        'dataExtension',
-                        'sendClassification',
-                        'senderProfile',
                         'fileTransfer',
                         'importFile',
+                        'query',
                         'script',
+                        'sendClassification',
+                        'senderProfile',
                         'verification',
                     ],
                     'did not create deployment packages for all relevant types'
@@ -1810,7 +1814,7 @@ describe('GENERAL', () => {
                     await testUtils.getActualDeployFile('testTemplated_query', 'query', 'sql')
                 ).to.equal(await testUtils.getExpectedFile('9999999', 'query', 'build', 'sql'));
 
-                const expectedApiCallsRetrieve = 97;
+                const expectedApiCallsRetrieve = 101;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -1822,7 +1826,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU', ['automation', 'query']);
 
-                const expectedApiCallsRetrieve = 31;
+                const expectedApiCallsRetrieve = 35;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -2001,7 +2005,7 @@ describe('GENERAL', () => {
                 // download first before we test buildTemplate
                 await handler.retrieve('testInstance/testBU');
 
-                const expectedApiCallsRetrieve = 93;
+                const expectedApiCallsRetrieve = 97;
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
                     expectedApiCallsRetrieve,
@@ -2061,15 +2065,16 @@ describe('GENERAL', () => {
                     Object.keys(definitionResult),
                     [
                         'automation',
-                        'query',
+                        'dataExtension',
                         'dataExtract',
+                        'domainVerification',
                         'emailSend',
-                        'dataExtension',
-                        'sendClassification',
-                        'senderProfile',
                         'fileTransfer',
                         'importFile',
+                        'query',
                         'script',
+                        'sendClassification',
+                        'senderProfile',
                         'verification',
                     ],
                     'did not create deployment packages for all relevant types'
@@ -2503,7 +2508,7 @@ describe('GENERAL', () => {
                 );
                 assert.equal(
                     testUtils.getAPIHistoryLength(),
-                    9,
+                    12,
                     'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
                 );
             });

package/test/mockRoot/.mcdevrc.json

@@ -175,5 +175,5 @@
             "verification"
         ]
     },
-    "version": "7.10.0"
+    "version": "7.10.1"
 }

package/test/resourceFactory.js

@@ -270,6 +270,8 @@ export const handleRESTRequest = async (config) => {
         let filterBody;
         if (urlObj.searchParams.get('$filter')) {
             filterName = urlObj.searchParams.get('$filter').split(' eq ')[1];
+        } else if (urlObj.searchParams.get('action')) {
+            filterName = urlObj.searchParams.get('action');
         }
         const testPath = path
             .join(
@@ -283,9 +285,10 @@ export const handleRESTRequest = async (config) => {
         const testPathFilter = filterName
             ? testPath +
               '-' +
-              urlObj.searchParams.get('$filter').replaceAll(' eq ', '=').replaceAll(' ', '')
+              (urlObj.searchParams.get('$filter') || urlObj.searchParams.get('action'))
+                  .replaceAll(' eq ', '=')
+                  .replaceAll(' ', '')
             : null;
-
         if (!testPathFilter && config.method === 'post' && config.data) {
             const simpleOperators = { equal: '=', in: 'IN' };
             const data = JSON.parse(config.data);
@@ -308,7 +311,6 @@ export const handleRESTRequest = async (config) => {
             }
         }
         const testPathFilterBody = filterBody ? testPath + '-' + filterBody : null;
-
         if (testPathFilter && (await fs.pathExists(testPathFilter + '.json'))) {
             // build filter logic to ensure templating works
             if (filterName) {
@@ -317,8 +319,9 @@ export const handleRESTRequest = async (config) => {
                         encoding: 'utf8',
                     })
                 );
-                response.items = response.items.filter((def) => def.name == filterName);
-                response.count = response.items.length;
+                if (response.items) {
+                    response.items = response.items.filter((def) => def.name == filterName);
+                }
                 console.log(loadingFile + projectRoot + testPathFilter + '.json'); // eslint-disable-line no-console
                 return [200, JSON.stringify(response)];
             } else {

package/test/resources/9999999/automation/create-expected.json

@@ -45,5 +45,6 @@
             ],
             "name": ""
         }
-    ]
+    ],
+    "createdDate": "2023-07-04T07:49:08.297"
 }

package/test/resources/9999999/automation/retrieve-expected.json

@@ -57,5 +57,11 @@
             "message": "test",
             "type": "Error"
         }
-    ]
+    ],
+    "createdDate": "2022-01-12T08:41:35.773Z",
+    "createdName": "Tom Tester",
+    "modifiedDate": "2024-11-04T17:42:13.143Z",
+    "modifiedName": "Jörn Berkefeld",
+    "pausedDate": "2025-03-14T15:21:57.62Z",
+    "pausedName": "Jörn Berkefeld"
 }

package/test/resources/9999999/automation/retrieve-wait-expected.json

@@ -71,5 +71,11 @@
             ]
         }
     ],
-    "r__folder_Path": "my automations"
+    "r__folder_Path": "my automations",
+    "createdDate": "2024-11-04T17:30:12.973Z",
+    "createdName": "Jörn Berkefeld",
+    "modifiedDate": "2024-11-04T17:42:13.143Z",
+    "modifiedName": "Jörn Berkefeld",
+    "pausedDate": "2025-03-14T15:21:57.62Z",
+    "pausedName": "Jörn Berkefeld"
 }

package/test/resources/9999999/automation/update-expected.json

@@ -1,5 +1,5 @@
 {
-    "description": "updated on deploy",
+    "description": "bla bla",
     "key": "testExisting_automation",
     "name": "testExisting_automation",
     "r__folder_Path": "my automations",
@@ -36,10 +36,32 @@
                 {
                     "r__key": "testExisting_script",
                     "r__type": "script"
+                },
+                {
+                    "r__key": "testExisting_automation__s1.7",
+                    "r__type": "verification"
                 }
             ],
             "name": ""
         }
     ],
-    "type": "scheduled"
+    "type": "scheduled",
+    "notifications": [
+        {
+            "email": ["complete@test.accenture.com"],
+            "message": "",
+            "type": "Complete"
+        },
+        {
+            "email": ["error@test.accenture.com"],
+            "message": "test",
+            "type": "Error"
+        }
+    ],
+    "createdDate": "2022-01-12T08:41:35.773Z",
+    "createdName": "Tom Tester",
+    "modifiedDate": "2024-11-04T17:42:13.143Z",
+    "modifiedName": "Jörn Berkefeld",
+    "pausedDate": "2025-03-14T15:21:57.62Z",
+    "pausedName": "Jörn Berkefeld"
 }