@unchainedshop/core-orders 4.0.0-rc.2 → 4.0.0-rc.21

package/lib/director/OrderPricingSheet.js

@@ -0,0 +1,101 @@
+import { BasePricingSheet } from '@unchainedshop/utils';
+import { OrderPricingRowCategory, } from '@unchainedshop/types/orders.pricing.js';
+export const OrderPricingSheet = (params) => {
+    const basePricingSheet = BasePricingSheet(params);
+    const addTaxIfAvailabile = (category, taxAmount, meta, discountId) => {
+        if (taxAmount) {
+            basePricingSheet.calculation.push({
+                category: OrderPricingRowCategory.Taxes,
+                amount: taxAmount,
+                baseCategory: category,
+                discountId,
+                meta,
+            });
+        }
+    };
+    const pricingSheet = {
+        ...basePricingSheet,
+        addItems({ amount, taxAmount, meta }) {
+            basePricingSheet.calculation.push({
+                category: OrderPricingRowCategory.Items,
+                amount,
+                meta,
+            });
+            addTaxIfAvailabile(OrderPricingRowCategory.Items, taxAmount, meta);
+        },
+        addDiscount({ amount, taxAmount, discountId, meta }) {
+            basePricingSheet.calculation.push({
+                category: OrderPricingRowCategory.Discounts,
+                amount,
+                discountId,
+                meta,
+            });
+            addTaxIfAvailabile(OrderPricingRowCategory.Discounts, taxAmount, meta, discountId);
+        },
+        addDelivery({ amount, taxAmount, meta }) {
+            basePricingSheet.calculation.push({
+                category: OrderPricingRowCategory.Delivery,
+                amount,
+                meta,
+            });
+            addTaxIfAvailabile(OrderPricingRowCategory.Delivery, taxAmount, meta);
+        },
+        addPayment({ amount, taxAmount, meta }) {
+            basePricingSheet.calculation.push({
+                category: OrderPricingRowCategory.Payment,
+                amount,
+                meta,
+            });
+            addTaxIfAvailabile(OrderPricingRowCategory.Payment, taxAmount, meta);
+        },
+        taxSum(filter) {
+            return basePricingSheet.sum({
+                category: OrderPricingRowCategory.Taxes,
+                ...(filter || {}),
+            });
+        },
+        gross() {
+            // tax is included 2 times, this is only true for Order Pricing!
+            return basePricingSheet.sum() - this.taxSum();
+        },
+        net() {
+            return basePricingSheet.sum() - this.taxSum() - this.taxSum();
+        },
+        total({ category, useNetPrice, discountId } = { useNetPrice: false }) {
+            const taxAmount = this.taxSum({ baseCategory: category, discountId });
+            const amount = this.sum({ category, discountId }) - taxAmount;
+            // Sum does not contain taxes when filtering by category, it's net in that case and gross if there is no category
+            const netAmount = !category ? amount - taxAmount : amount;
+            return {
+                amount: Math.round(useNetPrice ? netAmount : netAmount + taxAmount),
+                currency: this.currency,
+            };
+        },
+        discountPrices(explicitDiscountId) {
+            const discountIds = pricingSheet
+                .filterBy({
+                category: OrderPricingRowCategory.Discounts,
+                discountId: explicitDiscountId,
+            })
+                .map(({ discountId }) => discountId);
+            return [...new Set(discountIds)]
+                .map((discountId) => {
+                const amount = basePricingSheet.sum({
+                    category: OrderPricingRowCategory.Discounts,
+                    discountId,
+                });
+                if (!amount) {
+                    return null;
+                }
+                return {
+                    discountId,
+                    amount: Math.round(amount),
+                    currency: basePricingSheet.currency,
+                };
+            })
+                .filter(Boolean);
+        },
+    };
+    return pricingSheet;
+};
+//# sourceMappingURL=OrderPricingSheet.js.map

