@unchainedshop/core-orders 3.0.0-alpha7 → 3.0.0-rc1

package/lib/orders-index.js

@@ -1,11 +1,4 @@
 export * from './types.js';
 export * from './module/configureOrdersModule.js';
-export * from './service/orderServices.js';
 export * from './orders-settings.js';
-export * from './director/OrderDiscountConfiguration.js';
-export * from './director/OrderDiscountAdapter.js';
-export * from './director/OrderDiscountDirector.js';
-export * from './director/OrderPricingAdapter.js';
-export * from './director/OrderPricingDirector.js';
-export * from './director/OrderPricingSheet.js';
 //# sourceMappingURL=orders-index.js.map

package/lib/orders-index.js.map

@@ -1 +1 @@
-{"version":3,"file":"orders-index.js","sourceRoot":"","sources":["../src/orders-index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,mCAAmC,CAAC;AAClD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,sBAAsB,CAAC;AAErC,cAAc,0CAA0C,CAAC;AACzD,cAAc,oCAAoC,CAAC;AACnD,cAAc,qCAAqC,CAAC;AAEpD,cAAc,mCAAmC,CAAC;AAClD,cAAc,oCAAoC,CAAC;AACnD,cAAc,iCAAiC,CAAC"}
+{"version":3,"file":"orders-index.js","sourceRoot":"","sources":["../src/orders-index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,mCAAmC,CAAC;AAClD,cAAc,sBAAsB,CAAC"}

package/lib/orders-settings.d.ts

@@ -1,7 +1,5 @@
 import { Order } from './types.js';
-import { UnchainedCore } from '@unchainedshop/core';
-import { Product } from '@unchainedshop/core-products';
-export interface OrderSettingsOrderPositionValidation {
+export interface OrderSettingsOrderPositionValidation<Product = unknown> {
     order: Order;
     product: Product;
     quantityDiff?: number;
@@ -13,14 +11,12 @@ export interface OrderSettingsOrderPositionValidation {
 export interface OrdersSettingsOptions {
     ensureUserHasCart?: boolean;
     orderNumberHashFn?: (order: Order, index: number) => string;
-    validateOrderPosition?: (validationParams: OrderSettingsOrderPositionValidation, context: UnchainedCore) => Promise<void>;
+    validateOrderPosition?: <UnchainedAPI = unknown>(validationParams: OrderSettingsOrderPositionValidation, unchainedAPI: UnchainedAPI) => Promise<void>;
     lockOrderDuringCheckout?: boolean;
 }
 export declare const defaultValidateOrderPosition: ({ product }: {
     product: any;
-}, { modules }: {
-    modules: any;
-}) => Promise<void>;
+}, { modules }: any) => Promise<void>;
 export declare const ordersSettings: {
     ensureUserHasCart: any;
     orderNumberHashFn: any;

package/lib/orders-settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orders-settings.d.ts","sourceRoot":"","sources":["../src/orders-settings.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAEvD,MAAM,WAAW,oCAAoC;IACnD,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACvD;AAED,MAAM,WAAW,qBAAqB;IACpC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IAC5D,qBAAqB,CAAC,EAAE,CACtB,gBAAgB,EAAE,oCAAoC,EACtD,OAAO,EAAE,aAAa,KACnB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAED,eAAO,MAAM,4BAA4B;;;;mBAIxC,CAAC;AAEF,eAAO,MAAM,cAAc;;;;;kHAWtB,qBAAqB;CAMzB,CAAC"}
+{"version":3,"file":"orders-settings.d.ts","sourceRoot":"","sources":["../src/orders-settings.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,MAAM,WAAW,oCAAoC,CAAC,OAAO,GAAG,OAAO;IACrE,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACvD;AAED,MAAM,WAAW,qBAAqB;IACpC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IAC5D,qBAAqB,CAAC,EAAE,CAAC,YAAY,GAAG,OAAO,EAC7C,gBAAgB,EAAE,oCAAoC,EACtD,YAAY,EAAE,YAAY,KACvB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAED,eAAO,MAAM,4BAA4B;;gBAAoC,GAAG,kBAI/E,CAAC;AAEF,eAAO,MAAM,cAAc;;;;;kHAWtB,qBAAqB;CAMzB,CAAC"}

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;AAsB1D,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;IAC7E,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;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"}

package/lib/types.d.ts

@@ -1,6 +1,5 @@
-import type { ProductPricingCalculation } from '@unchainedshop/core-products';
-import type { TimestampFields, LogFields, Address, Contact } from '@unchainedshop/mongodb';
-import { OrderPrice } from './director/OrderPricingDirector.js';
+import { TimestampFields, LogFields, Address, Contact } from '@unchainedshop/mongodb';
+import { Price } from '@unchainedshop/utils';
 export type OrderReport = {
     newCount: number;
     checkoutCount: number;
@@ -16,14 +15,14 @@ export declare enum OrderStatus {
 }
 export type OrderPosition = {
     _id?: string;
-    calculation: Array<ProductPricingCalculation>;
+    calculation: Array<any>;
     configuration: Array<{
         key: string;
         value: string;
     }>;
     context?: any;
     orderId: string;
-    originalProductId?: string;
+    originalProductId: string;
     productId: string;
     quantity: number;
     quotationId?: string;
@@ -56,7 +55,7 @@ export type OrderDiscount = {
     _id?: string;
     orderId: string;
     code?: string;
-    total?: OrderPrice;
+    total?: Price;
     trigger?: OrderDiscountTrigger;
     discountKey?: string;
     reservation?: any;
@@ -89,7 +88,7 @@ export type OrderPayment = {
     status?: OrderPaymentStatus | null;
     calculation?: Array<any>;
 } & LogFields & TimestampFields;
-export type OrderPaymentDiscount = Omit<OrderPrice, '_id'> & {
+export type OrderPaymentDiscount = Omit<Price, '_id'> & {
     _id?: string;
     discountId: string;
     item: OrderPayment;
@@ -103,12 +102,12 @@ export type OrderDelivery = {
     context?: any;
     calculation: Array<any>;
 } & LogFields & TimestampFields;
-export type OrderDeliveryDiscount = Omit<OrderPrice, '_id'> & {
+export type OrderDeliveryDiscount = Omit<Price, '_id'> & {
     _id?: string;
     discountId: string;
     item: OrderDelivery;
 };
-export type OrderPositionDiscount = Omit<OrderPrice, '_id'> & {
+export type OrderPositionDiscount = Omit<Price, '_id'> & {
     _id?: string;
     discountId: string;
     item: OrderPosition;

package/lib/types.d.ts.map

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

package/lib/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAYA,MAAM,CAAN,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,kCAAmB,CAAA;IACnB,sCAAuB,CAAA;IACvB,wCAAyB,CAAA;IACzB,oCAAqB,CAAA;AACvB,CAAC,EALW,WAAW,KAAX,WAAW,QAKtB;AAoCD,MAAM,CAAN,IAAY,oBAGX;AAHD,WAAY,oBAAoB;IAC9B,qCAAa,CAAA;IACb,yCAAiB,CAAA;AACnB,CAAC,EAHW,oBAAoB,KAApB,oBAAoB,QAG/B;AAqBD,MAAM,CAAN,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IAC7B,oCAAa,CAAA;IACb,8CAAuB,CAAA;IACvB,4CAAqB,CAAA;AACvB,CAAC,EAJW,mBAAmB,KAAnB,mBAAmB,QAI9B;AAED,MAAM,CAAN,IAAY,kBAIX;AAJD,WAAY,kBAAkB;IAC5B,mCAAa,CAAA;IACb,mCAAa,CAAA;IACb,2CAAqB,CAAA;AACvB,CAAC,EAJW,kBAAkB,KAAlB,kBAAkB,QAI7B"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAWA,MAAM,CAAN,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,kCAAmB,CAAA;IACnB,sCAAuB,CAAA;IACvB,wCAAyB,CAAA;IACzB,oCAAqB,CAAA;AACvB,CAAC,EALW,WAAW,KAAX,WAAW,QAKtB;AAoCD,MAAM,CAAN,IAAY,oBAGX;AAHD,WAAY,oBAAoB;IAC9B,qCAAa,CAAA;IACb,yCAAiB,CAAA;AACnB,CAAC,EAHW,oBAAoB,KAApB,oBAAoB,QAG/B;AAqBD,MAAM,CAAN,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IAC7B,oCAAa,CAAA;IACb,8CAAuB,CAAA;IACvB,4CAAqB,CAAA;AACvB,CAAC,EAJW,mBAAmB,KAAnB,mBAAmB,QAI9B;AAED,MAAM,CAAN,IAAY,kBAIX;AAJD,WAAY,kBAAkB;IAC5B,mCAAa,CAAA;IACb,mCAAa,CAAA;IACb,2CAAqB,CAAA;AACvB,CAAC,EAJW,kBAAkB,KAAlB,kBAAkB,QAI7B"}

package/package.json

@@ -1,16 +1,13 @@
 {
   "name": "@unchainedshop/core-orders",
-  "version": "3.0.0-alpha7",
+  "version": "3.0.0-rc1",
   "main": "lib/orders-index.js",
-  "exports": {
-    ".": "./lib/orders-index.js",
-    "./*": "./lib/*"
-  },
   "types": "lib/orders-index.d.ts",
   "type": "module",
   "scripts": {
-    "clean": "rm -rf lib",
-    "prepublishOnly": "npm run clean && tsc",
+    "clean": "tsc -b --clean",
+    "build": "tsc -b",
+    "prepublishOnly": "npm run clean && npm run build",
     "watch": "tsc -w",
     "test": "NODE_OPTIONS=--experimental-vm-modules jest --detectOpenHandles --forceExit",
     "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch --detectOpenHandles --forceExit"
@@ -32,14 +29,14 @@
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
     "@kontsedal/locco": "0.1.0",
-    "@unchainedshop/events": "^3.0.0-alpha4",
-    "@unchainedshop/logger": "^3.0.0-alpha4",
-    "@unchainedshop/utils": "^3.0.0-alpha4"
+    "@unchainedshop/events": "^3.0.0-rc1",
+    "@unchainedshop/logger": "^3.0.0-rc1",
+    "@unchainedshop/utils": "^3.0.0-rc1"
   },
   "devDependencies": {
-    "@types/node": "^22.8.1",
+    "@types/node": "^22.10.2",
     "jest": "^29.7.0",
     "ts-jest": "^29.2.5",
-    "typescript": "^5.6.3"
+    "typescript": "^5.7.2"
   }
 }

package/src/db/OrderDeliveriesCollection.ts

@@ -1,5 +1,5 @@
 import { mongodb, buildDbIndexes } from '@unchainedshop/mongodb';
-import { OrderDelivery } from '@unchainedshop/core-orders';
+import { OrderDelivery } from '../types.js';
 
 export const OrderDeliveriesCollection = async (db: mongodb.Db) => {
   const OrderDeliveries = db.collection<OrderDelivery>('order_deliveries');

package/src/db/OrderDiscountsCollection.ts

@@ -1,5 +1,5 @@
 import { mongodb, buildDbIndexes } from '@unchainedshop/mongodb';
-import { OrderDiscount } from '@unchainedshop/core-orders';
+import { OrderDiscount } from '../types.js';
 
 export const OrderDiscountsCollection = async (db: mongodb.Db) => {
   const OrderDiscounts = db.collection<OrderDiscount>('order_discounts');

package/src/db/OrderPaymentsCollection.ts

@@ -1,5 +1,5 @@
 import { mongodb, buildDbIndexes } from '@unchainedshop/mongodb';
-import { OrderPayment } from '@unchainedshop/core-orders';
+import { OrderPayment } from '../types.js';
 
 export const OrderPaymentsCollection = async (db: mongodb.Db) => {
   const OrderPayments = db.collection<OrderPayment>('order_payments');

package/src/db/OrderPositionsCollection.ts

@@ -1,5 +1,5 @@
 import { mongodb, buildDbIndexes } from '@unchainedshop/mongodb';
-import { OrderPosition } from '@unchainedshop/core-orders';
+import { OrderPosition } from '../types.js';
 
 export const OrderPositionsCollection = async (db: mongodb.Db) => {
   const OrderPositions = db.collection<OrderPosition>('order_positions');

package/src/module/buildFindSelector.test.ts

@@ -6,7 +6,7 @@ import {
   buildFindByContextDataSelector,
 } from './configureOrderPaymentsModule.js';
 import { buildFindByIdSelector as buildFindByIdSelectorForPosition } from './configureOrderPositionsModule.js';
-import { buildFindSelector as buildFindSelectorForOrder } from './configureOrdersModule-queries.js';
+import buildFindSelectorForOrder from './buildFindSelector.js';
 
 describe('OrderPosition', () => {
   describe('buildFindSelector', () => {

package/src/module/buildFindSelector.ts

@@ -0,0 +1,24 @@
+import { Order, OrderQuery } from '../types.js';
+import { mongodb } from '@unchainedshop/mongodb';
+
+export const buildFindSelector = ({ includeCarts, status, userId, queryString }: OrderQuery) => {
+  const selector: mongodb.Filter<Order> = {};
+
+  if (userId) {
+    selector.userId = userId;
+  }
+
+  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) {
+    (selector as any).$text = { $search: queryString };
+  }
+
+  return selector;
+};
+
+export default buildFindSelector;

package/src/module/configureOrderDeliveriesModule.ts

@@ -1,65 +1,7 @@
-import { UnchainedCore } from '@unchainedshop/core';
 import { mongodb, generateDbFilterById, generateDbObjectId } from '@unchainedshop/mongodb';
 import { emit, registerEvents } from '@unchainedshop/events';
-import { Order, OrderDelivery, OrderDeliveryStatus, OrderDiscount } from '../types.js';
-import { DeliveryLocation, IDeliveryPricingSheet } from '@unchainedshop/core-delivery';
-import { DeliveryDirector } from '@unchainedshop/core-delivery';
-import { OrderPricingDiscount } from '../director/OrderPricingDirector.js';
-
-export type OrderDeliveriesModule = {
-  // Queries
-  findDelivery: (
-    params: { orderDeliveryId: string },
-    options?: mongodb.FindOptions,
-  ) => Promise<OrderDelivery>;
-
-  // Transformations
-  discounts: (
-    orderDelivery: OrderDelivery,
-    params: { order: Order; orderDiscount: OrderDiscount },
-    unchainedAPI: UnchainedCore,
-  ) => Array<OrderPricingDiscount>;
-  isBlockingOrderConfirmation: (
-    orderDelivery: OrderDelivery,
-    unchainedAPI: UnchainedCore,
-  ) => Promise<boolean>;
-  isBlockingOrderFullfillment: (orderDelivery: OrderDelivery) => boolean;
-  normalizedStatus: (orderDelivery: OrderDelivery) => string;
-  pricingSheet: (
-    orderDelivery: OrderDelivery,
-    currency: string,
-    unchainedAPI: UnchainedCore,
-  ) => IDeliveryPricingSheet;
-
-  // Mutations
-  create: (doc: OrderDelivery) => Promise<OrderDelivery>;
-  delete: (orderDeliveryId: string) => Promise<number>;
-
-  markAsDelivered: (orderDelivery: OrderDelivery) => Promise<void>;
-
-  activePickUpLocation: (
-    orderDelivery: OrderDelivery,
-    unchainedAPI: UnchainedCore,
-  ) => Promise<DeliveryLocation | null>;
-
-  send: (
-    orderDelivery: OrderDelivery,
-    params: { order: Order; deliveryContext?: any },
-    unchainedAPI: UnchainedCore,
-  ) => Promise<OrderDelivery>;
-
-  updateContext: (orderDeliveryId: string, context: any) => Promise<OrderDelivery | null>;
-
-  updateStatus: (
-    orderDeliveryId: string,
-    params: { status: OrderDeliveryStatus; info?: string },
-  ) => Promise<OrderDelivery>;
-
-  updateCalculation: (
-    orderDelivery: OrderDelivery,
-    unchainedAPI: UnchainedCore,
-  ) => Promise<OrderDelivery>;
-};
+import { OrderDelivery, OrderDeliveryStatus } from '../types.js';
+import { PricingCalculation } from '@unchainedshop/utils';
 
 const ORDER_DELIVERY_EVENTS: string[] = ['ORDER_DELIVER', 'ORDER_UPDATE_DELIVERY'];
 
@@ -70,19 +12,19 @@ export const configureOrderDeliveriesModule = ({
   OrderDeliveries,
 }: {
   OrderDeliveries: mongodb.Collection<OrderDelivery>;
-}): OrderDeliveriesModule => {
+}) => {
   registerEvents(ORDER_DELIVERY_EVENTS);
 
-  const normalizedStatus: OrderDeliveriesModule['normalizedStatus'] = (orderDelivery) => {
+  const normalizedStatus = (orderDelivery: OrderDelivery) => {
     return orderDelivery.status === null
       ? OrderDeliveryStatus.OPEN
       : (orderDelivery.status as OrderDeliveryStatus);
   };
 
-  const updateStatus: OrderDeliveriesModule['updateStatus'] = async (
-    orderDeliveryId,
-    { status, info },
-  ) => {
+  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() },
@@ -106,72 +48,18 @@ export const configureOrderDeliveriesModule = ({
 
   return {
     // Queries
-    findDelivery: async ({ orderDeliveryId }, options) => {
+    findDelivery: async (
+      { orderDeliveryId }: { orderDeliveryId: string },
+      options?: mongodb.FindOptions,
+    ): Promise<OrderDelivery> => {
       return OrderDeliveries.findOne(buildFindByIdSelector(orderDeliveryId), options);
     },
 
-    // Transformations
-    discounts: (orderDelivery, { order, orderDiscount }, context) => {
-      const { modules } = context;
-      if (!orderDelivery) return [];
-
-      const pricingSheet = modules.orders.deliveries.pricingSheet(
-        orderDelivery,
-        order.currency,
-        context,
-      );
-
-      return pricingSheet.discountPrices(orderDiscount._id).map((discount) => ({
-        delivery: orderDelivery,
-        ...discount,
-      }));
-    },
-
-    isBlockingOrderConfirmation: async (orderDelivery, unchainedAPI) => {
-      const provider = await unchainedAPI.modules.delivery.findProvider({
-        deliveryProviderId: orderDelivery.deliveryProviderId,
-      });
-
-      const isAutoReleaseAllowed = await unchainedAPI.modules.delivery.isAutoReleaseAllowed(
-        provider,
-        unchainedAPI,
-      );
-
-      return !isAutoReleaseAllowed;
-    },
-
-    activePickUpLocation: async (orderDelivery, unchainedAPI) => {
-      const { orderPickUpLocationId } = orderDelivery.context || {};
-
-      const provider = await unchainedAPI.modules.delivery.findProvider({
-        deliveryProviderId: orderDelivery.deliveryProviderId,
-      });
-      const director = await DeliveryDirector.actions(
-        provider,
-        { orderDelivery: orderDelivery },
-        unchainedAPI,
-      );
-
-      return director.pickUpLocationById(orderPickUpLocationId);
-    },
-
-    isBlockingOrderFullfillment: (orderDelivery) => {
-      if (orderDelivery.status === OrderDeliveryStatus.DELIVERED) return false;
-      return true;
-    },
-
     normalizedStatus,
 
-    pricingSheet: (orderDelivery, currency, { modules }) => {
-      return modules.delivery.pricingSheet({
-        calculation: orderDelivery.calculation,
-        currency,
-      });
-    },
-
     // Mutations
 
-    create: async (doc) => {
+    create: async (doc: OrderDelivery): Promise<OrderDelivery> => {
       const { insertedId: orderDeliveryId } = await OrderDeliveries.insertOne({
         _id: generateDbObjectId(),
         created: new Date(),
@@ -184,56 +72,22 @@ export const configureOrderDeliveriesModule = ({
       return orderDelivery;
     },
 
-    delete: async (orderDeliveryId) => {
+    delete: async (orderDeliveryId: string) => {
       const { deletedCount } = await OrderDeliveries.deleteOne({ _id: orderDeliveryId });
       return deletedCount;
     },
 
-    markAsDelivered: async (orderDelivery) => {
+    markAsDelivered: async (orderDelivery: OrderDelivery) => {
       if (normalizedStatus(orderDelivery) !== OrderDeliveryStatus.OPEN) return;
       const updatedOrderDelivery = await updateStatus(orderDelivery._id, {
         status: OrderDeliveryStatus.DELIVERED,
         info: 'mark delivered manually',
       });
       await emit('ORDER_DELIVER', { orderDelivery: updatedOrderDelivery });
+      return updatedOrderDelivery;
     },
 
-    send: async (orderDelivery, { order, deliveryContext }, unchainedAPI) => {
-      if (normalizedStatus(orderDelivery) !== OrderDeliveryStatus.OPEN) return orderDelivery;
-
-      const deliveryProvider = await unchainedAPI.modules.delivery.findProvider({
-        deliveryProviderId: orderDelivery.deliveryProviderId,
-      });
-
-      const deliveryProviderId = deliveryProvider._id;
-
-      const address = orderDelivery.context?.address || order || order.billingAddress;
-
-      const arbitraryResponseData = await unchainedAPI.modules.delivery.send(
-        deliveryProviderId,
-        {
-          order,
-          orderDelivery,
-          transactionContext: {
-            ...(deliveryContext || {}),
-            ...(orderDelivery.context || {}),
-            ...(address || {}),
-          },
-        },
-        unchainedAPI,
-      );
-
-      if (arbitraryResponseData) {
-        return updateStatus(orderDelivery._id, {
-          status: OrderDeliveryStatus.DELIVERED,
-          info: JSON.stringify(arbitraryResponseData),
-        });
-      }
-
-      return orderDelivery;
-    },
-
-    updateContext: async (orderDeliveryId, context) => {
+    updateContext: async (orderDeliveryId: string, context: any): Promise<OrderDelivery> => {
       const selector = buildFindByIdSelector(orderDeliveryId);
       if (!context || Object.keys(context).length === 0) return OrderDeliveries.findOne(selector, {});
       const contextSetters = Object.fromEntries(
@@ -263,16 +117,12 @@ export const configureOrderDeliveriesModule = ({
 
     updateStatus,
 
-    updateCalculation: async (orderDelivery, unchainedAPI) => {
-      const calculation = await unchainedAPI.modules.delivery.calculate(
-        {
-          item: orderDelivery,
-        },
-        unchainedAPI,
-      );
-
+    updateCalculation: async <T extends PricingCalculation>(
+      orderDeliveryId: string,
+      calculation: Array<T>,
+    ): Promise<OrderDelivery> => {
       return OrderDeliveries.findOneAndUpdate(
-        buildFindByIdSelector(orderDelivery._id),
+        { _id: orderDeliveryId },
         {
           $set: {
             calculation,
@@ -284,5 +134,12 @@ export const configureOrderDeliveriesModule = ({
         },
       );
     },
+
+    deleteOrderDeliveries: async (orderId: string) => {
+      const { deletedCount } = await OrderDeliveries.deleteMany({ orderId });
+      return deletedCount;
+    },
   };
 };
+
+export type OrderDeliveriesModule = ReturnType<typeof configureOrderDeliveriesModule>;