@unchainedshop/core-orders 3.0.0-alpha2 → 3.0.0-alpha4

package/lib/types.js

@@ -0,0 +1,25 @@
+export var OrderStatus;
+(function (OrderStatus) {
+    OrderStatus["PENDING"] = "PENDING";
+    OrderStatus["CONFIRMED"] = "CONFIRMED";
+    OrderStatus["FULLFILLED"] = "FULLFILLED";
+    OrderStatus["REJECTED"] = "REJECTED";
+})(OrderStatus || (OrderStatus = {}));
+export var OrderDiscountTrigger;
+(function (OrderDiscountTrigger) {
+    OrderDiscountTrigger["USER"] = "USER";
+    OrderDiscountTrigger["SYSTEM"] = "SYSTEM";
+})(OrderDiscountTrigger || (OrderDiscountTrigger = {}));
+export var OrderDeliveryStatus;
+(function (OrderDeliveryStatus) {
+    OrderDeliveryStatus["OPEN"] = "OPEN";
+    OrderDeliveryStatus["DELIVERED"] = "DELIVERED";
+    OrderDeliveryStatus["RETURNED"] = "RETURNED";
+})(OrderDeliveryStatus || (OrderDeliveryStatus = {}));
+export var OrderPaymentStatus;
+(function (OrderPaymentStatus) {
+    OrderPaymentStatus["OPEN"] = "OPEN";
+    OrderPaymentStatus["PAID"] = "PAID";
+    OrderPaymentStatus["REFUNDED"] = "REFUNDED";
+})(OrderPaymentStatus || (OrderPaymentStatus = {}));
+//# sourceMappingURL=types.js.map

package/lib/types.js.map

@@ -0,0 +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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/core-orders",
-  "version": "3.0.0-alpha2",
+  "version": "3.0.0-alpha4",
   "main": "lib/orders-index.js",
   "exports": {
     ".": "./lib/orders-index.js",
@@ -32,16 +32,14 @@
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
     "@kontsedal/locco": "0.1.0",
-    "@unchainedshop/events": "^3.0.0-alpha2",
-    "@unchainedshop/logger": "^3.0.0-alpha2",
-    "@unchainedshop/utils": "^3.0.0-alpha2",
-    "simpl-schema": "^3.4.6"
+    "@unchainedshop/events": "^3.0.0-alpha4",
+    "@unchainedshop/logger": "^3.0.0-alpha4",
+    "@unchainedshop/utils": "^3.0.0-alpha4"
   },
   "devDependencies": {
-    "@types/node": "^20.14.12",
-    "@unchainedshop/types": "^3.0.0-alpha2",
+    "@types/node": "^22.7.8",
     "jest": "^29.7.0",
-    "ts-jest": "^29.2.3",
-    "typescript": "^5.5.4"
+    "ts-jest": "^29.2.5",
+    "typescript": "^5.6.3"
   }
 }

package/src/db/OrderDeliveriesCollection.ts

@@ -1,5 +1,5 @@
 import { mongodb, buildDbIndexes } from '@unchainedshop/mongodb';
-import { OrderDelivery } from '@unchainedshop/types/orders.deliveries.js';
+import { OrderDelivery } from '@unchainedshop/core-orders';
 
 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/types/orders.discounts.js';
+import { OrderDiscount } from '@unchainedshop/core-orders';
 
 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/types/orders.payments.js';
+import { OrderPayment } from '@unchainedshop/core-orders';
 
 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/types/orders.positions.js';
