mcdev 9.0.2 → 9.0.3

package/test/type.attributeSet.test.js

@@ -52,5 +52,46 @@ describe('type: attributeSet', () => {
             );
             return;
         });
+
+        it('Should resolve shared dataExtensions in attributeSet when retrieved together with dataExtension', async () => {
+            // WHEN
+            // this test verifies the fix for: shared DEs not resolved if attributeSet+dataExtension is retrieved together
+            const retrieve = await handler.retrieve('testInstance/testBU', [
+                'dataExtension',
+                'attributeSet',
+            ]);
+
+            // THEN
+            assert.equal(process.exitCode, 0, 'retrieve should not have thrown an error');
+            assert.equal(
+                retrieve['testInstance/testBU'].attributeSet
+                    ? Object.keys(retrieve['testInstance/testBU'].attributeSet).length
+                    : 0,
+                28,
+                'only 28 attributeSets expected in retrieve response'
+            );
+            // get results from cache
+            const result = cache.getCache();
+            assert.equal(
+                result.attributeSet ? Object.keys(result.attributeSet).length : 0,
+                28,
+                'only 28 attributeSets expected in cache'
+            );
+
+            // verify that shared DE was resolved correctly in attributeSet (this is the key bug fix check)
+            assert.deepEqual(
+                await testUtils.getActualJson('testExisting_dataExtensionShared', 'attributeSet'),
+                await testUtils.getExpectedJson('9999999', 'attributeSet', 'retrieve'),
+
+                'returned metadata was not equal expected - shared DE should be resolved even when dataExtension is retrieved together with attributeSet'
+            );
+
+            assert.equal(
+                testUtils.getAPIHistoryLength(),
+                9,
+                'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
+            );
+            return;
+        });
     });
 });

package/test/type.automation.test.js

