@unchainedshop/api 3.0.0-rc6 → 3.0.0-rc8

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

@@ -5,8 +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 = {
   ...Product,
@@ -40,7 +38,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,17 +50,11 @@ 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 {
-      _id: await sha256(
-        [obj._id, countryContext, quantity, useNetPrice, user ? user._id : 'ANONYMOUS'].join(''),
-      ),
       ...unitPrice,
       isNetPrice: useNetPrice,
       isTaxable: pricing.taxSum() > 0,

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

@@ -1,5 +1,4 @@
 import { Product, ProductSupply } from '@unchainedshop/core-products';
-import { WarehousingContext, WarehousingDirector } from '@unchainedshop/core';
 import { Context } from '../../../context.js';
 import { DeliveryProviderType } from '@unchainedshop/core-delivery';
 import { DeliveryProvider } from '@unchainedshop/core-delivery';
@@ -15,54 +14,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 +42,6 @@ export const SimpleProduct = {
     requestContext: Context,
   ): Promise<
     Array<{
-      _id: string;
       deliveryProvider?: DeliveryProvider;
       warehousingProvider?: WarehousingProvider;
       quantity?: number;
@@ -87,39 +54,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/src/schema/inputTypes.ts

@@ -45,7 +45,6 @@ export default [
       isoCode: String!
       isActive: Boolean
       defaultCurrencyCode: String
-      defaultCurrencyId: String @deprecated(reason: "Use defaultCurrencyCode instead")
     }
 
     input CreateCurrencyInput {

package/src/schema/types/dispatch.ts

@@ -1,7 +1,6 @@
 export default [
   /* GraphQL */ `
     type Dispatch {
-      _id: ID!
       deliveryProvider: DeliveryProvider
       warehousingProvider: WarehousingProvider
       shipping: DateTime

package/src/schema/types/price.ts

@@ -1,7 +1,6 @@
 export default [
   /* GraphQL */ `
     type Price @cacheControl(maxAge: 60) {
-      _id: ID!
       isTaxable: Boolean!
       isNetPrice: Boolean!
       amount: Int!
@@ -9,7 +8,6 @@ export default [
     }
 
     type PriceRange @cacheControl(maxAge: 60) {
-      _id: ID!
       minPrice: Price!
       maxPrice: Price!
     }

package/src/schema/types/stock.ts

@@ -1,7 +1,6 @@
 export default [
   /* GraphQL */ `
     type Stock {
-      _id: ID!
       deliveryProvider: DeliveryProvider
       warehousingProvider: WarehousingProvider
       quantity: Int

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,
-  });
-};

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

@@ -1,27 +0,0 @@
-import { DeliveryProvider } from '@unchainedshop/core-delivery';
-import { Product } from '@unchainedshop/core-products';
-import { WarehousingProvider } from '@unchainedshop/core-warehousing';
-import { sha256 } from '@unchainedshop/utils';
-
-export const Dispatch = {
-  _id: async (params: {
-    product: Product;
-    deliveryProvider: DeliveryProvider;
-    warehousingProvider: WarehousingProvider;
-    referenceDate: Date;
-    quantity: number;
-    country: string;
-    userId?: string;
-  }) =>
-    await sha256(
-      [
-        params.product._id,
-        params.deliveryProvider._id,
-        params.warehousingProvider._id,
-        params.referenceDate,
-        params.quantity,
-        params.country,
-        params.userId || 'ANONYMOUS',
-      ].join(''),
-    ),
-};

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

@@ -1,25 +0,0 @@
-import { DeliveryProvider } from '@unchainedshop/core-delivery';
-import { Product } from '@unchainedshop/core-products';
-import { WarehousingProvider } from '@unchainedshop/core-warehousing';
-import { sha256 } from '@unchainedshop/utils';
-
-export const Stock = {
-  _id: async (params: {
-    product: Product;
-    deliveryProvider: DeliveryProvider;
-    warehousingProvider: WarehousingProvider;
-    referenceDate: Date;
-    country: string;
-    userId?: string;
-  }) =>
-    await sha256(
-      [
-        params.product._id,
-        params.deliveryProvider._id,
-        params.warehousingProvider._id,
-        params.referenceDate,
-        params.country,
-        params.userId || 'ANONYMOUS',
-      ].join(''),
-    ),
-};