+import { OrderPosition } from '@unchainedshop/core-orders';
 
 export const OrderPositionsCollection = async (db: mongodb.Db) => {
   const OrderPositions = db.collection<OrderPosition>('order_positions');

package/src/db/OrdersCollection.ts

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

package/src/director/OrderDiscountAdapter.ts

@@ -1,6 +1,6 @@
-import { IDiscountAdapter } from '@unchainedshop/types/discount.js';
 import { BaseDiscountAdapter } from '@unchainedshop/utils';
 import { OrderDiscountConfiguration } from './OrderDiscountConfiguration.js';
+import { IDiscountAdapter } from '@unchainedshop/utils';
 
 export const OrderDiscountAdapter: Omit<
   IDiscountAdapter<OrderDiscountConfiguration>,

package/src/director/OrderPricingAdapter.ts

@@ -1,11 +1,31 @@
-import {
-  IOrderPricingSheet,
+import { BasePricingAdapter, IPricingAdapter, BasePricingAdapterContext } from '@unchainedshop/utils';
+import { IOrderPricingSheet, OrderPricingCalculation, OrderPricingSheet } from './OrderPricingSheet.js';
+import { Order, OrderDelivery, OrderDiscount, OrderPayment, OrderPosition } from '../types.js';
+import { User } from '@unchainedshop/core-users';
+
+export interface OrderPricingAdapterContext extends BasePricingAdapterContext {
+  currency?: string;
+  discounts: Array<OrderDiscount>;
+  order: Order;
+  orderDelivery: OrderDelivery;
+  orderPositions: Array<OrderPosition>;
+  orderPayment: OrderPayment;
+  user: User;
+}
+
+export interface OrderPricingContext {
+  order: Order;
+  orderDelivery: OrderDelivery;
+  orderPositions: Array<OrderPosition>;
+  orderPayment: OrderPayment;
+}
+
+export type IOrderPricingAdapter<DiscountConfiguration = unknown> = IPricingAdapter<
   OrderPricingAdapterContext,
   OrderPricingCalculation,
-} from '@unchainedshop/types/orders.pricing.js';
-import { IPricingAdapter } from '@unchainedshop/types/pricing.js';
-import { BasePricingAdapter } from '@unchainedshop/utils';
-import { OrderPricingSheet } from './OrderPricingSheet.js';
+  IOrderPricingSheet,
+  DiscountConfiguration
+>;
 
 const basePricingAdapter = BasePricingAdapter<OrderPricingAdapterContext, OrderPricingCalculation>();
 

package/src/director/OrderPricingDirector.ts

@@ -1,12 +1,28 @@
+import { BasePricingDirector, PricingDiscount, IPricingDirector } from '@unchainedshop/utils';
+import { IOrderPricingSheet, OrderPricingCalculation, OrderPricingSheet } from './OrderPricingSheet.js';
+import { Order, OrderDelivery, OrderPayment, OrderPosition } from '../types.js';
 import {
   IOrderPricingAdapter,
-  IOrderPricingDirector,
   OrderPricingAdapterContext,
-  OrderPricingCalculation,
   OrderPricingContext,
-} from '@unchainedshop/types/orders.pricing.js';
-import { BasePricingDirector } from '@unchainedshop/utils';
-import { OrderPricingSheet } from './OrderPricingSheet.js';
+} from './OrderPricingAdapter.js';
+
+export type OrderPrice = { _id?: string; amount: number; currency: string };
+
+export type OrderPricingDiscount = PricingDiscount & {
+  delivery?: OrderDelivery;
+  item?: OrderPosition;
+  order?: Order;
+  payment?: OrderPayment;
+};
+
+export type IOrderPricingDirector<DiscountConfiguration = unknown> = IPricingDirector<
+  OrderPricingContext,
+  OrderPricingCalculation,
+  OrderPricingAdapterContext,
+  IOrderPricingSheet,
+  IOrderPricingAdapter<DiscountConfiguration>
+>;
 
 const baseDirector = BasePricingDirector<
   OrderPricingContext,

package/src/director/OrderPricingSheet.ts

