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

package/src/module/configureOrderPositionsModule.ts

@@ -1,7 +1,7 @@
-import { OrderPosition } from '../types.js';
 import { emit, registerEvents } from '@unchainedshop/events';
 import { generateDbFilterById, generateDbObjectId, mongodb } from '@unchainedshop/mongodb';
 import { PricingCalculation } from '@unchainedshop/utils';
+import { OrderPosition } from '../db/OrderPositionsCollection.js';
 
 const ORDER_POSITION_EVENTS: string[] = [
   'ORDER_UPDATE_CART_ITEM',
@@ -10,7 +10,7 @@ const ORDER_POSITION_EVENTS: string[] = [
   'ORDER_ADD_PRODUCT',
 ];
 
-export const buildFindByIdSelector = (orderPositionId: string, orderId?: string) =>
+export const buildFindOrderPositionByIdSelector = (orderPositionId: string, orderId?: string) =>
   generateDbFilterById(
     orderPositionId,
     orderId ? { orderId } : undefined,
@@ -29,7 +29,7 @@ export const configureOrderPositionsModule = ({
       { itemId }: { itemId: string },
       options?: mongodb.FindOptions,
     ): Promise<OrderPosition> => {
-      return OrderPositions.findOne(buildFindByIdSelector(itemId), options);
+      return OrderPositions.findOne(buildFindOrderPositionByIdSelector(itemId), options);
     },
 
     findOrderPositions: async ({ orderId }: { orderId: string }): Promise<OrderPosition[]> => {
@@ -38,7 +38,7 @@ export const configureOrderPositionsModule = ({
     },
 
     delete: async (orderPositionId: string): Promise<OrderPosition> => {
-      const selector = buildFindByIdSelector(orderPositionId);
+      const selector = buildFindOrderPositionByIdSelector(orderPositionId);
       const orderPosition = await OrderPositions.findOneAndDelete(selector, {});
       await emit('ORDER_REMOVE_CART_ITEM', {
         orderPosition,

package/src/module/configureOrdersModule-mutations.ts

@@ -1,4 +1,3 @@
-import { Order, OrderStatus, OrderPosition } from '../types.js';
 import { emit, registerEvents } from '@unchainedshop/events';
 import {
   Address,
@@ -7,6 +6,8 @@ import {
   generateDbObjectId,
   mongodb,
 } from '@unchainedshop/mongodb';
+import { Order, OrderStatus } from '../db/OrdersCollection.js';
+import { OrderPosition } from '../db/OrderPositionsCollection.js';
 
 export interface OrderMutations {
   create: (doc: {

package/src/module/configureOrdersModule-queries.ts

@@ -1,7 +1,15 @@
 import { SortDirection, SortOption, DateFilterInput } from '@unchainedshop/utils';
-import { Order, OrderQuery, OrderReport } from '../types.js';
 import { generateDbFilterById, buildSortOptions, mongodb } from '@unchainedshop/mongodb';
 import buildFindSelector from './buildFindSelector.js';
+import { Order, OrderQuery } from '../db/OrdersCollection.js';
+
+export type OrderReport = {
+  newCount: number;
+  checkoutCount: number;
+  rejectCount: number;
+  confirmCount: number;
+  fulfillCount: number;
+};
 
 const normalizeOrderAggregateResult = (data = {}): OrderReport => {
   const statusToFieldMap = {

package/src/module/configureOrdersModule.ts

@@ -4,7 +4,7 @@ import { OrderDeliveriesCollection } from '../db/OrderDeliveriesCollection.js';
 import { OrderDiscountsCollection } from '../db/OrderDiscountsCollection.js';
 import { OrderPaymentsCollection } from '../db/OrderPaymentsCollection.js';
 import { OrderPositionsCollection } from '../db/OrderPositionsCollection.js';
-import { OrdersCollection } from '../db/OrdersCollection.js';
+import { OrdersCollection, Order, OrderStatus } from '../db/OrdersCollection.js';
 import { ordersSettings, OrdersSettingsOptions } from '../orders-settings.js';
 import {
   configureOrderDeliveriesModule,
@@ -17,7 +17,6 @@ import { configureOrderModuleMutations, OrderMutations } from './configureOrders
 import { configureOrdersModuleQueries, OrderQueries } from './configureOrdersModule-queries.js';
 
 import { emit, registerEvents } from '@unchainedshop/events';
-import { Order, OrderStatus } from '../types.js';
 
 export type OrdersModule = OrderQueries &
   OrderMutations & {

package/src/orders-index.ts

@@ -1,3 +1,13 @@
-export * from './types.js';
 export * from './module/configureOrdersModule.js';
+export * from './module/configureOrderDeliveriesModule.js';
+export * from './module/configureOrderDiscountsModule.js';
+export * from './module/configureOrderPaymentsModule.js';
+export * from './module/configureOrderPositionsModule.js';
+export * from './module/configureOrdersModule-mutations.js';
+export * from './module/configureOrdersModule-queries.js';
+export * from './db/OrderDeliveriesCollection.js';
+export * from './db/OrderDiscountsCollection.js';
+export * from './db/OrderPaymentsCollection.js';
+export * from './db/OrderPositionsCollection.js';
+export * from './db/OrdersCollection.js';
 export * from './orders-settings.js';

package/src/orders-settings.ts

@@ -1,5 +1,5 @@
 import { generateRandomHash } from '@unchainedshop/utils';
-import { Order } from './types.js';
+import { Order } from './db/OrdersCollection.js';
 
 export interface OrderSettingsOrderPositionValidation<Product = unknown> {
   order: Order;

package/src/db/OrderDiscountTrigger.ts

@@ -1,4 +0,0 @@
-export enum OrderDiscountTrigger {
-  USER = 'USER',
-  SYSTEM = 'SYSTEM',
-}

package/src/types.ts

@@ -1,128 +0,0 @@
-import { TimestampFields, LogFields, Address, Contact } from '@unchainedshop/mongodb';
-import { Price } from '@unchainedshop/utils';
-
-export type OrderReport = {
-  newCount: number;
-  checkoutCount: number;
-  rejectCount: number;
-  confirmCount: number;
-  fulfillCount: number;
-};
-
-export enum OrderStatus {
-  PENDING = 'PENDING',
-  CONFIRMED = 'CONFIRMED',
-  FULLFILLED = 'FULLFILLED',
-  REJECTED = 'REJECTED',
-}
-
-export type OrderPosition = {
-  _id?: string;
-  calculation: Array<any>;
-  configuration: Array<{ key: string; value: string }>;
-  context?: any;
-  orderId: string;
-  originalProductId: string;
-  productId: string;
-  quantity: number;
-  quotationId?: string;
-  scheduling: Array<any>;
-} & TimestampFields;
-
-export type Order = {
-  _id?: string;
-  billingAddress?: Address;
-  calculation: Array<any>;
-  confirmed?: Date;
-  rejected?: Date;
-  contact?: Contact;
-  context?: any;
-  countryCode: string;
-  currency: string;
-  deliveryId?: string;
-  fullfilled?: Date;
-  ordered?: Date;
-  orderNumber?: string;
-  originEnrollmentId?: string;
-  paymentId?: string;
-  status: OrderStatus | null;
-  userId: string;
-} & LogFields &
-  TimestampFields;
-
-export enum OrderDiscountTrigger {
-  USER = 'USER',
-  SYSTEM = 'SYSTEM',
-}
-
-export type OrderDiscount = {
-  _id?: string;
-  orderId: string;
-  code?: string;
-  total?: Price;
-  trigger?: OrderDiscountTrigger;
-  discountKey?: string;
-  reservation?: any;
-  context?: any;
-} & TimestampFields;
-
-export type OrderQuery = {
-  includeCarts?: boolean;
-  orderStatus?: OrderStatus[];
-  queryString?: string;
-  status?: OrderStatus[];
-  userId?: string;
-};
-
-export enum OrderDeliveryStatus {
-  OPEN = 'OPEN', // Null value is mapped to OPEN status
-  DELIVERED = 'DELIVERED',
-  RETURNED = 'RETURNED',
-}
-
-export enum OrderPaymentStatus {
-  OPEN = 'OPEN', // Null value is mapped to OPEN status
-  PAID = 'PAID',
-  REFUNDED = 'REFUNDED',
-}
-
-export type OrderPayment = {
-  _id?: string;
-  orderId: string;
-  context?: any;
-  paid?: Date;
-  transactionId?: string;
-  paymentProviderId?: string;
-  status?: OrderPaymentStatus | null;
-  calculation?: Array<any>;
-} & LogFields &
-  TimestampFields;
-
-export type OrderPaymentDiscount = Omit<Price, '_id'> & {
-  _id?: string;
-  discountId: string;
-  item: OrderPayment;
-};
-
-export type OrderDelivery = {
-  _id?: string;
-  orderId: string;
-  deliveryProviderId: string;
-  delivered?: Date;
-  status: OrderDeliveryStatus | null;
-  context?: any;
-  calculation: Array<any>;
-} & LogFields &
-  TimestampFields;
-
-export type OrderDeliveryDiscount = Omit<Price, '_id'> & {
-  _id?: string;
-  discountId: string;
-  item: OrderDelivery;
-};
-
-export type OrderPositionDiscount = Omit<Price, '_id'> & {
-  _id?: string;
-  discountId: string;
-  item: OrderPosition;
-};