@unchainedshop/core-orders 4.0.0-rc.9 → 4.0.1

package/src/module/configureOrdersModule.ts

@@ -6,37 +6,16 @@ import { OrderPaymentsCollection } from '../db/OrderPaymentsCollection.js';
 import { OrderPositionsCollection } from '../db/OrderPositionsCollection.js';
 import { OrdersCollection, Order, OrderStatus } from '../db/OrdersCollection.js';
 import { ordersSettings, OrdersSettingsOptions } from '../orders-settings.js';
-import {
-  configureOrderDeliveriesModule,
-  OrderDeliveriesModule,
-} from './configureOrderDeliveriesModule.js';
-import { configureOrderDiscountsModule, OrderDiscountsModule } from './configureOrderDiscountsModule.js';
-import { configureOrderPaymentsModule, OrderPaymentsModule } from './configureOrderPaymentsModule.js';
-import { configureOrderPositionsModule, OrderPositionsModule } from './configureOrderPositionsModule.js';
-import { configureOrderModuleMutations, OrderMutations } from './configureOrdersModule-mutations.js';
-import { configureOrdersModuleQueries, OrderQueries } from './configureOrdersModule-queries.js';
+import { configureOrderDeliveriesModule } from './configureOrderDeliveriesModule.js';
+import { configureOrderDiscountsModule } from './configureOrderDiscountsModule.js';
+import { configureOrderPaymentsModule } from './configureOrderPaymentsModule.js';
+import { configureOrderPositionsModule } from './configureOrderPositionsModule.js';
+import { configureOrderModuleMutations } from './configureOrdersModule-mutations.js';
+import { configureOrdersModuleQueries } from './configureOrdersModule-queries.js';
 import { emit, registerEvents } from '@unchainedshop/events';
 
 import renameCurrencyCode from '../migrations/20250502111800-currency-code.js';
 
-export type OrdersModule = OrderQueries &
-  OrderMutations & {
-    // Sub entities
-    deliveries: OrderDeliveriesModule;
-    discounts: OrderDiscountsModule;
-    positions: OrderPositionsModule;
-    payments: OrderPaymentsModule;
-
-    updateStatus: (orderId: string, params: { status: OrderStatus; info?: string }) => Promise<Order>;
-    acquireLock: (
-      orderId: string,
-      identifier: string,
-      timeout?: number,
-    ) => Promise<{ release: () => void }>;
-    setDeliveryProvider: (orderId: string, deliveryProviderId: string) => Promise<Order>;
-    setPaymentProvider: (orderId: string, paymentProviderId: string) => Promise<Order>;
-  };
-
 // @kontsedal/locco uses a deprecated way of importing files in ESM (node16 behavior)
 const require = createRequire(import.meta.url);
 const { Locker, MongoAdapter } = require('@kontsedal/locco');
