mcdev 7.1.1 → 7.1.2

package/test/resources/9999999/asset/v1/content/assets/query/post-response-assetType.idIN219,220,221,222,223,224,225,226,227,228,230,232.json

@@ -0,0 +1,32 @@
+{
+    "count": 1,
+    "page": 1,
+    "pageSize": 50,
+    "links": {},
+    "items": [
+        {
+            "id": 1209971,
+            "customerKey": "mobileMessage_test",
+            "assetType": { "id": 230, "name": "jsonmessage", "displayName": "JSON Message" },
+            "name": "mobileMessage_test",
+            "createdDate": "2022-12-07T02:49:36.857-06:00",
+            "createdBy": {
+                "id": 700301950,
+                "email": "joern.berkefeld@accenture.com",
+                "name": "J├Ârn Berkefeld (ASGR)",
+                "userId": "700301950"
+            },
+            "modifiedDate": "2022-12-07T02:49:57.44-06:00",
+            "modifiedBy": {
+                "id": 700301950,
+                "email": "joern.berkefeld@accenture.com",
+                "name": "J├Ârn Berkefeld (ASGR)",
+                "userId": "700301950"
+            },
+            "status": { "id": 1, "name": "Draft" },
+            "category": { "id": 89397, "name": "Content Builder", "parentId": 0 },
+            "availableViews": ["push"],
+            "modelVersion": 2
+        }
+    ]
+}

package/test/resources/9999999/asset/v1/content/assets/query/post-response-assetType.idIN223,224,225,226,227,228,230,232.json

@@ -0,0 +1,32 @@
+{
+    "count": 1,
+    "page": 1,
+    "pageSize": 50,
+    "links": {},
+    "items": [
+        {
+            "id": 1209971,
+            "customerKey": "mobileMessage_test",
+            "assetType": { "id": 230, "name": "jsonmessage", "displayName": "JSON Message" },
+            "name": "mobileMessage_test",
+            "createdDate": "2022-12-07T02:49:36.857-06:00",
+            "createdBy": {
+                "id": 700301950,
+                "email": "joern.berkefeld@accenture.com",
+                "name": "J├Ârn Berkefeld (ASGR)",
+                "userId": "700301950"
+            },
+            "modifiedDate": "2022-12-07T02:49:57.44-06:00",
+            "modifiedBy": {
+                "id": 700301950,
+                "email": "joern.berkefeld@accenture.com",
+                "name": "J├Ârn Berkefeld (ASGR)",
+                "userId": "700301950"
+            },
+            "status": { "id": 1, "name": "Draft" },
+            "category": { "id": 89397, "name": "Content Builder", "parentId": 0 },
+            "availableViews": ["push"],
+            "modelVersion": 2
+        }
+    ]
+}

package/test/resources/9999999/interaction/v1/interactions/get-response.json

