@unchainedshop/core-orders 2.9.4 → 2.10.1

package/src/module/configureOrdersModule-processing.ts

@@ -1,5 +1,6 @@
 import { mongodb, generateDbFilterById } from '@unchainedshop/mongodb';
 import { Order, OrderStatus, OrderProcessing, OrdersModule } from '@unchainedshop/types/orders.js';
+import type { Locker } from '@kontsedal/locco';
 import { OrderDelivery } from '@unchainedshop/types/orders.deliveries.js';
 import { OrderPayment } from '@unchainedshop/types/orders.payments.js';
 import { OrderPosition } from '@unchainedshop/types/orders.positions.js';
@@ -21,11 +22,13 @@ export const configureOrderModuleProcessing = ({
   OrderPositions,
   OrderDeliveries,
   OrderPayments,
+  locker,
 }: {
   Orders: mongodb.Collection<Order>;
   OrderPositions: mongodb.Collection<OrderPosition>;
   OrderDeliveries: mongodb.Collection<OrderDelivery>;
   OrderPayments: mongodb.Collection<OrderPayment>;
+  locker: Locker;
 }): OrderProcessing => {
   registerEvents(ORDER_PROCESSING_EVENTS);
 
@@ -250,12 +253,10 @@ export const configureOrderModuleProcessing = ({
   };
 
   return {
-    checkout: async (orderId, { orderContext, paymentContext, deliveryContext }, unchainedAPI) => {
-      const { modules } = unchainedAPI;
-
-      await modules.orders.updateContext(orderId, orderContext, unchainedAPI);
-      let order = await modules.orders.findOrder({ orderId });
+    checkout: async (orderId, { paymentContext, deliveryContext }, unchainedAPI) => {
+      const { modules, services } = unchainedAPI;
 
+      const order = await Orders.findOne(generateDbFilterById(orderId), {});
       if (order.status !== null) return order;
 
       const errors = [
@@ -267,87 +268,83 @@ export const configureOrderModuleProcessing = ({
         throw new Error(errors[0]);
       }
 
-      // Process order
-      order = await modules.orders.processOrder(
-        order,
-        {
-          paymentContext,
-          deliveryContext,
-        },
-        unchainedAPI,
-      );
-
-      // After checkout, store last checkout information on user
-      await modules.users.updateLastBillingAddress(order.userId, order.billingAddress);
-      await modules.users.updateLastContact(order.userId, order.contact);
-
-      // Then ensure new cart is created before we return from checkout
-      const user = await modules.users.findUserById(order.userId);
-      const locale = modules.users.userLocale(user);
-      await modules.orders.ensureCartForUser(
-        {
-          user,
-          countryCode: locale.country,
-        },
-        unchainedAPI,
-      );
-
-      return order;
-    },
-
-    confirm: async (orderId, { orderContext, paymentContext, deliveryContext }, unchainedAPI) => {
-      const { modules } = unchainedAPI;
+      const lock = await locker.lock(`order:checkout:${order._id}`, 1500).acquire();
+      try {
+        const processedOrder = await modules.orders.processOrder(
+          order,
+          {
+            paymentContext,
+            deliveryContext,
+          },
+          unchainedAPI,
+        );
 
-      await modules.orders.updateContext(orderId, orderContext, unchainedAPI);
-      const order = await modules.orders.findOrder({ orderId });
+        await lock.extend(500);
 
-      if (order.status !== OrderStatus.PENDING) return order;
+        // After checkout, store last checkout information on user
+        await modules.users.updateLastBillingAddress(
+          processedOrder.userId,
+          processedOrder.billingAddress,
+        );
+        await modules.users.updateLastContact(processedOrder.userId, processedOrder.contact);
+
+        // Then eventually build next cart
+        const user = await modules.users.findUserById(processedOrder.userId);
+        const locale = modules.users.userLocale(user);
+        await services.orders.nextUserCart(
+          {
+            user,
+            countryCode: locale.country,
+          },
+          unchainedAPI,
+        );
 
-      return modules.orders.processOrder(
-        order,
-        {
-          paymentContext,
-          deliveryContext,
-          nextStatus: OrderStatus.CONFIRMED,
-        },
-        unchainedAPI,
-      );
+        return processedOrder;
+      } finally {
+        await lock.release();
+      }
     },
 
-    reject: async (orderId, { orderContext, paymentContext, deliveryContext }, unchainedAPI) => {
+    confirm: async (order, { paymentContext, deliveryContext }, unchainedAPI) => {
       const { modules } = unchainedAPI;
 
-      await modules.orders.updateContext(orderId, orderContext, unchainedAPI);
-      const order = await modules.orders.findOrder({ orderId });
-
       if (order.status !== OrderStatus.PENDING) return order;
 
-      return modules.orders.processOrder(
-        order,
-        {
-          paymentContext,
-          deliveryContext,
-          nextStatus: OrderStatus.REJECTED,
-        },
-        unchainedAPI,
-      );
+      const lock = await locker.lock(`order:confirm-reject:${order._id}`, 1500).acquire();
+      try {
+        return await modules.orders.processOrder(
+          order,
+          {
+            paymentContext,
+            deliveryContext,
+            nextStatus: OrderStatus.CONFIRMED,
+          },
+          unchainedAPI,
+        );
+      } finally {
+        await lock.release();
+      }
     },
 
-    ensureCartForUser: async ({ user, countryCode }, unchainedAPI) => {
-      const { modules, services } = unchainedAPI;
-
-      if (!ordersSettings.ensureUserHasCart) return null;
+    reject: async (order, { paymentContext, deliveryContext }, unchainedAPI) => {
+      const { modules } = unchainedAPI;
 
-      const cart = await modules.orders.cart({ countryContext: countryCode }, user);
-      if (cart) return cart;
+      if (order.status !== OrderStatus.PENDING) return order;
 
-      return services.orders.createUserCart(
-        {
-          user,
-          countryCode,
-        },
-        unchainedAPI,
-      );
+      const lock = await locker.lock(`order:confirm-reject:${order._id}`, 1500).acquire();
+      try {
+        return await modules.orders.processOrder(
+          order,
+          {
+            paymentContext,
+            deliveryContext,
+            nextStatus: OrderStatus.REJECTED,
+          },
+          unchainedAPI,
+        );
+      } finally {
+        await lock.release();
+      }
     },
 
     processOrder: async (initialOrder, params, unchainedAPI) => {

package/src/module/configureOrdersModule-transformations.ts

@@ -120,11 +120,11 @@ export const configureOrderModuleTransformations = ({
     isCart: (order) => {
       return order.status === null;
     },
-    cart: async ({ orderNumber, countryContext }, user) => {
+    cart: async ({ orderNumber, countryContext, userId }) => {
       const selector: mongodb.Filter<Order> = {
-        countryCode: countryContext || user.lastLogin.countryCode,
+        countryCode: countryContext,
         status: { $eq: null },
-        userId: user._id,
+        userId,
       };
 
       if (orderNumber) {

package/src/module/configureOrdersModule.ts

@@ -4,6 +4,7 @@ import { OrderDelivery } from '@unchainedshop/types/orders.deliveries.js';
 import { OrderPayment } from '@unchainedshop/types/orders.payments.js';
 import { OrderPosition } from '@unchainedshop/types/orders.positions.js';
 import { generateDbFilterById } from '@unchainedshop/mongodb';
+import { createRequire } from 'node:module';
 import { OrderDeliveriesCollection } from '../db/OrderDeliveriesCollection.js';
 import { OrderDiscountsCollection } from '../db/OrderDiscountsCollection.js';
 import { OrderDiscountTrigger } from '../db/OrderDiscountTrigger.js';
@@ -22,6 +23,9 @@ import { configureOrderModuleProcessing } from './configureOrdersModule-processi
 import { configureOrdersModuleQueries } from './configureOrdersModule-queries.js';
 import { configureOrderModuleTransformations } from './configureOrdersModule-transformations.js';
 
+const require = createRequire(import.meta.url);
+const { Locker, MongoAdapter } = require('@kontsedal/locco');
+
 export const configureOrdersModule = async ({
   db,
   options: orderOptions = {},
@@ -34,6 +38,16 @@ export const configureOrdersModule = async ({
   const OrderPayments = await OrderPaymentsCollection(db);
   const OrderPositions = await OrderPositionsCollection(db);
 
+  const mongoAdapter = new MongoAdapter({
+    client: {
+      db: () => db,
+    },
+  });
+  const locker = new Locker({
+    adapter: mongoAdapter,
+    retrySettings: { retryDelay: 200, retryTimes: 10 },
+  });
+
   const findOrderPositions = async (order: Order) =>
     OrderPositions.find(
       {
@@ -251,6 +265,7 @@ export const configureOrdersModule = async ({
     OrderDeliveries,
     OrderPayments,
     OrderPositions,
+    locker,
   });
   const orderMutations = configureOrderModuleMutations({
     Orders,

package/src/orders-settings.ts

@@ -11,14 +11,17 @@ export const ordersSettings = {
   ensureUserHasCart: null,
   orderNumberHashFn: null,
   validateOrderPosition: null,
+  lockOrderDuringCheckout: false,
 
   configureSettings({
     ensureUserHasCart = false,
     orderNumberHashFn = generateRandomHash,
     validateOrderPosition = defaultValidateOrderPosition,
+    lockOrderDuringCheckout = false,
   }: OrdersSettingsOptions = {}) {
     this.ensureUserHasCart = ensureUserHasCart;
     this.orderNumberHashFn = orderNumberHashFn;
     this.validateOrderPosition = validateOrderPosition;
+    this.lockOrderDuringCheckout = lockOrderDuringCheckout;
   },
 };

package/src/service/migrateOrderCartService.ts

@@ -1,11 +1,17 @@
 import { MigrateOrderCartsService } from '@unchainedshop/types/orders.js';
 
 export const migrateOrderCartsService: MigrateOrderCartsService = async (
-  { fromUser, toUser, shouldMerge, countryContext },
+  { fromUserId, toUserId, shouldMerge, countryContext },
   unchainedAPI,
 ) => {
-  const fromCart = await unchainedAPI.modules.orders.cart({ countryContext }, fromUser);
-  const toCart = await unchainedAPI.modules.orders.cart({ countryContext }, toUser);
+  const fromCart = await unchainedAPI.modules.orders.cart({
+    countryContext,
+    userId: fromUserId,
+  });
+  const toCart = await unchainedAPI.modules.orders.cart({
+    countryContext,
+    userId: toUserId,
+  });
 
   if (!fromCart) {
     // No cart, don't copy
@@ -14,7 +20,7 @@ export const migrateOrderCartsService: MigrateOrderCartsService = async (
 
   if (!toCart || !shouldMerge) {
     // No destination cart, move whole cart
-    unchainedAPI.modules.orders.setCartOwner({ orderId: fromCart._id, userId: toUser._id });
+    unchainedAPI.modules.orders.setCartOwner({ orderId: fromCart._id, userId: toUserId });
     return unchainedAPI.modules.orders.updateCalculation(fromCart._id, unchainedAPI);
   }
 

package/src/service/{createUserCartService.ts → nextUserCartService.ts}

@@ -1,11 +1,22 @@
-import { CreateUserCartService } from '@unchainedshop/types/orders.js';
+import { NextUserCartService } from '@unchainedshop/types/orders.js';
+import { ordersSettings } from '../orders-settings.js';
 
-export const createUserCartService: CreateUserCartService = async (
-  { user, orderNumber, countryCode },
+export const nextUserCartService: NextUserCartService = async (
+  { user, orderNumber, countryCode, forceCartCreation },
   unchainedAPI,
 ) => {
   const { modules, services } = unchainedAPI;
 
+  const cart = await modules.orders.cart({
+    countryContext: countryCode || user.lastLogin?.countryCode,
+    orderNumber,
+    userId: user._id,
+  });
+  if (cart) return cart;
+
+  const shouldCreateNewCart = forceCartCreation || !ordersSettings.ensureUserHasCart;
+  if (!shouldCreateNewCart) return null;
+
   const currency = await services.countries.resolveDefaultCurrencyCode(
     {
       isoCode: countryCode,

package/src/service/orderServices.ts

@@ -1,8 +1,8 @@
 import { OrderServices } from '@unchainedshop/types/orders.js';
 import { migrateOrderCartsService } from './migrateOrderCartService.js';
-import { createUserCartService } from './createUserCartService.js';
+import { nextUserCartService } from './nextUserCartService.js';
 
 export const orderServices: OrderServices = {
   migrateOrderCarts: migrateOrderCartsService,
-  createUserCart: createUserCartService,
+  nextUserCart: nextUserCartService,
 };

package/lib/service/createUserCartService.d.ts

@@ -1,2 +0,0 @@
-import { CreateUserCartService } from '@unchainedshop/types/orders.js';
-export declare const createUserCartService: CreateUserCartService;

package/lib/service/createUserCartService.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"createUserCartService.js","sourceRoot":"","sources":["../../src/service/createUserCartService.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,qBAAqB,GAA0B,KAAK,EAC/D,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,EAClC,YAAY,EACZ,EAAE;IACF,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC;IAE3C,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,0BAA0B,CAClE;QACE,OAAO,EAAE,WAAW;KACrB,EACD,YAAY,CACb,CAAC;IAEF,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;QACxC,MAAM,EAAE,IAAI,CAAC,GAAG;QAChB,WAAW;QACX,QAAQ;QACR,WAAW;QACX,cAAc,EAAE,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC,OAAO,EAAE,OAAO;QAChE,OAAO,EACL,IAAI,CAAC,WAAW;YAChB,CAAC,CAAC,IAAI,CAAC,KAAK;gBACV,CAAC,CAAC;oBACE,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,WAAW;oBACpC,YAAY,EAAE,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,OAAO;iBACxD;gBACH,CAAC,CAAC,EAAE,CAAC;KACV,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;AAC3D,CAAC,CAAC"}