mcdev 4.3.3 → 5.0.0

package/lib/metadataTypes/{Interaction.js → Journey.js}

@@ -8,7 +8,7 @@ const cache = require('../util/cache');
 const File = require('../util/file');
 
 /**
- * Interaction MetadataType
+ * Journey MetadataType
  * ! BETA RELEASE of journey support (v4.3.0); it so far only resolves a limited amount of dependencies and will likely break during cross-BU deployments!
  * id: A unique id of the journey assigned by the journey’s API during its creation
  * key: A unique id of the journey within the MID. Can be generated by the developer
@@ -16,9 +16,9 @@ const File = require('../util/file');
  *
  * @augments MetadataType
  */
-class Interaction extends MetadataType {
+class Journey extends MetadataType {
     /**
-     * Retrieves Metadata of Interaction
+     * Retrieves Metadata of Journey
      *
      * @param {string} retrieveDir Directory where retrieved metadata directory will be saved
      * @param {void} [_] unused parameter
@@ -72,7 +72,6 @@ class Interaction extends MetadataType {
                     retrieveDir,
                     `${uri}${singleKey}?extras=${extras}`,
                     null,
-                    null,
                     key
                 );
             } else {
@@ -97,11 +96,12 @@ class Interaction extends MetadataType {
                           results.items.map(async (a) => {
                               try {
                                   return await this.client.rest.get(
-                                      `${uri}key:${a[this.definition.keyField]}?extras=${extras}`
+                                      `${uri}key:${a[this.definition.keyField]}?extras=${extras}` +
+                                          `&versionNumber=${a.version}`
                                   );
                               } catch (ex) {
                                   // if we do get here, we should log the error and continue instead of failing to download all automations
-                                  Util.logger.error(
+                                  Util.logger.warn(
                                       ` ☇ skipping ${this.definition.type} ${
                                           a[this.definition.nameField]
                                       } (${a[this.definition.keyField]}): ${ex.message} (${
@@ -139,7 +139,7 @@ class Interaction extends MetadataType {
             // if the interaction does not exist, the API returns an error code which would otherwise bring execution to a hold
             if (
                 [
-                    'Interaction matching key not found.',
+                    'Journey matching key not found.',
                     'Must provide a valid ID or Key parameter',
                 ].includes(ex.message)
             ) {
@@ -201,7 +201,7 @@ class Interaction extends MetadataType {
             );
         }
         Util.logger.warn(
-            `Deleting Interactions via this command breaks following retrieve-by-key/id requests until you've deployed/created a new draft version! You can get still get the latest available version of your journey by retrieving all interactions on this BU.`
+            `Deleting Journeys via this command breaks following retrieve-by-key/id requests until you've deployed/created a new draft version! You can get still get the latest available version of your journey by retrieving all interactions on this BU.`
         );
         /* eslint-enable unicorn/prefer-ternary */
         return super.deleteByKeyREST(
@@ -216,11 +216,12 @@ class Interaction extends MetadataType {
      * @param {TYPE.MetadataTypeMap} metadata metadata mapped by their keyField
      * @param {string} deployDir directory where deploy metadata are saved
      * @param {string} retrieveDir directory where metadata after deploy should be saved
+     * @param {boolean} [isRefresh] optional flag - so far not used by interaction
      * @returns {Promise.<TYPE.MetadataTypeMap>} Promise of keyField => metadata map
      */
-    static async deploy(metadata, deployDir, retrieveDir) {
+    static async deploy(metadata, deployDir, retrieveDir, isRefresh) {
         Util.logBeta(this.definition.type);
-        return super.deploy(metadata, deployDir, retrieveDir);
+        return super.deploy(metadata, deployDir, retrieveDir, isRefresh);
     }
 
     /**
@@ -230,7 +231,11 @@ class Interaction extends MetadataType {
      * @returns {Promise} Promise
      */
     static update(metadata) {
-        return super.updateREST(metadata, '/interaction/v1/interactions/', true);
+        return super.updateREST(
+            metadata,
+            '/interaction/v1/interactions/key:' + metadata.key,
+            'put'
+        );
     }
 
     /**
@@ -260,7 +265,7 @@ class Interaction extends MetadataType {
     }
 
     /**
-     * helper for Interaction's {@link saveResults}. Gets executed after retreive of metadata type and
+     * helper for Journey's {@link saveResults}. Gets executed after retreive of metadata type and
      *
      * @param {TYPE.MetadataTypeMap} metadataMap key=customer key, value=metadata
      */
@@ -287,8 +292,8 @@ class Interaction extends MetadataType {
      * manages post retrieve steps
      * ! BETA RELEASE of journey support (v4.3.0); it so far only resolves a limited amount of dependencies and will likely break during cross-BU deployments!
      *
-     * @param {TYPE.MetadataTypeItem} metadata a single query
-     * @returns {TYPE.MetadataTypeItem} Array with one metadata object and one query string
+     * @param {TYPE.MetadataTypeItem} metadata a single item
+     * @returns {TYPE.MetadataTypeItem} Array with one metadata object
      */
     static postRetrieveTasks(metadata) {
         // folder
@@ -298,7 +303,7 @@ class Interaction extends MetadataType {
             case 'Multistep': {
                 // Multi-Step Journey
                 // ~~~ TRIGGERS ~~~~
-                // eventDefinition / definitionType==='Multistep' && channel==='' && triggers[].type === 'EmailAudience'|'APIEvent'
+                // event / definitionType==='Multistep' && channel==='' && triggers[].type === 'EmailAudience'|'APIEvent'
                 if (
                     metadata.triggers?.length > 0 &&
                     metadata.triggers[0].metaData?.eventDefinitionKey
@@ -306,14 +311,14 @@ class Interaction extends MetadataType {
                     // trigger found; there can only be one entry in this array
                     try {
                         const edId = cache.searchForField(
-                            'eventDefinition',
+                            'event',
                             metadata.triggers[0].metaData.eventDefinitionKey,
                             'eventDefinitionKey',
                             'id'
                         );
                         if (metadata.triggers[0].metaData.eventDefinitionId !== edId) {
                             throw new Error(
-                                `eventDefinitionId not matching Id found on eventDefinition with key in eventDefinitionKey`
+                                `eventDefinitionId not matching Id found on event with key in eventDefinitionKey`
                             );
                         }
                         delete metadata.triggers[0].metaData.eventDefinitionId;
@@ -328,44 +333,7 @@ class Interaction extends MetadataType {
 
                 // ~~~ ACTIVITIES ~~~~
 
-                // triggeredSend + email+asset / activities[].type === 'EMAILV2'
-                // TODO email / asset
-                for (const item of metadata.activities) {
-                    // check if all triggeredSends are there
-                    try {
-                        if (item.configurationArguments?.triggeredSendKey) {
-                            // triggeredSendKey is not always set but triggeredSendId is
-                            cache.searchForField(
-                                'triggeredSendDefinition',
-                                item.configurationArguments.triggeredSendKey,
-                                'CustomerKey',
-                                'CustomerKey'
-                            );
-                            delete item.configurationArguments.triggeredSendId;
-                        } else if (item.configurationArguments?.triggeredSendId) {
-                            // triggeredSendKey is not always set but triggeredSendId is
-                            item.configurationArguments.triggeredSendKey = cache.searchForField(
-                                'triggeredSendDefinition',
-                                item.configurationArguments.triggeredSendId,
-                                'ObjectID',
-                                'CustomerKey'
-                            );
-                            delete item.configurationArguments.triggeredSendId;
-                        }
-                    } catch (ex) {
-                        Util.logger.warn(
-                            ` - ${this.definition.type} '${metadata[this.definition.nameField]}' (${
-                                metadata[this.definition.keyField]
-                            }): Could not find triggeredSendDefinition (${ex.message})`
-                        );
-                    }
-                }
-
-                // TODO: Filters / activities[].type === 'MULTICRITERIADECISION'
-                // - activities[].arguments.filterResult
-                // - activities[].arguments.configurationArguments.criteria
-
-                // TODO: wait activity / activities[].type === 'WAIT'
+                this._postRetrieveTasks_activities(metadata);
 
                 // TODO: journey template id? / metaData.templateId
                 break;
@@ -378,7 +346,7 @@ class Interaction extends MetadataType {
                     }): definitionType Quicksend is not fully supported yet.`
                 );
                 // ~~~ TRIGGERS ~~~~
-                // eventDefinition && triggers[].type === 'ContactAudience'
+                // event && triggers[].type === 'ContactAudience'
                 if (
                     metadata.triggers?.length > 0 &&
                     metadata.triggers[0].metaData?.eventDefinitionKey
@@ -386,7 +354,7 @@ class Interaction extends MetadataType {
                     // trigger found; there can only be one entry in this array
                     try {
                         const edId = cache.searchForField(
-                            'eventDefinition',
+                            'event',
                             metadata.triggers[0].metaData.eventDefinitionKey,
                             'eventDefinitionKey',
                             'id'
@@ -397,7 +365,7 @@ class Interaction extends MetadataType {
                                     metadata[this.definition.nameField]
                                 } (${
                                     metadata[this.definition.keyField]
-                                }): eventDefinitionId not matching Id found on eventDefinition with key in eventDefinitionKey`
+                                }): eventDefinitionId not matching Id found on event with key in eventDefinitionKey`
                             );
                         }
                         delete metadata.triggers[0].metaData.eventDefinitionId;
@@ -440,18 +408,16 @@ class Interaction extends MetadataType {
                             metadata.activities?.length > 0 &&
                             metadata.activities[0].configurationArguments?.triggeredSendKey
                         ) {
+                            const activity = metadata.activities[0];
                             // trigger found; there can only be one entry in this array
                             try {
                                 const tEmailId = cache.searchForField(
                                     'transactionalEmail',
-                                    metadata.activities[0].configurationArguments?.triggeredSendKey,
+                                    activity.configurationArguments?.triggeredSendKey,
                                     'definitionKey',
                                     'definitionId'
                                 );
-                                if (
-                                    tEmailId !=
-                                    metadata.activities[0].configurationArguments?.triggeredSendId
-                                ) {
+                                if (tEmailId != activity.configurationArguments?.triggeredSendId) {
                                     throw new Error(
                                         ` - ${this.definition.type} ${
                                             metadata[this.definition.nameField]
@@ -461,12 +427,9 @@ class Interaction extends MetadataType {
                                     );
                                 }
                                 if (
-                                    metadata.activities[0].metaData?.highThroughput
-                                        ?.definitionKey &&
-                                    metadata.activities[0].metaData?.highThroughput
-                                        ?.definitionKey !=
-                                        metadata.activities[0].configurationArguments
-                                            ?.triggeredSendKey
+                                    activity.metaData?.highThroughput?.definitionKey &&
+                                    activity.metaData?.highThroughput?.definitionKey !=
+                                        activity.configurationArguments?.triggeredSendKey
                                 ) {
                                     throw new Error(
                                         ` - ${this.definition.type} ${
@@ -514,6 +477,165 @@ class Interaction extends MetadataType {
 
         return metadata;
     }
+    /**
+     * helper for {@link postRetrieveTasks}
+     *
+     * @private
+     * @param {TYPE.MetadataTypeItem} metadata a single item
+     */
+    static _postRetrieveTasks_activities(metadata) {
+        for (const activity of metadata.activities) {
+            switch (activity.type) {
+                case 'EMAILV2': {
+                    // triggeredSend + email+asset
+                    // TODO email / asset
+                    try {
+                        if (activity.configurationArguments?.triggeredSendKey) {
+                            // triggeredSendKey is not always set but triggeredSendId is
+                            cache.searchForField(
+                                'triggeredSend',
+                                activity.configurationArguments.triggeredSendKey,
+                                'CustomerKey',
+                                'CustomerKey'
+                            );
+                            delete activity.configurationArguments.triggeredSendId;
+                        } else if (activity.configurationArguments?.triggeredSendId) {
+                            // triggeredSendKey is not always set but triggeredSendId is
+                            activity.configurationArguments.triggeredSendKey = cache.searchForField(
+                                'triggeredSend',
+                                activity.configurationArguments.triggeredSendId,
+                                'ObjectID',
+                                'CustomerKey'
+                            );
+                            delete activity.configurationArguments.triggeredSendId;
+                        }
+                    } catch (ex) {
+                        Util.logger.warn(
+                            ` - ${this.definition.type} '${metadata[this.definition.nameField]}' (${
+                                metadata[this.definition.keyField]
+                            }) activity-key=${activity.key}: ${ex.message}`
+                        );
+                    }
+
+                    break;
+                }
+                case 'SMSSYNC': {
+                    // mobileMessage
+                    try {
+                        if (activity.configurationArguments?.messageId) {
+                            activity.configurationArguments.c__mobileMessage_id =
+                                cache.searchForField(
+                                    'mobileMessage',
+                                    activity.configurationArguments.messageId,
+                                    'id',
+                                    'id'
+                                );
+                            delete activity.configurationArguments.messageId;
+                        }
+                    } catch (ex) {
+                        Util.logger.warn(
+                            ` - ${this.definition.type} '${metadata[this.definition.nameField]}' (${
+                                metadata[this.definition.keyField]
+                            }) activity-key=${activity.key}: ${ex.message}`
+                        );
+                    }
+                    try {
+                        // mobileKeyword
+                        if (activity.configurationArguments?.keywordId) {
+                            activity.configurationArguments.c__mobileKeyword = cache.searchForField(
+                                'mobileKeyword',
+                                activity.configurationArguments.keywordId,
+                                'id',
+                                'keyword'
+                            );
+                            delete activity.configurationArguments.keywordId;
+                        }
+                    } catch (ex) {
+                        Util.logger.warn(
+                            ` - ${this.definition.type} '${metadata[this.definition.nameField]}' (${
+                                metadata[this.definition.keyField]
+                            }) activity-key=${activity.key}: ${ex.message}`
+                        );
+                    }
+                    try {
+                        if (activity.configurationArguments?.nextKeywordId) {
+                            activity.configurationArguments.c__next_mobileKeyword =
+                                cache.searchForField(
+                                    'mobileKeyword',
+                                    activity.configurationArguments.nextKeywordId,
+                                    'id',
+                                    'keyword'
+                                );
+                            delete activity.configurationArguments.nextKeywordId;
+                        }
+                    } catch (ex) {
+                        Util.logger.warn(
+                            ` - ${this.definition.type} '${metadata[this.definition.nameField]}' (${
+                                metadata[this.definition.keyField]
+                            }) activity-key=${activity.key}: ${ex.message}`
+                        );
+                    }
+                    try {
+                        // mobileCode
+                        if (activity.configurationArguments?.codeId) {
+                            activity.configurationArguments.c__mobileCode = cache.searchForField(
+                                'mobileCode',
+                                activity.configurationArguments.codeId,
+                                'id',
+                                'code'
+                            );
+                            delete activity.configurationArguments.codeId;
+                        }
+                    } catch (ex) {
+                        Util.logger.warn(
+                            ` - ${this.definition.type} '${metadata[this.definition.nameField]}' (${
+                                metadata[this.definition.keyField]
+                            }) activity-key=${activity.key}: ${ex.message}`
+                        );
+                    }
+
+                    try {
+                        // asset-asset: jsonmessage
+                        if (activity.configurationArguments?.assetId) {
+                            activity.configurationArguments.r__assetMessage_Name_readOnly =
+                                cache.searchForField(
+                                    'asset',
+                                    activity.configurationArguments.assetId,
+                                    'id',
+                                    'name'
+                                );
+
+                            activity.configurationArguments.r__assetMessage_Key =
+                                cache.searchForField(
+                                    'asset',
+                                    activity.configurationArguments.assetId,
+                                    'id',
+                                    'customerKey'
+                                );
+                            delete activity.configurationArguments.assetId;
+                        }
+                    } catch (ex) {
+                        Util.logger.warn(
+                            ` - ${this.definition.type} '${metadata[this.definition.nameField]}' (${
+                                metadata[this.definition.keyField]
+                            }) activity-key=${activity.key}: ${ex.message}`
+                        );
+                    }
+
+                    // applicationExtensionId always equal "00000000-0000-0000-0000-000000000000"
+                    delete activity.configurationArguments.applicationExtensionId;
+
+                    break;
+                }
+            }
+            // TODO: Filters / activities[].type === 'MULTICRITERIADECISION'
+            // - activities[].arguments.filterResult
+            // - activities[].arguments.configurationArguments.criteria
+
+            // TODO: wait activity / activities[].type === 'WAIT'
+        }
+    }
+
     /**
      * prepares a TSD for deployment
      * ! BETA RELEASE of journey support (v4.3.0); it so far only resolves a limited amount of dependencies and will likely break during cross-BU deployments!
@@ -534,14 +656,14 @@ class Interaction extends MetadataType {
                 // Multi-Step Journey
                 // ~~~ TRIGGERS ~~~~
 
-                // eventDefinition / definitionType==='Multistep' && channel==='' && triggers[].type === 'EmailAudience'|'APIEvent'
+                // event / definitionType==='Multistep' && channel==='' && triggers[].type === 'EmailAudience'|'APIEvent'
                 if (
                     metadata.triggers?.length > 0 &&
                     metadata.triggers[0].metaData?.eventDefinitionKey
                 ) {
                     // trigger found; there can only be one entry in this array
                     metadata.triggers[0].metaData.eventDefinitionId = cache.searchForField(
-                        'eventDefinition',
+                        'event',
                         metadata.triggers[0].metaData.eventDefinitionKey,
                         'eventDefinitionKey',
                         'id'
@@ -552,21 +674,7 @@ class Interaction extends MetadataType {
 
                 // ~~~ ACTIVITIES ~~~~
 
-                // triggeredSend + email+asset / activities[].type === 'EMAILV2'
-                // TODO email / asset
-                for (const item of metadata.activities) {
-                    // check if all triggeredSends are there
-                    if (!item.configurationArguments?.triggeredSendKey) {
-                        continue;
-                    }
-                    // triggeredSendKey is not always set but triggeredSendId is
-                    item.configurationArguments.triggeredSendId = cache.searchForField(
-                        'triggeredSendDefinition',
-                        item.configurationArguments.triggeredSendKey,
-                        'CustomerKey',
-                        'ObjectID'
-                    );
-                }
+                this._preDeployTasks_activities(metadata);
 
                 // TODO: Filters / activities[].type === 'MULTICRITERIADECISION'
                 // - activities[].arguments.filterResult
@@ -585,7 +693,7 @@ class Interaction extends MetadataType {
                     }): definitionType Quicksend is not supported yet and might fail to deploy.`
                 );
                 // ~~~ TRIGGERS ~~~~
-                // eventDefinition && triggers[].type === 'ContactAudience'
+                // event && triggers[].type === 'ContactAudience'
                 if (
                     metadata.triggers?.length > 0 &&
                     metadata.triggers[0].metaData?.eventDefinitionKey
@@ -593,7 +701,7 @@ class Interaction extends MetadataType {
                     // trigger found; there can only be one entry in this array
                     try {
                         metadata.triggers[0].metaData.eventDefinitionId = cache.searchForField(
-                            'eventDefinition',
+                            'event',
                             metadata.triggers[0].metaData?.eventDefinitionKey,
                             'eventDefinitionKey',
                             'id'
@@ -691,80 +799,136 @@ class Interaction extends MetadataType {
     }
 
     /**
+     * helper for {@link preDeployTasks}
+     *
+     * @private
+     * @param {TYPE.MetadataTypeItem} metadata a single item
+     */
+    static _preDeployTasks_activities(metadata) {
+        for (const activity of metadata.activities) {
+            switch (activity.type) {
+                case 'EMAILV2': {
+                    // triggeredSend + email+asset
+                    // TODO email / asset
+                    if (activity.configurationArguments?.triggeredSendKey) {
+                        // triggeredSendKey is not always set but triggeredSendId is
+                        activity.configurationArguments.triggeredSendId = cache.searchForField(
+                            'triggeredSend',
+                            activity.configurationArguments.triggeredSendKey,
+                            'CustomerKey',
+                            'ObjectID'
+                        );
+                    }
+                    break;
+                }
+                case 'SMSSYNC': {
+                    // mobileMessage
+                    if (activity.configurationArguments?.c__mobileMessage_id) {
+                        activity.configurationArguments.messageId = cache.searchForField(
+                            'mobileMessage',
+                            activity.configurationArguments.c__mobileMessage_id,
+                            'id',
+                            'id'
+                        );
+                        delete activity.configurationArguments.c__mobileMessage_id;
+                    }
+                    // mobileKeyword
+                    if (activity.configurationArguments?.c__mobileKeyword) {
+                        activity.configurationArguments.keywordId = cache.searchForField(
+                            'mobileKeyword',
+                            activity.c__mobileKeyword,
+                            'keyword',
+                            'id'
+                        );
+                        delete activity.configurationArguments.c__mobileKeyword;
+                    }
+                    if (activity.configurationArguments?.c__next_mobileKeyword) {
+                        activity.configurationArguments.nextKeywordId = cache.searchForField(
+                            'mobileKeyword',
+                            activity.configurationArguments.c__next_mobileKeyword,
+                            'keyword',
+                            'id'
+                        );
+                        delete activity.configurationArguments.c__next_mobileKeyword;
+                    }
+                    // mobileCode
+                    if (activity.configurationArguments?.c__mobileCode) {
+                        activity.configurationArguments.codeId = cache.searchForField(
+                            'mobileCode',
+                            activity.configurationArguments.c__mobileCode,
+                            'code',
+                            'id'
+                        );
+                        delete activity.configurationArguments.c__mobileCode;
+                    }
+                    // asset-asset: jsonmessage
+                    if (activity.configurationArguments?.r__assetMessage_Key) {
+                        activity.configurationArguments.assetId = cache.searchForField(
+                            'asset',
+                            activity.configurationArguments.r__assetMessage_Key,
+                            'customerKey',
+                            'id'
+                        );
+                        delete activity.configurationArguments.r__assetMessage_Key;
+                        delete activity.configurationArguments.r__assetMessage_Name_readOnly;
+                    }
+
+                    // applicationExtensionId always equal "00000000-0000-0000-0000-000000000000"
+                    activity.configurationArguments.applicationExtensionId =
+                        '00000000-0000-0000-0000-000000000000';
+                    break;
+                }
+            }
+        }
+    }
+
+    /**
+     * helper for {@link MetadataType.upsert}
      *
-     * @param {TYPE.MetadataTypeItem} metadata single metadata itme
+     * @param {TYPE.MetadataTypeMap} metadataMap list of metadata
      * @param {string} metadataKey key of item we are looking at
      * @param {boolean} hasError error flag from previous code
      * @param {TYPE.MetadataTypeItemDiff[]} metadataToUpdate list of items to update
      * @param {TYPE.MetadataTypeItem[]} metadataToCreate list of items to create
+     * @returns {'create' | 'update' | 'skip'} action to take
      */
-    static createOrUpdate(metadata, metadataKey, hasError, metadataToUpdate, metadataToCreate) {
-        const normalizedKey = File.reverseFilterIllegalFilenames(
-            metadata[metadataKey][this.definition.keyField]
+    static createOrUpdate(metadataMap, metadataKey, hasError, metadataToUpdate, metadataToCreate) {
+        const action = super.createOrUpdate(
+            metadataMap,
+            metadataKey,
+            hasError,
+            metadataToUpdate,
+            metadataToCreate
         );
-        // Update if it already exists; Create it if not
-        if (Util.logger.level === 'debug' && metadata[metadataKey][this.definition.idField]) {
-            // TODO: re-evaluate in future releases if & when we managed to solve folder dependencies once and for all
-            // only used if resource is excluded from cache and we still want to update it
-            // needed e.g. to rewire lost folders
-            Util.logger.warn(
-                ' - Hotfix for non-cachable resource found in deploy folder. Trying update:'
+        if (action === 'update') {
+            const normalizedKey = File.reverseFilterIllegalFilenames(
+                metadataMap[metadataKey][this.definition.keyField]
             );
-            Util.logger.warn(JSON.stringify(metadata[metadataKey]));
-            if (hasError) {
-                metadataToUpdate.push(null);
-            } else {
-                metadataToUpdate.push({
-                    before: {},
-                    after: metadata[metadataKey],
-                });
-            }
-        } else {
             const cachedVersion = cache.getByKey(this.definition.type, normalizedKey);
-            if (cachedVersion && cachedVersion.status === 'Draft') {
-                // normal way of processing update files
-                if (!this.hasChanged(cachedVersion, metadata[metadataKey])) {
-                    hasError = true;
-                }
-
-                if (hasError) {
-                    // do this in case something went wrong during pre-deploy steps to ensure the total counter is correct
-                    metadataToUpdate.push(null);
+            if (cachedVersion) {
+                if (cachedVersion.status === 'Draft') {
+                    // add version to ensure we update the correct one
+                    metadataMap[metadataKey].version = cachedVersion.version;
                 } else {
-                    // add ObjectId to allow actual update
-                    metadata[metadataKey][this.definition.idField] =
-                        cachedVersion[this.definition.idField];
-                    // add ObjectId to allow actual update
-                    metadata[metadataKey].version = cachedVersion.version;
-
-                    metadataToUpdate.push({
-                        before: cachedVersion,
-                        after: metadata[metadataKey],
-                    });
-                }
-            } else {
-                if (hasError) {
-                    // do this in case something went wrong during pre-deploy steps to ensure the total counter is correct
-                    metadataToCreate.push(null);
-                } else {
-                    if (cachedVersion) {
-                        Util.logger.info(
-                            ` - Found ${this.definition.type} ${
-                                metadata[metadataKey][this.definition.nameField]
-                            } (${
-                                metadata[metadataKey][this.definition.keyField]
-                            }) on BU, but it is not in Draft status. Will create new version.`
-                        );
-                    }
-
-                    metadataToCreate.push(metadata[metadataKey]);
+                    // remove last entry from metadataToUpdate again
+                    metadataToUpdate.pop();
+                    Util.logger.info(
+                        ` - Found ${this.definition.type} ${
+                            metadataMap[metadataKey][this.definition.nameField]
+                        } (${
+                            metadataMap[metadataKey][this.definition.keyField]
+                        }) on BU, but it is not in Draft status. Will create new version.`
+                    );
+                    metadataToCreate.push(metadataMap[metadataKey]);
+                    return 'create';
                 }
             }
         }
+        return action;
     }
 }
 
 // Assign definition to static attributes
-Interaction.definition = require('../MetadataTypeDefinitions').interaction;
+Journey.definition = require('../MetadataTypeDefinitions').journey;
 
-module.exports = Interaction;
+module.exports = Journey;