Merge pull request #2051 from Accenture/bug/2035-deploy-asset-fails-if-pre-existing-cbbk-dependencies-are-not-also-deployed

Bug/2035 deploy asset fails if pre existing cbbk dependencies are not also deployed

Author: JoernBerkefeld

@types/lib/metadataTypes/Asset.d.ts

@@ -188,13 +188,13 @@ class Asset extends MetadataType {
     }
 
     /**
-     * Returns Order in which metadata needs to be retrieved/deployed
+     * Returns Order in which metadata needs to be retrieved/deployed and skips components with missing components
      *
      * @param {AssetMap} metadataMap metadata mapped by their keyField
      * @param {string} deployDir directory where deploy metadata are saved
      * @returns {Promise.<AssetMap>} keyField => metadata map but sorted to ensure dependencies are deployed in correct order
      */
-    static async _getUpsertOrder(metadataMap, deployDir) {
+    static async _getUpsertOrderAndSkipMissing(metadataMap, deployDir) {
         /**
          * one entry for each dependency with the first item being the key thats required by the second item
          *
@@ -225,11 +225,14 @@ class Asset extends MetadataType {
                     dependencies.push([undefined, key]);
                 }
             } catch (ex) {
-                if (ex.code !== 200) {
-                    Util.logger.errorStack(ex, 'Cannot find related code blocks for ' + key);
+                if (ex.code === 200) {
+                    // no dependent keys found
+                    dependencies.push([undefined, key]);
+                } else {
+                    Util.logger.error(
+                        ` ☇ skipping ${this.definition.type} ${key}: content block ${ex.message} that is referenced via ContentBlockByX was not found on BU nor in deployment package`
+                    );
                 }
-                // no dependent keys found
-                dependencies.push([undefined, key]);
             }
         }
 
@@ -240,7 +243,9 @@ class Asset extends MetadataType {
         const metadataTypeMapSorted = {};
         // group subtypes per type
         for (const key of flatList) {
-            metadataTypeMapSorted[key] = metadataMap[key];
+            if (metadataMap[key]) {
+                metadataTypeMapSorted[key] = metadataMap[key];
+            }
         }
         return metadataTypeMapSorted;
     }
@@ -253,12 +258,13 @@ class Asset extends MetadataType {
      * @returns {Promise.<AssetMap>} keyField => metadata map
      */
     static async upsert(metadataMap, deployDir) {
-        if (Object.keys(metadataMap).length > 1) {
-            // fill the cache map with our deployment package to ensure we can find
-            ReplaceCbReference.createCacheForMap(metadataMap);
-            // assets can link to other assets (via template, content block reference and SSJS/AMPscript) and deployment would fail if we did not sort this here
-            metadataMap = await this._getUpsertOrder(metadataMap, deployDir);
-        }
+        // add already existing, cached items to our cache map to ensure we can find them
+        ReplaceCbReference.createCacheForMap(cache.getCache().asset);
+        // await ReplaceCbReference.createCache(this.properties, this.buObject, true);
+        // fill the cache map with our deployment package to ensure we can find
+        ReplaceCbReference.createCacheForMap(metadataMap);
+        // assets can link to other assets (via template, content block reference and SSJS/AMPscript) and deployment would fail if we did not sort this here
+        metadataMap = await this._getUpsertOrderAndSkipMissing(metadataMap, deployDir);
         return super.upsert(metadataMap, deployDir, true);
     }