@unchainedshop/core 4.0.0-rc.15 → 4.0.0-rc.17

package/src/services/simulateProductInventory.ts

@@ -1,7 +1,7 @@
 import { Modules } from '../modules.js';
 import { supportedWarehousingProvidersService } from './supportedWarehousingProviders.js';
 import { Product } from '@unchainedshop/core-products';
-import { EstimatedStock, WarehousingDirector } from '../directors/WarehousingDirector.js';
+import { WarehousingDirector } from '../directors/WarehousingDirector.js';
 import { WarehousingContext } from '../directors/WarehousingAdapter.js';
 import { WarehousingProvider } from '@unchainedshop/core-warehousing';
 
@@ -18,7 +18,11 @@ export async function simulateProductInventoryService(
   const deliveryProviders = await this.delivery.allProviders();
 
   return deliveryProviders.reduce<
-    Promise<(WarehousingContext & EstimatedStock & { warehousingProvider: WarehousingProvider })[]>
+    Promise<
+      (WarehousingContext & { quantity?: number } & {
+        warehousingProvider: WarehousingProvider;
+      })[]
+    >
   >(async (oldResult, deliveryProvider) => {
     const result = await oldResult;
 
@@ -31,7 +35,7 @@ export async function simulateProductInventoryService(
 
     const mappedWarehousingProviders = await Promise.all(
       warehousingProviders.map(async (warehousingProvider) => {
-        const warehousingContext: WarehousingContext = {
+        const warehousingContext = {
           deliveryProvider,
           product,
           referenceDate,

package/src/services/simulateProductPricing.ts

@@ -2,16 +2,19 @@ import { Product, ProductConfiguration } from '@unchainedshop/core-products';
 import { ProductPricingDirector } from '../core-index.js';
 import { User } from '@unchainedshop/core-users';
 import { Modules } from '../modules.js';
+import { Order, OrderDiscount } from '@unchainedshop/core-orders';
 
 export async function simulateProductPricingService(
   this: Modules,
   pricingContext: {
-    product: Product;
-    user: User;
-    countryCode: string;
     currencyCode: string;
+    countryCode: string;
     quantity: number;
+    discounts: OrderDiscount[];
+    order?: Order;
+    product: Product;
     configuration?: ProductConfiguration[];
+    user?: User;
   },
 ) {
   const calculated = await ProductPricingDirector.rebuildCalculation(pricingContext, { modules: this });

package/src/services/terminateEnrollment.ts

@@ -1,5 +1,6 @@
 import { Enrollment, EnrollmentStatus } from '@unchainedshop/core-enrollments';
 import { processEnrollmentService } from './processEnrollment.js';
+import { addMessageService } from './addMessage.js';
 
 export async function terminateEnrollmentService(enrollment: Enrollment) {
   if (enrollment.status === EnrollmentStatus.TERMINATED) return enrollment;
@@ -14,15 +15,10 @@ export async function terminateEnrollmentService(enrollment: Enrollment) {
   const user = await this.users.findUserById(enrollment.userId);
   const locale = this.users.userLocale(user);
 
-  await this.worker.addWork({
-    type: 'MESSAGE',
-    retries: 0,
-    input: {
-      reason: 'status_change',
-      locale: locale.baseName,
-      template: 'ENROLLMENT_STATUS',
-      enrollmentId: updatedEnrollment._id,
-    },
+  await addMessageService.bind(this)('ENROLLMENT_STATUS', {
+    reason: 'status_change',
+    locale: locale.baseName,
+    enrollmentId: updatedEnrollment._id,
   });
 
   return updatedEnrollment;

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';
@@ -12,6 +18,7 @@ import {
 
 export async function updateCalculationService(this: Modules, orderId: string) {
   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)({
@@ -125,7 +140,7 @@ export async function updateCalculationService(this: Modules, orderId: string) {
   );
 
   if (JSON.stringify(order.calculation) !== JSON.stringify(calculation)) {
-    order = await this.orders.updateCalculationSheet(orderId, calculation);
+    order = (await this.orders.updateCalculationSheet(orderId, calculation)) as 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

@@ -21,5 +21,7 @@ export async function uploadFileFromStreamService(
   );
   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 });
 }

package/lib/factory/registerProductDiscoverabilityFilter copy.d.ts

@@ -1,5 +0,0 @@
-export default function registerProductDiscoverabilityFilter({ orderIndex, hiddenTagValue, }: {
-    orderIndex?: number;
-    hiddenTagValue?: string;
-}): void;
-//# sourceMappingURL=registerProductDiscoverabilityFilter%20copy.d.ts.map

package/lib/factory/registerProductDiscoverabilityFilter copy.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"registerProductDiscoverabilityFilter copy.d.ts","sourceRoot":"","sources":["../../src/factory/registerProductDiscoverabilityFilter copy.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,OAAO,UAAU,oCAAoC,CAAC,EAC3D,UAAc,EACd,cAAyB,GAC1B,EAAE;IACD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,QA2BA"}

package/lib/factory/registerProductDiscoverabilityFilter copy.js

@@ -1,28 +0,0 @@
-import { randomBytes } from 'crypto';
-import { FilterAdapter, FilterDirector } from '../core-index.js';
-export default function registerProductDiscoverabilityFilter({ orderIndex = 0, hiddenTagValue = 'hidden', }) {
-    FilterDirector.registerAdapter({
-        ...FilterAdapter,
-        key: `shop.unchained.filters.product-discoverability-${randomBytes(4).toString('hex')}`,
-        label: 'Product Discoverability Filter',
-        version: '1.0.0',
-        orderIndex,
-        actions: (params) => {
-            return {
-                ...FilterAdapter.actions(params),
-                transformProductSelector: async (lastSelector, options) => {
-                    const { key } = options || {};
-                    if (!key) {
-                        const newSelector = { ...lastSelector };
-                        if (!newSelector.$and)
-                            newSelector.$and = [];
-                        newSelector.$and.push({ tags: { $ne: hiddenTagValue } });
-                        return newSelector;
-                    }
-                    return lastSelector;
-                },
-            };
-        },
-    });
-}
-//# sourceMappingURL=registerProductDiscoverabilityFilter%20copy.js.map

package/lib/factory/registerProductDiscoverabilityFilter copy.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"registerProductDiscoverabilityFilter copy.js","sourceRoot":"","sources":["../../src/factory/registerProductDiscoverabilityFilter copy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEjE,MAAM,CAAC,OAAO,UAAU,oCAAoC,CAAC,EAC3D,UAAU,GAAG,CAAC,EACd,cAAc,GAAG,QAAQ,GAI1B;IACC,cAAc,CAAC,eAAe,CAAC;QAC7B,GAAG,aAAa;QAEhB,GAAG,EAAE,kDAAkD,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QACvF,KAAK,EAAE,gCAAgC;QACvC,OAAO,EAAE,OAAO;QAChB,UAAU;QAEV,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;YAClB,OAAO;gBACL,GAAG,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC;gBAEhC,wBAAwB,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,EAAE;oBACxD,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;oBAE9B,IAAI,CAAC,GAAG,EAAE,CAAC;wBACT,MAAM,WAAW,GAAG,EAAE,GAAG,YAAY,EAAE,CAAC;wBACxC,IAAI,CAAC,WAAW,CAAC,IAAI;4BAAE,WAAW,CAAC,IAAI,GAAG,EAAE,CAAC;wBAC7C,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC;wBACzD,OAAO,WAAW,CAAC;oBACrB,CAAC;oBACD,OAAO,YAAY,CAAC;gBACtB,CAAC;aACF,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}