@unchainedshop/core-orders 4.5.0 → 4.6.1

package/README.md

@@ -103,7 +103,7 @@ await ordersModule.checkout(orderId, { paymentContext: {} });
 
 | Export | Description |
 |--------|-------------|
-| `OrderStatus` | Order status values (OPEN, PENDING, CONFIRMED, FULLFILLED, REJECTED) |
+| `OrderStatus` | Order status values (OPEN, PENDING, CONFIRMED, FULFILLED, REJECTED) |
 
 ### Settings
 
@@ -132,7 +132,7 @@ await ordersModule.checkout(orderId, { paymentContext: {} });
 | `ORDER_CHECKOUT` | Order checked out |
 | `ORDER_CONFIRMED` | Order confirmed |
 | `ORDER_REJECTED` | Order rejected |
-| `ORDER_FULLFILLED` | Order fulfilled |
+| `ORDER_FULFILLED` | Order fulfilled |
 
 ## License
 

package/lib/db/OrdersCollection.d.ts

@@ -3,7 +3,7 @@ import type { DateFilterInput } from '@unchainedshop/utils';
 export declare const OrderStatus: {
     readonly PENDING: "PENDING";
     readonly CONFIRMED: "CONFIRMED";
-    readonly FULLFILLED: "FULLFILLED";
+    readonly FULFILLED: "FULFILLED";
     readonly REJECTED: "REJECTED";
 };
 export type OrderStatus = (typeof OrderStatus)[keyof typeof OrderStatus];
