@unchainedshop/api 3.0.0-rc6 → 3.0.0-rc7

package/src/resolvers/mutations/orders/addMultipleCartProducts.ts

@@ -4,8 +4,8 @@ import {
   ProductNotFoundError,
   OrderQuantityTooLowError,
   OrderWrongStatusError,
+  OrderNotFoundError,
 } from '../../../errors.js';
-import { getOrderCart } from '../utils/getOrderCart.js';
 import { ordersSettings } from '@unchainedshop/core-orders';
 
 export default async function addMultipleCartProducts(
@@ -41,7 +41,12 @@ export default async function addMultipleCartProducts(
     }),
   );
 
-  const order = await getOrderCart({ orderId, user }, context);
+  const order = await services.orders.findOrInitCart({
+    orderId,
+    user,
+    countryCode: context.countryContext,
+  });
+  if (!order) throw new OrderNotFoundError({ orderId });
   if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
 
   // Reduce is used to wait for each product to be added before processing the next (sequential processing)

package/src/resolvers/mutations/orders/checkoutCart.ts

@@ -1,6 +1,5 @@
 import { Context } from '../../../context.js';
-import { OrderCheckoutError } from '../../../errors.js';
-import { getOrderCart } from '../utils/getOrderCart.js';
+import { OrderCheckoutError, OrderNotFoundError } from '../../../errors.js';
 import { createLogger, log } from '@unchainedshop/logger';
 
 const logger = createLogger('unchained:api');