package/lib/director/OrderPricingSheet.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OrderPricingSheet.js","sourceRoot":"","sources":["../../src/director/OrderPricingSheet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAEL,uBAAuB,GAExB,MAAM,wCAAwC,CAAC;AAGhD,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,MAAmD,EAC/B,EAAE;IACtB,MAAM,gBAAgB,GAA+C,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAE9F,MAAM,kBAAkB,GAAG,CAAC,QAAgB,EAAE,SAAkB,EAAE,IAAU,EAAE,UAAmB,EAAE,EAAE;QACnG,IAAI,SAAS,EAAE,CAAC;YACd,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC;gBAChC,QAAQ,EAAE,uBAAuB,CAAC,KAAK;gBACvC,MAAM,EAAE,SAAS;gBACjB,YAAY,EAAE,QAAQ;gBACtB,UAAU;gBACV,IAAI;aACL,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,YAAY,GAAuB;QACvC,GAAG,gBAAgB;QAEnB,QAAQ,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE;YAClC,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC;gBAChC,QAAQ,EAAE,uBAAuB,CAAC,KAAK;gBACvC,MAAM;gBACN,IAAI;aACL,CAAC,CAAC;YAEH,kBAAkB,CAAC,uBAAuB,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QACrE,CAAC;QAED,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE;YACjD,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC;gBAChC,QAAQ,EAAE,uBAAuB,CAAC,SAAS;gBAC3C,MAAM;gBACN,UAAU;gBACV,IAAI;aACL,CAAC,CAAC;YAEH,kBAAkB,CAAC,uBAAuB,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;QACrF,CAAC;QAED,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE;YACrC,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC;gBAChC,QAAQ,EAAE,uBAAuB,CAAC,QAAQ;gBAC1C,MAAM;gBACN,IAAI;aACL,CAAC,CAAC;YAEH,kBAAkB,CAAC,uBAAuB,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QACxE,CAAC;QAED,UAAU,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE;YACpC,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC;gBAChC,QAAQ,EAAE,uBAAuB,CAAC,OAAO;gBACzC,MAAM;gBACN,IAAI;aACL,CAAC,CAAC;YAEH,kBAAkB,CAAC,uBAAuB,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QACvE,CAAC;QAED,MAAM,CAAC,MAAM;YACX,OAAO,gBAAgB,CAAC,GAAG,CAAC;gBAC1B,QAAQ,EAAE,uBAAuB,CAAC,KAAK;gBACvC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;aAClB,CAAC,CAAC;QACL,CAAC;QAED,KAAK;YACH,gEAAgE;YAChE,OAAO,gBAAgB,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAChD,CAAC;QAED,GAAG;YACD,OAAO,gBAAgB,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAChE,CAAC;QAED,KAAK,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE;YAClE,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;YACtE,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,GAAG,SAAS,CAAC;YAE9D,iHAAiH;YACjH,MAAM,SAAS,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;YAE1D,OAAO;gBACL,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,GAAG,SAAS,CAAC;gBACnE,QAAQ,EAAE,IAAI,CAAC,QAAQ;aACxB,CAAC;QACJ,CAAC;QAED,cAAc,CAAC,kBAAkB;YAC/B,MAAM,WAAW,GAAG,YAAY;iBAC7B,QAAQ,CAAC;gBACR,QAAQ,EAAE,uBAAuB,CAAC,SAAS;gBAC3C,UAAU,EAAE,kBAAkB;aAC/B,CAAC;iBACD,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC;YAEvC,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;iBAC7B,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;gBAClB,MAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC;oBAClC,QAAQ,EAAE,uBAAuB,CAAC,SAAS;oBAC3C,UAAU;iBACX,CAAC,CAAC;gBACH,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,OAAO;oBACL,UAAU;oBACV,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;oBAC1B,QAAQ,EAAE,gBAAgB,CAAC,QAAQ;iBACpC,CAAC;YACJ,CAAC,CAAC;iBACD,MAAM,CAAC,OAAO,CAAC,CAAC;QACrB,CAAC;KACF,CAAC;IAEF,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC"}

package/lib/module/buildFindSelector.d.ts

@@ -1,5 +1,5 @@
 import { OrderQuery, Order } from '../db/OrdersCollection.js';
 import { mongodb } from '@unchainedshop/mongodb';
-export declare const buildFindSelector: ({ includeCarts, status, userId, queryString, ...rest }: OrderQuery) => mongodb.Filter<Order>;
+export declare const buildFindSelector: ({ includeCarts, status, userId, queryString, paymentIds, deliveryIds, dateRange, ...rest }: OrderQuery) => mongodb.Filter<Order>;
 export default buildFindSelector;
 //# sourceMappingURL=buildFindSelector.d.ts.map

package/lib/module/buildFindSelector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildFindSelector.d.ts","sourceRoot":"","sources":["../../src/module/buildFindSelector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAA8B,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAE7E,eAAO,MAAM,iBAAiB,GAAI,wDAM/B,UAAU,0BAmBZ,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"buildFindSelector.d.ts","sourceRoot":"","sources":["../../src/module/buildFindSelector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAA8B,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAE7E,eAAO,MAAM,iBAAiB,GAAI,4FAS/B,UAAU,0BAkCZ,CAAC;AAEF,eAAe,iBAAiB,CAAC"}

package/lib/module/buildFindSelector.js

@@ -1,9 +1,25 @@
 import { assertDocumentDBCompatMode } from '@unchainedshop/mongodb';
-export const buildFindSelector = ({ includeCarts, status, userId, queryString, ...rest }) => {
+export const buildFindSelector = ({ includeCarts, status, userId, queryString, paymentIds, deliveryIds, dateRange, ...rest }) => {
     const selector = { ...rest };
     if (userId) {
         selector.userId = userId;
     }
+    if (dateRange) {
+        const dateFilter = {};
+        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 };
     }

package/lib/module/buildFindSelector.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildFindSelector.js","sourceRoot":"","sources":["../../src/module/buildFindSelector.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAW,MAAM,wBAAwB,CAAC;AAE7E,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAChC,YAAY,EACZ,MAAM,EACN,MAAM,EACN,WAAW,EACX,GAAG,IAAI,EACI,EAAE,EAAE;IACf,MAAM,QAAQ,GAA0B,EAAE,GAAG,IAAI,EAAE,CAAC;IAEpD,IAAI,MAAM,EAAE,CAAC;QACX,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC;IAC3B,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,EAAE,MAAM,EAAE,CAAC;QAC5C,QAAQ,CAAC,MAAM,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;IACpC,CAAC;SAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QACzB,QAAQ,CAAC,MAAM,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,mDAAmD;IACtF,CAAC;IAED,IAAI,WAAW,EAAE,CAAC;QAChB,0BAA0B,EAAE,CAAC;QAC5B,QAAgB,CAAC,KAAK,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IACrD,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"buildFindSelector.js","sourceRoot":"","sources":["../../src/module/buildFindSelector.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAW,MAAM,wBAAwB,CAAC;AAE7E,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAChC,YAAY,EACZ,MAAM,EACN,MAAM,EACN,WAAW,EACX,UAAU,EACV,WAAW,EACX,SAAS,EACT,GAAG,IAAI,EACI,EAAE,EAAE;IACf,MAAM,QAAQ,GAA0B,EAAE,GAAG,IAAI,EAAE,CAAC;IAEpD,IAAI,MAAM,EAAE,CAAC;QACX,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC;IAC3B,CAAC;IACD,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,UAAU,GAA0B,EAAE,CAAC;QAC7C,IAAI,SAAS,CAAC,KAAK;YAAE,UAAU,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACjE,IAAI,SAAS,CAAC,GAAG;YAAE,UAAU,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC7D,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvC,QAAQ,CAAC,OAAO,GAAG,UAAU,CAAC;QAChC,CAAC;IACH,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,WAAW,EAAE,MAAM,EAAE,CAAC;QACtD,QAAQ,CAAC,UAAU,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC;IAC7C,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,UAAU,EAAE,MAAM,EAAE,CAAC;QACpD,QAAQ,CAAC,SAAS,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC;IAC3C,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,EAAE,MAAM,EAAE,CAAC;QAC5C,QAAQ,CAAC,MAAM,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;IACpC,CAAC;SAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QACzB,QAAQ,CAAC,MAAM,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,mDAAmD;IACtF,CAAC;IACD,IAAI,WAAW,EAAE,CAAC;QAChB,0BAA0B,EAAE,CAAC;QAC5B,QAAgB,CAAC,KAAK,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IACrD,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,eAAe,iBAAiB,CAAC"}

package/lib/module/configureOrderDeliveriesModule.d.ts

@@ -7,17 +7,20 @@ export declare const configureOrderDeliveriesModule: ({ OrderDeliveries, }: {
 }) => {
     findDelivery: ({ orderDeliveryId }: {
         orderDeliveryId: string;
-    }, options?: mongodb.FindOptions) => Promise<OrderDelivery>;
+    }, options?: mongodb.FindOptions) => Promise<OrderDelivery | null>;
+    findDeliveryByProvidersId: ({ deliveryProviderIds }: {
+        deliveryProviderIds: string[];
+    }, options?: mongodb.FindOptions) => Promise<OrderDelivery[]>;
     normalizedStatus: (orderDelivery: OrderDelivery) => OrderDeliveryStatus;
