Skip to content

Commit 9973af0

Browse files
author
Gerald Baulig
committed
fix(setting): preserve setting keys consistency
1 parent 0a10f84 commit 9973af0

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

cfg/config.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@
367367
"shop_invoice_create_enabled": true,
368368
"shop_invoice_render_enabled": true,
369369
"shop_invoice_send_enabled": true,
370-
"shop_order_error_cleanup": true
370+
"shop_order_error_cleanup_enabled": true
371371
}
372372
}
373373
}

src/service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2042,7 +2042,7 @@ export class OrderingService
20422042
this.logger?.debug('Cleanup failed orders...');
20432043
const failed_order_ids = Object.values(response_map)?.filter(
20442044
order => order.status?.code !== 200
2045-
&& settings.get(order.status?.id)?.shop_order_error_cleanup
2045+
&& settings.get(order.status?.id)?.shop_order_error_cleanup_enabled
20462046
).map(
20472047
order => order.payload?.id ?? order.status?.id
20482048
) ?? [];

src/utils.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ export const DefaultUrns = {
137137
shop_invoice_create_enabled: 'urn:restorecommerce:shop:setting:order:submit:invoice:create:enabled', // Creates invoice on order submit if enabled (default: true)
138138
shop_invoice_render_enabled: 'urn:restorecommerce:shop:setting:order:submit:invoice:render:enabled', // Renders invoice on order submit if enabled, overrides create! (default: true)
139139
shop_invoice_send_enabled: 'urn:restorecommerce:shop:setting:order:submit:invoice:send:enabled', // Sends invoice on order submit if enabled, overrides render! (default: true)
140-
shop_order_error_cleanup: 'urn:restorecommerce:shop:setting:order:error:cleanup:enabled', // Clean up orders on any error of fulfillment or invoice (default: false)
140+
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)
141141
};
142142
export type KnownUrns = typeof DefaultUrns;
143143

@@ -146,7 +146,7 @@ export const DefaultSetting = {
146146
shop_invoice_create_enabled: true,
147147
shop_invoice_render_enabled: true,
148148
shop_invoice_send_enabled: true,
149-
shop_order_error_cleanup: true,
149+
shop_order_error_cleanup_enabled: true,
150150
}
151151
export type ResolvedSetting = typeof DefaultSetting;
152152
export type ResolvedSettingMap = Map<string, ResolvedSetting>;

src/worker.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ registerProtoMeta(
4343
);
4444

4545
export type Handler = (msg: any, context: any, config: any, eventName: string) => any;
46-
export type HandlerMap = { [key: string]: Handler };
47-
46+
export type HandlerMap = Record<string, Handler>;
4847
export class Worker {
4948
private _cfg?: ServiceConfig;
5049
private _offsetStore?: OffsetStore;

test/ordering-srv.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ describe('The Ordering Service:', () => {
104104
worker?.stop(),
105105
])
106106
).finally(
107-
() => mocking?.forEach(mock => mock?.stop())
107+
() => Promise.allSettled(mocking?.map(mock => mock?.stop()))
108108
);
109109
});
110110

0 commit comments

Comments
 (0)