@@ -1,10 +1,29 @@
-import { BasePricingSheet } from '@unchainedshop/utils';
 import {
-  OrderPricingCalculation,
-  OrderPricingRowCategory,
-  IOrderPricingSheet,
-} from '@unchainedshop/types/orders.pricing.js';
-import { IBasePricingSheet, PricingSheetParams } from '@unchainedshop/types/pricing.js';
+  BasePricingSheet,
+  IPricingSheet,
+  IBasePricingSheet,
+  PricingCalculation,
+  PricingSheetParams,
+} from '@unchainedshop/utils';
+
+export interface OrderPricingCalculation extends PricingCalculation {
+  discountId?: string;
+}
+
+export enum OrderPricingRowCategory {
+  Items = 'ITEMS',
+  Discounts = 'DISCOUNTS',
+  Taxes = 'TAXES',
+  Delivery = 'DELIVERY',
+  Payment = 'PAYMENT',
+}
+
+export interface IOrderPricingSheet extends IPricingSheet<OrderPricingCalculation> {
+  addDelivery: (params: { amount: number; taxAmount: number; meta?: any }) => void;
+  addDiscount: (params: { amount: number; taxAmount: number; discountId: string; meta?: any }) => void;
+  addItems: (params: { amount: number; taxAmount: number; meta?: any }) => void;
+  addPayment: (params: { amount: number; taxAmount: number; meta?: any }) => void;
+}
 
 export const OrderPricingSheet = (
   params: PricingSheetParams<OrderPricingCalculation>,

package/src/module/buildFindSelector.test.ts

@@ -1,105 +1,110 @@
-import {buildFindByIdSelector as buildFindByIdSelectorForDelivery} from "./configureOrderDeliveriesModule.js"
-import {buildFindByIdSelector as buildFindByIdSelectorForDiscount } from "./configureOrderDiscountsModule.js"
-import {buildFindByIdSelector as buildFindByIdSelectorForPayment, buildFindByContextDataSelector } from "./configureOrderPaymentsModule.js"
-import {buildFindByIdSelector as buildFindByIdSelectorForPosition } from "./configureOrderPositionsModule.js"
-import {buildFindSelector as buildFindSelectorForOrder} from "./configureOrdersModule-queries.js"
-
+import { OrderStatus } from '../types.js';
+import { buildFindByIdSelector as buildFindByIdSelectorForDelivery } from './configureOrderDeliveriesModule.js';
+import { buildFindByIdSelector as buildFindByIdSelectorForDiscount } from './configureOrderDiscountsModule.js';
+import {
+  buildFindByIdSelector as buildFindByIdSelectorForPayment,
+  buildFindByContextDataSelector,
+} from './configureOrderPaymentsModule.js';
+import { buildFindByIdSelector as buildFindByIdSelectorForPosition } from './configureOrderPositionsModule.js';
+import { buildFindSelector as buildFindSelectorForOrder } from './configureOrdersModule-queries.js';
 
 describe('OrderPosition', () => {
-  describe('buildFindSelector',  () => {
-    it('Return filter object when passed no argument', async () => {   
-      expect(buildFindSelectorForOrder({})).toEqual({ status: { '$ne': null } })
-      
+  describe('buildFindSelector', () => {
+    it('Return filter object when passed no argument', () => {
+      expect(buildFindSelectorForOrder({})).toEqual({ status: { $ne: null } });
     });
 
-    it('Return filter object when passed no argument includeCarts, queryString, status, userId and (status should take precedence over includeCarts', async () => {   
-      expect(buildFindSelectorForOrder({includeCarts: false, queryString: "hello world", status: 'CONFIRMED', userId: "admin-id"})).toEqual({
+    it('Return filter object when passed no argument includeCarts, queryString, status, userId and (status should take precedence over includeCarts', () => {
+      expect(
+        buildFindSelectorForOrder({
+          includeCarts: false,
+          queryString: 'hello world',
+          status: [OrderStatus.CONFIRMED],
+          userId: 'admin-id',
+        }),
+      ).toEqual({
         userId: 'admin-id',
-        status: 'CONFIRMED',
-        '$text': { '$search': 'hello world' }
-      }
-  )
-      
+        status: {
+          $in: ['CONFIRMED'],
+        },
+        $text: { $search: 'hello world' },
+      });
     });
 
-    it('Return filter object when passed no argument includeCarts, queryString, userId ', async () => {   
-      expect(buildFindSelectorForOrder({includeCarts: true, queryString: "hello world", userId: "admin-id"})).toEqual( {
+    it('Return filter object when passed no argument includeCarts, queryString, userId ', () => {
+      expect(
+        buildFindSelectorForOrder({
+          includeCarts: true,
+          queryString: 'hello world',
+          userId: 'admin-id',
+        }),
+      ).toEqual({
         userId: 'admin-id',
-        
-        '$text': { '$search': 'hello world' }
-      }
-  )
-      
+
+        $text: { $search: 'hello world' },
+      });
     });
 
-    it('Return filter object when passed no argument queryString, userId ', async () => {   
-      expect(buildFindSelectorForOrder({ queryString: "hello world", userId: "admin-id"})).toEqual( {
+    it('Return filter object when passed no argument queryString, userId ', () => {
+      expect(buildFindSelectorForOrder({ queryString: 'hello world', userId: 'admin-id' })).toEqual({
         userId: 'admin-id',
-        '$text': { '$search': 'hello world' },
-        status: { '$ne': null },
-      }
-  )
-      
+        $text: { $search: 'hello world' },
+        status: { $ne: null },
+      });
     });
 
-    it('Return filter object when passed no argument queryString ', async () => {   
-      expect(buildFindSelectorForOrder({ queryString: "hello world"})).toEqual( {
-        '$text': { '$search': 'hello world' },
-        status: { '$ne': null },
-      })
-      
+    it('Return filter object when passed no argument queryString ', () => {
+      expect(buildFindSelectorForOrder({ queryString: 'hello world' })).toEqual({
+        $text: { $search: 'hello world' },
+        status: { $ne: null },
+      });
     });
-
-  })
-
+  });
 });
 
 describe('OrderDelivery', () => {
-
-  describe('buildFindByIdSelector',  () => {
-    it('Return correct db _id selector', async () => {
-      
-      expect(buildFindByIdSelectorForDelivery('order-delivery-id')).toEqual({ _id: 'order-delivery-id' })
+  describe('buildFindByIdSelector', () => {
+    it('Return correct db _id selector', () => {
+      expect(buildFindByIdSelectorForDelivery('order-delivery-id')).toEqual({
+        _id: 'order-delivery-id',
+      });
     });
-  })
-  
+  });
 });
 
-
 describe('OrderDiscount', () => {
-
-  describe('buildFindByIdSelector',  () => {
-    it('Return correct db _id selector', async () => {
-      
-      expect(buildFindByIdSelectorForDiscount('order-discount-id')).toEqual({ _id: 'order-discount-id' })
+  describe('buildFindByIdSelector', () => {
+    it('Return correct db _id selector', () => {
+      expect(buildFindByIdSelectorForDiscount('order-discount-id')).toEqual({
+        _id: 'order-discount-id',
+      });
     });
-  })
-  
+  });
 });
 
 describe('OrderPayment', () => {
-
-  describe('buildFindByIdSelector',  () => {
-    it('Return correct db _id selector', async () => {
-      
-      expect(buildFindByIdSelectorForPayment('order-payment-id')).toEqual({ _id: 'order-payment-id' })
+  describe('buildFindByIdSelector', () => {
+    it('Return correct db _id selector', () => {
+      expect(buildFindByIdSelectorForPayment('order-payment-id')).toEqual({ _id: 'order-payment-id' });
     });
-  })
+  });
 
-  describe('buildFindByContextDataSelector',  () => {
-      it('Return correct db context field selector object', async () => {
-        expect(buildFindByContextDataSelector({'first': 'first value', 'second': 'second value'})).toEqual({ 'context.first': 'first value', 'context.second': 'second value' })
+  describe('buildFindByContextDataSelector', () => {
+    it('Return correct db context field selector object', () => {
+      expect(buildFindByContextDataSelector({ first: 'first value', second: 'second value' })).toEqual({
+        'context.first': 'first value',
+        'context.second': 'second value',
       });
-  })
-  
+    });
+  });
 });
 
-
 describe('OrderPosition', () => {
-  describe('buildFindByIdSelector',  () => {
-    it('Return correct db _id selector', async () => {      
-      expect(buildFindByIdSelectorForPosition('order-position-id')).toEqual({ _id: 'order-position-id' })
+  describe('buildFindByIdSelector', () => {
+    it('Return correct db _id selector', () => {
+      expect(buildFindByIdSelectorForPosition('order-position-id')).toEqual({
+        _id: 'order-position-id',
+      });
     });
-  })
-
+  });
 });

package/src/module/configureOrderDeliveriesModule.ts

@@ -1,12 +1,65 @@
-import { ModuleMutations } from '@unchainedshop/types/core.js';
-import { mongodb, generateDbFilterById, generateDbMutations } from '@unchainedshop/mongodb';
-import {
-  OrderDeliveriesModule,
-  OrderDelivery,
-  OrderDeliveryStatus,
-} from '@unchainedshop/types/orders.deliveries.js';
+import { UnchainedCore } from '@unchainedshop/core';
+import { mongodb, generateDbFilterById, generateDbObjectId } from '@unchainedshop/mongodb';
 import { emit, registerEvents } from '@unchainedshop/events';
-import { OrderDeliveriesSchema } from '../db/OrderDeliveriesSchema.js';
+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>;
+};
 
 const ORDER_DELIVERY_EVENTS: string[] = ['ORDER_DELIVER', 'ORDER_UPDATE_DELIVERY'];
 
@@ -20,11 +73,6 @@ export const configureOrderDeliveriesModule = ({
 }): OrderDeliveriesModule => {
   registerEvents(ORDER_DELIVERY_EVENTS);
 
-  const mutations = generateDbMutations<OrderDelivery>(OrderDeliveries, OrderDeliveriesSchema, {
-    permanentlyDeleteByDefault: true,
-    hasCreateOnly: false,
-  }) as ModuleMutations<OrderDelivery>;
-
   const normalizedStatus: OrderDeliveriesModule['normalizedStatus'] = (orderDelivery) => {
     return orderDelivery.status === null
       ? OrderDeliveryStatus.OPEN
@@ -91,6 +139,22 @@ export const configureOrderDeliveriesModule = ({
 
       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;
@@ -108,7 +172,9 @@ export const configureOrderDeliveriesModule = ({
     // Mutations
 
     create: async (doc) => {
-      const orderDeliveryId = await mutations.create({
+      const { insertedId: orderDeliveryId } = await OrderDeliveries.insertOne({
+        _id: generateDbObjectId(),
+        created: new Date(),
         ...doc,
         context: doc.context || {},
         status: null,
@@ -119,7 +185,7 @@ export const configureOrderDeliveriesModule = ({
     },
 
     delete: async (orderDeliveryId) => {
-      const deletedCount = await mutations.delete(orderDeliveryId);
+      const { deletedCount } = await OrderDeliveries.deleteOne({ _id: orderDeliveryId });
       return deletedCount;
     },
 

package/src/module/configureOrderDiscountsModule.ts

@@ -1,10 +1,50 @@
-import { ModuleMutations, UnchainedCore } from '@unchainedshop/types/core.js';
-import { OrderDiscount, OrderDiscountsModule } from '@unchainedshop/types/orders.discounts.js';
+import { UnchainedCore } from '@unchainedshop/core';
 import { emit, registerEvents } from '@unchainedshop/events';
-import { generateDbFilterById, generateDbMutations, mongodb } from '@unchainedshop/mongodb';
-import { OrderDiscountsSchema } from '../db/OrderDiscountsSchema.js';
+import { generateDbFilterById, generateDbObjectId, mongodb } from '@unchainedshop/mongodb';
 import { OrderDiscountTrigger } from '../db/OrderDiscountTrigger.js';
 import { OrderDiscountDirector } from '../director/OrderDiscountDirector.js';
+import { Order, OrderDiscount } from '../types.js';
+import {
+  IPricingSheet,
+  PricingCalculation,
+  DiscountAdapterActions,
+  DiscountContext,
+} from '@unchainedshop/utils';
+
+export type OrderDiscountsModule = {
+  // Queries
+  findOrderDiscount: (
+    params: { discountId: string },
+    options?: mongodb.FindOptions,
+  ) => Promise<OrderDiscount>;
+  findOrderDiscounts: (params: { orderId: string }) => Promise<Array<OrderDiscount>>;
+
+  // Transformations
+  interface: (
+    orderDiscount: OrderDiscount,
+    unchainedAPI: UnchainedCore,
+  ) => Promise<DiscountAdapterActions<any>>;
+
+  isValid: (orderDiscount: OrderDiscount, unchainedAPI: UnchainedCore) => Promise<boolean>;
+
+  // Adapter
+  configurationForPricingAdapterKey: (
+    orderDiscount: OrderDiscount,
+    adapterKey: string,
+    calculationSheet: IPricingSheet<PricingCalculation>,
+    pricingContext: DiscountContext & UnchainedCore,
+  ) => Promise<any>;
+
+  // Mutations
+  createManualOrderDiscount: (
+    params: { code: string; order: Order },
+    unchainedAPI: UnchainedCore,
+  ) => Promise<OrderDiscount>;
+
+  create: (doc: OrderDiscount) => Promise<OrderDiscount>;
+  update: (orderDiscountId: string, doc: OrderDiscount) => Promise<OrderDiscount>;
+  delete: (orderDiscountId: string, unchainedAPI: UnchainedCore) => Promise<OrderDiscount>;
+};
 
 const ORDER_DISCOUNT_EVENTS: string[] = [
   'ORDER_CREATE_DISCOUNT',
@@ -28,11 +68,6 @@ export const configureOrderDiscountsModule = ({
 }): OrderDiscountsModule => {
   registerEvents(ORDER_DISCOUNT_EVENTS);
 
-  const mutations = generateDbMutations<OrderDiscount>(OrderDiscounts, OrderDiscountsSchema, {
-    permanentlyDeleteByDefault: true,
-    hasCreateOnly: false,
-  }) as ModuleMutations<OrderDiscount>;
-
   const getAdapter = async (orderDiscount: OrderDiscount, unchainedAPI: UnchainedCore) => {
     const order = await unchainedAPI.modules.orders.findOrder({
       orderId: orderDiscount.orderId,
@@ -47,7 +82,12 @@ export const configureOrderDiscountsModule = ({
 
   const createDiscount: OrderDiscountsModule['create'] = async (doc) => {
     const normalizedTrigger = doc.trigger || OrderDiscountTrigger.USER;
-    const discountId = await mutations.create({ ...doc, trigger: normalizedTrigger });
+    const { insertedId: discountId } = await OrderDiscounts.insertOne({
+      _id: generateDbObjectId(),
+      created: new Date(),
+      ...doc,
+      trigger: normalizedTrigger,
+    });
     const discount = await OrderDiscounts.findOne(buildFindByIdSelector(discountId));
     return discount;
   };
@@ -67,12 +107,16 @@ export const configureOrderDiscountsModule = ({
   };
 
   const updateDiscount: OrderDiscountsModule['update'] = async (orderDiscountId, doc) => {
-    await mutations.update(orderDiscountId, {
-      $set: doc,
-    });
-
-    const selector = buildFindByIdSelector(orderDiscountId);
-    const discount = await OrderDiscounts.findOne(selector, {});
+    const discount = await OrderDiscounts.findOneAndUpdate(
+      generateDbFilterById(orderDiscountId),
+      {
+        $set: {
+          updated: new Date(),
+          ...doc,
+        },
+      },
+      { returnDocument: 'after' },
+    );
     await emit('ORDER_UPDATE_DISCOUNT', { discount });
     return discount;
   };
@@ -200,10 +244,17 @@ export const configureOrderDiscountsModule = ({
     delete: deleteDiscount,
 
     update: async (orderDiscountId, doc) => {
-      await mutations.update(orderDiscountId, doc);
+      const discount = await OrderDiscounts.findOneAndUpdate(
+        generateDbFilterById(orderDiscountId),
+        {
+          $set: {
+            updated: new Date(),
+            ...doc,
+          },
+        },
+        { returnDocument: 'after' },
+      );
 
-      const selector = buildFindByIdSelector(orderDiscountId);
-      const discount = await OrderDiscounts.findOne(selector, {});
       await emit('ORDER_UPDATE_DISCOUNT', { discount });
       return discount;
     },