@@ -52,7 +31,7 @@ export const configureOrdersModule = async ({
   db,
   migrationRepository,
   options: orderOptions = {},
-}: ModuleInput<OrdersSettingsOptions>): Promise<OrdersModule> => {
+}: ModuleInput<OrdersSettingsOptions>) => {
   // Migration v3 -> v4
   renameCurrencyCode(migrationRepository);
 
@@ -117,10 +96,14 @@ export const configureOrdersModule = async ({
     positions: orderPositionsModule,
     payments: orderPaymentsModule,
 
-    updateStatus: async (orderId, { status, info }) => {
+    updateStatus: async (
+      orderId: string,
+      { status, info }: { status: OrderStatus | null; info?: string },
+    ) => {
       const selector = generateDbFilterById(orderId);
       const order = await Orders.findOne(selector, {});
 
+      if (!order) return null;
       if (order.status === status) return order;
 
       const date = new Date();
@@ -197,7 +180,7 @@ export const configureOrdersModule = async ({
       return await locker.lock(`order:${identifier}:${orderId}`, timeout).acquire();
     },
 
-    setDeliveryProvider: async (orderId, deliveryProviderId) => {
+    setDeliveryProvider: async (orderId: string, deliveryProviderId: string) => {
       const delivery = await OrderDeliveries.findOne({
         orderId,
         deliveryProviderId,
@@ -215,7 +198,7 @@ export const configureOrdersModule = async ({
         )._id;
 
       const order = await Orders.findOneAndUpdate(
-        { _id: orderId },
+        { _id: orderId, deliveryId: { $ne: deliveryId } },
         {
           $set: {
             deliveryId,
@@ -225,6 +208,7 @@ export const configureOrdersModule = async ({
         { returnDocument: 'after' },
       );
 
+      if (!order) return null;
       await emit('ORDER_SET_DELIVERY_PROVIDER', {
         order,
         deliveryProviderId,
@@ -233,7 +217,7 @@ export const configureOrdersModule = async ({
       return order;
     },
 
-    setPaymentProvider: async (orderId, paymentProviderId) => {
+    setPaymentProvider: async (orderId: string, paymentProviderId: string) => {
       const payment = await OrderPayments.findOne({
         orderId,
         paymentProviderId,
@@ -250,14 +234,16 @@ export const configureOrdersModule = async ({
             status: null,
           })
         )._id;
+
       const order = await Orders.findOneAndUpdate(
-        { _id: orderId },
+        { _id: orderId, paymentId: { $ne: paymentId } },
         {
           $set: { paymentId, updated: new Date() },
         },
         { returnDocument: 'after' },
       );
 
+      if (!order) return null;
       await emit('ORDER_SET_PAYMENT_PROVIDER', {
         order,
         paymentProviderId,
@@ -267,3 +253,5 @@ export const configureOrdersModule = async ({
     },
   };
 };
+
+export type OrdersModule = Awaited<ReturnType<typeof configureOrdersModule>>;

package/src/orders-settings.ts

@@ -5,18 +5,20 @@ export interface OrderSettingsOrderPositionValidation<Product = unknown> {
   order: Order;
   product: Product;
   quantityDiff?: number;
-  configuration?: { key: string; value: string }[];
+  configuration?: { key: string; value: string }[] | null;
 }
 
-export interface OrdersSettingsOptions {
-  ensureUserHasCart?: boolean;
-  orderNumberHashFn?: (order: Order, index: number) => string;
-  validateOrderPosition?: <UnchainedAPI = unknown>(
+export interface OrdersSettings {
+  ensureUserHasCart: boolean;
+  orderNumberHashFn: (order: Order, index: number) => string;
+  validateOrderPosition: <UnchainedAPI = unknown>(
     validationParams: OrderSettingsOrderPositionValidation,
     unchainedAPI: UnchainedAPI,
   ) => Promise<void>;
-  lockOrderDuringCheckout?: boolean;
+  lockOrderDuringCheckout: boolean;
+  configureSettings: (options?: OrdersSettingsOptions) => void;
 }
+export type OrdersSettingsOptions = Omit<Partial<OrdersSettings>, 'configureSettings'>;
 
 export const defaultValidateOrderPosition = async ({ product }, { modules }: any) => {
   if (!modules.products.isActive(product)) {
@@ -24,21 +26,20 @@ export const defaultValidateOrderPosition = async ({ product }, { modules }: any
   }
 };
 
-export const ordersSettings = {
-  ensureUserHasCart: null,
-  orderNumberHashFn: null,
-  validateOrderPosition: null,
+export const ordersSettings: OrdersSettings = {
+  ensureUserHasCart: false,
+  orderNumberHashFn: generateRandomHash,
+  validateOrderPosition: defaultValidateOrderPosition,
   lockOrderDuringCheckout: false,
-
   configureSettings({
-    ensureUserHasCart = false,
-    orderNumberHashFn = generateRandomHash,
-    validateOrderPosition = defaultValidateOrderPosition,
-    lockOrderDuringCheckout = false,
-  }: OrdersSettingsOptions = {}) {
-    this.ensureUserHasCart = ensureUserHasCart;
-    this.orderNumberHashFn = orderNumberHashFn;
-    this.validateOrderPosition = validateOrderPosition;
-    this.lockOrderDuringCheckout = lockOrderDuringCheckout;
+    ensureUserHasCart,
+    orderNumberHashFn,
+    validateOrderPosition,
+    lockOrderDuringCheckout,
+  } = {}) {
+    this.ensureUserHasCart = ensureUserHasCart || false;
+    this.orderNumberHashFn = orderNumberHashFn || generateRandomHash;
+    this.validateOrderPosition = validateOrderPosition || defaultValidateOrderPosition;
+    this.lockOrderDuringCheckout = lockOrderDuringCheckout || false;
   },
 };