@@ -1,5 +1,5 @@
 {
-    "count": 2,
+    "count": 3,
     "page": 1,
     "pageSize": 500,
     "links": {},

package/test/resources/9999999/interaction/v1/interactions/key_testExisting_journey_Multistep/get-response.json

@@ -86,7 +86,11 @@
                 "applicationExtensionKey": "jb-email-activity",
                 "isModified": true,
                 "googleAnalyticsCampaignName": "",
+                "triggeredSendId": "b3150cf0-6e78-e811-80d4-1402ec721c9d",
+                "triggeredSendKey": "wrong key",
                 "triggeredSend": {
+                    "id": "outdated id",
+                    "key": "outdated key",
                     "autoAddSubscribers": true,
                     "autoUpdateSubscribers": true,
                     "bccEmail": "",
@@ -98,7 +102,7 @@
                     "description": "my custom description",
                     "domainExclusions": [],
                     "dynamicEmailSubject": "testExisting_ email subject",
-                    "emailId": 531213,
+                    "emailId": 808714,
                     "emailSubject": "testExisting_ email subject",
                     "exclusionFilter": "",
                     "isSalesforceTracking": false,

package/test/resources/9999999/journey/build-expected.json

@@ -54,7 +54,6 @@
                     "r__senderProfile_key": "testTemplated_senderProfile",
                     "r__sendClassification_key": "testTemplated_sendClassification",
                     "c__priority": "High",
-                    "r__asset_name_readOnly": "testTemplated_asset_message",
                     "r__asset_key": "testTemplated_asset_message"
                 },
                 "applicationExtensionKey": "jb-email-activity"

package/test/resources/9999999/journey/get-multistep-expected.json

@@ -79,19 +79,20 @@
                 "applicationExtensionKey": "jb-email-activity",
                 "isModified": true,
                 "googleAnalyticsCampaignName": "",
+                "r__triggeredSend_key": "testExisting_triggeredSend",
                 "triggeredSend": {
-                    "autoAddSubscribers": true,
-                    "autoUpdateSubscribers": true,
+                    "autoAddSubscribers": false,
+                    "autoUpdateSubscribers": false,
                     "bccEmail": "",
                     "ccEmail": "",
                     "created": { "name": "", "date": "" },
                     "description": "my custom description",
                     "domainExclusions": [],
-                    "dynamicEmailSubject": "testExisting_ email subject",
-                    "emailSubject": "testExisting_ email subject",
+                    "dynamicEmailSubject": "You are successfully unsubscribed",
+                    "emailSubject": "You are successfully unsubscribed",
                     "exclusionFilter": "",
                     "isSalesforceTracking": false,
-                    "isMultipart": true,
+                    "isMultipart": false,
                     "isSendLogging": true,
                     "isStoppedOnJobError": false,
                     "modified": { "name": "", "date": "" },
@@ -104,7 +105,8 @@
                     "r__sendClassification_key": "testExisting_sendClassification",
                     "c__priority": "Medium",
                     "r__asset_name_readOnly": "testExisting_asset_message",
-                    "r__asset_key": "testExisting_asset_message"
+                    "r__asset_key": "testExisting_asset_message",
+                    "r__triggeredSend_key": "testExisting_triggeredSend"
                 }
             },
             "metaData": {

package/test/resources/9999999/journey/template-expected.json

@@ -54,7 +54,6 @@
                     "r__senderProfile_key": "{{{prefix}}}senderProfile",
                     "r__sendClassification_key": "{{{prefix}}}sendClassification",
                     "c__priority": "High",
-                    "r__asset_name_readOnly": "{{{prefix}}}asset_message",
                     "r__asset_key": "{{{prefix}}}asset_message"
                 },
                 "applicationExtensionKey": "jb-email-activity"

package/test/resources/9999999/triggeredSend/build-expected.json

@@ -21,7 +21,8 @@
     "SuppressTracking": false,
     "TriggeredSendStatus": "New",
     "TriggeredSendType": "Continuous",
-    "r__email_name": "Sporting Goods for September",
+    "r__asset_key": "testTemplated_asset_message",
+    "r__asset_name_readOnly": "testTemplated_asset_message",
     "r__folder_Path": "Triggered Sends",
     "r__sendClassification_key": "testTemplated_sendClassification",
     "r__senderProfile_key": "testTemplated_senderProfile"

package/test/resources/9999999/triggeredSend/get-expected.json

@@ -21,7 +21,8 @@
     "SuppressTracking": false,
     "TriggeredSendStatus": "New",
     "TriggeredSendType": "Continuous",
-    "r__email_name": "Sporting Goods for September",
+    "r__asset_key": "testExisting_asset_message",
+    "r__asset_name_readOnly": "testExisting_asset_message",
     "r__folder_Path": "Triggered Sends",
     "r__sendClassification_key": "testExisting_sendClassification",
     "r__senderProfile_key": "testExisting_senderProfile"

package/test/resources/9999999/triggeredSend/template-expected.json

@@ -21,7 +21,8 @@
     "SuppressTracking": false,
     "TriggeredSendStatus": "New",
     "TriggeredSendType": "Continuous",
-    "r__email_name": "Sporting Goods for September",
+    "r__asset_key": "{{{prefix}}}asset_message",
+    "r__asset_name_readOnly": "{{{prefix}}}asset_message",
     "r__folder_Path": "Triggered Sends",
     "r__sendClassification_key": "{{{prefix}}}sendClassification",
     "r__senderProfile_key": "{{{prefix}}}senderProfile"

package/test/resources/9999999/triggeredSendDefinition/retrieve-TriggeredSendStatusINNew,Active,Inactive,Moved,Canceled-response.xml

@@ -53,7 +53,7 @@
                 <TriggeredSendStatus>New</TriggeredSendStatus>
                 <Email>
                     <PartnerKey xsi:nil="true" />
-                    <ID>483943</ID>
+                    <ID>531213</ID>
                     <ObjectID xsi:nil="true" />
                 </Email>
                 <AutoAddSubscribers>false</AutoAddSubscribers>

