From 70f2bfad577f679ea2df4fc93f82ea67580de62f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Mon, 22 Jul 2024 11:07:25 +0200 Subject: [PATCH 1/4] #1470: TESTING: include QueryAllAcounts in soap response paths --- @types/lib/metadataTypes/Folder.d.ts.map | 2 +- @types/lib/util/util.d.ts.map | 2 +- lib/metadataTypes/Folder.js | 42 +- .../definitions/Folder.definition.js | 17 +- lib/util/util.js | 3 +- test/general.test.js | 24 - test/resourceFactory.js | 54 +- ...isting_userANDEmaillike@-QAA-response.xml} | 0 ...eFlag=falseANDEmaillike@-QAA-response.xml} | 0 ...isting_userANDEmaillike@-QAA-response.xml} | 0 ...MustChangePassword=false-QAA-response.xml} | 0 ...veFlag=trueANDEmaillike@-QAA-response.xml} | 0 ...erANDMustChangePassword=false-response.xml | 27 - ...l => retrieve-ID=1111111-QAA-response.xml} | 0 ...ynchronizeddataextension-QAA-response.xml} | 0 ...on,synchronizeddataextension-response.xml} | 0 .../1111111/dataFolder/retrieve-response-.xml | 387 +++++++++++++ .../get-response-Name=testExisting_query.json | 24 + ...get-response-name=testExisting_script.json | 17 + ...-ContentType=asset-shared-QAA-response.xml | 70 +++ ...ieve-ContentType=asset-shared-response.xml | 70 +++ .../retrieve-ContentType=journey-response.xml | 48 ++ ...sjsactiv,triggered,triggered-response.xml} | 0 ...tTypeINasset,asset-shared-QAA-response.xml | 70 +++ ...tentTypeINasset,asset-shared-response.xml} | 0 ...synchronizeddataextension-QAA-response.xml | 431 +++++++++++++++ ...ynchronizeddataextension-QAA-response.xml} | 0 ...ion,synchronizeddataextension-response.xml | 117 ++++ ...synchronizeddataextension-QAA-response.xml | 251 +++++++++ ...riggered_send_journeybuilder-response.xml} | 0 ...,contextual_suppression_list-response.xml} | 0 ...jsactivity,asset,asset-shared-response.xml | 92 ++++ .../9999999/dataFolder/retrieve-response-.xml | 519 ++++++++++++++++++ test/type.automation.test.js | 26 +- test/type.journey.test.js | 18 +- test/type.query.test.js | 36 +- test/type.script.test.js | 20 +- test/type.transactionalEmail.test.js | 6 +- test/type.triggeredSend.test.js | 6 +- 39 files changed, 2229 insertions(+), 150 deletions(-) rename test/resources/1111111/accountUser/{retrieve-ActiveFlag=falseANDCustomerKey=testExisting_userANDEmaillike@-response.xml => retrieve-ActiveFlag=falseANDCustomerKey=testExisting_userANDEmaillike@-QAA-response.xml} (100%) rename test/resources/1111111/accountUser/{retrieve-ActiveFlag=falseANDEmaillike@-response.xml => retrieve-ActiveFlag=falseANDEmaillike@-QAA-response.xml} (100%) rename test/resources/1111111/accountUser/{retrieve-ActiveFlag=trueANDCustomerKey=testExisting_userANDEmaillike@-response.xml => retrieve-ActiveFlag=trueANDCustomerKey=testExisting_userANDEmaillike@-QAA-response.xml} (100%) rename test/resources/1111111/accountUser/{retrieve-ActiveFlag=trueANDEmailisNullORNamelikeapp userANDMustChangePassword=false-response.xml => retrieve-ActiveFlag=trueANDEmailisNullORNamelikeapp userANDMustChangePassword=false-QAA-response.xml} (100%) rename test/resources/1111111/accountUser/{retrieve-ActiveFlag=trueANDEmaillike@-response.xml => retrieve-ActiveFlag=trueANDEmaillike@-QAA-response.xml} (100%) delete mode 100644 test/resources/1111111/accountUser/retrieve-CustomerKey=testExisting_userANDActiveFlag=trueANDEmailisNullORNamelikeapp userANDMustChangePassword=false-response.xml rename test/resources/1111111/businessUnit/{retrieve-ID=1111111-response.xml => retrieve-ID=1111111-QAA-response.xml} (100%) rename test/resources/1111111/dataFolder/{retrieve-ContentType=synchronizeddataextensionORContentType=shared_salesforcedataextensionORContentType=shared_dataextensionORContentType=shared_dataORContentType=salesforcedataextensionORContentType=dataextensionORContentType=hidden-response.xml => retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml} (100%) rename test/resources/1111111/dataFolder/{retrieve-response.xml => retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml} (100%) create mode 100644 test/resources/1111111/dataFolder/retrieve-response-.xml create mode 100644 test/resources/9999999/automation/v1/queries/get-response-Name=testExisting_query.json create mode 100644 test/resources/9999999/automation/v1/scripts/get-response-name=testExisting_script.json create mode 100644 test/resources/9999999/dataFolder/retrieve-ContentType=asset-shared-QAA-response.xml create mode 100644 test/resources/9999999/dataFolder/retrieve-ContentType=asset-shared-response.xml create mode 100644 test/resources/9999999/dataFolder/retrieve-ContentType=journey-response.xml rename test/resources/9999999/dataFolder/{retrieve-response.xml => retrieve-ContentTypeINasset,asset-sha,hidden,dataexten,salesforc,shared_da,shared_da,shared_sa,synchroni,automatio,useriniti,journey,mysubs,list,publicati,queryacti,ssjsactiv,triggered,triggered-response.xml} (100%) create mode 100644 test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-shared-QAA-response.xml rename test/resources/9999999/dataFolder/{retrieve-ContentType=asset-sharedORContentType=asset-response.xml => retrieve-ContentTypeINasset,asset-shared-response.xml} (100%) create mode 100644 test/resources/9999999/dataFolder/retrieve-ContentTypeINasset-shared,hidden,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml rename test/resources/9999999/dataFolder/{retrieve-ContentType=synchronizeddataextensionORContentType=shared_salesforcedataextensionORContentType=shared_dataextensionORContentType=shared_dataORContentType=salesforcedataextensionORContentType=dataextensionORContentType=hidden-response.xml => retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml} (100%) create mode 100644 test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml create mode 100644 test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml rename test/resources/9999999/dataFolder/{retrieve-ContentType=triggered_send_journeybuilderORContentType=triggered_sendORContentType=hidden-response.xml => retrieve-ContentTypeINhidden,triggered_send,triggered_send_journeybuilder-response.xml} (100%) rename test/resources/9999999/dataFolder/{retrieve-ContentType=contextual_suppression_listORContentType=publicationORContentType=suppression_listORContentType=mysubsORContentType=list-response.xml => retrieve-ContentTypeINlist,mysubs,suppression_list,publication,contextual_suppression_list-response.xml} (100%) create mode 100644 test/resources/9999999/dataFolder/retrieve-ContentTypeINssjsactivity,asset,asset-shared-response.xml create mode 100644 test/resources/9999999/dataFolder/retrieve-response-.xml diff --git a/@types/lib/metadataTypes/Folder.d.ts.map b/@types/lib/metadataTypes/Folder.d.ts.map index a5809b27a..b2ee17d38 100644 --- a/@types/lib/metadataTypes/Folder.d.ts.map +++ b/@types/lib/metadataTypes/Folder.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Folder.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Folder.js"],"names":[],"mappings":";uBASa,OAAO,wBAAwB,EAAE,QAAQ;0BACzC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;+BAChD,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;gCACnD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;AAVzD;;;;;;;;;;;GAWG;AAEH;;;;GAIG;AACH;IACI;;;;;;;;OAQG;IACH,6BANW,MAAM,qBACN,MAAM,EAAE,eACR,MAAM,EAAE,QACR,MAAM,gBA8HhB;IAED;;;;;;OAMG;IACH,4BAJW,IAAI,GAAG,MAAM,EAAE,eACf,MAAM,EAAE,gBAKlB;IAED;;;;;;;OAOG;IACH,wBAHW,eAAe,GACb,OAAO,CAAE,MAAM,CAAC,CAuK5B;IAED;;;;;OAKG;IACH,6BAHW,gBAAgB,gBA4D1B;IAED;;;;;OAKG;IACH,6BAHW,gBAAgB,gBAyB1B;IAED;;;;;OAKG;IACH,gCAHW,gBAAgB,GACd,OAAO,CAAE,gBAAgB,CAAC,CAgDtC;IAED;;;;;;OAMG;IACH,0BAJW,MAAM,gBACN,OAAO,GACL,OAAO,CAAE,eAAe,CAAC,CAkErC;IAED;;;;;;;OAOG;IACH,yCALW,MAAM,EAAE,qBACR,OAAO,oBACP,MAAM,EAAE,GACN,OAAO,CAAE,MAAM,CAAC,CA+B5B;IACD;;;;;OAKG;IACH,mCAHW,gBAAgB,GACd,gBAAgB,CAI5B;IACD;;;;;;;OAOG;IACH,4BALW,eAAe,eACf,MAAM,OACN,MAAM,GAAG,MAAM,GACb,OAAO,CAAE,MAAM,CAAC,CAuD5B;CACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBApqBwB,mBAAmB"} \ No newline at end of file +{"version":3,"file":"Folder.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Folder.js"],"names":[],"mappings":";uBASa,OAAO,wBAAwB,EAAE,QAAQ;0BACzC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;+BAChD,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;gCACnD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;AAVzD;;;;;;;;;;;GAWG;AAEH;;;;GAIG;AACH;IACI;;;;;;;;OAQG;IACH,6BANW,MAAM,qBACN,MAAM,EAAE,eACR,MAAM,EAAE,QACR,MAAM,gBAmIhB;IAED;;;;;;OAMG;IACH,4BAJW,IAAI,GAAG,MAAM,EAAE,eACf,MAAM,EAAE,gBAKlB;IAED;;;;;;;OAOG;IACH,wBAHW,eAAe,GACb,OAAO,CAAE,MAAM,CAAC,CAuK5B;IAED;;;;;OAKG;IACH,6BAHW,gBAAgB,gBA4D1B;IAED;;;;;OAKG;IACH,6BAHW,gBAAgB,gBAyB1B;IAED;;;;;OAKG;IACH,gCAHW,gBAAgB,GACd,OAAO,CAAE,gBAAgB,CAAC,CAgDtC;IAED;;;;;;OAMG;IACH,0BAJW,MAAM,gBACN,OAAO,GACL,OAAO,CAAE,eAAe,CAAC,CAkErC;IAED;;;;;;;OAOG;IACH,yCALW,MAAM,EAAE,qBACR,OAAO,oBACP,MAAM,EAAE,GACN,OAAO,CAAE,MAAM,CAAC,CA0B5B;IACD;;;;;OAKG;IACH,mCAHW,gBAAgB,GACd,gBAAgB,CAI5B;IACD;;;;;;;OAOG;IACH,4BALW,eAAe,eACf,MAAM,OACN,MAAM,GAAG,MAAM,GACb,OAAO,CAAE,MAAM,CAAC,CAuD5B;CACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBApqBwB,mBAAmB"} \ No newline at end of file diff --git a/@types/lib/util/util.d.ts.map b/@types/lib/util/util.d.ts.map index a5f39d708..a8217b9b6 100644 --- a/@types/lib/util/util.d.ts.map +++ b/@types/lib/util/util.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../lib/util/util.js"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../lib/util/util.js"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/metadataTypes/Folder.js b/lib/metadataTypes/Folder.js index 20a8e07f7..cc04d334c 100644 --- a/lib/metadataTypes/Folder.js +++ b/lib/metadataTypes/Folder.js @@ -38,12 +38,17 @@ class Folder extends MetadataType { if (key) { Util.logger.error(`Folder.retrieve() does not support key parameter`); } - const queryAllFolders = await this.retrieveHelper(additionalFields, true, subTypeArr); + const queryAllFolders = await this.retrieveHelper(additionalFields, false, subTypeArr); if (this.buObject.eid !== this.buObject.mid) { - queryAllFolders.push( - ...(await this.retrieveHelper(additionalFields, false, subTypeArr)) - ); + const selectedParentTypes = subTypeArr?.length + ? subTypeArr.filter((item) => this.definition.folderTypesFromParent.includes(item)) + : subTypeArr; + if (!subTypeArr?.length || selectedParentTypes.length) { + queryAllFolders.push( + ...(await this.retrieveHelper(additionalFields, true, selectedParentTypes)) + ); + } } const sortPairs = toposort(queryAllFolders.map((a) => [a.ParentFolder.ID, a.ID])); const idMap = {}; @@ -578,23 +583,18 @@ class Folder extends MetadataType { static async retrieveHelper(additionalFields, queryAllAccounts, contentTypeList) { const options = { QueryAllAccounts: !!queryAllAccounts }; if (contentTypeList) { - for (const contentType of contentTypeList) { - options.filter = options.filter - ? { - leftOperand: { - leftOperand: 'ContentType', - operator: 'equals', - rightOperand: contentType, - }, - operator: 'OR', - rightOperand: options.filter, - } - : { - leftOperand: 'ContentType', - operator: 'equals', - rightOperand: contentType, - }; - } + const newFilter = { + leftOperand: 'ContentType', + operator: contentTypeList.length === 1 ? 'equals' : 'IN', + rightOperand: contentTypeList.length === 1 ? contentTypeList[0] : contentTypeList, + }; + options.filter = options.filter + ? { + leftOperand: newFilter, + operator: 'OR', + rightOperand: options.filter, + } + : newFilter; } const response = await this.client.soap.retrieveBulk( 'DataFolder', diff --git a/lib/metadataTypes/definitions/Folder.definition.js b/lib/metadataTypes/definitions/Folder.definition.js index dec5b1f9d..21a111518 100644 --- a/lib/metadataTypes/definitions/Folder.definition.js +++ b/lib/metadataTypes/definitions/Folder.definition.js @@ -10,10 +10,10 @@ export default { 'dataextension', 'filteractivity', 'filterdefinition', + 'hidden', 'journey', 'list', 'mysubs', - 'mysubs', 'publication', 'queryactivity', 'salesforcedataextension', @@ -61,18 +61,19 @@ export default { 'shared salesforce data extensions', ], folderTypesFromParent: [ + 'asset-shared', + 'hidden', + 'shared_content', 'shared_data', 'shared_dataextension', - 'shared_salesforcedataextension', - 'synchronizeddataextension', + 'shared_email', 'shared_item', 'shared_portfolio', - 'shared_template', - 'shared_email', - 'shared_content', - 'shared_suppression_list', 'shared_publication', - 'asset-shared', + 'shared_salesforcedataextension', + 'shared_suppression_list', + 'shared_template', + 'synchronizeddataextension', ], hasExtended: false, idField: 'ID', diff --git a/lib/util/util.js b/lib/util/util.js index bc9197d03..47ebe264d 100644 --- a/lib/util/util.js +++ b/lib/util/util.js @@ -1043,7 +1043,8 @@ export const Util = { */ getTypeKeyCount(selectedTypes) { return Object.keys(selectedTypes).reduce( - (previousValue, type) => previousValue + selectedTypes[type].length, + (previousValue, type) => + previousValue + (selectedTypes[type] ? selectedTypes[type].length : 0), 0 ); }, diff --git a/test/general.test.js b/test/general.test.js index 188a031ca..5ca501833 100644 --- a/test/general.test.js +++ b/test/general.test.js @@ -800,15 +800,7 @@ describe('GENERAL', () => { }); it('buildTemplate + buildDefinition for multiple types with keys and --retrieve', async () => { - // download first before we test buildTemplate - // await handler.retrieve('testInstance/testBU', ['automation', 'query']); - const expectedApiCallsRetrieve = 28; - // assert.equal( - // testUtils.getAPIHistoryLength(), - // expectedApiCallsRetrieve, - // 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' - // ); // preparation const argvMetadata = [ @@ -1041,15 +1033,7 @@ describe('GENERAL', () => { }); it('buildTemplate + buildDefinition for multiple types with keys and --dependencies and --retrieve', async () => { - // download first before we test buildTemplate - // await handler.retrieve('testInstance/testBU'); - const expectedApiCallsRetrieve = 78; - // assert.equal( - // testUtils.getAPIHistoryLength(), - // expectedApiCallsRetrieve, - // 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' - // ); // preparation const argvMetadata = [ @@ -1567,15 +1551,7 @@ describe('GENERAL', () => { }); it('build multiple type with keys and --dependencies and --retrieve', async () => { - // download everything before we test buildTemplate - // await handler.retrieve('testInstance/testBU'); - const expectedApiCallsRetrieve = 78; - // assert.equal( - // testUtils.getAPIHistoryLength(), - // expectedApiCallsRetrieve, - // 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' - // ); // preparation const argvMetadata = [ diff --git a/test/resourceFactory.js b/test/resourceFactory.js index ba7302c58..ce0472c4d 100644 --- a/test/resourceFactory.js +++ b/test/resourceFactory.js @@ -37,12 +37,13 @@ if (Util.isRunViaVSCodeExtension) { * @param {string} type metadata Type * @param {string} mid of Business Unit * @param {object|string} filter likely for customer key + * @param {boolean} [QueryAllAccounts] get data from other BUs or not * @returns {Promise.} relevant metadata stringified */ -async function loadSOAPRecords(mcdevAction, type, mid, filter) { +async function loadSOAPRecords(mcdevAction, type, mid, filter, QueryAllAccounts) { type = type[0].toLowerCase() + type.slice(1); const testPath = path.join('test', 'resources', mid.toString(), type, mcdevAction); - const filterPath = typeof filter === 'string' && filter ? '-' + filter : filterToPath(filter); + const filterPath = getFilterPath(filter, QueryAllAccounts); if (await fs.pathExists(testPath + filterPath + '-response.xml')) { return fs.readFile(testPath + filterPath + '-response.xml', { encoding: 'utf8', @@ -79,6 +80,26 @@ async function loadSOAPRecords(mcdevAction, type, mid, filter) { encoding: 'utf8', }); } +/** + * helper for {@link loadSOAPRecords} to get the filter path + * + * @param {object|string} filter likely for customer key + * @param {boolean} [QueryAllAccounts] get data from other BUs or not + * @param {number} [shorten] number of characters to shorten filters by to match windows max file length of 256 chars + * @returns {string} filterPath value + */ +function getFilterPath(filter, QueryAllAccounts, shorten) { + const filterPath = + (typeof filter === 'string' && filter ? '-' + filter : filterToPath(filter, shorten)) + + (QueryAllAccounts ? '-QAA' : ''); + if ((filterPath + '-response.xml').length > 256) { + shorten ||= 10; + return getFilterPath(filter, QueryAllAccounts, --shorten); + } else { + return filterPath; + } +} + /** * main filter to path function * @@ -89,11 +110,12 @@ async function loadSOAPRecords(mcdevAction, type, mid, filter) { * @param {object} filter.LeftOperand contains a filter object itself * @param {'AND'|'OR'} filter.LogicalOperator string representation of the comparison method * @param {object} filter.RightOperand field value to check for + * @param {number} [shorten] number of characters to shorten filters by to match windows max file length of 256 chars * @returns {string} string represenation of the entire filter */ -export function filterToPath(filter) { +export function filterToPath(filter, shorten) { if (filter) { - return '-' + _filterToPath(filter); + return '-' + _filterToPath(filter, shorten); } return ''; } @@ -107,18 +129,27 @@ export function filterToPath(filter) { * @param {object} filter.LeftOperand contains a filter object itself * @param {'AND'|'OR'} filter.LogicalOperator string representation of the comparison method * @param {object} filter.RightOperand field value to check for + * @param {number} [shorten] number of characters to shorten filters by to match windows max file length of 256 chars * @returns {string} string represenation of the entire filter */ -function _filterToPath(filter) { +function _filterToPath(filter, shorten) { if (filter.Property && filter.SimpleOperator) { - return `${filter.Property}${filter.SimpleOperator.replace('equals', '=')}${ - filter.Value === undefined ? '' : filter.Value - }`; + let value; + if (filter.Value === undefined) { + value = ''; + } else if (Array.isArray(filter.Value)) { + value = shorten + ? filter.Value.map((val) => val.slice(0, Math.max(0, shorten))).join(',') + : filter.Value.join(','); + } else { + value = shorten ? filter.Value.slice(0, Math.max(0, shorten)) : filter.Value; + } + return `${filter.Property}${filter.SimpleOperator.replace('equals', '=')}${value}`; } else if (filter.LeftOperand && filter.LogicalOperator && filter.RightOperand) { return ( - _filterToPath(filter.LeftOperand) + + _filterToPath(filter.LeftOperand, shorten) + filter.LogicalOperator + - _filterToPath(filter.RightOperand) + _filterToPath(filter.RightOperand, shorten) ); } else { throw new Error('unknown filter type'); @@ -141,7 +172,8 @@ export const handleSOAPRequest = async (config) => { config.headers.SOAPAction.toLocaleLowerCase(), jObj.Envelope.Body.RetrieveRequestMsg.RetrieveRequest.ObjectType, jObj.Envelope.Header.fueloauth, - jObj.Envelope.Body.RetrieveRequestMsg.RetrieveRequest.Filter + jObj.Envelope.Body.RetrieveRequestMsg.RetrieveRequest.Filter, + jObj.Envelope.Body.RetrieveRequestMsg.RetrieveRequest.QueryAllAccounts ); break; diff --git a/test/resources/1111111/accountUser/retrieve-ActiveFlag=falseANDCustomerKey=testExisting_userANDEmaillike@-response.xml b/test/resources/1111111/accountUser/retrieve-ActiveFlag=falseANDCustomerKey=testExisting_userANDEmaillike@-QAA-response.xml similarity index 100% rename from test/resources/1111111/accountUser/retrieve-ActiveFlag=falseANDCustomerKey=testExisting_userANDEmaillike@-response.xml rename to test/resources/1111111/accountUser/retrieve-ActiveFlag=falseANDCustomerKey=testExisting_userANDEmaillike@-QAA-response.xml diff --git a/test/resources/1111111/accountUser/retrieve-ActiveFlag=falseANDEmaillike@-response.xml b/test/resources/1111111/accountUser/retrieve-ActiveFlag=falseANDEmaillike@-QAA-response.xml similarity index 100% rename from test/resources/1111111/accountUser/retrieve-ActiveFlag=falseANDEmaillike@-response.xml rename to test/resources/1111111/accountUser/retrieve-ActiveFlag=falseANDEmaillike@-QAA-response.xml diff --git a/test/resources/1111111/accountUser/retrieve-ActiveFlag=trueANDCustomerKey=testExisting_userANDEmaillike@-response.xml b/test/resources/1111111/accountUser/retrieve-ActiveFlag=trueANDCustomerKey=testExisting_userANDEmaillike@-QAA-response.xml similarity index 100% rename from test/resources/1111111/accountUser/retrieve-ActiveFlag=trueANDCustomerKey=testExisting_userANDEmaillike@-response.xml rename to test/resources/1111111/accountUser/retrieve-ActiveFlag=trueANDCustomerKey=testExisting_userANDEmaillike@-QAA-response.xml diff --git a/test/resources/1111111/accountUser/retrieve-ActiveFlag=trueANDEmailisNullORNamelikeapp userANDMustChangePassword=false-response.xml b/test/resources/1111111/accountUser/retrieve-ActiveFlag=trueANDEmailisNullORNamelikeapp userANDMustChangePassword=false-QAA-response.xml similarity index 100% rename from test/resources/1111111/accountUser/retrieve-ActiveFlag=trueANDEmailisNullORNamelikeapp userANDMustChangePassword=false-response.xml rename to test/resources/1111111/accountUser/retrieve-ActiveFlag=trueANDEmailisNullORNamelikeapp userANDMustChangePassword=false-QAA-response.xml diff --git a/test/resources/1111111/accountUser/retrieve-ActiveFlag=trueANDEmaillike@-response.xml b/test/resources/1111111/accountUser/retrieve-ActiveFlag=trueANDEmaillike@-QAA-response.xml similarity index 100% rename from test/resources/1111111/accountUser/retrieve-ActiveFlag=trueANDEmaillike@-response.xml rename to test/resources/1111111/accountUser/retrieve-ActiveFlag=trueANDEmaillike@-QAA-response.xml diff --git a/test/resources/1111111/accountUser/retrieve-CustomerKey=testExisting_userANDActiveFlag=trueANDEmailisNullORNamelikeapp userANDMustChangePassword=false-response.xml b/test/resources/1111111/accountUser/retrieve-CustomerKey=testExisting_userANDActiveFlag=trueANDEmailisNullORNamelikeapp userANDMustChangePassword=false-response.xml deleted file mode 100644 index af1dec2e2..000000000 --- a/test/resources/1111111/accountUser/retrieve-CustomerKey=testExisting_userANDActiveFlag=trueANDEmailisNullORNamelikeapp userANDMustChangePassword=false-response.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - RetrieveResponse - urn:uuid:1babdae0-9282-4bba-b69f-2f1843deaf11 - urn:uuid:39d1c021-b3df-49f9-a8f7-bb444172d2d3 - http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous - - - 2023-03-11T13:53:00Z - 2023-03-11T13:58:00Z - - - - - - OK - 5347bf1d-e801-486a-b4a9-c2d46a8909b6 - - - - \ No newline at end of file diff --git a/test/resources/1111111/businessUnit/retrieve-ID=1111111-response.xml b/test/resources/1111111/businessUnit/retrieve-ID=1111111-QAA-response.xml similarity index 100% rename from test/resources/1111111/businessUnit/retrieve-ID=1111111-response.xml rename to test/resources/1111111/businessUnit/retrieve-ID=1111111-QAA-response.xml diff --git a/test/resources/1111111/dataFolder/retrieve-ContentType=synchronizeddataextensionORContentType=shared_salesforcedataextensionORContentType=shared_dataextensionORContentType=shared_dataORContentType=salesforcedataextensionORContentType=dataextensionORContentType=hidden-response.xml b/test/resources/1111111/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml similarity index 100% rename from test/resources/1111111/dataFolder/retrieve-ContentType=synchronizeddataextensionORContentType=shared_salesforcedataextensionORContentType=shared_dataextensionORContentType=shared_dataORContentType=salesforcedataextensionORContentType=dataextensionORContentType=hidden-response.xml rename to test/resources/1111111/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml diff --git a/test/resources/1111111/dataFolder/retrieve-response.xml b/test/resources/1111111/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml similarity index 100% rename from test/resources/1111111/dataFolder/retrieve-response.xml rename to test/resources/1111111/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml diff --git a/test/resources/1111111/dataFolder/retrieve-response-.xml b/test/resources/1111111/dataFolder/retrieve-response-.xml new file mode 100644 index 000000000..41bb03f59 --- /dev/null +++ b/test/resources/1111111/dataFolder/retrieve-response-.xml @@ -0,0 +1,387 @@ + + + + RetrieveResponse + urn:uuid:4d209b2f-d7ce-4e6e-916c-c8642d368866 + urn:uuid:a850f043-1422-4d16-8443-702dd2f9f13a + http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous + + + 2023-08-11T13:15:46Z + 2023-08-11T13:20:46Z + + + + + + OK + ba1b0c59-78c4-4608-8423-35dda2248d4d + + + 1111111 + + + 2016-07-22T11:52:18.73 + 2016-07-22T11:52:19.603 + 89344 + + shared_data_default + + + 0 + + + Shared Items + + shared_data + true + false + false + + + + 1111111 + + + 2016-07-22T11:52:19.6 + 2016-07-22T11:52:19.6 + 89355 + + dataextension_default + + + 0 + + + Data Extensions + + dataextension + true + false + true + + + + 1111111 + + + 2016-07-22T11:52:19.603 + 2016-07-22T11:52:19.603 + 89356 + + shared_dataextension_default + + + 89344 + + shared_data_default + + Shared Data Extensions + + shared_dataextension + true + false + true + + + + 1111111 + + + 2016-07-29T12:13:27.28 + 2016-07-29T12:13:27.28 + 90889 + + HiddenCategory_default + + + 0 + + + HiddenCategory + Hidden folder to store Hidden items + Hidden + true + false + true + + + + 1111111 + + + 2016-08-23T09:22:27.54 + 2016-08-23T09:22:27.54 + 93698 + + salesforcedataextension_default + + + 0 + + + Salesforce Data Extensions + + salesforcedataextension + true + false + true + + + + 1111111 + + + 2016-08-23T09:22:27.55 + 2016-08-23T09:22:27.55 + 93699 + + shared_salesforcedataextension_defau + + + 89344 + + shared_data_default + + Shared Salesforce Data Extensions + + shared_salesforcedataextension + true + false + true + + + + 1111111 + + + 2020-01-27T10:50:46.573 + 2020-01-27T10:50:46.573 + 309082 + + + + + 89355 + + dataextension_default + + QueryStudioResults + + dataextension + true + true + true + + + + 1111111 + + + 2020-04-17T08:14:19.763 + 2020-04-17T08:14:19.763 + 587750 + + + + + 89356 + + shared_dataextension_default + + catalyst target 1 + + shared_dataextension + true + true + true + + + + 1111111 + + + 2020-07-09T02:30:12.38 + 2021-12-16T03:43:30.753 + 605618 + + dataextension_default + + + 89355 + + dataextension_default + + Audiences + + dataextension + true + true + true + + + + 1111111 + + + 2020-12-25T06:11:40.107 + 2021-12-23T10:51:24.393 + 633441 + + + + + 89355 + + dataextension_default + + System DEs + + dataextension + true + true + true + + + + 1111111 + + + 2021-01-30T11:54:36.11 + 2021-01-30T11:54:36.11 + 638814 + + 0b72bf27-0678-484d-ac0b-a8762b9bec33 + + + 89356 + + shared_dataextension_default + + Customer 360 Segments + All Customer 360 segments will be grouped here. Each sub-folder relates to an activation profile name. + shared_dataextension + true + false + true + + + + 1111111 + + + 2021-01-30T11:56:38.77 + 2021-01-30T11:56:38.77 + 638815 + + cedd206d-178e-41cb-8965-ce255975b046 + + + 638814 + + 0b72bf27-0678-484d-ac0b-a8762b9bec33 + + FirstAudience360 Segment + + shared_dataextension + true + false + false + + + + 1111111 + + + 2021-02-07T10:44:01.413 + 2021-12-16T03:43:33.38 + 639967 + + + + + 89355 + + dataextension_default + + TestAudiences + + dataextension + true + true + true + + + + 1111111 + + + 2021-08-04T15:17:18.533 + 2021-08-04T15:17:18.567 + 675203 + + A19F7E38-7369-497E-826F-D551F17FB0B4 + + + 0 + + + Synchronized Data Extensions + + synchronizeddataextension + true + false + true + + + + 1111111 + + + 2021-10-03T05:01:37.23 + 2021-10-03T05:01:37.37 + 688352 + + B80AE306-55BC-4C2E-A79F-8CCA486F0BA0 + + + 0 + + + Synchronized Data Extensions + + synchronizeddataextension + true + false + true + + + + 1111111 + + + 2022-10-26T09:48:38.293 + 2022-10-26T09:48:38.31 + 757145 + + 0ACB800B-AA8B-4F0F-9642-4907592C919C + + + 0 + + + Synchronized Data Extensions + + synchronizeddataextension + true + false + true + + + + diff --git a/test/resources/9999999/automation/v1/queries/get-response-Name=testExisting_query.json b/test/resources/9999999/automation/v1/queries/get-response-Name=testExisting_query.json new file mode 100644 index 000000000..6e61075f0 --- /dev/null +++ b/test/resources/9999999/automation/v1/queries/get-response-Name=testExisting_query.json @@ -0,0 +1,24 @@ +{ + "count": 1, + "page": 1, + "pageSize": 50, + "items": [ + { + "queryDefinitionId": "549f0568-607c-4940-afef-437965094dat", + "name": "testExisting_query", + "key": "testExisting_query", + "description": "bla bla", + "queryText": "Select\n SubscriberKey as testField, Trim(last_name) AS name\nFrom\n _Subscribers\nwhere\n country in ('test')\n", + "targetName": "testExisting_dataExtension", + "targetKey": "testExisting_dataExtension", + "targetId": "21711373-72c1-ec11-b83b-48df37d1deb7", + "targetDescription": "", + "createdDate": "2022-04-26T15:21:16.453", + "modifiedDate": "2022-04-26T16:02:44.01", + "targetUpdateTypeId": 0, + "targetUpdateTypeName": "Overwrite", + "categoryId": 999, + "isFrozen": false + } + ] +} diff --git a/test/resources/9999999/automation/v1/scripts/get-response-name=testExisting_script.json b/test/resources/9999999/automation/v1/scripts/get-response-name=testExisting_script.json new file mode 100644 index 000000000..b2aee3357 --- /dev/null +++ b/test/resources/9999999/automation/v1/scripts/get-response-name=testExisting_script.json @@ -0,0 +1,17 @@ +{ + "count": 1, + "page": 1, + "pageSize": 500, + "items": [ + { + "ssjsActivityId": "39f6a488-20eb-4ba0-b0b9-023725b574e4", + "name": "testExisting_script", + "key": "testExisting_script", + "description": "", + "script": " ", + "categoryId": 304, + "createdDate": "2022-10-20T00:41:26.163", + "modifiedDate": "2022-10-20T00:41:26.163" + } + ] +} diff --git a/test/resources/9999999/dataFolder/retrieve-ContentType=asset-shared-QAA-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentType=asset-shared-QAA-response.xml new file mode 100644 index 000000000..e40e8bbdb --- /dev/null +++ b/test/resources/9999999/dataFolder/retrieve-ContentType=asset-shared-QAA-response.xml @@ -0,0 +1,70 @@ + + + + RetrieveResponse + urn:uuid:ece12788-5617-4bf7-97b6-d2ee6fefa7c5 + urn:uuid:260afb64-4686-421e-bc94-46386dd6e28d + http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous + + + 2024-07-22T09:14:36Z + 2024-07-22T09:19:36Z + + + + + + OK + 0df23b67-2645-4b4f-87e1-f3eb6b818dde + + + 1111111 + + + 2021-06-21T11:55:12.743 + 2021-06-21T11:55:12.743 + 4707 + + + + + 0 + + + Content Builder + The root folder for assets + asset + true + false + true + + + + 1111111 + + + 2021-06-21T11:55:13.34 + 2021-06-21T11:55:13.34 + 4710 + + + + + 0 + + + Shared Content + The root shared folder for assets + asset-shared + true + false + true + + + + diff --git a/test/resources/9999999/dataFolder/retrieve-ContentType=asset-shared-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentType=asset-shared-response.xml new file mode 100644 index 000000000..e40e8bbdb --- /dev/null +++ b/test/resources/9999999/dataFolder/retrieve-ContentType=asset-shared-response.xml @@ -0,0 +1,70 @@ + + + + RetrieveResponse + urn:uuid:ece12788-5617-4bf7-97b6-d2ee6fefa7c5 + urn:uuid:260afb64-4686-421e-bc94-46386dd6e28d + http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous + + + 2024-07-22T09:14:36Z + 2024-07-22T09:19:36Z + + + + + + OK + 0df23b67-2645-4b4f-87e1-f3eb6b818dde + + + 1111111 + + + 2021-06-21T11:55:12.743 + 2021-06-21T11:55:12.743 + 4707 + + + + + 0 + + + Content Builder + The root folder for assets + asset + true + false + true + + + + 1111111 + + + 2021-06-21T11:55:13.34 + 2021-06-21T11:55:13.34 + 4710 + + + + + 0 + + + Shared Content + The root shared folder for assets + asset-shared + true + false + true + + + + diff --git a/test/resources/9999999/dataFolder/retrieve-ContentType=journey-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentType=journey-response.xml new file mode 100644 index 000000000..f0aac0fcd --- /dev/null +++ b/test/resources/9999999/dataFolder/retrieve-ContentType=journey-response.xml @@ -0,0 +1,48 @@ + + + + RetrieveResponse + urn:uuid:dc2be79b-a2b9-4775-90f9-92f7298129e4 + urn:uuid:e6015b6f-c9d3-4649-aed8-ea66f1a1dbe8 + http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous + + + 2024-07-22T11:05:21Z + 2024-07-22T11:10:21Z + + + + + + OK + 37bbe40c-a525-4f43-b907-0cc83fe7a020 + + + 9999999 + + + 2017-02-16T01:59:32.323 + 2017-02-16T01:59:32.323 + 6298 + + journey_default + + + 0 + + + my journeys + The root folder for Journeys + journey + true + false + true + + + + diff --git a/test/resources/9999999/dataFolder/retrieve-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-sha,hidden,dataexten,salesforc,shared_da,shared_da,shared_sa,synchroni,automatio,useriniti,journey,mysubs,list,publicati,queryacti,ssjsactiv,triggered,triggered-response.xml similarity index 100% rename from test/resources/9999999/dataFolder/retrieve-response.xml rename to test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-sha,hidden,dataexten,salesforc,shared_da,shared_da,shared_sa,synchroni,automatio,useriniti,journey,mysubs,list,publicati,queryacti,ssjsactiv,triggered,triggered-response.xml diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-shared-QAA-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-shared-QAA-response.xml new file mode 100644 index 000000000..e40e8bbdb --- /dev/null +++ b/test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-shared-QAA-response.xml @@ -0,0 +1,70 @@ + + + + RetrieveResponse + urn:uuid:ece12788-5617-4bf7-97b6-d2ee6fefa7c5 + urn:uuid:260afb64-4686-421e-bc94-46386dd6e28d + http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous + + + 2024-07-22T09:14:36Z + 2024-07-22T09:19:36Z + + + + + + OK + 0df23b67-2645-4b4f-87e1-f3eb6b818dde + + + 1111111 + + + 2021-06-21T11:55:12.743 + 2021-06-21T11:55:12.743 + 4707 + + + + + 0 + + + Content Builder + The root folder for assets + asset + true + false + true + + + + 1111111 + + + 2021-06-21T11:55:13.34 + 2021-06-21T11:55:13.34 + 4710 + + + + + 0 + + + Shared Content + The root shared folder for assets + asset-shared + true + false + true + + + + diff --git a/test/resources/9999999/dataFolder/retrieve-ContentType=asset-sharedORContentType=asset-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-shared-response.xml similarity index 100% rename from test/resources/9999999/dataFolder/retrieve-ContentType=asset-sharedORContentType=asset-response.xml rename to test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-shared-response.xml diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINasset-shared,hidden,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINasset-shared,hidden,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml new file mode 100644 index 000000000..2fff35d18 --- /dev/null +++ b/test/resources/9999999/dataFolder/retrieve-ContentTypeINasset-shared,hidden,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml @@ -0,0 +1,431 @@ + + + + RetrieveResponse + urn:uuid:4d209b2f-d7ce-4e6e-916c-c8642d368866 + urn:uuid:a850f043-1422-4d16-8443-702dd2f9f13a + http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous + + + 2023-08-11T13:15:46Z + 2023-08-11T13:20:46Z + + + + + + OK + ba1b0c59-78c4-4608-8423-35dda2248d4d + + + 1111111 + + + 2016-07-22T11:52:18.73 + 2016-07-22T11:52:19.603 + 89344 + + shared_data_default + + + 0 + + + Shared Items + + shared_data + true + false + false + + + + 1111111 + + + 2016-07-22T11:52:19.6 + 2016-07-22T11:52:19.6 + 89355 + + dataextension_default + + + 0 + + + Data Extensions + + dataextension + true + false + true + + + + 1111111 + + + 2016-07-22T11:52:19.603 + 2016-07-22T11:52:19.603 + 89356 + + shared_dataextension_default + + + 89344 + + shared_data_default + + Shared Data Extensions + + shared_dataextension + true + false + true + + + + 1111111 + + + 2016-07-29T12:13:27.28 + 2016-07-29T12:13:27.28 + 90889 + + HiddenCategory_default + + + 0 + + + HiddenCategory + Hidden folder to store Hidden items + Hidden + true + false + true + + + + 1111111 + + + 2016-08-23T09:22:27.54 + 2016-08-23T09:22:27.54 + 93698 + + salesforcedataextension_default + + + 0 + + + Salesforce Data Extensions + + salesforcedataextension + true + false + true + + + + 1111111 + + + 2016-08-23T09:22:27.55 + 2016-08-23T09:22:27.55 + 93699 + + shared_salesforcedataextension_defau + + + 89344 + + shared_data_default + + Shared Salesforce Data Extensions + + shared_salesforcedataextension + true + false + true + + + + 1111111 + + + 2020-01-27T10:50:46.573 + 2020-01-27T10:50:46.573 + 309082 + + + + + 89355 + + dataextension_default + + QueryStudioResults + + dataextension + true + true + true + + + + 1111111 + + + 2020-04-17T08:14:19.763 + 2020-04-17T08:14:19.763 + 587750 + + + + + 89356 + + shared_dataextension_default + + catalyst target 1 + + shared_dataextension + true + true + true + + + + 1111111 + + + 2020-07-09T02:30:12.38 + 2021-12-16T03:43:30.753 + 605618 + + dataextension_default + + + 89355 + + dataextension_default + + Audiences + + dataextension + true + true + true + + + + 1111111 + + + 2020-12-25T06:11:40.107 + 2021-12-23T10:51:24.393 + 633441 + + + + + 89355 + + dataextension_default + + System DEs + + dataextension + true + true + true + + + + 1111111 + + + 2021-01-30T11:54:36.11 + 2021-01-30T11:54:36.11 + 638814 + + 0b72bf27-0678-484d-ac0b-a8762b9bec33 + + + 89356 + + shared_dataextension_default + + Customer 360 Segments + All Customer 360 segments will be grouped here. Each sub-folder relates to an activation profile name. + shared_dataextension + true + false + true + + + + 1111111 + + + 2021-01-30T11:56:38.77 + 2021-01-30T11:56:38.77 + 638815 + + cedd206d-178e-41cb-8965-ce255975b046 + + + 638814 + + 0b72bf27-0678-484d-ac0b-a8762b9bec33 + + FirstAudience360 Segment + + shared_dataextension + true + false + false + + + + 1111111 + + + 2021-02-07T10:44:01.413 + 2021-12-16T03:43:33.38 + 639967 + + + + + 89355 + + dataextension_default + + TestAudiences + + dataextension + true + true + true + + + + 1111111 + + + 2021-08-04T15:17:18.533 + 2021-08-04T15:17:18.567 + 675203 + + A19F7E38-7369-497E-826F-D551F17FB0B4 + + + 0 + + + Synchronized Data Extensions + + synchronizeddataextension + true + false + true + + + + 1111111 + + + 2021-10-03T05:01:37.23 + 2021-10-03T05:01:37.37 + 688352 + + B80AE306-55BC-4C2E-A79F-8CCA486F0BA0 + + + 0 + + + Synchronized Data Extensions + + synchronizeddataextension + true + false + true + + + + 1111111 + + + 2022-10-26T09:48:38.293 + 2022-10-26T09:48:38.31 + 757145 + + 0ACB800B-AA8B-4F0F-9642-4907592C919C + + + 0 + + + Synchronized Data Extensions + + synchronizeddataextension + true + false + true + + + + 1111111 + + + 2021-06-21T11:55:12.743 + 2021-06-21T11:55:12.743 + 4707 + + + + + 0 + + + Content Builder + The root folder for assets + asset + true + false + true + + + + 1111111 + + + 2021-06-21T11:55:13.34 + 2021-06-21T11:55:13.34 + 4710 + + + + + 0 + + + Shared Content + The root shared folder for assets + asset-shared + true + false + true + + + + diff --git a/test/resources/9999999/dataFolder/retrieve-ContentType=synchronizeddataextensionORContentType=shared_salesforcedataextensionORContentType=shared_dataextensionORContentType=shared_dataORContentType=salesforcedataextensionORContentType=dataextensionORContentType=hidden-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml similarity index 100% rename from test/resources/9999999/dataFolder/retrieve-ContentType=synchronizeddataextensionORContentType=shared_salesforcedataextensionORContentType=shared_dataextensionORContentType=shared_dataORContentType=salesforcedataextensionORContentType=dataextensionORContentType=hidden-response.xml rename to test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml new file mode 100644 index 000000000..d51b42687 --- /dev/null +++ b/test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml @@ -0,0 +1,117 @@ + + + + RetrieveResponse + urn:uuid:f36f3303-3b5a-4641-8109-b26447634d91 + urn:uuid:33983968-28c4-4379-bb5f-f80ae32eb988 + http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous + + + 2022-04-19T20:03:41Z + 2022-04-19T20:08:41Z + + + + + + OK + 02cd5ccb-8f84-4651-826f-71169eeecf05 + + + 9999999 + + + 2016-07-22T11:52:19.6 + 2016-07-22T11:52:19.6 + 2 + + dataextension_default + + + 0 + + + Data Extensions + + dataextension + true + false + true + + + + 9999999 + + + 2017-02-08T10:19:37.123 + 2017-02-08T10:19:37.123 + 386 + + + + + 2 + + dataextension_default + + Einstein + + dataextension + true + true + true + + + + 1111111 + + + 2016-07-22T11:52:19.603 + 2016-07-22T11:52:19.603 + 89356 + + shared_dataextension_default + + + 89344 + + shared_data_default + + Shared Data Extensions + + shared_dataextension + true + false + true + + + + 1111111 + + + 2016-07-22T11:52:18.73 + 2016-07-22T11:52:19.603 + 89344 + + shared_data_default + + + 0 + + + Shared Items + + shared_data + true + false + false + + + + + diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml new file mode 100644 index 000000000..ffa795de7 --- /dev/null +++ b/test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml @@ -0,0 +1,251 @@ + + + + RetrieveResponse + urn:uuid:4d209b2f-d7ce-4e6e-916c-c8642d368866 + urn:uuid:a850f043-1422-4d16-8443-702dd2f9f13a + http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous + + + 2023-08-11T13:15:46Z + 2023-08-11T13:20:46Z + + + + + + OK + ba1b0c59-78c4-4608-8423-35dda2248d4d + + + 1111111 + + + 2016-07-22T11:52:18.73 + 2016-07-22T11:52:19.603 + 89344 + + shared_data_default + + + 0 + + + Shared Items + + shared_data + true + false + false + + + + 1111111 + + + 2016-07-22T11:52:19.603 + 2016-07-22T11:52:19.603 + 89356 + + shared_dataextension_default + + + 89344 + + shared_data_default + + Shared Data Extensions + + shared_dataextension + true + false + true + + + + 1111111 + + + 2016-07-29T12:13:27.28 + 2016-07-29T12:13:27.28 + 90889 + + HiddenCategory_default + + + 0 + + + HiddenCategory + Hidden folder to store Hidden items + Hidden + true + false + true + + + + 1111111 + + + 2016-08-23T09:22:27.55 + 2016-08-23T09:22:27.55 + 93699 + + shared_salesforcedataextension_defau + + + 89344 + + shared_data_default + + Shared Salesforce Data Extensions + + shared_salesforcedataextension + true + false + true + + + + 1111111 + + + 2020-04-17T08:14:19.763 + 2020-04-17T08:14:19.763 + 587750 + + + + + 89356 + + shared_dataextension_default + + catalyst target 1 + + shared_dataextension + true + true + true + + + + 1111111 + + + 2021-01-30T11:54:36.11 + 2021-01-30T11:54:36.11 + 638814 + + 0b72bf27-0678-484d-ac0b-a8762b9bec33 + + + 89356 + + shared_dataextension_default + + Customer 360 Segments + All Customer 360 segments will be grouped here. Each sub-folder relates to an activation profile name. + shared_dataextension + true + false + true + + + + 1111111 + + + 2021-01-30T11:56:38.77 + 2021-01-30T11:56:38.77 + 638815 + + cedd206d-178e-41cb-8965-ce255975b046 + + + 638814 + + 0b72bf27-0678-484d-ac0b-a8762b9bec33 + + FirstAudience360 Segment + + shared_dataextension + true + false + false + + + + 1111111 + + + 2021-08-04T15:17:18.533 + 2021-08-04T15:17:18.567 + 675203 + + A19F7E38-7369-497E-826F-D551F17FB0B4 + + + 0 + + + Synchronized Data Extensions + + synchronizeddataextension + true + false + true + + + + 1111111 + + + 2021-10-03T05:01:37.23 + 2021-10-03T05:01:37.37 + 688352 + + B80AE306-55BC-4C2E-A79F-8CCA486F0BA0 + + + 0 + + + Synchronized Data Extensions + + synchronizeddataextension + true + false + true + + + + 1111111 + + + 2022-10-26T09:48:38.293 + 2022-10-26T09:48:38.31 + 757145 + + 0ACB800B-AA8B-4F0F-9642-4907592C919C + + + 0 + + + Synchronized Data Extensions + + synchronizeddataextension + true + false + true + + + + diff --git a/test/resources/9999999/dataFolder/retrieve-ContentType=triggered_send_journeybuilderORContentType=triggered_sendORContentType=hidden-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,triggered_send,triggered_send_journeybuilder-response.xml similarity index 100% rename from test/resources/9999999/dataFolder/retrieve-ContentType=triggered_send_journeybuilderORContentType=triggered_sendORContentType=hidden-response.xml rename to test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,triggered_send,triggered_send_journeybuilder-response.xml diff --git a/test/resources/9999999/dataFolder/retrieve-ContentType=contextual_suppression_listORContentType=publicationORContentType=suppression_listORContentType=mysubsORContentType=list-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINlist,mysubs,suppression_list,publication,contextual_suppression_list-response.xml similarity index 100% rename from test/resources/9999999/dataFolder/retrieve-ContentType=contextual_suppression_listORContentType=publicationORContentType=suppression_listORContentType=mysubsORContentType=list-response.xml rename to test/resources/9999999/dataFolder/retrieve-ContentTypeINlist,mysubs,suppression_list,publication,contextual_suppression_list-response.xml diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINssjsactivity,asset,asset-shared-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINssjsactivity,asset,asset-shared-response.xml new file mode 100644 index 000000000..88ae9f358 --- /dev/null +++ b/test/resources/9999999/dataFolder/retrieve-ContentTypeINssjsactivity,asset,asset-shared-response.xml @@ -0,0 +1,92 @@ + + + + RetrieveResponse + urn:uuid:00106553-ac00-4e72-b387-42325fe6f93d + urn:uuid:a1dd2a9d-b696-480e-9a1b-265f262a8997 + http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous + + + 2024-01-08T14:30:39Z + 2024-01-08T14:35:39Z + + + + + + OK + 6596087d-d12f-4c9d-9353-783fe01775a3 + + + 9999999 + + + 2016-07-22T11:52:35.687 + 2016-07-22T11:52:35.687 + 89397 + + + + + 0 + + + Content Builder + The root folder for assets + asset + true + false + true + + + + 9999999 + + + 2016-07-29T12:13:07.7 + 2021-12-16T02:56:14.68 + 90888 + + + + + 89397 + + + Test Folder + + asset + true + true + true + + + + 9999999 + + + 2017-01-24T06:32:42.353 + 2017-01-24T06:32:42.353 + 304 + + SSJSActivity_default + + + 0 + + + Scripts + + SSJSActivity + true + false + true + + + + diff --git a/test/resources/9999999/dataFolder/retrieve-response-.xml b/test/resources/9999999/dataFolder/retrieve-response-.xml new file mode 100644 index 000000000..5b28f9747 --- /dev/null +++ b/test/resources/9999999/dataFolder/retrieve-response-.xml @@ -0,0 +1,519 @@ + + + + RetrieveResponse + urn:uuid:f36f3303-3b5a-4641-8109-b26447634d91 + urn:uuid:33983968-28c4-4379-bb5f-f80ae32eb988 + http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous + + + 2022-04-19T20:03:41Z + 2022-04-19T20:08:41Z + + + + + + OK + 02cd5ccb-8f84-4651-826f-71169eeecf05 + + + 9999999 + + + 2016-07-22T11:52:19.6 + 2016-07-22T11:52:19.6 + 2 + + dataextension_default + + + 0 + + + Data Extensions + + dataextension + true + false + true + + + + 9999999 + + + 2016-07-22T11:52:20.407 + 2016-07-22T11:52:20.407 + 999 + + queryactivity_default + + + 0 + + + Query + + queryactivity + true + false + true + + + + 9999999 + + + 2017-02-16T01:59:27.18 + 2017-02-16T01:59:27.18 + 412 + + mysubs_default + + + 0 + + + my subscribers + + mysubs + true + false + true + + + + 9999999 + + + 2017-02-16T01:59:27.177 + 2017-02-16T01:59:27.177 + 404 + + list_default + + + 0 + + + my lists + + list + true + false + true + + + + 9999999 + + + 2017-02-16T01:59:34.023 + 2017-02-16T01:59:34.023 + 424 + + publication_default + + + 0 + + + Publication Lists + + publication + true + false + true + + + + 9999999 + + + 2017-02-16T01:59:32.323 + 2017-02-16T01:59:32.323 + 419 + + suppression_list_default + + + 0 + + + Suppression Lists + + suppression_list + true + false + true + + + + 9999999 + + + 2017-02-16T01:59:32.323 + 2017-02-16T01:59:32.323 + 6298 + + journey_default + + + 0 + + + my journeys + The root folder for Journeys + journey + true + false + true + + + + 9999999 + + + 2019-10-25T05:35:17.337 + 2019-10-25T05:35:17.337 + 290937 + + + + + 0 + + + my automations + + automations + true + true + true + + + + 9999999 + + + 2017-02-08T10:19:37.123 + 2017-02-08T10:19:37.123 + 386 + + + + + 2 + + dataextension_default + + Einstein + + dataextension + true + true + true + + + + 9999999 + + + 2016-07-22T11:52:35.687 + 2016-07-22T11:52:35.687 + 89397 + + + + + 0 + + + Content Builder + The root folder for assets + asset + true + false + true + + + + 9999999 + + + 2016-07-29T12:13:07.7 + 2021-12-16T02:56:14.68 + 90888 + + + + + 89397 + + + Test Folder + + asset + true + true + true + + + + 9999999 + + + 2016-07-22T11:52:19.28 + 2016-07-22T11:52:19.28 + 89348 + + triggered_send_default + + + 0 + + + Triggered Sends + + triggered_send + true + false + true + + + + 9999999 + + + 2016-07-22T11:52:34.983 + 2016-07-22T11:52:34.983 + 89396 + + triggered_send_journeybuilder + + + 0 + + + Journey Builder Sends + + triggered_send_journeybuilder + true + false + true + + + + 9999999 + + + 2016-07-29T12:13:27.28 + 2016-07-29T12:13:27.28 + 90889 + + HiddenCategory_default + + + 0 + + + HiddenCategory + Hidden folder to store Hidden items + Hidden + true + false + true + + + + 9999999 + + + 2016-08-25T10:04:09.12 + 2016-08-25T10:04:09.12 + 94030 + + + + + 89396 + + triggered_send_journeybuilder + + Satisfaction Score Survey + + triggered_send_journeybuilder + true + true + true + + + + 9999999 + + + 2016-08-25T10:04:09.133 + 2016-08-25T10:04:09.133 + 94031 + + + + + 94030 + + + Version 1 + + triggered_send_journeybuilder + true + true + true + + + + 9999999 + + + 2021-06-09T10:17:06.27 + 2021-06-09T10:17:06.27 + 664654 + + 6aa28490-6577-4cb2-8eac-fd5e4f983cae + + + 317169 + + HiddenJourneyBuilderTriggeredSends_d + + 6aa28490-6577-4cb2-8eac-fd5e4f983cae_V9 + triggered_send folder to store triggered_send items + triggered_send + true + true + true + + + + 9999999 + + + 2022-07-31T19:55:31.657 + 2022-07-31T19:55:31.657 + 742869 + + 77211381-9967-4472-bd12-f58d4d5952a1 + + + 317169 + + HiddenJourneyBuilderTriggeredSends_d + + 77211381-9967-4472-bd12-f58d4d5952a1_V1 + triggered_send folder to store triggered_send items + triggered_send + true + true + true + + + + 9999999 + + + 2022-07-31T19:56:51.297 + 2022-07-31T19:56:51.297 + 742871 + + HiddenJourneyBuilderSimulationTrigge + + + 90889 + + HiddenCategory_default + + HiddenJourneyBuilderSimulationTriggeredSends + triggered_send_journeybuilder folder to store triggered_send_journeybuilder items + triggered_send_journeybuilder + true + true + true + + + + 9999999 + + + 2023-03-08T10:26:55.787 + 2023-03-08T10:26:55.787 + 771879 + + 8c24f428-4da8-4df6-97a7-beba5166c3c7 + + + 317169 + + HiddenJourneyBuilderTriggeredSends_d + + 8c24f428-4da8-4df6-97a7-beba5166c3c7_V1 + triggered_send folder to store triggered_send items + triggered_send + true + true + true + + + + 9999999 + + + 2023-04-10T15:46:09.947 + 2023-04-10T15:46:09.947 + 776623 + + 0a85b483-4208-4377-87fb-25794f5df244 + + + 317169 + + HiddenJourneyBuilderTriggeredSends_d + + 0a85b483-4208-4377-87fb-25794f5df244_V1 + triggered_send folder to store triggered_send items + triggered_send + true + true + true + + + + 9999999 + + + 2020-03-06T07:57:37.633 + 2020-03-06T07:57:37.633 + 317169 + + HiddenJourneyBuilderTriggeredSends_d + + + 90889 + + HiddenCategory_default + + HiddenJourneyBuilderTriggeredSends + triggered_send folder to store triggered_send items + triggered_send + true + true + true + + + + + diff --git a/test/type.automation.test.js b/test/type.automation.test.js index b0beb13d6..19966334d 100644 --- a/test/type.automation.test.js +++ b/test/type.automation.test.js @@ -47,7 +47,7 @@ describe('type: automation', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 22, + 21, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -133,7 +133,7 @@ describe('type: automation', () => { assert.equal( testUtils.getAPIHistoryLength(), - 29, + 28, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -233,7 +233,7 @@ describe('type: automation', () => { assert.equal( testUtils.getAPIHistoryLength(), - 37, + 36, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -300,7 +300,7 @@ describe('type: automation', () => { assert.equal( testUtils.getAPIHistoryLength(), - 33, + 32, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -339,7 +339,7 @@ describe('type: automation', () => { // check number of API calls assert.equal( testUtils.getAPIHistoryLength(), - 22, + 21, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -383,7 +383,7 @@ describe('type: automation', () => { // check number of API calls assert.equal( testUtils.getAPIHistoryLength(), - 48, + 46, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -427,7 +427,7 @@ describe('type: automation', () => { // check number of API calls assert.equal( testUtils.getAPIHistoryLength(), - 50, + 48, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -471,7 +471,7 @@ describe('type: automation', () => { // check number of API calls assert.equal( testUtils.getAPIHistoryLength(), - 51, + 49, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -515,7 +515,7 @@ describe('type: automation', () => { // check number of API calls assert.equal( testUtils.getAPIHistoryLength(), - 43, + 41, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -559,7 +559,7 @@ describe('type: automation', () => { // check number of API calls assert.equal( testUtils.getAPIHistoryLength(), - 49, + 47, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -603,7 +603,7 @@ describe('type: automation', () => { // check number of API calls assert.equal( testUtils.getAPIHistoryLength(), - 51, + 49, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -647,7 +647,7 @@ describe('type: automation', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 24, + 23, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -691,7 +691,7 @@ describe('type: automation', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 22, + 21, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; diff --git a/test/type.journey.test.js b/test/type.journey.test.js index fb3d5149f..73493706b 100644 --- a/test/type.journey.test.js +++ b/test/type.journey.test.js @@ -46,7 +46,7 @@ describe('type: journey', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 25, + 23, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -75,7 +75,7 @@ describe('type: journey', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 20, + 18, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -105,7 +105,7 @@ describe('type: journey', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 20, + 18, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -131,7 +131,7 @@ describe('type: journey', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 22, + 20, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -160,7 +160,7 @@ describe('type: journey', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 20, + 18, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -229,7 +229,7 @@ describe('type: journey', () => { assert.equal( testUtils.getAPIHistoryLength(), - 25, + 23, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -404,7 +404,7 @@ describe('type: journey', () => { assert.equal( testUtils.getAPIHistoryLength(), - 31, + 29, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -439,7 +439,7 @@ describe('type: journey', () => { assert.equal( testUtils.getAPIHistoryLength(), - 31, + 29, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -474,7 +474,7 @@ describe('type: journey', () => { assert.equal( testUtils.getAPIHistoryLength(), - 31, + 29, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; diff --git a/test/type.query.test.js b/test/type.query.test.js index 81caf9818..ad379fa50 100644 --- a/test/type.query.test.js +++ b/test/type.query.test.js @@ -48,7 +48,7 @@ describe('type: query', () => { assert.equal( testUtils.getAPIHistoryLength(), - 6, + 5, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -76,7 +76,7 @@ describe('type: query', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 7, + 6, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -107,7 +107,7 @@ describe('type: query', () => { .exist; assert.equal( testUtils.getAPIHistoryLength(), - 6, + 5, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -133,7 +133,7 @@ describe('type: query', () => { .exist; assert.equal( testUtils.getAPIHistoryLength(), - 6, + 5, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -189,7 +189,7 @@ describe('type: query', () => { // check number of API calls assert.equal( testUtils.getAPIHistoryLength(), - 8, + 7, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -221,7 +221,7 @@ describe('type: query', () => { // check number of API calls assert.equal( testUtils.getAPIHistoryLength(), - 12, + 11, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -285,7 +285,7 @@ describe('type: query', () => { // check number of API calls assert.equal( testUtils.getAPIHistoryLength(), - 14, + 12, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -339,7 +339,7 @@ describe('type: query', () => { // check number of API calls assert.equal( testUtils.getAPIHistoryLength(), - 14, + 12, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -395,7 +395,7 @@ describe('type: query', () => { // check number of API calls assert.equal( testUtils.getAPIHistoryLength(), - 14, + 12, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -471,7 +471,7 @@ describe('type: query', () => { // check number of API calls assert.equal( testUtils.getAPIHistoryLength(), - 7, + 6, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -509,7 +509,7 @@ describe('type: query', () => { // check number of API calls assert.equal( testUtils.getAPIHistoryLength(), - 16, + 14, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -560,7 +560,7 @@ describe('type: query', () => { // check number of API calls assert.equal( testUtils.getAPIHistoryLength(), - 16, + 14, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -602,7 +602,7 @@ describe('type: query', () => { // check number of API calls assert.equal( testUtils.getAPIHistoryLength(), - 18, + 16, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -640,7 +640,7 @@ describe('type: query', () => { // check number of API calls assert.equal( testUtils.getAPIHistoryLength(), - 38, + 35, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -682,7 +682,7 @@ describe('type: query', () => { // check number of API calls assert.equal( testUtils.getAPIHistoryLength(), - 40, + 37, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -719,7 +719,7 @@ describe('type: query', () => { // check number of API calls assert.equal( testUtils.getAPIHistoryLength(), - 14, + 12, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -770,7 +770,7 @@ describe('type: query', () => { assert.equal( testUtils.getAPIHistoryLength(), - 6, + 5, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -822,7 +822,7 @@ describe('type: query', () => { assert.equal( testUtils.getAPIHistoryLength(), - 6, + 5, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; diff --git a/test/type.script.test.js b/test/type.script.test.js index 2ce2fb773..4b098ae64 100644 --- a/test/type.script.test.js +++ b/test/type.script.test.js @@ -109,7 +109,7 @@ describe('type: script', () => { assert.equal( testUtils.getAPIHistoryLength(), - 3, + 2, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -150,7 +150,7 @@ describe('type: script', () => { assert.equal( testUtils.getAPIHistoryLength(), - 3, + 2, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -192,7 +192,7 @@ describe('type: script', () => { assert.equal( testUtils.getAPIHistoryLength(), - 3, + 2, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -217,7 +217,7 @@ describe('type: script', () => { .exist; assert.equal( testUtils.getAPIHistoryLength(), - 3, + 2, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -261,7 +261,7 @@ describe('type: script', () => { // check number of API calls assert.equal( testUtils.getAPIHistoryLength(), - 5, + 4, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -312,7 +312,7 @@ describe('type: script', () => { assert.equal( testUtils.getAPIHistoryLength(), - 3, + 2, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -364,7 +364,7 @@ describe('type: script', () => { assert.equal( testUtils.getAPIHistoryLength(), - 3, + 2, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -532,7 +532,7 @@ describe('type: script', () => { assert.equal( testUtils.getAPIHistoryLength(), - 9, + 8, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -598,7 +598,7 @@ describe('type: script', () => { assert.equal( testUtils.getAPIHistoryLength(), - 9, + 8, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -669,7 +669,7 @@ describe('type: script', () => { assert.equal( testUtils.getAPIHistoryLength(), - 9, + 8, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; diff --git a/test/type.transactionalEmail.test.js b/test/type.transactionalEmail.test.js index a3d0a8447..da95877bd 100644 --- a/test/type.transactionalEmail.test.js +++ b/test/type.transactionalEmail.test.js @@ -36,7 +36,7 @@ describe('type: transactionalEmail', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 12, + 11, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -75,7 +75,7 @@ describe('type: transactionalEmail', () => { // check number of API calls assert.equal( testUtils.getAPIHistoryLength(), - 14, + 13, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -137,7 +137,7 @@ describe('type: transactionalEmail', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 12, + 11, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; diff --git a/test/type.triggeredSend.test.js b/test/type.triggeredSend.test.js index a10c49d2d..74df46bb8 100644 --- a/test/type.triggeredSend.test.js +++ b/test/type.triggeredSend.test.js @@ -36,7 +36,7 @@ describe('type: triggeredSend', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 12, + 10, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -75,7 +75,7 @@ describe('type: triggeredSend', () => { // check number of API calls assert.equal( testUtils.getAPIHistoryLength(), - 14, + 12, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -122,7 +122,7 @@ describe('type: triggeredSend', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 12, + 10, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; From a445f46bcc2610502d893ca27b9b8bc09780b149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Mon, 22 Jul 2024 19:51:37 +0200 Subject: [PATCH 2/4] #1470: add folder type "asset" to types that can be shared from the parent --- lib/metadataTypes/definitions/Folder.definition.js | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/metadataTypes/definitions/Folder.definition.js b/lib/metadataTypes/definitions/Folder.definition.js index 21a111518..338d2881d 100644 --- a/lib/metadataTypes/definitions/Folder.definition.js +++ b/lib/metadataTypes/definitions/Folder.definition.js @@ -62,6 +62,7 @@ export default { ], folderTypesFromParent: [ 'asset-shared', + 'asset', 'hidden', 'shared_content', 'shared_data', From f5a0f225aba1739376e9e01fe76891a41cac8b52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Mon, 22 Jul 2024 21:44:48 +0200 Subject: [PATCH 3/4] #1470: improve folder loading - part 2 --- @types/lib/Deployer.d.ts.map | 2 +- lib/Deployer.js | 16 +- .../definitions/Folder.definition.js | 1 - test/general.test.js | 24 +- ...on,synchronizeddataextension-response.xml} | 23 - ...ssjsactiv,triggered,triggered-response.xml | 519 ++++++++++++++++++ ...synchronizeddataextension-QAA-response.xml | 115 ++++ ...ynchronizeddataextension-QAA-response.xml} | 0 ...peINautomations,queryactivity-response.xml | 70 +++ ...ynchronizeddataextension-QAA-response.xml} | 0 ...eddataextension,queryactivity-response.xml | 138 +++++ ...ion,synchronizeddataextension-response.xml | 46 ++ ...eINjourney,asset,asset-shared-response.xml | 92 ++++ ...ynchronizeddataextension-QAA-response.xml} | 0 test/type.emailSend.test.js | 6 +- test/type.importFile.test.js | 10 +- test/type.triggeredSend.test.js | 6 +- 17 files changed, 1013 insertions(+), 55 deletions(-) rename test/resources/1111111/dataFolder/{retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml => retrieve-ContentTypeINshared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml} (94%) create mode 100644 test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-sha,dataexten,salesforc,shared_da,shared_da,shared_sa,synchroni,automatio,useriniti,journey,mysubs,list,publicati,queryacti,ssjsactiv,triggered,triggered-response.xml create mode 100644 test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-shared,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml rename test/resources/9999999/dataFolder/{retrieve-ContentTypeINasset-shared,hidden,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml => retrieve-ContentTypeINasset-shared,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml} (100%) create mode 100644 test/resources/9999999/dataFolder/retrieve-ContentTypeINautomations,queryactivity-response.xml rename test/resources/9999999/dataFolder/{retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml => retrieve-ContentTypeINdataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml} (100%) create mode 100644 test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension,queryactivity-response.xml create mode 100644 test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml create mode 100644 test/resources/9999999/dataFolder/retrieve-ContentTypeINjourney,asset,asset-shared-response.xml rename test/resources/9999999/dataFolder/{retrieve-ContentTypeINhidden,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml => retrieve-ContentTypeINshared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml} (100%) diff --git a/@types/lib/Deployer.d.ts.map b/@types/lib/Deployer.d.ts.map index bcd78a0bd..fcbbeaf3f 100644 --- a/@types/lib/Deployer.d.ts.map +++ b/@types/lib/Deployer.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Deployer.d.ts","sourceRoot":"","sources":["../../lib/Deployer.js"],"names":[],"mappings":";uBAYa,OAAO,qBAAqB,EAAE,QAAQ;0BACtC,OAAO,qBAAqB,EAAE,WAAW;8BACzC,OAAO,qBAAqB,EAAE,eAAe;sBAC7C,OAAO,qBAAqB,EAAE,OAAO;+BACrC,OAAO,qBAAqB,EAAE,gBAAgB;mCAC9C,OAAO,qBAAqB,EAAE,oBAAoB;kCAClD,OAAO,qBAAqB,EAAE,mBAAmB;8BACjD,OAAO,qBAAqB,EAAE,eAAe;iCAC7C,OAAO,qBAAqB,EAAE,kBAAkB;oCAChD,OAAO,qBAAqB,EAAE,qBAAqB;gCACnD,OAAO,qBAAqB,EAAE,iBAAiB;0BAC/C,OAAO,qBAAqB,EAAE,WAAW;mCACzC,OAAO,qBAAqB,EAAE,oBAAoB;2BAClD,OAAO,qBAAqB,EAAE,YAAY;AAdvD;;;;;;;;;;;;;;;GAeG;AAEH;;;GAGG;AACH;IAwBI;;;;;;;OAOG;IACH,4BALW,MAAM,qBACN,MAAM,EAAE,GAAG,YAAY,WACvB,MAAM,EAAE,GACN,OAAO,CAAE;YAAQ,MAAM,GAAE,oBAAoB;KAAC,CAAC,CA2J3D;IACD;;;;;;;;;OASG;IACH,uBAPW,MAAM,MACN,MAAM,cACN,OAAO,YACP,MAAM,EAAE,GAAG,YAAY,WACvB,MAAM,EAAE,GACN,OAAO,CAAE,oBAAoB,CAAC,CAmB1C;IAiHD;;;;;;;OAOG;IACH,iCALW,MAAM,YACN,MAAM,EAAE,gBACR,OAAO,GACL,OAAO,CAAE,oBAAoB,CAAC,CA4B1C;IAED;;;;;;;OAOG;IACH,0CALW,MAAM,YACN,oBAAoB,mBACpB,MAAM,EAAE,GACN,OAAO,CAAE,MAAM,CAAC,CA6G5B;IA5dD;;;;;OAKG;IACH,wBAHW,OAAO,YACP,QAAQ,EAkBlB;IAfG,iDAAwB;IACxB,kDAA4B;IAC5B,kBAIE;IACF,oBAIE;IAoMN;;;;;;OAMG;IACH,gBAJW,MAAM,EAAE,GAAG,YAAY,WACvB,MAAM,EAAE,GACN,OAAO,CAAE,oBAAoB,CAAC,CAwG1C;IAhGO,mCAAmC;IACnC,UADW,oBAAoB,CACuC;CAyPjF"} \ No newline at end of file +{"version":3,"file":"Deployer.d.ts","sourceRoot":"","sources":["../../lib/Deployer.js"],"names":[],"mappings":";uBAYa,OAAO,qBAAqB,EAAE,QAAQ;0BACtC,OAAO,qBAAqB,EAAE,WAAW;8BACzC,OAAO,qBAAqB,EAAE,eAAe;sBAC7C,OAAO,qBAAqB,EAAE,OAAO;+BACrC,OAAO,qBAAqB,EAAE,gBAAgB;mCAC9C,OAAO,qBAAqB,EAAE,oBAAoB;kCAClD,OAAO,qBAAqB,EAAE,mBAAmB;8BACjD,OAAO,qBAAqB,EAAE,eAAe;iCAC7C,OAAO,qBAAqB,EAAE,kBAAkB;oCAChD,OAAO,qBAAqB,EAAE,qBAAqB;gCACnD,OAAO,qBAAqB,EAAE,iBAAiB;0BAC/C,OAAO,qBAAqB,EAAE,WAAW;mCACzC,OAAO,qBAAqB,EAAE,oBAAoB;2BAClD,OAAO,qBAAqB,EAAE,YAAY;AAdvD;;;;;;;;;;;;;;;GAeG;AAEH;;;GAGG;AACH;IAwBI;;;;;;;OAOG;IACH,4BALW,MAAM,qBACN,MAAM,EAAE,GAAG,YAAY,WACvB,MAAM,EAAE,GACN,OAAO,CAAE;YAAQ,MAAM,GAAE,oBAAoB;KAAC,CAAC,CA2J3D;IACD;;;;;;;;;OASG;IACH,uBAPW,MAAM,MACN,MAAM,cACN,OAAO,YACP,MAAM,EAAE,GAAG,YAAY,WACvB,MAAM,EAAE,GACN,OAAO,CAAE,oBAAoB,CAAC,CAmB1C;IAmHD;;;;;;;OAOG;IACH,iCALW,MAAM,YACN,MAAM,EAAE,gBACR,OAAO,GACL,OAAO,CAAE,oBAAoB,CAAC,CA4B1C;IAED;;;;;;;OAOG;IACH,0CALW,MAAM,YACN,oBAAoB,mBACpB,MAAM,EAAE,GACN,OAAO,CAAE,MAAM,CAAC,CA6G5B;IA9dD;;;;;OAKG;IACH,wBAHW,OAAO,YACP,QAAQ,EAkBlB;IAfG,iDAAwB;IACxB,kDAA4B;IAC5B,kBAIE;IACF,oBAIE;IAoMN;;;;;;OAMG;IACH,gBAJW,MAAM,EAAE,GAAG,YAAY,WACvB,MAAM,EAAE,GACN,OAAO,CAAE,oBAAoB,CAAC,CA0G1C;IAlGO,mCAAmC;IACnC,UADW,oBAAoB,CACuC;CA2PjF"} \ No newline at end of file diff --git a/lib/Deployer.js b/lib/Deployer.js index 9c323f9c9..81c80781e 100644 --- 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 index 338d2881d..6fecb16a4 100644 --- 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 index 5ca501833..5b9df9125 100644 --- 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/test/resources/1111111/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml b/test/resources/1111111/dataFolder/retrieve-ContentTypeINshared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml similarity index 94% rename from test/resources/1111111/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml rename to test/resources/1111111/dataFolder/retrieve-ContentTypeINshared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml index 41bb03f59..48b0d0baf 100644 --- a/test/resources/1111111/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml +++ b/test/resources/1111111/dataFolder/retrieve-ContentTypeINshared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml @@ -293,29 +293,6 @@ false false - - - 1111111 - - - 2021-02-07T10:44:01.413 - 2021-12-16T03:43:33.38 - 639967 - - - - - 89355 - - dataextension_default - - TestAudiences - - dataextension - true - true - true - 1111111 diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-sha,dataexten,salesforc,shared_da,shared_da,shared_sa,synchroni,automatio,useriniti,journey,mysubs,list,publicati,queryacti,ssjsactiv,triggered,triggered-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-sha,dataexten,salesforc,shared_da,shared_da,shared_sa,synchroni,automatio,useriniti,journey,mysubs,list,publicati,queryacti,ssjsactiv,triggered,triggered-response.xml new file mode 100644 index 000000000..5b28f9747 --- /dev/null +++ b/test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-sha,dataexten,salesforc,shared_da,shared_da,shared_sa,synchroni,automatio,useriniti,journey,mysubs,list,publicati,queryacti,ssjsactiv,triggered,triggered-response.xml @@ -0,0 +1,519 @@ + + + + RetrieveResponse + urn:uuid:f36f3303-3b5a-4641-8109-b26447634d91 + urn:uuid:33983968-28c4-4379-bb5f-f80ae32eb988 + http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous + + + 2022-04-19T20:03:41Z + 2022-04-19T20:08:41Z + + + + + + OK + 02cd5ccb-8f84-4651-826f-71169eeecf05 + + + 9999999 + + + 2016-07-22T11:52:19.6 + 2016-07-22T11:52:19.6 + 2 + + dataextension_default + + + 0 + + + Data Extensions + + dataextension + true + false + true + + + + 9999999 + + + 2016-07-22T11:52:20.407 + 2016-07-22T11:52:20.407 + 999 + + queryactivity_default + + + 0 + + + Query + + queryactivity + true + false + true + + + + 9999999 + + + 2017-02-16T01:59:27.18 + 2017-02-16T01:59:27.18 + 412 + + mysubs_default + + + 0 + + + my subscribers + + mysubs + true + false + true + + + + 9999999 + + + 2017-02-16T01:59:27.177 + 2017-02-16T01:59:27.177 + 404 + + list_default + + + 0 + + + my lists + + list + true + false + true + + + + 9999999 + + + 2017-02-16T01:59:34.023 + 2017-02-16T01:59:34.023 + 424 + + publication_default + + + 0 + + + Publication Lists + + publication + true + false + true + + + + 9999999 + + + 2017-02-16T01:59:32.323 + 2017-02-16T01:59:32.323 + 419 + + suppression_list_default + + + 0 + + + Suppression Lists + + suppression_list + true + false + true + + + + 9999999 + + + 2017-02-16T01:59:32.323 + 2017-02-16T01:59:32.323 + 6298 + + journey_default + + + 0 + + + my journeys + The root folder for Journeys + journey + true + false + true + + + + 9999999 + + + 2019-10-25T05:35:17.337 + 2019-10-25T05:35:17.337 + 290937 + + + + + 0 + + + my automations + + automations + true + true + true + + + + 9999999 + + + 2017-02-08T10:19:37.123 + 2017-02-08T10:19:37.123 + 386 + + + + + 2 + + dataextension_default + + Einstein + + dataextension + true + true + true + + + + 9999999 + + + 2016-07-22T11:52:35.687 + 2016-07-22T11:52:35.687 + 89397 + + + + + 0 + + + Content Builder + The root folder for assets + asset + true + false + true + + + + 9999999 + + + 2016-07-29T12:13:07.7 + 2021-12-16T02:56:14.68 + 90888 + + + + + 89397 + + + Test Folder + + asset + true + true + true + + + + 9999999 + + + 2016-07-22T11:52:19.28 + 2016-07-22T11:52:19.28 + 89348 + + triggered_send_default + + + 0 + + + Triggered Sends + + triggered_send + true + false + true + + + + 9999999 + + + 2016-07-22T11:52:34.983 + 2016-07-22T11:52:34.983 + 89396 + + triggered_send_journeybuilder + + + 0 + + + Journey Builder Sends + + triggered_send_journeybuilder + true + false + true + + + + 9999999 + + + 2016-07-29T12:13:27.28 + 2016-07-29T12:13:27.28 + 90889 + + HiddenCategory_default + + + 0 + + + HiddenCategory + Hidden folder to store Hidden items + Hidden + true + false + true + + + + 9999999 + + + 2016-08-25T10:04:09.12 + 2016-08-25T10:04:09.12 + 94030 + + + + + 89396 + + triggered_send_journeybuilder + + Satisfaction Score Survey + + triggered_send_journeybuilder + true + true + true + + + + 9999999 + + + 2016-08-25T10:04:09.133 + 2016-08-25T10:04:09.133 + 94031 + + + + + 94030 + + + Version 1 + + triggered_send_journeybuilder + true + true + true + + + + 9999999 + + + 2021-06-09T10:17:06.27 + 2021-06-09T10:17:06.27 + 664654 + + 6aa28490-6577-4cb2-8eac-fd5e4f983cae + + + 317169 + + HiddenJourneyBuilderTriggeredSends_d + + 6aa28490-6577-4cb2-8eac-fd5e4f983cae_V9 + triggered_send folder to store triggered_send items + triggered_send + true + true + true + + + + 9999999 + + + 2022-07-31T19:55:31.657 + 2022-07-31T19:55:31.657 + 742869 + + 77211381-9967-4472-bd12-f58d4d5952a1 + + + 317169 + + HiddenJourneyBuilderTriggeredSends_d + + 77211381-9967-4472-bd12-f58d4d5952a1_V1 + triggered_send folder to store triggered_send items + triggered_send + true + true + true + + + + 9999999 + + + 2022-07-31T19:56:51.297 + 2022-07-31T19:56:51.297 + 742871 + + HiddenJourneyBuilderSimulationTrigge + + + 90889 + + HiddenCategory_default + + HiddenJourneyBuilderSimulationTriggeredSends + triggered_send_journeybuilder folder to store triggered_send_journeybuilder items + triggered_send_journeybuilder + true + true + true + + + + 9999999 + + + 2023-03-08T10:26:55.787 + 2023-03-08T10:26:55.787 + 771879 + + 8c24f428-4da8-4df6-97a7-beba5166c3c7 + + + 317169 + + HiddenJourneyBuilderTriggeredSends_d + + 8c24f428-4da8-4df6-97a7-beba5166c3c7_V1 + triggered_send folder to store triggered_send items + triggered_send + true + true + true + + + + 9999999 + + + 2023-04-10T15:46:09.947 + 2023-04-10T15:46:09.947 + 776623 + + 0a85b483-4208-4377-87fb-25794f5df244 + + + 317169 + + HiddenJourneyBuilderTriggeredSends_d + + 0a85b483-4208-4377-87fb-25794f5df244_V1 + triggered_send folder to store triggered_send items + triggered_send + true + true + true + + + + 9999999 + + + 2020-03-06T07:57:37.633 + 2020-03-06T07:57:37.633 + 317169 + + HiddenJourneyBuilderTriggeredSends_d + + + 90889 + + HiddenCategory_default + + HiddenJourneyBuilderTriggeredSends + triggered_send folder to store triggered_send items + triggered_send + true + true + true + + + + + diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-shared,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-shared,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml new file mode 100644 index 000000000..4f040825c --- /dev/null +++ b/test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-shared,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml @@ -0,0 +1,115 @@ + + + + RetrieveResponse + urn:uuid:ece12788-5617-4bf7-97b6-d2ee6fefa7c5 + urn:uuid:260afb64-4686-421e-bc94-46386dd6e28d + http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous + + + 2024-07-22T09:14:36Z + 2024-07-22T09:19:36Z + + + + + + OK + 0df23b67-2645-4b4f-87e1-f3eb6b818dde + + + 1111111 + + + 2021-06-21T11:55:12.743 + 2021-06-21T11:55:12.743 + 4707 + + + + + 0 + + + Content Builder + The root folder for assets + asset + true + false + true + + + + 1111111 + + + 2021-06-21T11:55:13.34 + 2021-06-21T11:55:13.34 + 4710 + + + + + 0 + + + Shared Content + The root shared folder for assets + asset-shared + true + false + true + + + + 1111111 + + + 2016-07-22T11:52:19.603 + 2016-07-22T11:52:19.603 + 89356 + + shared_dataextension_default + + + 89344 + + shared_data_default + + Shared Data Extensions + + shared_dataextension + true + false + true + + + + 1111111 + + + 2016-07-22T11:52:18.73 + 2016-07-22T11:52:19.603 + 89344 + + shared_data_default + + + 0 + + + Shared Items + + shared_data + true + false + false + + + + diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINasset-shared,hidden,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINasset-shared,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml similarity index 100% rename from test/resources/9999999/dataFolder/retrieve-ContentTypeINasset-shared,hidden,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml rename to test/resources/9999999/dataFolder/retrieve-ContentTypeINasset-shared,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINautomations,queryactivity-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINautomations,queryactivity-response.xml new file mode 100644 index 000000000..f41293234 --- /dev/null +++ b/test/resources/9999999/dataFolder/retrieve-ContentTypeINautomations,queryactivity-response.xml @@ -0,0 +1,70 @@ + + + + RetrieveResponse + urn:uuid:f36f3303-3b5a-4641-8109-b26447634d91 + urn:uuid:33983968-28c4-4379-bb5f-f80ae32eb988 + http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous + + + 2022-04-19T20:03:41Z + 2022-04-19T20:08:41Z + + + + + + OK + 02cd5ccb-8f84-4651-826f-71169eeecf05 + + + 9999999 + + + 2019-10-25T05:35:17.337 + 2019-10-25T05:35:17.337 + 290937 + + + + + 0 + + + my automations + + automations + true + true + true + + + + 9999999 + + + 2016-07-22T11:52:20.407 + 2016-07-22T11:52:20.407 + 999 + + queryactivity_default + + + 0 + + + Query + + queryactivity + true + false + true + + + + diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINdataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml similarity index 100% rename from test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml rename to test/resources/9999999/dataFolder/retrieve-ContentTypeINdataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension,queryactivity-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension,queryactivity-response.xml new file mode 100644 index 000000000..1545eab80 --- /dev/null +++ b/test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension,queryactivity-response.xml @@ -0,0 +1,138 @@ + + + + RetrieveResponse + urn:uuid:f36f3303-3b5a-4641-8109-b26447634d91 + urn:uuid:33983968-28c4-4379-bb5f-f80ae32eb988 + http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous + + + 2022-04-19T20:03:41Z + 2022-04-19T20:08:41Z + + + + + + OK + 02cd5ccb-8f84-4651-826f-71169eeecf05 + + + 9999999 + + + 2016-07-22T11:52:19.6 + 2016-07-22T11:52:19.6 + 2 + + dataextension_default + + + 0 + + + Data Extensions + + dataextension + true + false + true + + + + 9999999 + + + 2017-02-08T10:19:37.123 + 2017-02-08T10:19:37.123 + 386 + + + + + 2 + + dataextension_default + + Einstein + + dataextension + true + true + true + + + + 1111111 + + + 2016-07-22T11:52:19.603 + 2016-07-22T11:52:19.603 + 89356 + + shared_dataextension_default + + + 89344 + + shared_data_default + + Shared Data Extensions + + shared_dataextension + true + false + true + + + + 1111111 + + + 2016-07-22T11:52:18.73 + 2016-07-22T11:52:19.603 + 89344 + + shared_data_default + + + 0 + + + Shared Items + + shared_data + true + false + false + + + + 9999999 + + + 2016-07-22T11:52:20.407 + 2016-07-22T11:52:20.407 + 999 + + queryactivity_default + + + 0 + + + Query + + queryactivity + true + false + true + + + + diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml new file mode 100644 index 000000000..c2d90ad4d --- /dev/null +++ b/test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml @@ -0,0 +1,46 @@ + + + + RetrieveResponse + urn:uuid:f36f3303-3b5a-4641-8109-b26447634d91 + urn:uuid:33983968-28c4-4379-bb5f-f80ae32eb988 + http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous + + + 2022-04-19T20:03:41Z + 2022-04-19T20:08:41Z + + + + + + + + 9999999 + + + 2016-07-29T12:13:27.28 + 2016-07-29T12:13:27.28 + 90889 + + HiddenCategory_default + + + 0 + + + HiddenCategory + Hidden folder to store Hidden items + Hidden + true + false + true + + + + diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINjourney,asset,asset-shared-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINjourney,asset,asset-shared-response.xml new file mode 100644 index 000000000..9a22cf373 --- /dev/null +++ b/test/resources/9999999/dataFolder/retrieve-ContentTypeINjourney,asset,asset-shared-response.xml @@ -0,0 +1,92 @@ + + + + RetrieveResponse + urn:uuid:dc2be79b-a2b9-4775-90f9-92f7298129e4 + urn:uuid:e6015b6f-c9d3-4649-aed8-ea66f1a1dbe8 + http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous + + + 2024-07-22T11:05:21Z + 2024-07-22T11:10:21Z + + + + + + OK + 37bbe40c-a525-4f43-b907-0cc83fe7a020 + + + 9999999 + + + 2017-02-16T01:59:32.323 + 2017-02-16T01:59:32.323 + 6298 + + journey_default + + + 0 + + + my journeys + The root folder for Journeys + journey + true + false + true + + + + 1111111 + + + 2021-06-21T11:55:12.743 + 2021-06-21T11:55:12.743 + 4707 + + + + + 0 + + + Content Builder + The root folder for assets + asset + true + false + true + + + + 1111111 + + + 2021-06-21T11:55:13.34 + 2021-06-21T11:55:13.34 + 4710 + + + + + 0 + + + Shared Content + The root shared folder for assets + asset-shared + true + false + true + + + + diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINshared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml similarity index 100% rename from test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml rename to test/resources/9999999/dataFolder/retrieve-ContentTypeINshared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-QAA-response.xml diff --git a/test/type.emailSend.test.js b/test/type.emailSend.test.js index ebd055a12..03a93c15d 100644 --- a/test/type.emailSend.test.js +++ b/test/type.emailSend.test.js @@ -36,7 +36,7 @@ describe('type: emailSend', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 16, + 14, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -76,7 +76,7 @@ describe('type: emailSend', () => { // check number of API calls assert.equal( testUtils.getAPIHistoryLength(), - 18, + 16, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -120,7 +120,7 @@ describe('type: emailSend', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 16, + 14, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; diff --git a/test/type.importFile.test.js b/test/type.importFile.test.js index 3cfe1bac6..81335cd85 100644 --- a/test/type.importFile.test.js +++ b/test/type.importFile.test.js @@ -41,7 +41,7 @@ describe('type: importFile', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 15, + 14, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -70,7 +70,7 @@ describe('type: importFile', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 14, + 13, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -110,7 +110,7 @@ describe('type: importFile', () => { // check number of API calls assert.equal( testUtils.getAPIHistoryLength(), - 17, + 16, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -152,7 +152,7 @@ describe('type: importFile', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 14, + 13, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -194,7 +194,7 @@ describe('type: importFile', () => { ); assert.equal( testUtils.getAPIHistoryLength(), - 15, + 14, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; diff --git a/test/type.triggeredSend.test.js b/test/type.triggeredSend.test.js index 74df46bb8..c8d8114ab 100644 --- a/test/type.triggeredSend.test.js +++ b/test/type.triggeredSend.test.js @@ -256,7 +256,7 @@ describe('type: triggeredSend', () => { assert.equal( testUtils.getAPIHistoryLength(), - 18, + 16, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -291,7 +291,7 @@ describe('type: triggeredSend', () => { assert.equal( testUtils.getAPIHistoryLength(), - 18, + 16, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; @@ -326,7 +326,7 @@ describe('type: triggeredSend', () => { assert.equal( testUtils.getAPIHistoryLength(), - 18, + 16, 'Unexpected number of requests made. Run testUtils.logAPIHistoryDebug() to see the requests' ); return; From 7225a8e050bed344f0247b1fc32bbab014500bc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Berkefeld?= Date: Mon, 22 Jul 2024 22:19:34 +0200 Subject: [PATCH 4/4] #1470: sort folder subtypes alphabetically in requests to ease testing --- @types/lib/metadataTypes/Folder.d.ts.map | 2 +- lib/metadataTypes/Folder.js | 3 ++- ...sforcedataextension,synchronizeddataextension-response.xml} | 0 ...activ,synchroni,triggered,triggered,useriniti-response.xml} | 0 ...rieve-ContentTypeINasset,asset-shared,journey-response.xml} | 0 ...-ContentTypeINasset,asset-shared,ssjsactivity-response.xml} | 0 ...list,list,mysubs,publication,suppression_list-response.xml} | 0 ...sforcedataextension,synchronizeddataextension-response.xml} | 0 ...sforcedataextension,synchronizeddataextension-response.xml} | 0 9 files changed, 3 insertions(+), 2 deletions(-) rename test/resources/1111111/dataFolder/{retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml => retrieve-ContentTypeINdataextension,hidden,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml} (100%) rename test/resources/9999999/dataFolder/{retrieve-ContentTypeINasset,asset-sha,hidden,dataexten,salesforc,shared_da,shared_da,shared_sa,synchroni,automatio,useriniti,journey,mysubs,list,publicati,queryacti,ssjsactiv,triggered,triggered-response.xml => retrieve-ContentTypeINasset,asset-sha,automatio,dataexten,hidden,journey,list,mysubs,publicati,queryacti,salesforc,shared_da,shared_da,shared_sa,ssjsactiv,synchroni,triggered,triggered,useriniti-response.xml} (100%) rename test/resources/9999999/dataFolder/{retrieve-ContentTypeINjourney,asset,asset-shared-response.xml => retrieve-ContentTypeINasset,asset-shared,journey-response.xml} (100%) rename test/resources/9999999/dataFolder/{retrieve-ContentTypeINssjsactivity,asset,asset-shared-response.xml => retrieve-ContentTypeINasset,asset-shared,ssjsactivity-response.xml} (100%) rename test/resources/9999999/dataFolder/{retrieve-ContentTypeINlist,mysubs,suppression_list,publication,contextual_suppression_list-response.xml => retrieve-ContentTypeINcontextual_suppression_list,list,mysubs,publication,suppression_list-response.xml} (100%) rename test/resources/9999999/dataFolder/{retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension,queryactivity-response.xml => retrieve-ContentTypeINdataextension,hidden,queryactivity,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml} (100%) rename test/resources/9999999/dataFolder/{retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml => retrieve-ContentTypeINdataextension,hidden,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml} (100%) diff --git a/@types/lib/metadataTypes/Folder.d.ts.map b/@types/lib/metadataTypes/Folder.d.ts.map index b2ee17d38..4bc459909 100644 --- a/@types/lib/metadataTypes/Folder.d.ts.map +++ b/@types/lib/metadataTypes/Folder.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Folder.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Folder.js"],"names":[],"mappings":";uBASa,OAAO,wBAAwB,EAAE,QAAQ;0BACzC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;+BAChD,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;gCACnD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;AAVzD;;;;;;;;;;;GAWG;AAEH;;;;GAIG;AACH;IACI;;;;;;;;OAQG;IACH,6BANW,MAAM,qBACN,MAAM,EAAE,eACR,MAAM,EAAE,QACR,MAAM,gBAmIhB;IAED;;;;;;OAMG;IACH,4BAJW,IAAI,GAAG,MAAM,EAAE,eACf,MAAM,EAAE,gBAKlB;IAED;;;;;;;OAOG;IACH,wBAHW,eAAe,GACb,OAAO,CAAE,MAAM,CAAC,CAuK5B;IAED;;;;;OAKG;IACH,6BAHW,gBAAgB,gBA4D1B;IAED;;;;;OAKG;IACH,6BAHW,gBAAgB,gBAyB1B;IAED;;;;;OAKG;IACH,gCAHW,gBAAgB,GACd,OAAO,CAAE,gBAAgB,CAAC,CAgDtC;IAED;;;;;;OAMG;IACH,0BAJW,MAAM,gBACN,OAAO,GACL,OAAO,CAAE,eAAe,CAAC,CAkErC;IAED;;;;;;;OAOG;IACH,yCALW,MAAM,EAAE,qBACR,OAAO,oBACP,MAAM,EAAE,GACN,OAAO,CAAE,MAAM,CAAC,CA0B5B;IACD;;;;;OAKG;IACH,mCAHW,gBAAgB,GACd,gBAAgB,CAI5B;IACD;;;;;;;OAOG;IACH,4BALW,eAAe,eACf,MAAM,OACN,MAAM,GAAG,MAAM,GACb,OAAO,CAAE,MAAM,CAAC,CAuD5B;CACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBApqBwB,mBAAmB"} \ No newline at end of file +{"version":3,"file":"Folder.d.ts","sourceRoot":"","sources":["../../../lib/metadataTypes/Folder.js"],"names":[],"mappings":";uBASa,OAAO,wBAAwB,EAAE,QAAQ;0BACzC,OAAO,wBAAwB,EAAE,WAAW;8BAC5C,OAAO,wBAAwB,EAAE,eAAe;+BAChD,OAAO,wBAAwB,EAAE,gBAAgB;mCACjD,OAAO,wBAAwB,EAAE,oBAAoB;kCACrD,OAAO,wBAAwB,EAAE,mBAAmB;8BACpD,OAAO,wBAAwB,EAAE,eAAe;iCAChD,OAAO,wBAAwB,EAAE,kBAAkB;gCACnD,OAAO,wBAAwB,EAAE,iBAAiB;0BAClD,OAAO,wBAAwB,EAAE,WAAW;AAVzD;;;;;;;;;;;GAWG;AAEH;;;;GAIG;AACH;IACI;;;;;;;;OAQG;IACH,6BANW,MAAM,qBACN,MAAM,EAAE,eACR,MAAM,EAAE,QACR,MAAM,gBAmIhB;IAED;;;;;;OAMG;IACH,4BAJW,IAAI,GAAG,MAAM,EAAE,eACf,MAAM,EAAE,gBAKlB;IAED;;;;;;;OAOG;IACH,wBAHW,eAAe,GACb,OAAO,CAAE,MAAM,CAAC,CAuK5B;IAED;;;;;OAKG;IACH,6BAHW,gBAAgB,gBA4D1B;IAED;;;;;OAKG;IACH,6BAHW,gBAAgB,gBAyB1B;IAED;;;;;OAKG;IACH,gCAHW,gBAAgB,GACd,OAAO,CAAE,gBAAgB,CAAC,CAgDtC;IAED;;;;;;OAMG;IACH,0BAJW,MAAM,gBACN,OAAO,GACL,OAAO,CAAE,eAAe,CAAC,CAkErC;IAED;;;;;;;OAOG;IACH,yCALW,MAAM,EAAE,qBACR,OAAO,oBACP,MAAM,EAAE,GACN,OAAO,CAAE,MAAM,CAAC,CA2B5B;IACD;;;;;OAKG;IACH,mCAHW,gBAAgB,GACd,gBAAgB,CAI5B;IACD;;;;;;;OAOG;IACH,4BALW,eAAe,eACf,MAAM,OACN,MAAM,GAAG,MAAM,GACb,OAAO,CAAE,MAAM,CAAC,CAuD5B;CACJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBArqBwB,mBAAmB"} \ No newline at end of file diff --git a/lib/metadataTypes/Folder.js b/lib/metadataTypes/Folder.js index cc04d334c..954d2b71f 100644 --- a/lib/metadataTypes/Folder.js +++ b/lib/metadataTypes/Folder.js @@ -586,7 +586,8 @@ class Folder extends MetadataType { const newFilter = { leftOperand: 'ContentType', operator: contentTypeList.length === 1 ? 'equals' : 'IN', - rightOperand: contentTypeList.length === 1 ? contentTypeList[0] : contentTypeList, + rightOperand: + contentTypeList.length === 1 ? contentTypeList[0] : contentTypeList.sort(), }; options.filter = options.filter ? { diff --git a/test/resources/1111111/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml b/test/resources/1111111/dataFolder/retrieve-ContentTypeINdataextension,hidden,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml similarity index 100% rename from test/resources/1111111/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml rename to test/resources/1111111/dataFolder/retrieve-ContentTypeINdataextension,hidden,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-sha,hidden,dataexten,salesforc,shared_da,shared_da,shared_sa,synchroni,automatio,useriniti,journey,mysubs,list,publicati,queryacti,ssjsactiv,triggered,triggered-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-sha,automatio,dataexten,hidden,journey,list,mysubs,publicati,queryacti,salesforc,shared_da,shared_da,shared_sa,ssjsactiv,synchroni,triggered,triggered,useriniti-response.xml similarity index 100% rename from test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-sha,hidden,dataexten,salesforc,shared_da,shared_da,shared_sa,synchroni,automatio,useriniti,journey,mysubs,list,publicati,queryacti,ssjsactiv,triggered,triggered-response.xml rename to test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-sha,automatio,dataexten,hidden,journey,list,mysubs,publicati,queryacti,salesforc,shared_da,shared_da,shared_sa,ssjsactiv,synchroni,triggered,triggered,useriniti-response.xml diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINjourney,asset,asset-shared-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-shared,journey-response.xml similarity index 100% rename from test/resources/9999999/dataFolder/retrieve-ContentTypeINjourney,asset,asset-shared-response.xml rename to test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-shared,journey-response.xml diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINssjsactivity,asset,asset-shared-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-shared,ssjsactivity-response.xml similarity index 100% rename from test/resources/9999999/dataFolder/retrieve-ContentTypeINssjsactivity,asset,asset-shared-response.xml rename to test/resources/9999999/dataFolder/retrieve-ContentTypeINasset,asset-shared,ssjsactivity-response.xml diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINlist,mysubs,suppression_list,publication,contextual_suppression_list-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINcontextual_suppression_list,list,mysubs,publication,suppression_list-response.xml similarity index 100% rename from test/resources/9999999/dataFolder/retrieve-ContentTypeINlist,mysubs,suppression_list,publication,contextual_suppression_list-response.xml rename to test/resources/9999999/dataFolder/retrieve-ContentTypeINcontextual_suppression_list,list,mysubs,publication,suppression_list-response.xml diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension,queryactivity-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINdataextension,hidden,queryactivity,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml similarity index 100% rename from test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension,queryactivity-response.xml rename to test/resources/9999999/dataFolder/retrieve-ContentTypeINdataextension,hidden,queryactivity,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml diff --git a/test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml b/test/resources/9999999/dataFolder/retrieve-ContentTypeINdataextension,hidden,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml similarity index 100% rename from test/resources/9999999/dataFolder/retrieve-ContentTypeINhidden,dataextension,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml rename to test/resources/9999999/dataFolder/retrieve-ContentTypeINdataextension,hidden,salesforcedataextension,shared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml