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

package/src/services/updateCalculation.ts

@@ -1,4 +1,10 @@
-import { OrderDiscountTrigger } from '@unchainedshop/core-orders';
+import {
+  OrderDelivery,
+  OrderDiscountTrigger,
+  OrderPayment,
+  Order,
+  OrderPosition,
+} from '@unchainedshop/core-orders';
 import { initCartProvidersService } from './initCartProviders.js';
 import { Modules } from '../modules.js';
 import { updateSchedulingService } from './updateScheduling.js';
@@ -11,7 +17,8 @@ import {
 } from '../directors/index.js';
 
 export async function updateCalculationService(this: Modules, orderId: string) {
-  const order = await this.orders.findOrder({ orderId });
+  let order = await this.orders.findOrder({ orderId });
+  if (!order) throw new Error('Order not found');
 
   // Don't recalculate orders, only carts
   if (order.status !== null) return order;
@@ -27,15 +34,17 @@ export async function updateCalculationService(this: Modules, orderId: string) {
       const Adapter = OrderDiscountDirector.getAdapter(orderDiscount.discountKey);
       if (!Adapter) return null;
       const adapter = await Adapter.actions({
-        context: { order, orderDiscount, code: orderDiscount.code, modules: this },
+        context: { order: order!, orderDiscount, code: orderDiscount.code, modules: this },
       });
 
-      const isValid =
-        orderDiscount.trigger === OrderDiscountTrigger.SYSTEM
-          ? await adapter.isValidForSystemTriggering()
-          : await adapter.isValidForCodeTriggering({
-              code: orderDiscount.code,
-            });
+      let isValid = false;
+      if (orderDiscount.trigger === OrderDiscountTrigger.SYSTEM) {
+        isValid = await adapter.isValidForSystemTriggering();
+      } else if (orderDiscount.trigger === OrderDiscountTrigger.USER && orderDiscount.code) {
+        isValid = await adapter.isValidForCodeTriggering({
+          code: orderDiscount.code,
+        });
+      }
 
       if (!isValid) {
         if (orderDiscount.trigger === OrderDiscountTrigger.USER) {
@@ -52,14 +61,14 @@ export async function updateCalculationService(this: Modules, orderId: string) {
   });
 
   const currentDiscountKeys = cleanedDiscounts.map(({ discountKey }) => discountKey);
-  const director = await OrderDiscountDirector.actions({ order, code: null }, { modules: this });
+  const director = await OrderDiscountDirector.actions({ order }, { modules: this });
   const systemDiscounts = await director.findSystemDiscounts();
   await Promise.all(
     systemDiscounts
       .filter((key) => currentDiscountKeys.indexOf(key) === -1)
       .map(async (discountKey) =>
         this.orders.discounts.create({
-          orderId: order._id,
+          orderId: order!._id,
           discountKey,
           trigger: OrderDiscountTrigger.SYSTEM,
         }),
@@ -73,18 +82,21 @@ export async function updateCalculationService(this: Modules, orderId: string) {
     orderPositions.map(async (orderPosition) => {
       const positionCalculation = await ProductPricingDirector.rebuildCalculation(
         {
-          currencyCode: order.currencyCode,
+          currencyCode: order!.currencyCode,
           quantity: orderPosition.quantity,
           item: orderPosition,
         },
         { modules: this },
       );
-      return this.orders.positions.updateCalculation(orderPosition._id, positionCalculation);
+      return (await this.orders.positions.updateCalculation(
+        orderPosition._id,
+        positionCalculation,
+      )) as OrderPosition;
     }),
   );
 
   let orderDelivery = await this.orders.deliveries.findDelivery({
-    orderDeliveryId: order.deliveryId,
+    orderDeliveryId: order.deliveryId!,
   });
   if (orderDelivery) {
     const deliveryCalculation = await DeliveryPricingDirector.rebuildCalculation(
@@ -94,13 +106,13 @@ export async function updateCalculationService(this: Modules, orderId: string) {
       },
       { modules: this },
     );
-    orderDelivery = await this.orders.deliveries.updateCalculation(
+    orderDelivery = (await this.orders.deliveries.updateCalculation(
       orderDelivery._id,
       deliveryCalculation,
-    );
+    )) as OrderDelivery;
   }
   let orderPayment = await this.orders.payments.findOrderPayment({
-    orderPaymentId: order.paymentId,
+    orderPaymentId: order.paymentId!,
   });
   if (orderPayment) {
     const paymentCalculation = await PaymentPricingDirector.rebuildCalculation(
@@ -110,7 +122,10 @@ export async function updateCalculationService(this: Modules, orderId: string) {
       },
       { modules: this },
     );
-    orderPayment = await this.orders.payments.updateCalculation(orderPayment._id, paymentCalculation);
+    orderPayment = (await this.orders.payments.updateCalculation(
+      orderPayment._id,
+      paymentCalculation,
+    )) as OrderPayment;
   }
 
   orderPositions = await updateSchedulingService.bind(this)({
@@ -124,7 +139,9 @@ export async function updateCalculationService(this: Modules, orderId: string) {
     { modules: this },
   );
 
-  const updatedOrder = await this.orders.updateCalculationSheet(orderId, calculation);
+  if (JSON.stringify(order.calculation) !== JSON.stringify(calculation)) {
+    order = (await this.orders.updateCalculationSheet(orderId, calculation)) as Order;
+  }
 
   /*
        // We have to do initCartProviders after calculation, only then filterSupportedProviders will work correctly and has access to recent pricing
@@ -138,5 +155,5 @@ export async function updateCalculationService(this: Modules, orderId: string) {
         // 6. update calculation -> order pricing updated to items 0, delivery 0, payment 0
         // 7. initCartProviders with updated order -> all providers are valid -> return order
     */
-  return initCartProvidersService.bind(this)(updatedOrder);
+  return initCartProvidersService.bind(this)(order);
 }

package/src/services/updateScheduling.ts

@@ -2,6 +2,7 @@ import { Order, OrderDelivery, OrderPosition } from '@unchainedshop/core-orders'
 import { WarehousingDirector } from '../directors/index.js';
 import { Modules } from '../modules.js';
 import { supportedWarehousingProvidersService } from './supportedWarehousingProviders.js';
+import { Product } from '@unchainedshop/core-products';
 
 export async function updateSchedulingService(
   this: Modules,
@@ -9,7 +10,7 @@ export async function updateSchedulingService(
     orderPositions,
     order,
     orderDelivery,
-  }: { orderPositions: OrderPosition[]; order: Order; orderDelivery: OrderDelivery },
+  }: { orderPositions: OrderPosition[]; order: Order; orderDelivery: OrderDelivery | null },
 ) {
   const deliveryProvider =
     orderDelivery &&
@@ -17,14 +18,14 @@ export async function updateSchedulingService(
       deliveryProviderId: orderDelivery.deliveryProviderId,
     }));
 
+  if (!deliveryProvider) return [];
+
   return (await Promise.all(
     orderPositions.map(async (orderPosition) => {
       // scheduling (store in db for auditing)
-      const product = await this.products.findProduct({
+      const product = (await this.products.findProduct({
         productId: orderPosition.productId,
-      });
-
-      const { countryCode, userId } = order;
+      })) as Product;
 
       const scheduling = await Promise.all(
         (
@@ -33,22 +34,20 @@ export async function updateSchedulingService(
             deliveryProvider,
           })
         ).map(async (warehousingProvider) => {
-          const context = {
+          const director = await WarehousingDirector.actions(
             warehousingProvider,
-            deliveryProvider,
-            product,
-            item: orderPosition,
-            delivery: deliveryProvider,
-            order,
-            userId,
-            countryCode,
-            referenceDate: order.ordered,
-            quantity: orderPosition.quantity,
-          };
-
-          const director = await WarehousingDirector.actions(warehousingProvider, context, {
-            modules: this,
-          });
+            {
+              deliveryProvider,
+              product,
+              orderPosition,
+              order,
+              referenceDate: order.ordered,
+              quantity: orderPosition.quantity,
+            },
+            {
+              modules: this,
+            },
+          );
           const dispatch = await director.estimatedDispatch();
 
           return {

package/src/services/updateUserAvatarAfterUpload.ts

@@ -5,7 +5,10 @@ import { createLogger } from '@unchainedshop/logger';
 
 const logger = createLogger('unchained:core');
 
-export async function updateUserAvatarAfterUploadService(this: Modules, { file }: { file: File }) {
+export async function updateUserAvatarAfterUploadService(
+  this: Modules,
+  { file }: { file: Pick<File, '_id' | 'path' | 'meta'> },
+) {
   const { userId } = file.meta as { userId: string };
 
   const files = await this.files.findFiles({

package/src/services/uploadFileFromStream.ts

@@ -3,13 +3,25 @@ import { Modules } from '../modules.js';
 
 export async function uploadFileFromStreamService(
   this: Modules,
-  { directoryName, rawFile, meta }: { directoryName: string; rawFile: any; meta?: any },
+  {
+    directoryName,
+    rawFile,
+    meta,
+    ...options
+  }: { directoryName: string; rawFile: any; meta?: any } & Record<string, any>,
 ): Promise<File> {
   const fileUploadAdapter = getFileAdapter();
-  const uploadFileData = await fileUploadAdapter.uploadFileFromStream(directoryName, rawFile, {
-    modules: this,
-  });
+  const uploadFileData = await fileUploadAdapter.uploadFileFromStream(
+    directoryName,
+    rawFile,
+    {
+      modules: this,
+    },
+    options,
+  );
   const fileData = getFileFromFileData(uploadFileData, meta);
   const fileId = await this.files.create(fileData);
-  return this.files.findFile({ fileId });
+  const file = await this.files.findFile({ fileId });
+  if (!file) throw new Error('File not found after upload');
+  return file;
 }

package/src/services/uploadFileFromURL.ts

@@ -1,4 +1,4 @@
-import { getFileFromFileData, getFileAdapter, File } from '@unchainedshop/core-files';
+import { getFileFromFileData, getFileAdapter } from '@unchainedshop/core-files';
 import { Modules } from '../modules.js';
 
 export async function uploadFileFromURLService(
@@ -17,7 +17,7 @@ export async function uploadFileFromURLService(
     };
     meta?: any;
   },
-): Promise<File> {
+) {
   const fileUploadAdapter = getFileAdapter();
 
   const uploadFileData = await fileUploadAdapter.uploadFileFromURL(directoryName, fileInput, {

package/src/services/validateOrder.ts

@@ -2,52 +2,48 @@ import { Order, ordersSettings } from '@unchainedshop/core-orders';
 import { Modules } from '../modules.js';
 
 export async function validateOrderService(this: Modules, order: Order) {
-  const errors = [];
-  if (!order.contact) errors.push(new Error('Contact data not provided'));
-  if (!order.billingAddress) errors.push(new Error('Billing address not provided'));
-  if (!(await this.orders.deliveries.findDelivery({ orderDeliveryId: order.deliveryId })))
-    errors.push('No delivery provider selected');
-  if (!(await this.orders.payments.findOrderPayment({ orderPaymentId: order.paymentId })))
-    errors.push('No payment provider selected');
+  if (!order.contact) throw new Error('Contact data not provided');
+  if (!order.billingAddress) throw new Error('Billing address not provided');
+  if (
+    !order.deliveryId ||
+    !(await this.orders.deliveries.findDelivery({ orderDeliveryId: order.deliveryId }))
+  )
+    throw new Error('No delivery provider selected');
+  if (
+    !order.paymentId ||
+    !(await this.orders.payments.findOrderPayment({ orderPaymentId: order.paymentId }))
+  )
+    throw new Error('No payment provider selected');
 
   const orderPositions = await this.orders.positions.findOrderPositions({ orderId: order._id });
   if (orderPositions.length === 0) {
     const NoItemsError = new Error('No items to checkout');
     NoItemsError.name = 'NoItemsError';
-    return [NoItemsError];
+    throw NoItemsError;
   }
-  await Promise.all(
-    orderPositions.map(async (orderPosition) => {
-      const product = await this.products.findProduct({
-        productId: orderPosition.productId,
-      });
 
-      try {
-        await ordersSettings.validateOrderPosition(
-          {
-            order,
-            product,
-            configuration: orderPosition.configuration,
-            quantityDiff: 0,
-          },
-          { modules: this },
-        );
-      } catch (e) {
-        errors.push(e);
-      }
+  for (const orderPosition of orderPositions) {
+    const product = await this.products.findProduct({
+      productId: orderPosition.productId,
+    });
 
-      const quotation =
-        orderPosition.quotationId &&
-        (await this.quotations.findQuotation({
-          quotationId: orderPosition.quotationId,
-        }));
-      if (quotation && !this.quotations.isProposalValid(quotation)) {
-        errors.push(new Error('Quotation expired or fullfiled, please request a new offer'));
-      }
-    }),
-  );
+    await ordersSettings.validateOrderPosition(
+      {
+        order,
+        product,
+        configuration: orderPosition.configuration,
+        quantityDiff: 0,
+      },
+      { modules: this },
+    );
 
-  if (errors.length > 0) {
-    throw new Error(errors[0]);
+    const quotation =
+      orderPosition.quotationId &&
+      (await this.quotations.findQuotation({
+        quotationId: orderPosition.quotationId,
+      }));
+    if (quotation && !this.quotations.isProposalValid(quotation)) {
+      throw new Error('Quotation expired or fullfiled, please request a new offer');
+    }
   }
 }

package/src/services/verifyQuotation.ts

@@ -9,10 +9,10 @@ export async function verifyQuotationService(
 ) {
   if (quotation.status !== QuotationStatus.REQUESTED) return quotation;
 
-  const updatedQuotation = await this.quotations.updateStatus(quotation._id, {
+  const updatedQuotation = (await this.quotations.updateStatus(quotation._id, {
     status: QuotationStatus.PROCESSING,
     info: 'verified elligibility manually',
-  });
+  })) as Quotation;
 
   return await processQuotationService.bind(this)(updatedQuotation, { quotationContext });
 }