-    create: (doc: OrderDelivery) => Promise<OrderDelivery>;
+    create: (doc: Omit<OrderDelivery, "_id" | "created"> & Pick<Partial<OrderDelivery>, "_id" | "created">) => Promise<OrderDelivery>;
     delete: (orderDeliveryId: string) => Promise<number>;
-    markAsDelivered: (orderDelivery: OrderDelivery) => Promise<OrderDelivery>;
-    updateContext: (orderDeliveryId: string, context: any) => Promise<OrderDelivery>;
+    markAsDelivered: (orderDelivery: OrderDelivery) => Promise<mongodb.WithId<OrderDelivery> | null | undefined>;
+    updateContext: (orderDeliveryId: string, context: any) => Promise<mongodb.WithId<OrderDelivery> | null>;
     updateStatus: (orderDeliveryId: string, { status, info }: {
         status: OrderDeliveryStatus;
         info?: string;
-    }) => Promise<OrderDelivery>;
-    updateCalculation: <T extends PricingCalculation>(orderDeliveryId: string, calculation: T[]) => Promise<OrderDelivery>;
+    }) => Promise<mongodb.WithId<OrderDelivery> | null>;
+    updateCalculation: <T extends PricingCalculation>(orderDeliveryId: string, calculation: T[]) => Promise<mongodb.WithId<OrderDelivery> | null>;
     deleteOrderDeliveries: (orderId: string) => Promise<number>;
 };
 export type OrderDeliveriesModule = ReturnType<typeof configureOrderDeliveriesModule>;

package/lib/module/configureOrderDeliveriesModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configureOrderDeliveriesModule.d.ts","sourceRoot":"","sources":["../../src/module/configureOrderDeliveriesModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAA4C,MAAM,wBAAwB,CAAC;AAE3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAIxF,eAAO,MAAM,qBAAqB,GAAI,iBAAiB,MAAM,KAClB,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;AAEzE,eAAO,MAAM,8BAA8B,GAAI,sBAE5C;IACD,eAAe,EAAE,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;CACpD;wCAqC0B;QAAE,eAAe,EAAE,MAAM,CAAA;KAAE,YACtC,OAAO,CAAC,WAAW,KAC5B,OAAO,CAAC,aAAa,CAAC;sCApCc,aAAa;kBA4ChC,aAAa,KAAG,OAAO,CAAC,aAAa,CAAC;8BAa1B,MAAM;qCAKC,aAAa;qCAUb,MAAM,WAAW,GAAG,KAAG,OAAO,CAAC,aAAa,CAAC;oCAjEnE,MAAM,oBACL;QAAE,MAAM,EAAE,mBAAmB,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,KAC/D,OAAO,CAAC,aAAa,CAAC;wBA6FG,CAAC,SAAS,kBAAkB,mBACnC,MAAM,eACV,CAAC,EAAE,KACf,OAAO,CAAC,aAAa,CAAC;qCAec,MAAM;CAKhD,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,UAAU,CAAC,OAAO,8BAA8B,CAAC,CAAC"}
+{"version":3,"file":"configureOrderDeliveriesModule.d.ts","sourceRoot":"","sources":["../../src/module/configureOrderDeliveriesModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAA4C,MAAM,wBAAwB,CAAC;AAE3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAIxF,eAAO,MAAM,qBAAqB,GAAI,iBAAiB,MAAM,KAClB,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;AAEzE,eAAO,MAAM,8BAA8B,GAAI,sBAE5C;IACD,eAAe,EAAE,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;CACpD;wCAqC0B;QAAE,eAAe,EAAE,MAAM,CAAA;KAAE,YACtC,OAAO,CAAC,WAAW;yDAMJ;QAAE,mBAAmB,EAAE,MAAM,EAAE,CAAA;KAAE,YAChD,OAAO,CAAC,WAAW,KAC5B,OAAO,CAAC,aAAa,EAAE,CAAC;sCA3CY,aAAa;kBAwD7C,IAAI,CAAC,aAAa,EAAE,KAAK,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;8BAgB/D,MAAM;qCAKC,aAAa;qCAUb,MAAM,WAAW,GAAG;oCAhF1C,MAAM,oBACL;QAAE,MAAM,EAAE,mBAAmB,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE;wBA0GtC,CAAC,SAAS,kBAAkB,mBACnC,MAAM,eACV,CAAC,EAAE;qCAgBqB,MAAM;CAKhD,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,UAAU,CAAC,OAAO,8BAA8B,CAAC,CAAC"}

package/lib/module/configureOrderDeliveriesModule.js

@@ -35,6 +35,11 @@ export const configureOrderDeliveriesModule = ({ OrderDeliveries, }) => {
         findDelivery: async ({ orderDeliveryId }, options) => {
             return OrderDeliveries.findOne(buildFindByIdSelector(orderDeliveryId), options);
         },
+        findDeliveryByProvidersId: async ({ deliveryProviderIds }, options) => {
+            if (!deliveryProviderIds?.length)
+                return [];
+            return OrderDeliveries.find({ deliveryProviderId: { $in: deliveryProviderIds } }, options).toArray();
+        },
         normalizedStatus,
         // Mutations
         create: async (doc) => {
@@ -45,7 +50,7 @@ export const configureOrderDeliveriesModule = ({ OrderDeliveries, }) => {
                 context: doc.context || {},
                 status: null,
             });
-            const orderDelivery = await OrderDeliveries.findOne(buildFindByIdSelector(orderDeliveryId));
+            const orderDelivery = (await OrderDeliveries.findOne(buildFindByIdSelector(orderDeliveryId)));
             return orderDelivery;
         },
         delete: async (orderDeliveryId) => {
@@ -67,19 +72,18 @@ export const configureOrderDeliveriesModule = ({ OrderDeliveries, }) => {
             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(selector, {
+            const orderDelivery = await OrderDeliveries.findOneAndUpdate(selector, {
                 $set: {
                     ...contextSetters,
                     updated: new Date(),
                 },
-            }, { includeResultMetadata: true, returnDocument: 'after' });
-            if (result.ok) {
-                await emit('ORDER_UPDATE_DELIVERY', {
-                    orderDelivery: result.value,
-                });
-                return result.value;
-            }
-            return null;
+            }, { returnDocument: 'after' });
+            if (!orderDelivery)
+                return null;
+            await emit('ORDER_UPDATE_DELIVERY', {
+                orderDelivery,
+            });
+            return orderDelivery;
         },
         updateStatus,
         updateCalculation: async (orderDeliveryId, calculation) => {

package/lib/module/configureOrderDeliveriesModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"configureOrderDeliveriesModule.js","sourceRoot":"","sources":["../../src/module/configureOrderDeliveriesModule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"configureOrderDeliveriesModule.js","sourceRoot":"","sources":["../../src/module/configureOrderDeliveriesModule.ts"],"names":[],"mappings":"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"}

package/lib/module/configureOrderDiscountsModule.d.ts

@@ -6,20 +6,20 @@ export declare const configureOrderDiscountsModule: ({ OrderDiscounts, }: {
 }) => {
     findOrderDiscount: ({ discountId }: {
         discountId: string;
-    }, options?: mongodb.FindOptions) => Promise<OrderDiscount>;
+    }, options?: mongodb.FindOptions) => Promise<OrderDiscount | null>;
     findOrderDiscounts: ({ orderId }: {
         orderId: string;
     }) => Promise<OrderDiscount[]>;
-    create: (doc: OrderDiscount) => Promise<OrderDiscount>;
-    delete: (orderDiscountId: string) => Promise<OrderDiscount>;
+    create: (doc: Omit<OrderDiscount, "_id" | "created" | "trigger"> & Pick<Partial<OrderDiscount>, "_id" | "created" | "trigger">) => Promise<OrderDiscount>;
+    delete: (orderDiscountId: string) => Promise<mongodb.WithId<OrderDiscount> | null>;
     isDiscountCodeUsed: ({ code, orderId }: {
         code: any;
         orderId: any;
     }) => Promise<boolean>;
     findSpareDiscount: ({ code }: {
         code: any;
-    }) => Promise<OrderDiscount>;
-    update: (orderDiscountId: string, doc: OrderDiscount) => Promise<OrderDiscount>;
+    }) => Promise<mongodb.WithId<OrderDiscount> | null>;
+    update: (orderDiscountId: string, doc: Partial<OrderDiscount>) => Promise<mongodb.WithId<OrderDiscount> | null>;
     deleteOrderDiscounts: (orderId: string) => Promise<number>;
 };
 export type OrderDiscountsModule = ReturnType<typeof configureOrderDiscountsModule>;