package/test/type.asset.test.js

@@ -323,7 +323,122 @@ describe('type: asset', () => {
             return;
         });
 
-        it('Should create an assetwith mis-matching memberId and --keySuffix', async () => {
+        it('Should update an asset with --matchName', async () => {
+            handler.setOptions({ matchName: true });
+            // WHEN
+            const deployResult = await handler.deploy(
+                'testInstance/testBU',
+                ['asset'],
+                ['testExisting_asset_htmlblock-matchName']
+            );
+            // THEN
+            assert.equal(process.exitCode, 0, 'deploy should not have thrown an error');
+
+            // check how many items were deployed
+            assert.equal(
+                deployResult['testInstance/testBU']?.asset
+                    ? Object.keys(deployResult['testInstance/testBU']?.asset).length
+                    : 0,
+                1,
+                '1 assets to be deployed'
+            );
+            const currentCache = cache.getCache();
+
+            const upsertCallout = testUtils.getRestCallout(
+                'patch',
+                '/asset/v1/content/assets/1295064'
+            );
+            assert.equal(
+                upsertCallout?.customerKey,
+                'testExisting_asset_htmlblock-matchName',
+                'customerKey should be testExisting_asset_htmlblock-matchName'
+            );
+            assert.equal(
+                upsertCallout?.id,
+                currentCache.asset['testExisting_asset_htmlblock'].id,
+                'id should be that of the existing testExisting_asset_htmlblock'
+            );
+
+            assert.equal(
+                testUtils.getAPIHistoryLength(),
+                5,
+                'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
+            );
+            return;
+        });
+
+        it('Should not update an asset with --matchName due to multiple potential matches', async () => {
+            handler.setOptions({ matchName: true });
+            // WHEN
+            const deployResult = await handler.deploy(
+                'testInstance/testBU',
+                ['asset'],
+                ['testExisting_asset_htmlblock-matchName-fail']
+            );
+            // THEN
+            assert.equal(process.exitCode, 1, 'deploy should have thrown an error');
+
+            // check how many items were deployed
+            assert.equal(
+                deployResult['testInstance/testBU']?.asset
+                    ? Object.keys(deployResult['testInstance/testBU']?.asset).length
+                    : 0,
+                0,
+                '0 assets to be deployed'
+            );
+
+            const upsertCallout = testUtils.getRestCallout('patch', '/asset/v1/content/assets/%');
+            assert.equal(upsertCallout, null, 'there should have been no patch');
+
+            assert.equal(
+                testUtils.getAPIHistoryLength(),
+                4,
+                'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
+            );
+            return;
+        });
+
+        it('Should create an asset with --matchName because it found no match', async () => {
+            handler.setOptions({ matchName: true });
+            // WHEN
+            const deployResult = await handler.deploy(
+                'testInstance/testBU',
+                ['asset'],
+                ['testExisting_asset_htmlblock-matchName-create']
+            );
+            // THEN
+            assert.equal(process.exitCode, 0, 'deploy should not have thrown an error');
+
+            // check how many items were deployed
+            assert.equal(
+                deployResult['testInstance/testBU']?.asset
+                    ? Object.keys(deployResult['testInstance/testBU']?.asset).length
+                    : 0,
+                1,
+                '1 assets to be deployed'
+            );
+
+            const upsertCallout = testUtils.getRestCallout('post', '/asset/v1/content/assets/');
+            assert.equal(
+                upsertCallout?.customerKey,
+                'testExisting_asset_htmlblock-matchName-create',
+                'asset.customerKey should be testExisting_asset_htmlblock-matchName-create'
+            );
+            assert.equal(
+                upsertCallout?.id,
+                undefined,
+                'asset.id should not be set as we are in a create call'
+            );
+
+            assert.equal(
+                testUtils.getAPIHistoryLength(),
+                5,
+                'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
+            );
+            return;
+        });
+
+        it('Should create an asset with mis-matching memberId and --keySuffix', async () => {
             handler.setOptions({ keySuffix: '_DEV' });
             // WHEN
             const deployResult = await handler.deploy(
@@ -357,7 +472,7 @@ describe('type: asset', () => {
             return;
         });
 
-        it('Should create an assetwith mis-matching memberId', async () => {
+        it('Should create an asset with mis-matching memberId', async () => {
             // WHEN
             const deployResult = await handler.deploy(
                 'testInstance/testBU',

package/test/utils.js

@@ -13,7 +13,13 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 import fsmock from 'mock-fs';
 
 let apimock;
-import { handleSOAPRequest, handleRESTRequest, soapUrl, restUrl } from './resourceFactory.js';
+import {
+    handleSOAPRequest,
+    handleRESTRequest,
+    soapUrl,
+    restUrl,
+    tWarn,
+} from './resourceFactory.js';
 const authResources = File.readJsonSync(path.join(__dirname, './resources/auth.json'));
 
 /**
@@ -174,6 +180,7 @@ export function mockSetup(isDeploy) {
             json: undefined,
             keySuffix: undefined,
             like: undefined,
+            matchName: undefined,
             noUpdate: undefined,
             publish: undefined,
             referenceFrom: undefined,
@@ -288,10 +295,28 @@ export function getAPIHistory() {
  * @returns {object} json payload of the request
  */
 export function getRestCallout(method, url) {
+    if (!apimock.history[method]?.length) {
+        console.log(`${tWarn} No history for method ${method}.`); // eslint-disable-line no-console
+        const methods = Object.keys(apimock.history)
+            .filter((el) => apimock.history[el]?.length)
+            .join(', ');
+        console.error(`Available methods: ${methods}`); // eslint-disable-line no-console
+        return null;
+    }
     const subset = apimock.history[method];
     const myCallout = subset.find((item) =>
         url.endsWith('%') ? item.url.startsWith(url.slice(0, -1)) : item.url === url
     );
+    if (!myCallout) {
+        console.error(`${tWarn} No callout found for ${method} ${url}`); // eslint-disable-line no-console
+        const urls = [...new Set(subset.map((el) => el.url))].join('\n- ');
+        const methods = Object.keys(apimock.history)
+            .filter((el) => apimock.history[el]?.length)
+            .join(', ');
+        console.error(`Available methods: ${methods}`); // eslint-disable-line no-console
+        console.error(`Available unique urls in method ${method}:\n- ${urls}`); // eslint-disable-line no-console
+        return null;
+    }
     return JSON.parse(myCallout.data);
 }
 /**
@@ -318,6 +343,10 @@ export function getSoapCallouts(requestAction, objectType) {
                   : false
         )
         .map((item) => item.data);
+    if (!myCallout) {
+        console.error(`${tWarn} No callout found for ${requestAction} ${objectType || ''}`); // eslint-disable-line no-console
+        return null;
+    }
     return myCallout;
 }
 /**

package/types/mcdev.d.js

@@ -444,8 +444,8 @@ complex
  * @typedef {'error'|'verbose'|'info'|'debug'} LoggerLevel
  * @typedef {object} McdevLogger
  * @property {LoggerLevel} [level] (msg) print info message
- * @property {Function} error (msg) print error message
- * @property {Function} errorStack (ex, msg) print error with trace message
+ * @property {(msg:string)=>void} error (msg) print error message; wrapper around winstonLogger.error that also sets error code to 1
+ * @property {(ex:SDKError,message?:string)=>void} errorStack print error with trace message
  * @typedef {import('winston').Logger & McdevLogger} Logger
  */
 /**

package/test/resources/9999999/asset/v1/content/assets/query/post-response-assetType.idIN223,224,225,226,227,228,214,4.json

@@ -1,35 +0,0 @@
-{
-    "count": 1,
-    "page": 1,
-    "pageSize": 50,
-    "links": {},
-    "items": [
-        {
-            "id": 5286,
-            "customerKey": "testExisting_asset_template",
-            "assetType": {
-                "id": 4,
-                "name": "template",
-                "displayName": "Template"
-            },
-            "name": " testExisting_asset_template",
-            "createdDate": "2024-04-22T03:33:08.253-06:00",
-            "createdBy": {
-                "id": 710411605,
-                "email": "joern.berkefeld@accenture.com",
-                "name": "Jörn Berkefeld",
-                "userId": "710411605"
-            },
-            "modifiedDate": "2024-05-13T07:12:13.117-06:00",
-            "modifiedBy": {
-                "id": 710420432,
-                "name": "joern.berkefeld app user",
-                "userId": "710420432"
-            },
-            "category": {
-                "id": 89397
-            },
-            "modelVersion": 2
-        }
-    ]
-}

package/test/resources/9999999/asset/v1/content/assets/query/post-response-assetType.idIN223,224,225,226,227,228.json

@@ -1,7 +0,0 @@
-{
-    "count": 0,
-    "page": 1,
-    "pageSize": 50,
-    "links": {},
-    "items": []
-}