@unchainedshop/core-orders 4.0.0-rc.8 → 4.0.0

package/lib/orders-settings.js

@@ -5,15 +5,15 @@ export const defaultValidateOrderPosition = async ({ product }, { modules }) =>
     }
 };
 export const ordersSettings = {
-    ensureUserHasCart: null,
-    orderNumberHashFn: null,
-    validateOrderPosition: null,
+    ensureUserHasCart: false,
+    orderNumberHashFn: generateRandomHash,
+    validateOrderPosition: defaultValidateOrderPosition,
     lockOrderDuringCheckout: false,
-    configureSettings({ ensureUserHasCart = false, orderNumberHashFn = generateRandomHash, validateOrderPosition = defaultValidateOrderPosition, lockOrderDuringCheckout = false, } = {}) {
-        this.ensureUserHasCart = ensureUserHasCart;
-        this.orderNumberHashFn = orderNumberHashFn;
-        this.validateOrderPosition = validateOrderPosition;
-        this.lockOrderDuringCheckout = lockOrderDuringCheckout;
+    configureSettings({ ensureUserHasCart, orderNumberHashFn, validateOrderPosition, lockOrderDuringCheckout, } = {}) {
+        this.ensureUserHasCart = ensureUserHasCart || false;
+        this.orderNumberHashFn = orderNumberHashFn || generateRandomHash;
+        this.validateOrderPosition = validateOrderPosition || defaultValidateOrderPosition;
+        this.lockOrderDuringCheckout = lockOrderDuringCheckout || false;
     },
 };
 //# sourceMappingURL=orders-settings.js.map

package/lib/orders-settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"orders-settings.js","sourceRoot":"","sources":["../src/orders-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAoB1D,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAO,EAAE,EAAE;IAClF,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC9C,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,iBAAiB,EAAE,IAAI;IACvB,iBAAiB,EAAE,IAAI;IACvB,qBAAqB,EAAE,IAAI;IAC3B,uBAAuB,EAAE,KAAK;IAE9B,iBAAiB,CAAC,EAChB,iBAAiB,GAAG,KAAK,EACzB,iBAAiB,GAAG,kBAAkB,EACtC,qBAAqB,GAAG,4BAA4B,EACpD,uBAAuB,GAAG,KAAK,MACN,EAAE;QAC3B,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;QACnD,IAAI,CAAC,uBAAuB,GAAG,uBAAuB,CAAC;IACzD,CAAC;CACF,CAAC"}
+{"version":3,"file":"orders-settings.js","sourceRoot":"","sources":["../src/orders-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAsB1D,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAO,EAAE,EAAE;IAClF,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC9C,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAmB;IAC5C,iBAAiB,EAAE,KAAK;IACxB,iBAAiB,EAAE,kBAAkB;IACrC,qBAAqB,EAAE,4BAA4B;IACnD,uBAAuB,EAAE,KAAK;IAC9B,iBAAiB,CAAC,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,qBAAqB,EACrB,uBAAuB,GACxB,GAAG,EAAE;QACJ,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,IAAI,KAAK,CAAC;QACpD,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,IAAI,kBAAkB,CAAC;QACjE,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,IAAI,4BAA4B,CAAC;QACnF,IAAI,CAAC,uBAAuB,GAAG,uBAAuB,IAAI,KAAK,CAAC;IAClE,CAAC;CACF,CAAC"}

package/lib/service/migrateOrderCartService.d.ts

@@ -0,0 +1,3 @@
+import { MigrateOrderCartsService } from '@unchainedshop/types/orders.js';
+export declare const migrateOrderCartsService: MigrateOrderCartsService;
+//# sourceMappingURL=migrateOrderCartService.d.ts.map

package/lib/service/migrateOrderCartService.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrateOrderCartService.d.ts","sourceRoot":"","sources":["../../src/service/migrateOrderCartService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAE1E,eAAO,MAAM,wBAAwB,EAAE,wBA2CtC,CAAC"}

package/lib/service/migrateOrderCartService.js

@@ -0,0 +1,32 @@
+export const migrateOrderCartsService = async ({ fromUserId, toUserId, shouldMerge, countryContext }, unchainedAPI) => {
+    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
+        return toCart;
+    }
+    if (!toCart || !shouldMerge) {
+        // No destination cart, move whole cart
+        unchainedAPI.modules.orders.setCartOwner({ orderId: fromCart._id, userId: toUserId });
+        return unchainedAPI.modules.orders.updateCalculation(fromCart._id, unchainedAPI);
+    }
+    // Move positions
+    unchainedAPI.modules.orders.moveCartPositions({ fromOrderId: fromCart._id, toOrderId: toCart._id });
+    // Move billing address if target order has none
+    if (fromCart.billingAddress && !toCart.billingAddress) {
+        await unchainedAPI.modules.orders.updateBillingAddress(toCart._id, fromCart.billingAddress, unchainedAPI);
+    }
+    // Move contact data if target order has none
+    if (fromCart.contact && !toCart.contact) {
+        await unchainedAPI.modules.orders.updateContact(toCart._id, fromCart.contact, unchainedAPI);
+    }
+    await unchainedAPI.modules.orders.updateCalculation(fromCart._id, unchainedAPI);
+    return unchainedAPI.modules.orders.updateCalculation(toCart._id, unchainedAPI);
+};
+//# sourceMappingURL=migrateOrderCartService.js.map

package/lib/service/migrateOrderCartService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrateOrderCartService.js","sourceRoot":"","sources":["../../src/service/migrateOrderCartService.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,wBAAwB,GAA6B,KAAK,EACrE,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE,EACrD,YAAY,EACZ,EAAE;IACF,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;QACtD,cAAc;QACd,MAAM,EAAE,UAAU;KACnB,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;QACpD,cAAc;QACd,MAAM,EAAE,QAAQ;KACjB,CAAC,CAAC;IAEH,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,sBAAsB;QACtB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC5B,uCAAuC;QACvC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QACtF,OAAO,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IACnF,CAAC;IAED,iBAAiB;IACjB,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;IAEpG,gDAAgD;IAChD,IAAI,QAAQ,CAAC,cAAc,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;QACtD,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,oBAAoB,CACpD,MAAM,CAAC,GAAG,EACV,QAAQ,CAAC,cAAc,EACvB,YAAY,CACb,CAAC;IACJ,CAAC;IAED,6CAA6C;IAC7C,IAAI,QAAQ,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACxC,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAC9F,CAAC;IAED,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAChF,OAAO,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;AACjF,CAAC,CAAC"}

package/lib/service/nextUserCartService.d.ts

@@ -0,0 +1,3 @@
+import { NextUserCartService } from '@unchainedshop/types/orders.js';
+export declare const nextUserCartService: NextUserCartService;
+//# sourceMappingURL=nextUserCartService.d.ts.map

package/lib/service/nextUserCartService.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nextUserCartService.d.ts","sourceRoot":"","sources":["../../src/service/nextUserCartService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAIrE,eAAO,MAAM,mBAAmB,EAAE,mBAqCjC,CAAC"}

package/lib/service/nextUserCartService.js

@@ -0,0 +1,34 @@
+import { ordersSettings } from '../orders-settings.js';
+import { resolveBestCurrency } from '@unchainedshop/utils';
+export const nextUserCartService = async ({ user, orderNumber, countryCode, forceCartCreation }, unchainedAPI) => {
+    const { modules } = 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 countryObject = await modules.countries.findCountry({ isoCode: countryCode });
+    const currencies = await modules.currencies.findCurrencies({ includeInactive: false });
+    const currency = resolveBestCurrency(countryObject.defaultCurrencyCode, currencies);
+    const order = await modules.orders.create({
+        userId: user._id,
+        orderNumber,
+        currency,
+        countryCode,
+        billingAddress: user.lastBillingAddress || user.profile?.address,
+        contact: user.lastContact ||
+            (!user.guest
+                ? {
+                    telNumber: user.profile?.phoneMobile,
+                    emailAddress: modules.users.primaryEmail(user)?.address,
+                }
+                : {}),
+    });
+    return modules.orders.initProviders(order, unchainedAPI);
+};
+//# sourceMappingURL=nextUserCartService.js.map

package/lib/service/nextUserCartService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nextUserCartService.js","sourceRoot":"","sources":["../../src/service/nextUserCartService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAE3D,MAAM,CAAC,MAAM,mBAAmB,GAAwB,KAAK,EAC3D,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,iBAAiB,EAAE,EACrD,YAAY,EACZ,EAAE;IACF,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;IAEjC,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;QACrC,cAAc,EAAE,WAAW,IAAI,IAAI,CAAC,SAAS,EAAE,WAAW;QAC1D,WAAW;QACX,MAAM,EAAE,IAAI,CAAC,GAAG;KACjB,CAAC,CAAC;IACH,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IAEtB,MAAM,mBAAmB,GAAG,iBAAiB,IAAI,cAAc,CAAC,iBAAiB,CAAC;IAClF,IAAI,CAAC,mBAAmB;QAAE,OAAO,IAAI,CAAC;IAEtC,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;IACpF,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAC;IACvF,MAAM,QAAQ,GAAG,mBAAmB,CAAC,aAAa,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;IAEpF,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"}

package/lib/service/orderServices.d.ts

@@ -0,0 +1,3 @@
+import { OrderServices } from '@unchainedshop/types/orders.js';
+export declare const orderServices: OrderServices;
+//# sourceMappingURL=orderServices.d.ts.map

package/lib/service/orderServices.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"orderServices.d.ts","sourceRoot":"","sources":["../../src/service/orderServices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAI/D,eAAO,MAAM,aAAa,EAAE,aAG3B,CAAC"}

package/lib/service/orderServices.js

@@ -0,0 +1,7 @@
+import { migrateOrderCartsService } from './migrateOrderCartService.js';
+import { nextUserCartService } from './nextUserCartService.js';
+export const orderServices = {
+    migrateOrderCarts: migrateOrderCartsService,
+    nextUserCart: nextUserCartService,
+};
+//# sourceMappingURL=orderServices.js.map

package/lib/service/orderServices.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"orderServices.js","sourceRoot":"","sources":["../../src/service/orderServices.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,MAAM,CAAC,MAAM,aAAa,GAAkB;IAC1C,iBAAiB,EAAE,wBAAwB;IAC3C,YAAY,EAAE,mBAAmB;CAClC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/core-orders",
-  "version": "4.0.0-rc.8",
+  "version": "4.0.0",
   "main": "lib/orders-index.js",
   "types": "lib/orders-index.d.ts",
   "type": "module",
@@ -32,9 +32,9 @@
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
     "@kontsedal/locco": "0.1.0",
-    "@unchainedshop/events": "^4.0.0-rc.4",
-    "@unchainedshop/logger": "^4.0.0-rc.4",
-    "@unchainedshop/utils": "^4.0.0-rc.4"
+    "@unchainedshop/events": "^4.0.0",
+    "@unchainedshop/logger": "^4.0.0",
+    "@unchainedshop/utils": "^4.0.0"
   },
   "devDependencies": {
     "@types/node": "^24.0.13",

package/src/db/OrderDeliveriesCollection.ts

@@ -8,7 +8,7 @@ export enum OrderDeliveryStatus {
 }
 
 export type OrderDelivery = {
-  _id?: string;
+  _id: string;
   orderId: string;
   deliveryProviderId: string;
   delivered?: Date;
@@ -19,7 +19,7 @@ export type OrderDelivery = {
   TimestampFields;
 
 export type OrderDeliveryDiscount = Omit<Price, '_id'> & {
-  _id?: string;
+  _id: string;
   discountId: string;
   item: OrderDelivery;
 };

package/src/db/OrderDiscountsCollection.ts

@@ -2,12 +2,12 @@ import { mongodb, buildDbIndexes, TimestampFields } from '@unchainedshop/mongodb
 import { Price } from '@unchainedshop/utils';
 
 export type OrderDiscount = {
-  _id?: string;
+  _id: string;
   orderId: string;
   code?: string;
   total?: Price;
   trigger?: OrderDiscountTrigger;
-  discountKey?: string;
+  discountKey: string;
   reservation?: any;
   context?: any;
 } & TimestampFields;

package/src/db/OrderPaymentsCollection.ts

@@ -8,19 +8,19 @@ export enum OrderPaymentStatus {
 }
 
 export type OrderPayment = {
-  _id?: string;
+  _id: string;
   orderId: string;
   context?: any;
   paid?: Date;
   transactionId?: string;
-  paymentProviderId?: string;
+  paymentProviderId: string;
   status?: OrderPaymentStatus | null;
   calculation?: any[];
 } & LogFields &
   TimestampFields;
 
 export type OrderPaymentDiscount = Omit<Price, '_id'> & {
-  _id?: string;
+  _id: string;
   discountId: string;
   item: OrderPayment;
 };

package/src/db/OrderPositionsCollection.ts

@@ -2,7 +2,7 @@ import { mongodb, buildDbIndexes, TimestampFields } from '@unchainedshop/mongodb
 import { Price } from '@unchainedshop/utils';
 
 export type OrderPosition = {
-  _id?: string;
+  _id: string;
   calculation: any[];
   configuration: { key: string; value: string }[];
   context?: any;
@@ -15,7 +15,6 @@ export type OrderPosition = {
 } & TimestampFields;
 
 export type OrderPositionDiscount = Omit<Price, '_id'> & {
-  _id?: string;
   discountId: string;
   item: OrderPosition;
 };

package/src/db/OrdersCollection.ts

@@ -7,6 +7,7 @@ import {
   TimestampFields,
   isDocumentDBCompatModeEnabled,
 } from '@unchainedshop/mongodb';
+import { DateFilterInput } from '@unchainedshop/utils';
 
 export enum OrderStatus {
   PENDING = 'PENDING',
@@ -16,7 +17,7 @@ export enum OrderStatus {
 }
 
 export type Order = {
-  _id?: string;
+  _id: string;
   billingAddress?: Address;
   calculation: any[];
   confirmed?: Date;
@@ -41,37 +42,45 @@ export interface OrderQuery extends mongodb.Filter<Order> {
   queryString?: string;
   status?: OrderStatus[];
   userId?: string;
+  deliveryIds?: string[];
+  paymentIds?: string[];
+  dateRange?: DateFilterInput;
 }
 
 export const OrdersCollection = async (db: mongodb.Db) => {
   const Orders = db.collection<Order>('orders');
 
+  if (!isDocumentDBCompatModeEnabled()) {
+    await buildDbIndexes<Order>(Orders, [
+      {
+        index: {
+          _id: 'text',
+          userId: 'text',
+          orderNumber: 'text',
+          status: 'text',
+          'contact.emailAddress': 'text',
+          'contact.telNumber': 'text',
+        } as any,
+        options: {
+          weights: {
+            _id: 8,
+            userId: 3,
+            orderNumber: 6,
+            'contact.telNumber': 5,
+            'contact.emailAddress': 4,
+            status: 1,
+          },
+          name: 'order_fulltext_search',
+        },
+      },
+    ]);
+  }
+
   // Order Indexes
   await buildDbIndexes<Order>(Orders, [
     { index: { userId: 1 } },
     { index: { status: 1 } },
     { index: { orderNumber: 1 } },
-    !isDocumentDBCompatModeEnabled() && {
-      index: {
-        _id: 'text',
-        userId: 'text',
-        orderNumber: 'text',
-        status: 'text',
-        'contact.emailAddress': 'text',
-        'contact.telNumber': 'text',
-      } as any,
-      options: {
-        weights: {
-          _id: 8,
-          userId: 3,
-          orderNumber: 6,
-          'contact.telNumber': 5,
-          'contact.emailAddress': 4,
-          status: 1,
-        },
-        name: 'order_fulltext_search',
-      },
-    },
   ]);
 
   return Orders;

package/src/module/buildFindSelector.ts

@@ -6,6 +6,9 @@ export const buildFindSelector = ({
   status,
   userId,
   queryString,
+  paymentIds,
+  deliveryIds,
+  dateRange,
   ...rest
 }: OrderQuery) => {
   const selector: mongodb.Filter<Order> = { ...rest };
@@ -13,13 +16,28 @@ export const buildFindSelector = ({
   if (userId) {
     selector.userId = userId;
   }
+  if (dateRange) {
+    const dateFilter: mongodb.Filter<Order> = {};
+    if (dateRange.start) dateFilter.$gte = new Date(dateRange.start);
+    if (dateRange.end) dateFilter.$lte = new Date(dateRange.end);
+    if (Object.keys(dateFilter).length > 0) {
+      selector.ordered = dateFilter;
+    }
+  }
+
+  if (Array.isArray(deliveryIds) && deliveryIds?.length) {
+    selector.deliveryId = { $in: deliveryIds };
+  }
+
+  if (Array.isArray(paymentIds) && paymentIds?.length) {
+    selector.paymentId = { $in: paymentIds };
+  }
 
   if (Array.isArray(status) && status?.length) {
     selector.status = { $in: status };
   } else if (!includeCarts) {
     selector.status = { $ne: null }; // TODO: Slow performance! IDXSCAN in common query!
   }
-
   if (queryString) {
     assertDocumentDBCompatMode();
     (selector as any).$text = { $search: queryString };

package/src/module/configureOrderDeliveriesModule.ts

@@ -24,7 +24,7 @@ export const configureOrderDeliveriesModule = ({
   const updateStatus = async (
     orderDeliveryId: string,
     { status, info }: { status: OrderDeliveryStatus; info?: string },
-  ): Promise<OrderDelivery> => {
+  ) => {
     const date = new Date();
     const modifier: mongodb.UpdateFilter<OrderDelivery> = {
       $set: { status, updated: new Date() },
@@ -51,15 +51,28 @@ export const configureOrderDeliveriesModule = ({
     findDelivery: async (
       { orderDeliveryId }: { orderDeliveryId: string },
       options?: mongodb.FindOptions,
-    ): Promise<OrderDelivery> => {
+    ) => {
       return OrderDeliveries.findOne(buildFindByIdSelector(orderDeliveryId), options);
     },
 
+    findDeliveryByProvidersId: async (
+      { deliveryProviderIds }: { deliveryProviderIds: string[] },
+      options?: mongodb.FindOptions,
+    ): Promise<OrderDelivery[]> => {
+      if (!deliveryProviderIds?.length) return [];
+      return OrderDeliveries.find(
+        { deliveryProviderId: { $in: deliveryProviderIds } },
+        options,
+      ).toArray();
+    },
+
     normalizedStatus,
 
     // Mutations
 
-    create: async (doc: OrderDelivery): Promise<OrderDelivery> => {
+    create: async (
+      doc: Omit<OrderDelivery, '_id' | 'created'> & Pick<Partial<OrderDelivery>, '_id' | 'created'>,
+    ) => {
       const { insertedId: orderDeliveryId } = await OrderDeliveries.insertOne({
         _id: generateDbObjectId(),
         created: new Date(),
@@ -68,7 +81,9 @@ export const configureOrderDeliveriesModule = ({
         status: null,
       });
 
-      const orderDelivery = await OrderDeliveries.findOne(buildFindByIdSelector(orderDeliveryId));
+      const orderDelivery = (await OrderDeliveries.findOne(
+        buildFindByIdSelector(orderDeliveryId),
+      )) as OrderDelivery;
       return orderDelivery;
     },
 
@@ -87,14 +102,14 @@ export const configureOrderDeliveriesModule = ({
       return updatedOrderDelivery;
     },
 
-    updateContext: async (orderDeliveryId: string, context: any): Promise<OrderDelivery> => {
+    updateContext: async (orderDeliveryId: string, context: any) => {
       const selector = buildFindByIdSelector(orderDeliveryId);
       if (!context || Object.keys(context).length === 0) return OrderDeliveries.findOne(selector, {});
       const contextSetters = Object.fromEntries(
         Object.entries(context).map(([key, value]) => [`context.${key}`, value]),
       );
 
-      const result = await OrderDeliveries.findOneAndUpdate(
+      const orderDelivery = await OrderDeliveries.findOneAndUpdate(
         selector,
         {
           $set: {
@@ -102,17 +117,14 @@ export const configureOrderDeliveriesModule = ({
             updated: new Date(),
           },
         },
-        { includeResultMetadata: true, returnDocument: 'after' },
+        { returnDocument: 'after' },
       );
 
-      if (result.ok) {
-        await emit('ORDER_UPDATE_DELIVERY', {
-          orderDelivery: result.value,
-        });
-        return result.value;
-      }
-
-      return null;
+      if (!orderDelivery) return null;
+      await emit('ORDER_UPDATE_DELIVERY', {
+        orderDelivery,
+      });
+      return orderDelivery;
     },
 
     updateStatus,
@@ -120,7 +132,7 @@ export const configureOrderDeliveriesModule = ({
     updateCalculation: async <T extends PricingCalculation>(
       orderDeliveryId: string,
       calculation: T[],
-    ): Promise<OrderDelivery> => {
+    ) => {
       return OrderDeliveries.findOneAndUpdate(
         { _id: orderDeliveryId },
         {

package/src/module/configureOrderDiscountsModule.ts

@@ -20,10 +20,7 @@ export const configureOrderDiscountsModule = ({
 
   return {
     // Queries
-    findOrderDiscount: async (
-      { discountId }: { discountId: string },
-      options?: mongodb.FindOptions,
-    ): Promise<OrderDiscount> => {
+    findOrderDiscount: async ({ discountId }: { discountId: string }, options?: mongodb.FindOptions) => {
       return OrderDiscounts.findOne(buildFindOrderDiscountByIdSelector(discountId), options);
     },
 
@@ -32,7 +29,10 @@ export const configureOrderDiscountsModule = ({
       return discounts.toArray();
     },
 
-    create: async (doc: OrderDiscount): Promise<OrderDiscount> => {
+    create: async (
+      doc: Omit<OrderDiscount, '_id' | 'created' | 'trigger'> &
+        Pick<Partial<OrderDiscount>, '_id' | 'created' | 'trigger'>,
+    ): Promise<OrderDiscount> => {
       const normalizedTrigger = doc.trigger || OrderDiscountTrigger.USER;
       const { insertedId: discountId } = await OrderDiscounts.insertOne({
         _id: generateDbObjectId(),
@@ -40,14 +40,14 @@ export const configureOrderDiscountsModule = ({
         ...doc,
         trigger: normalizedTrigger,
       });
-      const discount = await OrderDiscounts.findOne({
+      const discount = (await OrderDiscounts.findOne({
         _id: discountId,
-      });
+      })) as OrderDiscount;
       await emit('ORDER_CREATE_DISCOUNT', { discount });
       return discount;
     },
 
-    delete: async (orderDiscountId: string): Promise<OrderDiscount> => {
+    delete: async (orderDiscountId: string) => {
       const selector = buildFindOrderDiscountByIdSelector(orderDiscountId);
       const orderDiscount = await OrderDiscounts.findOneAndDelete(selector);
       await emit('ORDER_REMOVE_DISCOUNT', { discount: orderDiscount });
@@ -63,14 +63,14 @@ export const configureOrderDiscountsModule = ({
       );
     },
 
-    findSpareDiscount: async ({ code }): Promise<OrderDiscount> => {
+    findSpareDiscount: async ({ code }) => {
       return OrderDiscounts.findOne({
         code,
-        orderId: { $in: [undefined, null] },
+        orderId: { $exists: false },
       });
     },
 
-    update: async (orderDiscountId: string, doc: OrderDiscount): Promise<OrderDiscount> => {
+    update: async (orderDiscountId: string, doc: Partial<OrderDiscount>) => {
       const discount = await OrderDiscounts.findOneAndUpdate(
         { _id: orderDiscountId },
         {

package/src/module/configureOrderPaymentsModule.ts

@@ -8,7 +8,7 @@ const ORDER_PAYMENT_EVENTS: string[] = ['ORDER_UPDATE_PAYMENT', 'ORDER_SIGN_PAYM
 export const buildFindOrderPaymentByIdSelector = (orderPaymentId: string) =>
   generateDbFilterById(orderPaymentId) as mongodb.Filter<OrderPayment>;
 
-export const buildFindByContextDataSelector = (context: any): mongodb.Filter<OrderPayment> => {
+export const buildFindByContextDataSelector = (context: any) => {
   const contextKeys = Object.keys(context);
 
   if (contextKeys.length === 0) return null;
@@ -46,7 +46,7 @@ export const configureOrderPaymentsModule = ({
       status,
       info,
     }: { transactionId?: string; status: OrderPaymentStatus; info?: string },
-  ): Promise<OrderPayment> => {
+  ) => {
     const date = new Date();
     const modifier: mongodb.UpdateFilter<OrderPayment> = {
       $set: { status, updated: new Date() },
@@ -82,9 +82,21 @@ export const configureOrderPaymentsModule = ({
         orderPaymentId: string;
       },
       options?: mongodb.FindOptions,
-    ): Promise<OrderPayment> => {
+    ) => {
       return OrderPayments.findOne(buildFindOrderPaymentByIdSelector(orderPaymentId), options);
     },
+
+    findOrderPaymentsByProviderIds: async (
+      {
+        paymentProviderIds,
+      }: {
+        paymentProviderIds: string[];
+      },
+      options?: mongodb.FindOptions,
+    ): Promise<OrderPayment[]> => {
+      if (!paymentProviderIds?.length) return [];
+      return OrderPayments.find({ paymentProviderId: { $in: paymentProviderIds } }, options).toArray();
+    },
     findOrderPaymentByContextData: async (
       {
         context,
@@ -92,9 +104,9 @@ export const configureOrderPaymentsModule = ({
         context: any;
       },
       options?: mongodb.FindOptions,
-    ): Promise<OrderPayment> => {
+    ) => {
       const selector = buildFindByContextDataSelector(context);
-
+      if (!selector) return null;
       return OrderPayments.findOne(selector, options);
     },
     countOrderPaymentsByContextData: async (
@@ -106,7 +118,7 @@ export const configureOrderPaymentsModule = ({
       options?: mongodb.FindOptions,
     ) => {
       const selector = buildFindByContextDataSelector(context);
-
+      if (!selector) return 0;
       return OrderPayments.countDocuments(selector, options);
     },
 
@@ -114,7 +126,9 @@ export const configureOrderPaymentsModule = ({
 
     // Mutations
 
-    create: async (doc: OrderPayment): Promise<OrderPayment> => {
+    create: async (
+      doc: Omit<OrderPayment, '_id' | 'created'> & Pick<Partial<OrderPayment>, '_id' | 'created'>,
+    ): Promise<OrderPayment> => {
       const { insertedId: orderPaymentId } = await OrderPayments.insertOne({
         _id: generateDbObjectId(),
         created: new Date(),
@@ -123,9 +137,9 @@ export const configureOrderPaymentsModule = ({
         context: doc.context || {},
       });
 
-      const orderPayment = await OrderPayments.findOne(
+      const orderPayment = (await OrderPayments.findOne(
         buildFindOrderPaymentByIdSelector(orderPaymentId),
-      );
+      )) as OrderPayment;
 
       return orderPayment;
     },
@@ -156,14 +170,14 @@ export const configureOrderPaymentsModule = ({
       await emit('ORDER_PAY', { orderPayment });
     },
 
-    updateContext: async (orderPaymentId: string, context: any): Promise<OrderPayment> => {
+    updateContext: async (orderPaymentId: string, context: any) => {
       const selector = buildFindOrderPaymentByIdSelector(orderPaymentId);
       if (!context || Object.keys(context).length === 0) return OrderPayments.findOne(selector, {});
 
       const contextSetters = Object.fromEntries(
         Object.entries(context).map(([key, value]) => [`context.${key}`, value]),
       );
-      const result = await OrderPayments.findOneAndUpdate(
+      const orderPayment = await OrderPayments.findOneAndUpdate(
         selector,
         {
           $set: {
@@ -171,17 +185,14 @@ export const configureOrderPaymentsModule = ({
             updated: new Date(),
           },
         },
-        { includeResultMetadata: true, returnDocument: 'after' },
+        { returnDocument: 'after' },
       );
 
-      if (result.ok) {
-        await emit('ORDER_UPDATE_PAYMENT', {
-          orderPayment: result.value,
-        });
-        return result.value;
-      }
-
-      return null;
+      if (!orderPayment) return null;
+      await emit('ORDER_UPDATE_PAYMENT', {
+        orderPayment,
+      });
+      return orderPayment;
     },
 
     updateStatus,