@@ -20,11 +19,16 @@ export default async function checkoutCart(
   log('mutation checkoutCart', { orderId: forceOrderId, userId });
 
   // Do not check for order status here! The checkout method will act accordingly
-  let order = await getOrderCart({ orderId: forceOrderId, user }, context);
+  const order = await services.orders.findOrInitCart({
+    orderId: forceOrderId,
+    user,
+    countryCode: context.countryContext,
+  });
+  if (!order) throw new OrderNotFoundError({ orderId: forceOrderId });
 
   try {
-    order = await services.orders.checkoutOrder(order._id, transactionContext);
-    return order;
+    const checkedOutOrder = await services.orders.checkoutOrder(order._id, transactionContext);
+    return checkedOutOrder;
   } catch (error) {
     logger.error(error.message, { userId, orderId: order._id });
     throw new OrderCheckoutError({

package/src/resolvers/mutations/orders/emptyCart.ts

@@ -1,7 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { Context } from '../../../context.js';
-import { getOrderCart } from '../utils/getOrderCart.js';
-import { OrderWrongStatusError } from '../../../errors.js';
+import { OrderNotFoundError, OrderWrongStatusError } from '../../../errors.js';
 
 export default async function emptyCart(
   root: never,
@@ -12,7 +11,12 @@ export default async function emptyCart(
 
   log('mutation emptyCart', { userId, orderId });
 
-  const order = await getOrderCart({ orderId, user }, context);
+  const order = await services.orders.findOrInitCart({
+    orderId,
+    user,
+    countryCode: context.countryContext,
+  });
+  if (!order) throw new OrderNotFoundError({ orderId });
   if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
 
   if (!order) return null;

package/src/resolvers/mutations/orders/signPaymentProviderForCheckout.ts

@@ -32,7 +32,7 @@ export default async function signPaymentProviderForCheckout(
     if (!orderPayment) throw new OrderPaymentNotFoundError({ orderPaymentId });
   } else {
     const order = await modules.orders.cart({
-      countryContext: context.countryContext || context.user.lastLogin?.countryCode,
+      countryCode: context.countryContext,
       userId,
     });
     if (!order) throw new UserNoCartError({ userId });

package/src/resolvers/mutations/orders/updateCart.ts

@@ -1,7 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { Context } from '../../../context.js';
-import { getOrderCart } from '../utils/getOrderCart.js';
-import { OrderWrongStatusError } from '../../../errors.js';
+import { OrderNotFoundError, OrderWrongStatusError } from '../../../errors.js';
 import { Address, Contact } from '@unchainedshop/mongodb';
 
 interface UpdateCartParams {
@@ -20,7 +19,12 @@ export default async function updateCart(root: never, params: UpdateCartParams,
 
   log('mutation updateCart', { userId });
 
-  let order = await getOrderCart({ orderId, user }, context);
+  let order = await services.orders.findOrInitCart({
+    orderId,
+    user,
+    countryCode: context.countryContext,
+  });
+  if (!order) throw new OrderNotFoundError({ orderId });
   if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
 
   if (meta) {

package/src/resolvers/type/filter/loaded-filter-types.ts

@@ -1,7 +1,6 @@
 import { Context } from '../../../context.js';
 import { Filter, SearchQuery } from '@unchainedshop/core-filters';
 import { FilterDirector } from '@unchainedshop/core';
-import { intersectSet } from '@unchainedshop/utils';
 
 type LoadedFilterData = {
   forceLiveCollection: boolean;
@@ -26,7 +25,7 @@ export const LoadedFilter = {
   ) => {
     const filterActions = await FilterDirector.actions({ searchQuery }, context);
     return filterActions.aggregateProductIds({
-      productIds: Array.from(intersectSet(filteredByOtherFiltersSet, filteredByThisFilterSet)),
+      productIds: Array.from(filteredByOtherFiltersSet.intersection(filteredByThisFilterSet)),
     }).length;
   },
   productsCount: async (

package/src/resolvers/type/product/product-configurable-types.ts

@@ -8,7 +8,6 @@ import {
 import { Context } from '../../../context.js';
 import { Product } from './product-types.js';
 import { sha256 } from '@unchainedshop/utils';
-import { ProductPricingDirector } from '@unchainedshop/core';
 
 export const ConfigurableProduct = {
   ...Product,
@@ -105,7 +104,7 @@ export const ConfigurableProduct = {
     },
     requestContext: Context,
   ): Promise<ProductPriceRange> {
-    const { countryContext, modules } = requestContext;
+    const { countryContext, modules, services } = requestContext;
     const currency = forcedCurrencyCode || requestContext.currencyContext;
 
     const products = await modules.products.proxyProducts(product, vectors, {
@@ -123,14 +122,8 @@ export const ConfigurableProduct = {
             quantity,
           };
 
-          const calculated = await ProductPricingDirector.rebuildCalculation(
-            pricingContext,
-            requestContext,
-          );
-
-          if (!calculated || !calculated.length) return null;
-
-          const pricing = ProductPricingDirector.calculationSheet(pricingContext, calculated);
+          const pricing = await services.products.simulateProductPricing(pricingContext);
+          if (!pricing) return null;
           const unitPrice = pricing.unitPrice({ useNetPrice });
 
           return {

package/src/resolvers/type/product/product-plan-types.ts

@@ -5,7 +5,6 @@ import {
 } from '@unchainedshop/core-products';
 import { Context } from '../../../context.js';
 import { Product } from './product-types.js';
-import { ProductPricingDirector } from '@unchainedshop/core';
 import { sha256 } from '@unchainedshop/utils';
 
 export const PlanProduct = {
@@ -40,7 +39,7 @@ export const PlanProduct = {
     },
     requestContext: Context,
   ): Promise<ProductPrice> {
-    const { countryContext, user } = requestContext;
+    const { countryContext, user, services } = requestContext;
     const currency = forcedCurrencyCode || requestContext.currencyContext;
 
     const pricingContext = {
@@ -52,11 +51,8 @@ export const PlanProduct = {
       configuration,
     };
 
-    const calculated = await ProductPricingDirector.rebuildCalculation(pricingContext, requestContext);
-
-    if (!calculated || !calculated.length) return null;
-
-    const pricing = ProductPricingDirector.calculationSheet(pricingContext, calculated);
+    const pricing = await services.products.simulateProductPricing(pricingContext);
+    if (!pricing) return null;
     const unitPrice = pricing.unitPrice({ useNetPrice });
 
     return {

package/src/resolvers/type/product/product-simple-types.ts

@@ -15,54 +15,23 @@ export const SimpleProduct = {
     requestContext: Context,
   ): Promise<
     Array<{
-      _id: string;
       deliveryProvider?: DeliveryProvider;
       warehousingProvider?: WarehousingProvider;
       shipping?: Date;
       earliestDelivery?: Date;
     }>
   > {
-    const { deliveryProviderType, referenceDate, quantity } = params;
-    const { modules, services } = requestContext;
-
-    const deliveryProviders = await modules.delivery.findProviders({
-      type: deliveryProviderType,
-    });
-
-    return deliveryProviders.reduce(async (oldResult, deliveryProvider) => {
-      const result = await oldResult;
-
-      const warehousingProviders = await services.orders.supportedWarehousingProviders({
-        product: obj,
-        deliveryProvider,
-      });
-
-      const mappedWarehousingProviders = await Promise.all(
-        warehousingProviders.map(async (warehousingProvider) => {
-          const warehousingContext: WarehousingContext = {
-            deliveryProvider,
-            product: obj,
-            quantity,
-            referenceDate,
-          };
+    const { referenceDate, quantity } = params;
+    const { services, modules } = requestContext;
 
-          const director = await WarehousingDirector.actions(
-            warehousingProvider,
-            warehousingContext,
-            requestContext,
-          );
-          const dispatch = await director.estimatedDispatch();
+    const deliveryProviders = await modules.delivery.findProviders({});
 
-          return {
-            warehousingProvider,
-            ...warehousingContext,
-            ...dispatch,
-          };
-        }),
-      );
-
-      return result.concat(result, mappedWarehousingProviders);
-    }, Promise.resolve([]));
+    return services.products.simulateProductDispatching({
+      deliveryProviders,
+      product: obj,
+      quantity,
+      referenceDate,
+    });
   },
 
   async simulatedStocks(
@@ -74,7 +43,6 @@ export const SimpleProduct = {
     requestContext: Context,
   ): Promise<
     Array<{
-      _id: string;
       deliveryProvider?: DeliveryProvider;
       warehousingProvider?: WarehousingProvider;
       quantity?: number;
@@ -87,39 +55,11 @@ export const SimpleProduct = {
       type: deliveryProviderType,
     });
 
-    return deliveryProviders.reduce(async (oldResult, deliveryProvider) => {
-      const result = await oldResult;
-
-      const warehousingProviders = await services.orders.supportedWarehousingProviders({
-        product: obj,
-        deliveryProvider,
-      });
-
-      const mappedWarehousingProviders = await Promise.all(
-        warehousingProviders.map(async (warehousingProvider) => {
-          const warehousingContext: WarehousingContext = {
-            deliveryProvider,
-            product: obj,
-            referenceDate,
-          };
-
-          const director = await WarehousingDirector.actions(
-            warehousingProvider,
-            warehousingContext,
-            requestContext,
-          );
-          const stock = await director.estimatedStock();
-
-          return {
-            warehousingProvider,
-            ...warehousingContext,
-            ...stock,
-          };
-        }),
-      );
-
-      return result.concat(result, mappedWarehousingProviders);
-    }, Promise.resolve([]));
+    return services.products.simulateProductInventory({
+      deliveryProviders,
+      product: obj,
+      referenceDate,
+    });
   },
 
   baseUnit({ warehousing }): string {

package/src/resolvers/type/product/product-tokenized-types.ts

@@ -1,4 +1,3 @@
-import { WarehousingContext, WarehousingDirector } from '@unchainedshop/core';
 import {
   Product,
   ProductContractConfiguration,
@@ -40,7 +39,6 @@ export const TokenizedProduct = {
     requestContext: Context,
   ): Promise<
     Array<{
-      _id: string;
       deliveryProvider?: DeliveryProvider;
       warehousingProvider?: WarehousingProvider;
       quantity?: number;
@@ -51,39 +49,11 @@ export const TokenizedProduct = {
 
     const deliveryProviders = await modules.delivery.findProviders({});
 
-    return deliveryProviders.reduce(async (oldResult, deliveryProvider) => {
-      const result = await oldResult;
-
-      const warehousingProviders = await services.orders.supportedWarehousingProviders({
-        product: obj,
-        deliveryProvider,
-      });
-
-      const mappedWarehousingProviders = await Promise.all(
-        warehousingProviders.map(async (warehousingProvider) => {
-          const warehousingContext: WarehousingContext = {
-            deliveryProvider,
-            product: obj,
-            referenceDate,
-          };
-
-          const director = await WarehousingDirector.actions(
-            warehousingProvider,
-            warehousingContext,
-            requestContext,
-          );
-          const stock = await director.estimatedStock();
-
-          return {
-            warehousingProvider,
-            ...warehousingContext,
-            ...stock,
-          };
-        }),
-      );
-
-      return result.concat(result, mappedWarehousingProviders);
-    }, Promise.resolve([]));
+    return services.products.simulateProductInventory({
+      deliveryProviders,
+      product: obj,
+      referenceDate,
+    });
   },
 
   async tokens(product: Product, params: never, requestContext: Context) {

package/src/resolvers/type/user-types.ts

@@ -114,7 +114,9 @@ const {
 } = actions as Record<string, string>;
 
 const getPrimaryEmail = (user: UserType) => {
-  return (user.emails || []).sort((left, right) => Number(right.verified) - Number(left.verified))?.[0];
+  return (user.emails || []).toSorted(
+    (left, right) => Number(right.verified) - Number(left.verified),
+  )?.[0];
 };
 
 export const User: UserHelperTypes = {
@@ -174,7 +176,7 @@ export const User: UserHelperTypes = {
     const { modules, countryContext } = context;
     await checkAction(context, viewUserOrders, [user, params]);
     return modules.orders.cart({
-      countryContext: countryContext || user.lastLogin?.countryCode,
+      countryCode: countryContext,
       orderNumber: params.orderNumber,
       userId: user._id,
     });

package/tests/api-index.test.ts

@@ -1,8 +1,8 @@
 // Import the function to be tested.
-import { admin } from '../lib/roles/admin.js';
-import { actions } from '../lib/roles/index.js';
-import { checkAction, ensureActionExists, ensureIsFunction } from '../lib/acl.js';
-import { NoPermissionError, PermissionSystemError } from '../lib/errors.js';
+import { admin } from '../src/roles/admin.js';
+import { actions } from '../src/roles/index.js';
+import { checkAction, ensureActionExists, ensureIsFunction } from '../src/acl.js';
+import { NoPermissionError, PermissionSystemError } from '../src/errors.js';
 import { Roles } from '@unchainedshop/roles';
 
 describe('API', () => {

package/lib/resolvers/mutations/utils/getOrderCart.d.ts

@@ -1,7 +0,0 @@
-import { Context } from '../../../context.js';
-import { User } from '@unchainedshop/core-users';
-export declare const getOrderCart: (params: {
-    orderId?: string;
-    user: User;
-}, context: Context) => Promise<any>;
-//# sourceMappingURL=getOrderCart.d.ts.map

package/lib/resolvers/mutations/utils/getOrderCart.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getOrderCart.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/utils/getOrderCart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAGjD,eAAO,MAAM,YAAY,WAAkB;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,IAAI,CAAA;CAAE,WAAW,OAAO,iBAe5F,CAAC"}

package/lib/resolvers/mutations/utils/getOrderCart.js

@@ -1,17 +0,0 @@
-import { OrderNotFoundError } from '../../../errors.js';
-export const getOrderCart = async (params, context) => {
-    const { modules, services } = context;
-    const { orderId, user } = params;
-    if (orderId) {
-        const order = await modules.orders.findOrder({ orderId });
-        if (!order)
-            throw new OrderNotFoundError({ orderId });
-        return order;
-    }
-    return services.orders.nextUserCart({
-        user,
-        countryCode: context.countryContext,
-        forceCartCreation: true,
-    });
-};
-//# sourceMappingURL=getOrderCart.js.map

package/lib/resolvers/mutations/utils/getOrderCart.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getOrderCart.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/utils/getOrderCart.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAExD,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,MAAwC,EAAE,OAAgB,EAAE,EAAE;IAC/F,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACtC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAEjC,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,KAAK;YAAE,MAAM,IAAI,kBAAkB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QACtD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC;QAClC,IAAI;QACJ,WAAW,EAAE,OAAO,CAAC,cAAc;QACnC,iBAAiB,EAAE,IAAI;KACxB,CAAC,CAAC;AACL,CAAC,CAAC"}

package/src/resolvers/mutations/utils/getOrderCart.ts

@@ -1,20 +0,0 @@
-import { Context } from '../../../context.js';
-import { User } from '@unchainedshop/core-users';
-import { OrderNotFoundError } from '../../../errors.js';
-
-export const getOrderCart = async (params: { orderId?: string; user: User }, context: Context) => {
-  const { modules, services } = context;
-  const { orderId, user } = params;
-
-  if (orderId) {
-    const order = await modules.orders.findOrder({ orderId });
-    if (!order) throw new OrderNotFoundError({ orderId });
-    return order;
-  }
-
-  return services.orders.nextUserCart({
-    user,
-    countryCode: context.countryContext,
-    forceCartCreation: true,
-  });
-};