package/lib/module/configureOrderDiscountsModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configureOrderDiscountsModule.d.ts","sourceRoot":"","sources":["../../src/module/configureOrderDiscountsModule.ts"],"names":[],"mappings":"AACA,OAAO,EAA4C,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAwB,MAAM,mCAAmC,CAAC;AAQxF,eAAO,MAAM,kCAAkC,GAAI,iBAAiB,MAAM,KAC/B,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;AAEzE,eAAO,MAAM,6BAA6B,GAAI,qBAE3C;IACD,cAAc,EAAE,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;CACnD;wCAMqB;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,YAC5B,OAAO,CAAC,WAAW,KAC5B,OAAO,CAAC,aAAa,CAAC;sCAIe;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAG,OAAO,CAAC,aAAa,EAAE,CAAC;kBAKlE,aAAa,KAAG,OAAO,CAAC,aAAa,CAAC;8BAe1B,MAAM,KAAG,OAAO,CAAC,aAAa,CAAC;;;;UAOhB,OAAO,CAAC,OAAO,CAAC;;;UAS1B,OAAO,CAAC,aAAa,CAAC;8BAO3B,MAAM,OAAO,aAAa,KAAG,OAAO,CAAC,aAAa,CAAC;oCAe7C,MAAM;CAK/C,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,UAAU,CAAC,OAAO,6BAA6B,CAAC,CAAC"}
+{"version":3,"file":"configureOrderDiscountsModule.d.ts","sourceRoot":"","sources":["../../src/module/configureOrderDiscountsModule.ts"],"names":[],"mappings":"AACA,OAAO,EAA4C,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAwB,MAAM,mCAAmC,CAAC;AAQxF,eAAO,MAAM,kCAAkC,GAAI,iBAAiB,MAAM,KAC/B,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;AAEzE,eAAO,MAAM,6BAA6B,GAAI,qBAE3C;IACD,cAAc,EAAE,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;CACnD;wCAK6C;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,YAAY,OAAO,CAAC,WAAW;sCAIvD;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAG,OAAO,CAAC,aAAa,EAAE,CAAC;kBAM/E,IAAI,CAAC,aAAa,EAAE,KAAK,GAAG,SAAS,GAAG,SAAS,CAAC,GACrD,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,KAAK,GAAG,SAAS,GAAG,SAAS,CAAC,KAC5D,OAAO,CAAC,aAAa,CAAC;8BAeO,MAAM;;;;UAOS,OAAO,CAAC,OAAO,CAAC;;;;8BAgB/B,MAAM,OAAO,OAAO,CAAC,aAAa,CAAC;oCAe7B,MAAM;CAK/C,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,UAAU,CAAC,OAAO,6BAA6B,CAAC,CAAC"}

package/lib/module/configureOrderDiscountsModule.js

@@ -26,9 +26,9 @@ export const configureOrderDiscountsModule = ({ OrderDiscounts, }) => {
                 ...doc,
                 trigger: normalizedTrigger,
             });
-            const discount = await OrderDiscounts.findOne({
+            const discount = (await OrderDiscounts.findOne({
                 _id: discountId,
-            });
+            }));
             await emit('ORDER_CREATE_DISCOUNT', { discount });
             return discount;
         },
@@ -47,7 +47,7 @@ export const configureOrderDiscountsModule = ({ OrderDiscounts, }) => {
         findSpareDiscount: async ({ code }) => {
             return OrderDiscounts.findOne({
                 code,
-                orderId: { $in: [undefined, null] },
+                orderId: { $exists: false },
             });
         },
         update: async (orderDiscountId, doc) => {

package/lib/module/configureOrderDiscountsModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"configureOrderDiscountsModule.js","sourceRoot":"","sources":["../../src/module/configureOrderDiscountsModule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"configureOrderDiscountsModule.js","sourceRoot":"","sources":["../../src/module/configureOrderDiscountsModule.ts"],"names":[],"mappings":"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"}

package/lib/module/configureOrderPaymentsModule.d.ts

@@ -2,30 +2,33 @@ import { mongodb } from '@unchainedshop/mongodb';
 import { PricingCalculation } from '@unchainedshop/utils';
 import { OrderPayment, OrderPaymentStatus } from '../db/OrderPaymentsCollection.js';
 export declare const buildFindOrderPaymentByIdSelector: (orderPaymentId: string) => mongodb.Filter<OrderPayment>;
-export declare const buildFindByContextDataSelector: (context: any) => mongodb.Filter<OrderPayment>;
+export declare const buildFindByContextDataSelector: (context: any) => mongodb.Filter<OrderPayment> | null;
 export declare const configureOrderPaymentsModule: ({ OrderPayments, }: {
     OrderPayments: mongodb.Collection<OrderPayment>;
 }) => {
     findOrderPayment: ({ orderPaymentId, }: {
         orderPaymentId: string;
-    }, options?: mongodb.FindOptions) => Promise<OrderPayment>;
+    }, options?: mongodb.FindOptions) => Promise<OrderPayment | null>;
+    findOrderPaymentsByProviderIds: ({ paymentProviderIds, }: {
+        paymentProviderIds: string[];
+    }, options?: mongodb.FindOptions) => Promise<OrderPayment[]>;
     findOrderPaymentByContextData: ({ context, }: {
         context: any;
-    }, options?: mongodb.FindOptions) => Promise<OrderPayment>;
+    }, options?: mongodb.FindOptions) => Promise<OrderPayment | null>;
     countOrderPaymentsByContextData: ({ context, }: {
         context: any;
     }, options?: mongodb.FindOptions) => Promise<number>;
     normalizedStatus: (orderPayment: OrderPayment) => OrderPaymentStatus;
-    create: (doc: OrderPayment) => Promise<OrderPayment>;
+    create: (doc: Omit<OrderPayment, "_id" | "created"> & Pick<Partial<OrderPayment>, "_id" | "created">) => Promise<OrderPayment>;
     logEvent: (orderPaymentId: string, event: any) => Promise<boolean>;
     markAsPaid: (orderPayment: OrderPayment, meta: any) => Promise<void>;
-    updateContext: (orderPaymentId: string, context: any) => Promise<OrderPayment>;
+    updateContext: (orderPaymentId: string, context: any) => Promise<mongodb.WithId<OrderPayment> | null>;
     updateStatus: (orderPaymentId: string, { transactionId, status, info, }: {
         transactionId?: string;
         status: OrderPaymentStatus;
         info?: string;
-    }) => Promise<OrderPayment>;
-    updateCalculation: <T extends PricingCalculation>(orderPaymentId: string, calculation: T[]) => Promise<mongodb.WithId<OrderPayment>>;
+    }) => Promise<mongodb.WithId<OrderPayment> | null>;
+    updateCalculation: <T extends PricingCalculation>(orderPaymentId: string, calculation: T[]) => Promise<mongodb.WithId<OrderPayment> | null>;
     deleteOrderPayments: (orderId: string) => Promise<number>;
 };
 export type OrderPaymentsModule = ReturnType<typeof configureOrderPaymentsModule>;

