@unchainedshop/core 5.0.0-alpha.7 → 5.0.0-alpha.9

package/lib/services/checkoutOrder.js

@@ -2,6 +2,7 @@ import { OrderStatus } from '@unchainedshop/core-orders';
 import { nextUserCartService } from "./nextUserCart.js";
 import { validateOrderService } from "./validateOrder.js";
 import { processOrderService } from "./processOrder.js";
+import { reserveOrderDiscountsForCheckout } from "./reserveOrderDiscountsForCheckout.js";
 export async function checkoutOrderService(orderId, transactionContext) {
     const order = await this.orders.findOrder({ orderId });
     if (!order)
@@ -10,7 +11,9 @@ export async function checkoutOrderService(orderId, transactionContext) {
         return order;
     await validateOrderService.bind(this)(order);
     const lock = await this.orders.acquireLock(order._id, 'checkout');
+    let discounts;
     try {
+        discounts = await reserveOrderDiscountsForCheckout.call(this, order);
         const processedOrder = await processOrderService.bind(this)(order, transactionContext);
         if (processedOrder.billingAddress) {
             await this.users.updateLastBillingAddress(processedOrder.userId, processedOrder.billingAddress);
@@ -27,6 +30,7 @@ export async function checkoutOrderService(orderId, transactionContext) {
         return processedOrder;
     }
     finally {
+        await discounts?.release();
         await lock.release();
     }
 }

package/lib/services/reserveOrderDiscountsForCheckout.d.ts

@@ -0,0 +1,5 @@
+import type { Order } from '@unchainedshop/core-orders';
+import type { Modules } from '../modules.ts';
+export declare function reserveOrderDiscountsForCheckout(this: Modules, order: Order): Promise<{
+    release: () => Promise<void>;
+}>;

package/lib/services/reserveOrderDiscountsForCheckout.js

@@ -0,0 +1,34 @@
+import { createLogger } from '@unchainedshop/logger';
+import { OrderDiscountDirector } from "../directors/OrderDiscountDirector.js";
+const logger = createLogger('unchained:core:checkoutOrder');
+export async function reserveOrderDiscountsForCheckout(order) {
+    const reservations = [];
+    const release = async () => {
+        const results = await Promise.allSettled(reservations.map((reservation) => reservation.release()));
+        for (const result of results) {
+            if (result.status === 'rejected') {
+                logger.error(`Could not release a discount reservation of order ${order._id}`, {
+                    error: result.reason,
+                });
+            }
+        }
+    };
+    try {
+        const discounts = await this.orders.discounts.findOrderDiscounts({ orderId: order._id });
+        for (const orderDiscount of discounts) {
+            const Adapter = OrderDiscountDirector.getAdapter(orderDiscount.discountKey);
+            if (!Adapter)
+                continue;
+            const adapter = await Adapter.actions({
+                context: { order, orderDiscount, code: orderDiscount.code, modules: this },
+            });
+            if (adapter.reserveForCheckout)
+                reservations.push(await adapter.reserveForCheckout());
+        }
+        return { release };
+    }
+    catch (error) {
+        await release();
+        throw error;
+    }
+}

package/lib/services/simulateProductDispatching.d.ts

@@ -3,10 +3,12 @@ import type { Product } from '@unchainedshop/core-products';
 import { type EstimatedDispatch } from '../directors/WarehousingDirector.ts';
 import type { WarehousingContext } from '../directors/WarehousingAdapter.ts';
 import type { WarehousingProvider } from '@unchainedshop/core-warehousing';
-export declare function simulateProductDispatchingService(this: Modules, { product, quantity, referenceDate, }: {
+import type { DeliveryProviderType } from '@unchainedshop/core-delivery';
+export declare function simulateProductDispatchingService(this: Modules, { product, quantity, referenceDate, deliveryProviderType, }: {
     product: Product;
     quantity: number;
     referenceDate?: Date;
+    deliveryProviderType?: DeliveryProviderType | null;
 }): Promise<(WarehousingContext & EstimatedDispatch & {
     warehousingProvider: WarehousingProvider;
 })[]>;

package/lib/services/simulateProductDispatching.js

@@ -1,7 +1,7 @@
 import { supportedWarehousingProvidersService } from "./supportedWarehousingProviders.js";
 import { WarehousingDirector } from "../directors/WarehousingDirector.js";
-export async function simulateProductDispatchingService({ product, quantity, referenceDate, }) {
-    const deliveryProviders = await this.delivery.allProviders();
+export async function simulateProductDispatchingService({ product, quantity, referenceDate, deliveryProviderType, }) {
+    const deliveryProviders = (await this.delivery.allProviders()).filter(({ type }) => !deliveryProviderType || type === deliveryProviderType);
     return deliveryProviders.reduce(async (oldResult, deliveryProvider) => {
         const result = await oldResult;
         const warehousingProviders = await supportedWarehousingProvidersService.bind(this)({
@@ -25,6 +25,6 @@ export async function simulateProductDispatchingService({ product, quantity, ref
                 ...dispatch,
             };
         }));
-        return result.concat(result, mappedWarehousingProviders);
+        return result.concat(mappedWarehousingProviders);
     }, Promise.resolve([]));
 }

package/lib/services/simulateProductInventory.d.ts

@@ -2,9 +2,11 @@ import type { Modules } from '../modules.ts';
 import type { Product } from '@unchainedshop/core-products';
 import type { WarehousingContext } from '../directors/WarehousingAdapter.ts';
 import type { WarehousingProvider } from '@unchainedshop/core-warehousing';
-export declare function simulateProductInventoryService(this: Modules, { product, referenceDate, }: {
+import type { DeliveryProviderType } from '@unchainedshop/core-delivery';
+export declare function simulateProductInventoryService(this: Modules, { product, referenceDate, deliveryProviderType, }: {
     product: Product;
     referenceDate?: Date;
+    deliveryProviderType?: DeliveryProviderType | null;
 }): Promise<(WarehousingContext & {
     quantity?: number;
 } & {

package/lib/services/simulateProductInventory.js

@@ -1,7 +1,7 @@
 import { supportedWarehousingProvidersService } from "./supportedWarehousingProviders.js";
 import { WarehousingDirector } from "../directors/WarehousingDirector.js";
-export async function simulateProductInventoryService({ product, referenceDate, }) {
-    const deliveryProviders = await this.delivery.allProviders();
+export async function simulateProductInventoryService({ product, referenceDate, deliveryProviderType, }) {
+    const deliveryProviders = (await this.delivery.allProviders()).filter(({ type }) => !deliveryProviderType || type === deliveryProviderType);
     return deliveryProviders.reduce(async (oldResult, deliveryProvider) => {
         const result = await oldResult;
         const warehousingProviders = await supportedWarehousingProvidersService.bind(this)({
@@ -24,6 +24,6 @@ export async function simulateProductInventoryService({ product, referenceDate,
                 ...stock,
             };
         }));
-        return result.concat(result, mappedWarehousingProviders);
+        return result.concat(mappedWarehousingProviders);
     }, Promise.resolve([]));
 }

package/lib/services/supportedDeliveryProviders.js

@@ -1,8 +1,17 @@
 import { deliverySettings } from '@unchainedshop/core-delivery';
+import { createLogger } from '@unchainedshop/logger';
 import { DeliveryDirector } from "../directors/index.js";
+const logger = createLogger('unchained:core');
 export async function supportedDeliveryProvidersService(params) {
     const allProviders = await this.delivery.allProviders();
     const providers = (await Promise.all(allProviders.map(async (provider) => {
+        if (!DeliveryDirector.getAdapter(provider.adapterKey)) {
+            logger.warn('Delivery provider skipped, its adapter is not registered', {
+                deliveryProviderId: provider._id,
+                adapterKey: provider.adapterKey,
+            });
+            return [];
+        }
         const adapter = await DeliveryDirector.actions(provider, params, { modules: this });
         return adapter.isActive() ? [provider] : [];
     }))).flat();

package/lib/services/supportedPaymentProviders.js

@@ -1,8 +1,17 @@
 import { paymentSettings } from '@unchainedshop/core-payment';
+import { createLogger } from '@unchainedshop/logger';
 import { PaymentDirector } from "../directors/PaymentDirector.js";
+const logger = createLogger('unchained:core');
 export async function supportedPaymentProvidersService(params) {
     const allProviders = await this.payment.paymentProviders.allProviders();
     const providers = (await Promise.all(allProviders.map(async (provider) => {
+        if (!PaymentDirector.getAdapter(provider.adapterKey)) {
+            logger.warn('Payment provider skipped, its adapter is not registered', {
+                paymentProviderId: provider._id,
+                adapterKey: provider.adapterKey,
+            });
+            return [];
+        }
         const adapter = await PaymentDirector.actions(provider, params, { modules: this });
         return adapter.isActive() ? [provider] : [];
     }))).flat();

package/lib/services/supportedWarehousingProviders.js

@@ -1,7 +1,16 @@
+import { createLogger } from '@unchainedshop/logger';
 import { WarehousingDirector } from "../directors/index.js";
+const logger = createLogger('unchained:core');
 export async function supportedWarehousingProvidersService(params) {
     const allProviders = await this.warehousing.allProviders();
     const providers = (await Promise.all(allProviders.map(async (provider) => {
+        if (!WarehousingDirector.getAdapter(provider.adapterKey)) {
+            logger.warn('Warehousing provider skipped, its adapter is not registered', {
+                warehousingProviderId: provider._id,
+                adapterKey: provider.adapterKey,
+            });
+            return [];
+        }
         const adapter = await WarehousingDirector.actions(provider, params, { modules: this });
         return adapter.isActive() ? [provider] : [];
     }))).flat();

package/package.json

@@ -1,7 +1,10 @@
 {
   "name": "@unchainedshop/core",
   "description": "Core orchestration package for the Unchained Engine with business services and directors",
-  "version": "5.0.0-alpha.7",
+  "version": "5.0.0-alpha.9",
+  "files": [
+    "lib"
+  ],
   "main": "lib/core-index.js",
   "types": "lib/core-index.d.ts",
   "type": "module",
@@ -35,27 +38,27 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/core-assortments": "^5.0.0-alpha.7",
-    "@unchainedshop/core-bookmarks": "^5.0.0-alpha.7",
-    "@unchainedshop/core-countries": "^5.0.0-alpha.7",
-    "@unchainedshop/core-currencies": "^5.0.0-alpha.7",
-    "@unchainedshop/core-delivery": "^5.0.0-alpha.7",
-    "@unchainedshop/core-enrollments": "^5.0.0-alpha.7",
-    "@unchainedshop/core-events": "^5.0.0-alpha.7",
-    "@unchainedshop/core-files": "^5.0.0-alpha.7",
-    "@unchainedshop/core-filters": "^5.0.0-alpha.7",
-    "@unchainedshop/core-languages": "^5.0.0-alpha.7",
-    "@unchainedshop/core-orders": "^5.0.0-alpha.7",
-    "@unchainedshop/core-payment": "^5.0.0-alpha.7",
-    "@unchainedshop/core-products": "^5.0.0-alpha.7",
-    "@unchainedshop/core-quotations": "^5.0.0-alpha.7",
-    "@unchainedshop/core-users": "^5.0.0-alpha.7",
-    "@unchainedshop/core-warehousing": "^5.0.0-alpha.7",
-    "@unchainedshop/core-worker": "^5.0.0-alpha.7",
-    "@unchainedshop/events": "^5.0.0-alpha.7",
-    "@unchainedshop/logger": "^5.0.0-alpha.7",
-    "@unchainedshop/mongodb": "^5.0.0-alpha.7",
-    "@unchainedshop/utils": "^5.0.0-alpha.7",
+    "@unchainedshop/core-assortments": "^5.0.0-alpha.9",
+    "@unchainedshop/core-bookmarks": "^5.0.0-alpha.9",
+    "@unchainedshop/core-countries": "^5.0.0-alpha.9",
+    "@unchainedshop/core-currencies": "^5.0.0-alpha.9",
+    "@unchainedshop/core-delivery": "^5.0.0-alpha.9",
+    "@unchainedshop/core-enrollments": "^5.0.0-alpha.9",
+    "@unchainedshop/core-events": "^5.0.0-alpha.9",
+    "@unchainedshop/core-files": "^5.0.0-alpha.9",
+    "@unchainedshop/core-filters": "^5.0.0-alpha.9",
+    "@unchainedshop/core-languages": "^5.0.0-alpha.9",
+    "@unchainedshop/core-orders": "^5.0.0-alpha.9",
+    "@unchainedshop/core-payment": "^5.0.0-alpha.9",
+    "@unchainedshop/core-products": "^5.0.0-alpha.9",
+    "@unchainedshop/core-quotations": "^5.0.0-alpha.9",
+    "@unchainedshop/core-users": "^5.0.0-alpha.9",
+    "@unchainedshop/core-warehousing": "^5.0.0-alpha.9",
+    "@unchainedshop/core-worker": "^5.0.0-alpha.9",
+    "@unchainedshop/events": "^5.0.0-alpha.9",
+    "@unchainedshop/logger": "^5.0.0-alpha.9",
+    "@unchainedshop/mongodb": "^5.0.0-alpha.9",
+    "@unchainedshop/utils": "^5.0.0-alpha.9",
     "minipass-json-stream": "^1.0.2",
     "zod": "^4.2.0"
   },