From 9973af0cb6919e833ac00276413f1121f92edbfa Mon Sep 17 00:00:00 2001
From: Gerald Baulig <gerald.baulig@n-fuse.co>
Date: Thu, 9 Jan 2025 12:39:23 +0100
Subject: [PATCH] fix(setting): preserve setting keys consistency

---
 cfg/config.json           | 2 +-
 src/service.ts            | 2 +-
 src/utils.ts              | 4 ++--
 src/worker.ts             | 3 +--
 test/ordering-srv.spec.ts | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/cfg/config.json b/cfg/config.json
index 10fdc8c..89c7f6d 100644
--- a/cfg/config.json
+++ b/cfg/config.json
@@ -367,7 +367,7 @@
       "shop_invoice_create_enabled": true,
       "shop_invoice_render_enabled": true,
       "shop_invoice_send_enabled": true,
-      "shop_order_error_cleanup": true
+      "shop_order_error_cleanup_enabled": true
     }
   }
 }
diff --git a/src/service.ts b/src/service.ts
index 5662c3f..0440bc1 100644
--- a/src/service.ts
+++ b/src/service.ts
@@ -2042,7 +2042,7 @@ export class OrderingService
       this.logger?.debug('Cleanup failed orders...');
       const failed_order_ids = Object.values(response_map)?.filter(
         order => order.status?.code !== 200
-          && settings.get(order.status?.id)?.shop_order_error_cleanup
+          && settings.get(order.status?.id)?.shop_order_error_cleanup_enabled
       ).map(
         order => order.payload?.id ?? order.status?.id
       ) ?? [];
diff --git a/src/utils.ts b/src/utils.ts
index 42a06e5..9c951fb 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -137,7 +137,7 @@ export const DefaultUrns = {
   shop_invoice_create_enabled:      'urn:restorecommerce:shop:setting:order:submit:invoice:create:enabled',     // Creates invoice on order submit if enabled (default: true)
   shop_invoice_render_enabled:      'urn:restorecommerce:shop:setting:order:submit:invoice:render:enabled',     // Renders invoice on order submit if enabled, overrides create! (default: true)
   shop_invoice_send_enabled:        'urn:restorecommerce:shop:setting:order:submit:invoice:send:enabled',       // Sends invoice on order submit if enabled, overrides render! (default: true)
-  shop_order_error_cleanup:         'urn:restorecommerce:shop:setting:order:error:cleanup:enabled',             // Clean up orders on any error of fulfillment or invoice (default: false)
+  shop_order_error_cleanup_enabled: 'urn:restorecommerce:shop:setting:order:error:cleanup:enabled',             // Clean up orders on any error of fulfillment or invoice (default: false)
 };
 export type KnownUrns = typeof DefaultUrns;
 
@@ -146,7 +146,7 @@ export const DefaultSetting = {
   shop_invoice_create_enabled: true,
   shop_invoice_render_enabled: true,
   shop_invoice_send_enabled: true,
-  shop_order_error_cleanup: true,
+  shop_order_error_cleanup_enabled: true,
 }
 export type ResolvedSetting = typeof DefaultSetting;
 export type ResolvedSettingMap = Map<string, ResolvedSetting>;
diff --git a/src/worker.ts b/src/worker.ts
index f200413..3e1ac85 100644
--- a/src/worker.ts
+++ b/src/worker.ts
@@ -43,8 +43,7 @@ registerProtoMeta(
 );
 
 export type Handler = (msg: any, context: any, config: any, eventName: string) => any;
-export type HandlerMap = { [key: string]: Handler };
-
+export type HandlerMap = Record<string, Handler>;
 export class Worker {
   private _cfg?: ServiceConfig;
   private _offsetStore?: OffsetStore;
diff --git a/test/ordering-srv.spec.ts b/test/ordering-srv.spec.ts
index b47aadc..a72c6a2 100644
--- a/test/ordering-srv.spec.ts
+++ b/test/ordering-srv.spec.ts
@@ -104,7 +104,7 @@ describe('The Ordering Service:', () => {
         worker?.stop(),
       ])
     ).finally(
-      () => mocking?.forEach(mock => mock?.stop())
+      () => Promise.allSettled(mocking?.map(mock => mock?.stop()))
     );
   });