@@ -18,7 +18,7 @@ export type Order = {
     countryCode: string;
     currencyCode: string;
     deliveryId?: string;
-    fullfilled?: Date;
+    fulfilled?: Date;
     ordered?: Date;
     orderNumber?: string;
     originEnrollmentId?: string;

package/lib/db/OrdersCollection.js

@@ -2,7 +2,7 @@ import { mongodb, buildDbIndexes, isDocumentDBCompatModeEnabled, } from '@unchai
 export const OrderStatus = {
     PENDING: 'PENDING',
     CONFIRMED: 'CONFIRMED',
-    FULLFILLED: 'FULLFILLED',
+    FULFILLED: 'FULFILLED',
     REJECTED: 'REJECTED',
 };
 export const OrdersCollection = async (db) => {
@@ -33,6 +33,7 @@ export const OrdersCollection = async (db) => {
         ]);
     }
     await buildDbIndexes(Orders, [
+        { index: { deleted: 1 } },
         { index: { userId: 1 } },
         { index: { status: 1 } },
         { index: { orderNumber: 1 } },

package/lib/module/configureOrderPaymentsModule.d.ts

@@ -2,7 +2,6 @@ import { mongodb } from '@unchainedshop/mongodb';
 import type { PricingCalculation } from '@unchainedshop/utils';
 import { type OrderPayment, OrderPaymentStatus } from '../db/OrderPaymentsCollection.ts';
 export declare const buildFindOrderPaymentByIdSelector: (orderPaymentId: string) => mongodb.Filter<OrderPayment>;
-export declare const buildFindByContextDataSelector: (context: any) => mongodb.Filter<OrderPayment> | null;
 export declare const configureOrderPaymentsModule: ({ OrderPayments, }: {
     OrderPayments: mongodb.Collection<OrderPayment>;
 }) => {
@@ -12,12 +11,7 @@ export declare const configureOrderPaymentsModule: ({ OrderPayments, }: {
     findOrderPaymentsByProviderIds: ({ paymentProviderIds, }: {
         paymentProviderIds: string[];
     }, options?: mongodb.FindOptions) => Promise<OrderPayment[]>;
-    findOrderPaymentByContextData: ({ context, }: {
-        context: any;
-    }, options?: mongodb.FindOptions) => Promise<OrderPayment | null>;
-    countOrderPaymentsByContextData: ({ context, }: {
-        context: any;
-    }, options?: mongodb.FindOptions) => Promise<number>;
+    findOrderPaymentByTransactionId: (transactionId: string) => Promise<mongodb.WithId<OrderPayment> | null>;
     normalizedStatus: (orderPayment: OrderPayment) => OrderPaymentStatus;
     create: (doc: Omit<OrderPayment, "_id" | "created"> & Pick<Partial<OrderPayment>, "_id" | "created">) => Promise<OrderPayment>;
     logEvent: (orderPaymentId: string, event: any) => Promise<boolean>;

package/lib/module/configureOrderPaymentsModule.js

@@ -3,18 +3,6 @@ import { generateDbFilterById, generateDbObjectId, mongodb } from '@unchainedsho
 import { OrderPaymentStatus } from "../db/OrderPaymentsCollection.js";
 const ORDER_PAYMENT_EVENTS = ['ORDER_UPDATE_PAYMENT', 'ORDER_SIGN_PAYMENT', 'ORDER_PAY'];
 export const buildFindOrderPaymentByIdSelector = (orderPaymentId) => generateDbFilterById(orderPaymentId);
-export const buildFindByContextDataSelector = (context) => {
-    const contextKeys = Object.keys(context);
-    if (contextKeys.length === 0)
-        return null;
-    const selector = contextKeys.reduce((currentSelector, key) => context[key] !== undefined
-        ? {
-            ...currentSelector,
-            [`context.${key}`]: context[key],
-        }
-        : currentSelector, {});
-    return selector;
-};
 export const configureOrderPaymentsModule = ({ OrderPayments, }) => {
     registerEvents(ORDER_PAYMENT_EVENTS);
     const normalizedStatus = (orderPayment) => {
@@ -52,17 +40,8 @@ export const configureOrderPaymentsModule = ({ OrderPayments, }) => {
                 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);
+        findOrderPaymentByTransactionId: async (transactionId) => {
+            return OrderPayments.findOne({ transactionId });
         },
         normalizedStatus,
         create: async (doc) => {

package/lib/module/configureOrdersModule-queries.d.ts

@@ -28,7 +28,7 @@ export interface DateRange {
     start?: string;
     end?: string;
 }
-export type StatisticsDateField = 'created' | 'ordered' | 'rejected' | 'confirmed' | 'fullfilled';
+export type StatisticsDateField = 'created' | 'ordered' | 'rejected' | 'confirmed' | 'fulfilled';
 export interface OrderAggregateParams {
     match?: Record<string, any>;
     matchAfterGroup?: Record<string, any>;

package/lib/module/configureOrdersModule.d.ts

@@ -87,12 +87,7 @@ export declare const configureOrdersModule: ({ db, migrationRepository, options:
         findOrderPaymentsByProviderIds: ({ paymentProviderIds, }: {
             paymentProviderIds: string[];
         }, options?: mongodb.FindOptions) => Promise<import("../db/OrderPaymentsCollection.ts").OrderPayment[]>;
-        findOrderPaymentByContextData: ({ context, }: {
-            context: any;
-        }, options?: mongodb.FindOptions) => Promise<import("../db/OrderPaymentsCollection.ts").OrderPayment | null>;
-        countOrderPaymentsByContextData: ({ context, }: {
-            context: any;
-        }, options?: mongodb.FindOptions) => Promise<number>;
+        findOrderPaymentByTransactionId: (transactionId: string) => Promise<mongodb.WithId<import("../db/OrderPaymentsCollection.ts").OrderPayment> | null>;
         normalizedStatus: (orderPayment: import("../db/OrderPaymentsCollection.ts").OrderPayment) => import("../db/OrderPaymentsCollection.ts").OrderPaymentStatus;
         create: (doc: Omit<import("../db/OrderPaymentsCollection.ts").OrderPayment, "_id" | "created"> & Pick<Partial<import("../db/OrderPaymentsCollection.ts").OrderPayment>, "_id" | "created">) => Promise<import("../db/OrderPaymentsCollection.ts").OrderPayment>;
         logEvent: (orderPaymentId: string, event: any) => Promise<boolean>;
@@ -110,7 +105,7 @@ export declare const configureOrdersModule: ({ db, migrationRepository, options:
         status: OrderStatus | null;
         info?: string;
     }) => Promise<mongodb.WithId<Order> | null>;
-    acquireLock: (orderId: string, identifier: string, timeout?: number) => Promise<any>;
+    acquireLock: (orderId: string, identifier: string, timeout?: number) => Promise<import("@kontsedal/locco").Lock>;
     setDeliveryProvider: (orderId: string, deliveryProviderId: string) => Promise<mongodb.WithId<Order> | null>;
     setPaymentProvider: (orderId: string, paymentProviderId: string) => Promise<mongodb.WithId<Order> | null>;
     create: ({ userId, orderNumber, currencyCode, countryCode, billingAddress, contact, context, }: {

package/lib/module/configureOrdersModule.js

@@ -1,5 +1,5 @@
+import { Locker, MongoAdapter } from '@kontsedal/locco';
 import { generateDbFilterById, mongodb } from '@unchainedshop/mongodb';
-import { createRequire } from 'node:module';
 import { OrderDeliveriesCollection } from "../db/OrderDeliveriesCollection.js";
 import { OrderDiscountsCollection } from "../db/OrderDiscountsCollection.js";
 import { OrderPaymentsCollection } from "../db/OrderPaymentsCollection.js";
@@ -14,13 +14,11 @@ import { configureOrderModuleMutations } from "./configureOrdersModule-mutations
 import { configureOrdersModuleQueries } from "./configureOrdersModule-queries.js";
 import { emit, registerEvents } from '@unchainedshop/events';
 import renameCurrencyCode from "../migrations/20250502111800-currency-code.js";
-const require = createRequire(import.meta.url);
-const { Locker, MongoAdapter } = require('@kontsedal/locco');
 const ORDER_EVENTS = [
     'ORDER_CHECKOUT',
     'ORDER_CONFIRMED',
     'ORDER_REJECTED',
-    'ORDER_FULLFILLED',
+    'ORDER_FULFILLED',
 ];
 export const configureOrdersModule = async ({ db, migrationRepository, options: orderOptions = {}, }) => {
     renameCurrencyCode(migrationRepository);
@@ -84,8 +82,8 @@ export const configureOrdersModule = async ({ db, migrationRepository, options:
                 updated: new Date(),
             };
             switch (status) {
-                case OrderStatus.FULLFILLED:
-                    $set.fullfilled = order.fullfilled || date;
+                case OrderStatus.FULFILLED:
+                    $set.fulfilled = order.fulfilled || date;
                 case OrderStatus.REJECTED:
                 case OrderStatus.CONFIRMED:
                     if (status === OrderStatus.REJECTED) {
@@ -123,8 +121,8 @@ export const configureOrdersModule = async ({ db, migrationRepository, options:
                     await emit('ORDER_CHECKOUT', { order: modificationResult.value, oldStatus: order.status });
                 }
                 switch (status) {
-                    case OrderStatus.FULLFILLED:
-                        await emit('ORDER_FULLFILLED', { order: modificationResult.value, oldStatus: order.status });
+                    case OrderStatus.FULFILLED:
+                        await emit('ORDER_FULFILLED', { order: modificationResult.value, oldStatus: order.status });
                         break;
                     case OrderStatus.REJECTED:
                         await emit('ORDER_REJECTED', { order: modificationResult.value, oldStatus: order.status });

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@unchainedshop/core-orders",
-  "version": "4.5.0",
+  "description": "Order management module for the Unchained Engine",
+  "version": "4.6.1",
   "main": "lib/orders-index.js",
   "types": "lib/orders-index.d.ts",
   "type": "module",
@@ -34,10 +35,10 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@kontsedal/locco": "0.1.0",
-    "@unchainedshop/events": "^4.5.0",
-    "@unchainedshop/logger": "^4.5.0",
-    "@unchainedshop/utils": "^4.5.0"
+    "@kontsedal/locco": "1.0.0",
+    "@unchainedshop/events": "^4.6.0",
+    "@unchainedshop/logger": "^4.6.0",
+    "@unchainedshop/utils": "^4.6.0"
   },
   "devDependencies": {
     "@types/node": "^25.0.0",