package/lib/module/configureOrderPaymentsModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configureOrderPaymentsModule.d.ts","sourceRoot":"","sources":["../../src/module/configureOrderPaymentsModule.ts"],"names":[],"mappings":"AACA,OAAO,EAA4C,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAC3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAIpF,eAAO,MAAM,iCAAiC,GAAI,gBAAgB,MAAM,KAC9B,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;AAEvE,eAAO,MAAM,8BAA8B,GAAI,SAAS,GAAG,KAAG,OAAO,CAAC,MAAM,CAAC,YAAY,CAgBxF,CAAC;AAEF,eAAO,MAAM,4BAA4B,GAAI,oBAE1C;IACD,aAAa,EAAE,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;CACjD;4CAgDQ;QACD,cAAc,EAAE,MAAM,CAAC;KACxB,YACS,OAAO,CAAC,WAAW,KAC5B,OAAO,CAAC,YAAY,CAAC;kDAMnB;QACD,OAAO,EAAE,GAAG,CAAC;KACd,YACS,OAAO,CAAC,WAAW,KAC5B,OAAO,CAAC,YAAY,CAAC;oDAQnB;QACD,OAAO,EAAE,GAAG,CAAC;KACd,YACS,OAAO,CAAC,WAAW;qCAtEO,YAAY;kBAiF9B,YAAY,KAAG,OAAO,CAAC,YAAY,CAAC;+BAgBvB,MAAM,SAAS,GAAG,KAAG,OAAO,CAAC,OAAO,CAAC;+BAgBrC,YAAY,QAAQ,GAAG;oCAUlB,MAAM,WAAW,GAAG,KAAG,OAAO,CAAC,YAAY,CAAC;mCApHlE,MAAM,oCAKnB;QAAE,aAAa,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,kBAAkB,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,KACvE,OAAO,CAAC,YAAY,CAAC;wBA4II,CAAC,SAAS,kBAAkB,kBACpC,MAAM,eACT,CAAC,EAAE;mCAemB,MAAM;CAK9C,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,UAAU,CAAC,OAAO,4BAA4B,CAAC,CAAC"}
+{"version":3,"file":"configureOrderPaymentsModule.d.ts","sourceRoot":"","sources":["../../src/module/configureOrderPaymentsModule.ts"],"names":[],"mappings":"AACA,OAAO,EAA4C,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAC3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAIpF,eAAO,MAAM,iCAAiC,GAAI,gBAAgB,MAAM,KAC9B,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;AAEvE,eAAO,MAAM,8BAA8B,GAAI,SAAS,GAAG,wCAgB1D,CAAC;AAEF,eAAO,MAAM,4BAA4B,GAAI,oBAE1C;IACD,aAAa,EAAE,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;CACjD;4CAgDQ;QACD,cAAc,EAAE,MAAM,CAAC;KACxB,YACS,OAAO,CAAC,WAAW;8DAQ1B;QACD,kBAAkB,EAAE,MAAM,EAAE,CAAC;KAC9B,YACS,OAAO,CAAC,WAAW,KAC5B,OAAO,CAAC,YAAY,EAAE,CAAC;kDAOrB;QACD,OAAO,EAAE,GAAG,CAAC;KACd,YACS,OAAO,CAAC,WAAW;oDAS1B;QACD,OAAO,EAAE,GAAG,CAAC;KACd,YACS,OAAO,CAAC,WAAW;qCAlFO,YAAY;kBA8F3C,IAAI,CAAC,YAAY,EAAE,KAAK,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC,KAC1F,OAAO,CAAC,YAAY,CAAC;+BAgBS,MAAM,SAAS,GAAG,KAAG,OAAO,CAAC,OAAO,CAAC;+BAgBrC,YAAY,QAAQ,GAAG;oCAUlB,MAAM,WAAW,GAAG;mCAlI1C,MAAM,oCAKnB;QAAE,aAAa,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,kBAAkB,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE;wBAwJ9C,CAAC,SAAS,kBAAkB,kBACpC,MAAM,eACT,CAAC,EAAE;mCAemB,MAAM;CAK9C,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,UAAU,CAAC,OAAO,4BAA4B,CAAC,CAAC"}

package/lib/module/configureOrderPaymentsModule.js

@@ -52,12 +52,21 @@ export const configureOrderPaymentsModule = ({ OrderPayments, }) => {
         findOrderPayment: async ({ orderPaymentId, }, options) => {
             return OrderPayments.findOne(buildFindOrderPaymentByIdSelector(orderPaymentId), options);
         },
+        findOrderPaymentsByProviderIds: async ({ paymentProviderIds, }, options) => {
+            if (!paymentProviderIds?.length)
+                return [];
+            return OrderPayments.find({ paymentProviderId: { $in: paymentProviderIds } }, options).toArray();
+        },
         findOrderPaymentByContextData: async ({ context, }, options) => {
             const selector = buildFindByContextDataSelector(context);
+            if (!selector)
+                return null;
             return OrderPayments.findOne(selector, options);
         },
         countOrderPaymentsByContextData: async ({ context, }, options) => {
             const selector = buildFindByContextDataSelector(context);
+            if (!selector)
+                return 0;
             return OrderPayments.countDocuments(selector, options);
         },
         normalizedStatus,
@@ -70,7 +79,7 @@ export const configureOrderPaymentsModule = ({ OrderPayments, }) => {
                 status: null,
                 context: doc.context || {},
             });