@@ -681,7 +681,7 @@ describe('type: automation', () => {
             await handler.retrieve('testInstance/testBU');
             assert.equal(process.exitCode, 0, 'retrieve should not have thrown an error');
 
-            const expectedApiCallsRetrieve = 109;
+            const expectedApiCallsRetrieve = 111;
             assert.equal(
                 testUtils.getAPIHistoryLength(),
                 expectedApiCallsRetrieve,

package/test/type.journey.test.js

@@ -26,7 +26,7 @@ describe('type: journey', () => {
             const result = cache.getCache();
             assert.equal(
                 result.journey ? Object.keys(result.journey).length : 0,
-                5,
+                6,
                 'unexpected number of journeys'
             );
             assert.deepEqual(
@@ -44,9 +44,52 @@ describe('type: journey', () => {
                 await testUtils.getExpectedJson('9999999', 'journey', 'get-transactionalEmail'),
                 'returned JSON was not equal expected'
             );
+            assert.deepEqual(
+                await testUtils.getActualJson(
+                    'testExisting_journey_updatecontact_sharedDE',
+                    'journey'
+                ),
+                await testUtils.getExpectedJson('9999999', 'journey', 'get-updatecontact-sharedDE'),
+                'returned JSON was not equal expected'
+            );
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                29,
+                31,
+                'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
+            );
+            return;
+        });
+
+        it('Should retrieve journeys with dataExtension type simultaneously (mcdev retrieve cred/bu -m journey dataExtension)', async () => {
+            // WHEN - both types at once, no keys: unrelated DEs present alongside UPDATECONTACTDATA DEs
+            await handler.retrieve('testInstance/testBU', ['journey', 'dataExtension']);
+            // THEN
+            assert.equal(process.exitCode, 0, 'retrieve should not have thrown an error');
+            // get results from cache
+            const result = cache.getCache();
+            assert.equal(
+                result.journey ? Object.keys(result.journey).length : 0,
+                6,
+                'unexpected number of journeys (includes local-DE and shared-DE UPDATECONTACTDATA journeys)'
+            );
+            // Verify UPDATECONTACTDATA activity with local DE is correctly resolved
+            assert.deepEqual(
+                await testUtils.getActualJson('testExisting_journey_updatecontact', 'journey'),
+                await testUtils.getExpectedJson('9999999', 'journey', 'get-updatecontact'),
+                'returned JSON was not equal expected for journey with local DE updatecontact activity'
+            );
+            // Verify UPDATECONTACTDATA activity with shared DE is correctly resolved
+            assert.deepEqual(
+                await testUtils.getActualJson(
+                    'testExisting_journey_updatecontact_sharedDE',
+                    'journey'
+                ),
+                await testUtils.getExpectedJson('9999999', 'journey', 'get-updatecontact-sharedDE'),
+                'returned JSON was not equal expected for journey with shared DE updatecontact activity'
+            );
+            assert.equal(
+                testUtils.getAPIHistoryLength(),
+                34,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
@@ -167,6 +210,39 @@ describe('type: journey', () => {
             return;
         });
 
+        it('Should retrieve a journey containing an UPDATECONTACTDATA activity referencing a shared DE with key', async () => {
+            // WHEN
+            await handler.retrieve(
+                'testInstance/testBU',
+                ['journey'],
+                ['testExisting_journey_updatecontact_sharedDE']
+            );
+            // THEN
+            assert.equal(process.exitCode, 0, 'retrieve should not have thrown an error');
+            // get results from cache
+            const result = cache.getCache();
+            assert.equal(
+                result.journey ? Object.keys(result.journey).length : 0,
+                1,
+                'only 1 journeys expected'
+            );
+
+            assert.deepEqual(
+                await testUtils.getActualJson(
+                    'testExisting_journey_updatecontact_sharedDE',
+                    'journey'
+                ),
+                await testUtils.getExpectedJson('9999999', 'journey', 'get-updatecontact-sharedDE'),
+                'returned JSON was not equal expected'
+            );
+            assert.equal(
+                testUtils.getAPIHistoryLength(),
+                20,
+                'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
+            );
+            return;
+        });
+
         it('Should retrieve a Transactional Email journey with key', async () => {
             // WHEN
             await handler.retrieve('testInstance/testBU', ['journey'], ['testExisting_temail']);
@@ -504,6 +580,32 @@ describe('type: journey', () => {
             );
             return;
         });
+
+        it('Should update a journey with UPDATECONTACT activity referencing a shared DE', async () => {
+            // WHEN
+            await handler.deploy(
+                'testInstance/testBU',
+                ['journey'],
+                ['testExisting_journey_updatecontact_sharedDE']
+            );
+            // THEN
+            assert.equal(process.exitCode, 0, 'deploy should not have thrown an error');
+            // confirm updated item
+            assert.deepEqual(
+                await testUtils.getActualJson(
+                    'testExisting_journey_updatecontact_sharedDE',
+                    'journey'
+                ),
+                await testUtils.getExpectedJson('9999999', 'journey', 'put-updatecontact-sharedDE'),
+                'returned metadata was not equal expected for update journey with shared DE updatecontact activity'
+            );
+            assert.equal(
+                testUtils.getAPIHistoryLength(),
+                22,
+                'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
+            );
+            return;
+        });
     });
 
     describe('Templating ================', () => {
@@ -545,7 +647,7 @@ describe('type: journey', () => {
 
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                29,
+                31,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
@@ -741,7 +843,7 @@ describe('type: journey', () => {
 
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                35,
+                37,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
@@ -776,7 +878,7 @@ describe('type: journey', () => {
 
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                35,
+                37,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;
@@ -811,7 +913,7 @@ describe('type: journey', () => {
 
             assert.equal(
                 testUtils.getAPIHistoryLength(),
-                35,
+                37,
                 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
             );
             return;

package/test/type.query.test.js

@@ -27,8 +27,8 @@ describe('type: query', () => {
             const result = cache.getCache();
             assert.equal(
                 result.query ? Object.keys(result.query).length : 0,
-                4,
-                'only 4 queries expected'
+                5,
+                'only 5 queries expected'
             );
             // normal test
             assert.deepEqual(
@@ -54,6 +54,37 @@ describe('type: query', () => {
             return;
         });
 
+        it('Should resolve shared dataExtensions in query when retrieved together with dataExtension', async () => {
+            // WHEN
+            // this test verifies the fix for: shared DEs not resolved if query+dataExtension is retrieved together
+            await handler.retrieve('testInstance/testBU', ['dataExtension', 'query']);
+            // THEN
+            assert.equal(process.exitCode, 0, 'retrieve should not have thrown an error');
+            // get results from cache
+            const result = cache.getCache();
+            assert.equal(
+                result.query ? Object.keys(result.query).length : 0,
+                5,
+                'only 5 queries expected'
+            );
+            // verify that shared DE was resolved correctly in query (this is the key bug fix check)
+            assert.deepEqual(
+                await testUtils.getActualJson('testExisting_query_SharedDE', 'query'),
+                await testUtils.getExpectedJson('9999999', 'query', 'get_sharedDE'),
+                'returned metadata was not equal expected - shared DE should be resolved even when dataExtension is retrieved together with query'
+            );
+            expect(
+                await testUtils.getActualFile('testExisting_query_SharedDE', 'query', 'sql')
+            ).to.equal(await testUtils.getExpectedFile('9999999', 'query', 'get_sharedDE', 'sql'));
+
+            assert.equal(
+                testUtils.getAPIHistoryLength(),
+                8,
+                'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests'
+            );
+            return;
+        });
+
         it('Should retrieve one specific query by key', async () => {
             // WHEN
             await handler.retrieve('testInstance/testBU', ['query'], ['testExisting_query']);
@@ -92,8 +123,8 @@ describe('type: query', () => {
             const result = cache.getCache();
             assert.equal(
                 result.query ? Object.keys(result.query).length : 0,
-                4,
-                '4 queries in cache expected'
+                5,
+                '5 queries in cache expected'
             );
             assert.deepEqual(
                 await testUtils.getActualJson('testExisting_query', 'query'),
@@ -123,8 +154,8 @@ describe('type: query', () => {
             const result = cache.getCache();
             assert.equal(
                 result.query ? Object.keys(result.query).length : 0,
-                4,
-                '4 queries in cache expected'
+                5,
+                '5 queries in cache expected'
             );
 
             expect(await testUtils.getActualFile('testExisting_query', 'query', 'sql')).to.not
@@ -165,8 +196,8 @@ describe('type: query', () => {
             const result = cache.getCache();
             assert.equal(
                 result.query ? Object.keys(result.query).length : 0,
-                5,
-                '5 queries expected in cache'
+                6,
+                '6 queries expected in cache'
             );
             // confirm created item
             assert.deepEqual(
@@ -784,6 +815,72 @@ describe('type: query', () => {
             return;
         });
 
+        it('Should warn about shared dataExtension in _ParentBU_ when running buildTemplate with --dependencies on child BU', async () => {
+            // Retrieve shared DEs from _ParentBU_ to disk first
+            await handler.retrieve('testInstance/_ParentBU_', ['dataExtension']);
+            assert.equal(
+                process.exitCode,
+                0,
+                '_ParentBU_ retrieve should not have thrown an error'
+            );
+            const expectedApiCallsParentBURetrieve = 4;
+            assert.equal(
+                testUtils.getAPIHistoryLength(),
+                expectedApiCallsParentBURetrieve,
+                'Unexpected number of requests for _ParentBU_ dataExtension retrieve'
+            );
+
+            // Retrieve query from child BU (testBU)
+            await handler.retrieve('testInstance/testBU', ['query']);
+            assert.equal(
+                process.exitCode,
+                0,
+                'testBU query retrieve should not have thrown an error'
+            );
+            const expectedApiCallsTestBURetrieve = 5;
+            assert.equal(
+                testUtils.getAPIHistoryLength() - expectedApiCallsParentBURetrieve,
+                expectedApiCallsTestBURetrieve,
+                'Unexpected number of requests for testBU query retrieve'
+            );
+
+            // Run buildTemplate with --dependencies: shared DE must show a warning, not be included in result
+            handler.setOptions({ dependencies: true, skipInteraction: true });
+            const templateResult = await handler.buildTemplate(
+                'testInstance/testBU',
+                'query',
+                ['testExisting_query_SharedDE'],
+                ['testSourceMarket']
+            );
+            assert.equal(process.exitCode, 0, 'buildTemplate should not have thrown an error');
+
+            // Verify query was templated
+            assert.equal(
+                templateResult.query ? templateResult.query.length : 0,
+                1,
+                'expected one query to be templated'
+            );
+            assert.deepEqual(
+                await testUtils.getActualTemplateJson('testExisting_query_SharedDE', 'query'),
+                await testUtils.getExpectedJson('9999999', 'query', 'template_sharedDE'),
+                'returned query template JSON was not equal expected'
+            );
+            expect(
+                await testUtils.getActualTemplateFile('testExisting_query_SharedDE', 'query', 'sql')
+            ).to.equal(
+                await testUtils.getExpectedFile('9999999', 'query', 'template_sharedDE', 'sql')
+            );
+
+            // Verify shared DE was NOT included in template result (only a warning should be shown)
+            assert.equal(
+                templateResult.dataExtension ? templateResult.dataExtension.length : 0,
+                0,
+                'shared DE should not be included in the child BU template result - only a warning should be shown'
+            );
+
+            return;
+        });
+
         it('Should create a query template via buildTemplate and build it', async () => {
             // download first before we test buildTemplate
             await handler.retrieve('testInstance/testBU', ['query']);