Merge pull request #2033 from Accenture/bug/2028-handle-event-404-whe…

…n-trying-to-delete-gracefully Bug/2028 handle event 404 when trying to delete gracefully
Accenture · Jan 30, 2025 · 353dedf · 353dedf
2 parents 2a07e19 + d3362af
commit 353dedf
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 16 deletions.
diff --git a/@types/lib/metadataTypes/Event.d.ts.map b/@types/lib/metadataTypes/Event.d.ts.map
diff --git a/@types/lib/metadataTypes/Journey.d.ts.map b/@types/lib/metadataTypes/Journey.d.ts.map
diff --git a/lib/metadataTypes/Event.js b/lib/metadataTypes/Event.js
@@ -46,7 +46,6 @@ class Event extends MetadataType {
      * @returns {Promise.<MetadataTypeMapObj>} Promise of metadata
      */
     static async retrieve(retrieveDir, _, __, key) {
-        Util.logBeta(this.definition.type);
         try {
             return await super.retrieveREST(
                 retrieveDir,
@@ -87,7 +86,6 @@ class Event extends MetadataType {
      * @returns {Promise.<MetadataTypeItemObj>} Promise of metadata
      */
     static async retrieveAsTemplate(templateDir, name, templateVariables) {
-        Util.logBeta(this.definition.type);
         const res = await this.client.rest.get(
             '/interaction/v1/eventDefinitions?name=' + encodeURIComponent(name)
         );
@@ -141,13 +139,27 @@ class Event extends MetadataType {
      * @param {string} key Identifier of item
      * @returns {Promise.<boolean>} deletion success status
      */
-    static deleteByKey(key) {
-        Util.logBeta(this.definition.type);
-        return super.deleteByKeyREST(
-            '/interaction/v1/eventDefinitions/key:' + encodeURIComponent(key),
-            key,
-            false
-        );
+    static async deleteByKey(key) {
+        let response = false;
+        try {
+            response = await super.deleteByKeyREST(
+                '/interaction/v1/eventDefinitions/key:' + encodeURIComponent(key),
+                key,
+                true
+            );
+            Util.logger.info(` - deleted ${this.definition.type}: ${key}`);
+        } catch (ex) {
+            if (ex.code === 30000) {
+                Util.logger.warn(
+                    ` ☇ skipping deletion of ${this.definition.type} ${key}: not found on server`
+                );
+            } else {
+                Util.logger.errorStack(ex, ` - Deleting ${this.definition.type} '${key}' failed`);
+            }
+
+            return false;
+        }
+        return response;
     }
 
     /**

diff --git a/lib/metadataTypes/Journey.js b/lib/metadataTypes/Journey.js
@@ -47,10 +47,6 @@ class Journey extends MetadataType {
      */
     static async retrieve(retrieveDir, _, __, key) {
         const extrasDefault = 'activities';
-        if (retrieveDir) {
-            // only print this during retrieve, not during retrieveForCache
-            Util.logBeta(this.definition.type);
-        }
 
         let singleKey = '';
         let mode = 'all';
@@ -318,7 +314,7 @@ class Journey extends MetadataType {
     }
 
     /**
-     * Deploys metadata - merely kept here to be able to print {@link Util.logBeta} once per deploy
+     * Deploys metadata
      *
      * @param {MetadataTypeMap} metadataMap metadata mapped by their keyField
      * @param {string} deployDir directory where deploy metadata are saved