-            const orderPayment = await OrderPayments.findOne(buildFindOrderPaymentByIdSelector(orderPaymentId));
+            const orderPayment = (await OrderPayments.findOne(buildFindOrderPaymentByIdSelector(orderPaymentId)));
             return orderPayment;
         },
         logEvent: async (orderPaymentId, event) => {
@@ -101,19 +110,18 @@ export const configureOrderPaymentsModule = ({ OrderPayments, }) => {
             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(selector, {
+            const orderPayment = await OrderPayments.findOneAndUpdate(selector, {
                 $set: {
                     ...contextSetters,
                     updated: new Date(),
                 },
-            }, { includeResultMetadata: true, returnDocument: 'after' });
-            if (result.ok) {
-                await emit('ORDER_UPDATE_PAYMENT', {
-                    orderPayment: result.value,
-                });
-                return result.value;
-            }
-            return null;
+            }, { returnDocument: 'after' });
+            if (!orderPayment)
+                return null;
+            await emit('ORDER_UPDATE_PAYMENT', {
+                orderPayment,
+            });
+            return orderPayment;
         },
         updateStatus,
         updateCalculation: async (orderPaymentId, calculation) => {

package/lib/module/configureOrderPaymentsModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"configureOrderPaymentsModule.js","sourceRoot":"","sources":["../../src/module/configureOrderPaymentsModule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"configureOrderPaymentsModule.js","sourceRoot":"","sources":["../../src/module/configureOrderPaymentsModule.ts"],"names":[],"mappings":"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"}

package/lib/module/configureOrderPositionsModule.d.ts

@@ -1,17 +1,27 @@
 import { mongodb } from '@unchainedshop/mongodb';
 import { PricingCalculation } from '@unchainedshop/utils';
 import { OrderPosition } from '../db/OrderPositionsCollection.js';
+export interface OrderPositionAggregateParams {
+    match?: mongodb.Document;
+    matchAfterGroup?: mongodb.Document;
+    project?: mongodb.Document;
+    group?: mongodb.Document;
+    addFields?: mongodb.Document;
+    sort?: mongodb.Document;
+    limit?: number;
+    pipeline?: mongodb.Document[];
+}
 export declare const buildFindOrderPositionByIdSelector: (orderPositionId: string, orderId?: string) => mongodb.Filter<OrderPosition>;
 export declare const configureOrderPositionsModule: ({ OrderPositions, }: {
     OrderPositions: mongodb.Collection<OrderPosition>;
 }) => {
     findOrderPosition: ({ itemId }: {
         itemId: string;
-    }, options?: mongodb.FindOptions) => Promise<OrderPosition>;
+    }, options?: mongodb.FindOptions) => Promise<OrderPosition | null>;
     findOrderPositions: ({ orderId }: {
         orderId: string;
     }) => Promise<OrderPosition[]>;
-    delete: (orderPositionId: string) => Promise<OrderPosition>;
+    delete: (orderPositionId: string) => Promise<mongodb.WithId<OrderPosition> | null>;
     removePositions: ({ orderId }: {
         orderId: string;
     }) => Promise<number>;
@@ -22,10 +32,10 @@ export declare const configureOrderPositionsModule: ({ OrderPositions, }: {
             value: string;
         }[];
         quantity?: number;
-    }) => Promise<OrderPosition>;
+    }) => Promise<mongodb.WithId<OrderPosition> | null>;
     removeProductByIdFromAllOpenPositions: (productId: string) => Promise<string[]>;
-    updateScheduling: (orderPositionId: any, scheduling: any) => Promise<OrderPosition>;
-    updateCalculation: <T extends PricingCalculation>(orderPositionId: string, calculation: T[]) => Promise<OrderPosition>;
+    updateScheduling: (orderPositionId: any, scheduling: any) => Promise<mongodb.WithId<OrderPosition> | null>;
+    updateCalculation: <T extends PricingCalculation>(orderPositionId: string, calculation: T[]) => Promise<mongodb.WithId<OrderPosition> | null>;
     addProductItem: (orderPosition: {
         context?: any;
         configuration?: {
@@ -39,6 +49,7 @@ export declare const configureOrderPositionsModule: ({ OrderPositions, }: {
         quotationId?: string;
     }) => Promise<OrderPosition>;
     deleteOrderPositions: (orderId: string) => Promise<number>;
+    aggregatePositions: ({ match, project, group, addFields, sort, limit, pipeline, }: OrderPositionAggregateParams) => Promise<mongodb.Document[]>;
 };
 export type OrderPositionsModule = ReturnType<typeof configureOrderPositionsModule>;
 //# sourceMappingURL=configureOrderPositionsModule.d.ts.map

package/lib/module/configureOrderPositionsModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configureOrderPositionsModule.d.ts","sourceRoot":"","sources":["../../src/module/configureOrderPositionsModule.ts"],"names":[],"mappings":"AACA,OAAO,EAA4C,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAC3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AASlE,eAAO,MAAM,kCAAkC,GAAI,iBAAiB,MAAM,EAAE,UAAU,MAAM,KAIrF,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;AAErC,eAAO,MAAM,6BAA6B,GAAI,qBAE3C;IACD,cAAc,EAAE,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;CACnD;oCAMiB;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,YACpB,OAAO,CAAC,WAAW,KAC5B,OAAO,CAAC,aAAa,CAAC;sCAIe;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAG,OAAO,CAAC,aAAa,EAAE,CAAC;8BAKtD,MAAM,KAAG,OAAO,CAAC,aAAa,CAAC;mCAS1B;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAG,OAAO,CAAC,MAAM,CAAC;uEAUvE;QACD,eAAe,EAAE,MAAM,CAAC;QACxB,aAAa,CAAC,EAAE;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QACjD,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,KAAG,OAAO,CAAC,aAAa,CAAC;uDAgC+B,MAAM,KAAG,OAAO,CAAC,MAAM,EAAE,CAAC;iEAoC5B,OAAO,CAAC,aAAa,CAAC;wBAYnD,CAAC,SAAS,kBAAkB,mBACnC,MAAM,eACV,CAAC,EAAE,KACf,OAAO,CAAC,aAAa,CAAC;oCAYa;QACpC,OAAO,CAAC,EAAE,GAAG,CAAC;QACd,aAAa,CAAC,EAAE;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QACjD,OAAO,EAAE,MAAM,CAAC;QAChB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,KAAG,OAAO,CAAC,aAAa,CAAC;oCAwCY,MAAM;CAK/C,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,UAAU,CAAC,OAAO,6BAA6B,CAAC,CAAC"}
+{"version":3,"file":"configureOrderPositionsModule.d.ts","sourceRoot":"","sources":["../../src/module/configureOrderPositionsModule.ts"],"names":[],"mappings":"AACA,OAAO,EAA4C,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAC3F,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AASlE,MAAM,WAAW,4BAA4B;IAC3C,KAAK,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC;IACzB,eAAe,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC;IACnC,OAAO,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC;IACzB,SAAS,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC;IAC7B,IAAI,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC;CAC/B;AAED,eAAO,MAAM,kCAAkC,GAAI,iBAAiB,MAAM,EAAE,UAAU,MAAM,KAIrF,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;AAErC,eAAO,MAAM,6BAA6B,GAAI,qBAE3C;IACD,cAAc,EAAE,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;CACnD;oCAKyC;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,YAAY,OAAO,CAAC,WAAW;sCAI/C;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAG,OAAO,CAAC,aAAa,EAAE,CAAC;8BAKtD,MAAM;mCASD;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,KAAG,OAAO,CAAC,MAAM,CAAC;uEAUvE;QACD,eAAe,EAAE,MAAM,CAAC;QACxB,aAAa,CAAC,EAAE;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QACjD,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB;uDAiCwD,MAAM,KAAG,OAAO,CAAC,MAAM,EAAE,CAAC;;wBAgDzD,CAAC,SAAS,kBAAkB,mBACnC,MAAM,eACV,CAAC,EAAE;oCAaoB;QACpC,OAAO,CAAC,EAAE,GAAG,CAAC;QACd,aAAa,CAAC,EAAE;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QACjD,OAAO,EAAE,MAAM,CAAC;QAChB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,KAAG,OAAO,CAAC,aAAa,CAAC;oCAqCY,MAAM;uFAazC,4BAA4B,KAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;CAiBhE,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,UAAU,CAAC,OAAO,6BAA6B,CAAC,CAAC"}

package/lib/module/configureOrderPositionsModule.js

@@ -24,7 +24,7 @@ export const configureOrderPositionsModule = ({ OrderPositions, }) => {
             await emit('ORDER_REMOVE_CART_ITEM', {
                 orderPosition,
             });
-            return { ...orderPosition, calculation: [] };
+            return orderPosition;
         },
         removePositions: async ({ orderId }) => {
             const result = await OrderPositions.deleteMany({ orderId });
@@ -48,6 +48,8 @@ export const configureOrderPositionsModule = ({ OrderPositions, }) => {
             }, modifier, {
                 returnDocument: 'after',
             });
+            if (!updatedOrderPosition)
+                return null;
             await emit('ORDER_UPDATE_CART_ITEM', {
                 orderPosition: updatedOrderPosition,
             });
@@ -105,10 +107,10 @@ export const configureOrderPositionsModule = ({ OrderPositions, }) => {
                 orderId,
                 productId,
                 originalProductId,
-                configuration: configuration || { $in: [null, undefined] },
+                configuration: configuration || { $exists: false },
                 ...scope,
             };
-            await OrderPositions.updateOne(selector, {
+            const upsertedOrderPosition = (await OrderPositions.findOneAndUpdate(selector, {
                 $set: {
                     updated: new Date(),
                 },
@@ -124,8 +126,7 @@ export const configureOrderPositionsModule = ({ OrderPositions, }) => {
                     configuration,
                     ...scope,
                 },
-            }, { upsert: true });
-            const upsertedOrderPosition = await OrderPositions.findOne(selector);
+            }, { upsert: true, returnDocument: 'after' }));
             await emit('ORDER_ADD_PRODUCT', { orderPosition: upsertedOrderPosition });
             return upsertedOrderPosition;
         },
@@ -133,6 +134,25 @@ export const configureOrderPositionsModule = ({ OrderPositions, }) => {
             const { deletedCount } = await OrderPositions.deleteMany({ orderId });
             return deletedCount;
         },
+        aggregatePositions: async ({ match, project, group, addFields, sort, limit, pipeline, }) => {
+            const stages = [];
+            if (pipeline?.length) {
+                return await OrderPositions.aggregate(pipeline).toArray();
+            }
+            if (match)
+                stages.push({ $match: match });
+            if (project)
+                stages.push({ $project: project });
+            if (group)
+                stages.push({ $group: group });
+            if (addFields)
+                stages.push({ $addFields: addFields });
+            if (sort)
+                stages.push({ $sort: sort });
+            if (typeof limit === 'number')
+                stages.push({ $limit: limit });
+            return OrderPositions.aggregate(stages).toArray();
+        },
     };
 };
 //# sourceMappingURL=configureOrderPositionsModule.js.map