@unchainedshop/api 3.0.0-alpha6 → 3.0.0-rc1

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

@@ -1 +1,59 @@
-export const LoadedFilter = {};
+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;
+  searchQuery: SearchQuery;
+  filter: Filter;
+  examinedProductIdSet: Set<string>;
+  filteredByOtherFiltersSet: Set<string>;
+  filteredByThisFilterSet: Set<string>;
+};
+
+export const LoadedFilter = {
+  definition: ({ filter }: LoadedFilterData) => {
+    return filter;
+  },
+  isSelected: ({ searchQuery, filter }: LoadedFilterData) => {
+    return searchQuery?.filterQuery?.some((q) => q.key === filter.key);
+  },
+  filteredProductsCount: async (
+    { filteredByOtherFiltersSet, filteredByThisFilterSet, searchQuery }: LoadedFilterData,
+    _: never,
+    context: Context,
+  ) => {
+    const filterActions = await FilterDirector.actions({ searchQuery }, context);
+    return filterActions.aggregateProductIds({
+      productIds: Array.from(intersectSet(filteredByOtherFiltersSet, filteredByThisFilterSet)),
+    }).length;
+  },
+  productsCount: async (
+    { examinedProductIdSet, searchQuery }: LoadedFilterData,
+    _: never,
+    context: Context,
+  ) => {
+    const filterActions = await FilterDirector.actions({ searchQuery }, context);
+    return filterActions.aggregateProductIds({
+      productIds: Array.from(examinedProductIdSet),
+    }).length;
+  },
+  options: async (
+    { filter, filteredByOtherFiltersSet, forceLiveCollection, searchQuery }: LoadedFilterData,
+    _: never,
+    context: Context,
+  ) => {
+    const { services } = context;
+    // The current base for options should be an array of product id's that:
+    // - Are part of the preselected product id array
+    // - Fit this filter generally
+    // - Are filtered by all other filters
+    // - Are not filtered by the currently selected value of this filter
+    return services.filters.loadFilterOptions(filter, {
+      searchQuery,
+      forceLiveCollection,
+      productIdSet: filteredByOtherFiltersSet,
+    });
+  },
+};

package/src/resolvers/type/index.ts

@@ -1,4 +1,4 @@
-import { Assortment } from './assortment/assortment-types.js';
+import { AssortmentTypes as Assortment } from './assortment/assortment-types.js';
 import { AssortmentFilter } from './assortment/assortment-filter-types.js';
 import { AssortmentLink } from './assortment/assortment-link-types.js';
 import { AssortmentMedia } from './assortment/assortment-media-types.js';
@@ -67,6 +67,7 @@ import { Media } from './media-types.js';
 import { Token } from './token-types.js';
 import { Web3Address } from './web3-address.js';
 import { LoginMethodResponse } from './login-method-response-types.js';
+import { ProductSearchResult } from './product-search-result-types.js';
 
 const types = {
   Assortment,
@@ -124,6 +125,7 @@ const types = {
   ProductVariationAssignment,
   ProductVariationAssignmentVector,
   ProductVariationOption,
+  ProductSearchResult,
   Quotation,
   Shop,
   SimpleProduct,

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

@@ -1,5 +1,5 @@
 import { Language as LanguageType } from '@unchainedshop/core-languages';
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../context.js';
 
 export interface LanguageHelperTypes {
   isBase: (language: LanguageType, params: never, context: Context) => boolean;

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

@@ -1,12 +1,23 @@
-import { File as FileType } from '@unchainedshop/core-files';
-import { Context } from '@unchainedshop/api';
-
+import { File as FileType, getFileAdapter } from '@unchainedshop/core-files';
+import { Context } from '../../context.js';
+import { checkAction } from '../../acl.js';
+import { actions } from '../../roles/index.js';
 export interface MediaHelperTypes {
-  url: (language: FileType, params: Record<string, any>, context: Context) => string;
+  url: (language: FileType, params: Record<string, any>, context: Context) => Promise<string>;
 }
 
 export const Media: MediaHelperTypes = {
-  url(root, params, { modules }) {
-    return modules.files.getUrl(root, params);
+  url: async (file, params, context) => {
+    const { modules } = context;
+    try {
+      await checkAction(context, actions.downloadFile, [file, params]);
+      if (!file) return null;
+      const fileUploadAdapter = getFileAdapter();
+      const url = await fileUploadAdapter.createDownloadURL(file, params?.expires);
+      return modules.files.normalizeUrl(url, params);
+    } catch (e) {
+      console.error(e);
+      return null;
+    }
   },
 };

package/src/resolvers/type/order/order-delivery-discount-types.ts

@@ -1,36 +1,21 @@
-import crypto from 'crypto';
-import { Context } from '@unchainedshop/api';
-import {
-  OrderDiscount,
-  OrderPrice,
-  OrderDeliveryDiscount as OrderDeliveryDiscountType,
-} from '@unchainedshop/core-orders';
+import { Context } from '../../../context.js';
+import { OrderDeliveryDiscount as OrderDeliveryDiscountType } from '@unchainedshop/core-orders';
+import { sha256 } from '@unchainedshop/utils';
 
-type HelperType<P, T> = (orderDelivery: OrderDeliveryDiscountType, params: P, context: Context) => T;
-
-export interface OrderDeliveryDiscountHelperTypes {
-  _id: HelperType<never, string>;
-  orderDiscount: HelperType<never, Promise<OrderDiscount>>;
-  total: HelperType<never, OrderPrice>;
-}
-
-export const OrderDeliveryDiscount: OrderDeliveryDiscountHelperTypes = {
-  _id(obj) {
+export const OrderDeliveryDiscount = {
+  _id(obj: OrderDeliveryDiscountType) {
     return `${obj.item._id}:${obj.discountId}`;
   },
 
-  orderDiscount: async (obj, _, { modules }) => {
+  orderDiscount: async (obj: OrderDeliveryDiscountType, _, { modules }: Context) => {
     return modules.orders.discounts.findOrderDiscount({
       discountId: obj.discountId,
     });
   },
 
-  total(obj) {
+  async total(obj: OrderDeliveryDiscountType) {
     return {
-      _id: crypto
-        .createHash('sha256')
-        .update([`${obj.item._id}:${obj.discountId}`, obj.amount, obj.currency].join(''))
-        .digest('hex'),
+      _id: await sha256([`${obj.item._id}:${obj.discountId}`, obj.amount, obj.currency].join('')),
       amount: obj.amount,
       currency: obj.currency,
     };

package/src/resolvers/type/order/order-delivery-pickup-types.ts

@@ -1,7 +1,7 @@
-import { Context } from '@unchainedshop/api';
+import { DeliveryDirector, DeliveryPricingSheet } from '@unchainedshop/core';
+import { Context } from '../../../context.js';
 import { DeliveryLocation, DeliveryProvider } from '@unchainedshop/core-delivery';
 import { OrderDelivery, OrderDeliveryDiscount } from '@unchainedshop/core-orders';
-import { DeliveryDirector } from '@unchainedshop/core-delivery';
 
 type HelperType<T> = (orderDelivery: OrderDelivery, _: never, context: Context) => T;
 
@@ -14,9 +14,19 @@ export interface OrderDeliveryPickupHelperTypes {
 }
 
 export const OrderDeliveryPickUp: OrderDeliveryPickupHelperTypes = {
-  activePickUpLocation: async (obj, _, context) => {
-    const { modules } = context;
-    return modules.orders.deliveries.activePickUpLocation(obj, context);
+  activePickUpLocation: async (orderDelivery, _, requestContext) => {
+    const { orderPickUpLocationId } = orderDelivery.context || {};
+
+    const provider = await requestContext.modules.delivery.findProvider({
+      deliveryProviderId: orderDelivery.deliveryProviderId,
+    });
+    const director = await DeliveryDirector.actions(
+      provider,
+      { orderDelivery: orderDelivery },
+      requestContext,
+    );
+
+    return director.pickUpLocationById(orderPickUpLocationId);
   },
 
   pickUpLocations: async (obj, _, context) => {
@@ -41,10 +51,15 @@ export const OrderDeliveryPickUp: OrderDeliveryPickupHelperTypes = {
   discounts: async (obj, _, context) => {
     const { modules } = context;
     const order = await modules.orders.findOrder({ orderId: obj.orderId });
-    const pricingSheet = modules.orders.deliveries.pricingSheet(obj, order.currency, context);
-    if (pricingSheet.isValid()) {
+
+    const pricing = DeliveryPricingSheet({
+      calculation: obj.calculation,
+      currency: order.currency,
+    });
+
+    if (pricing.isValid()) {
       // IMPORTANT: Do not send any parameter to obj.discounts!
-      return pricingSheet.discountPrices().map((discount) => ({
+      return pricing.discountPrices().map((discount) => ({
         item: obj,
         ...discount,
       }));

package/src/resolvers/type/order/order-delivery-shipping-types.ts

@@ -1,7 +1,8 @@
-import { Context } from '@unchainedshop/api';
+import { DeliveryPricingSheet } from '@unchainedshop/core';
+import { Context } from '../../../context.js';
 import { DeliveryProvider } from '@unchainedshop/core-delivery';
 import { OrderDelivery, OrderDeliveryDiscount } from '@unchainedshop/core-orders';
-import type { Address } from '@unchainedshop/mongodb';
+import { Address } from '@unchainedshop/mongodb';
 
 type HelperType<T> = (orderDelivery: OrderDelivery, _: never, context: Context) => T;
 
@@ -30,10 +31,13 @@ export const OrderDeliveryShipping: OrderDeliveryShippingHelperTypes = {
   discounts: async (obj, _, context) => {
     const { modules } = context;
     const order = await modules.orders.findOrder({ orderId: obj.orderId });
-    const pricingSheet = modules.orders.deliveries.pricingSheet(obj, order.currency, context);
-    if (pricingSheet.isValid()) {
+    const pricing = DeliveryPricingSheet({
+      calculation: obj.calculation,
+      currency: order.currency,
+    });
+    if (pricing.isValid()) {
       // IMPORTANT: Do not send any parameter to obj.discounts!
-      return pricingSheet.discountPrices().map((discount) => ({
+      return pricing.discountPrices().map((discount) => ({
         item: obj,
         ...discount,
       }));

package/src/resolvers/type/order/order-delivery-types.ts

@@ -1,7 +1,7 @@
 import { OrderDelivery as OrderDeliveryType } from '@unchainedshop/core-orders';
 import { DeliveryProviderType } from '@unchainedshop/core-delivery';
 import { objectInvert } from '@unchainedshop/utils';
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../../context.js';
 
 const OrderDeliveryMap = {
   OrderDeliveryShipping: DeliveryProviderType.SHIPPING,

package/src/resolvers/type/order/order-discount-types.ts

@@ -1,11 +1,7 @@
-import { Context } from '@unchainedshop/api';
-import {
-  Order,
-  OrderPrice,
-  OrderPricingDiscount,
-  OrderDiscount as OrderDiscountType,
-  OrderDiscountDirector,
-} from '@unchainedshop/core-orders';
+import { Price } from '@unchainedshop/utils';
+import { Context } from '../../../context.js';
+import { Order, OrderDiscount as OrderDiscountType } from '@unchainedshop/core-orders';
+import { OrderDiscountDirector, OrderPricingDiscount } from '@unchainedshop/core';
 
 type HelperType<P, T> = (orderDiscount: OrderDiscountType, params: P, context: Context) => T;
 
@@ -23,7 +19,7 @@ export interface OrderDiscountHelperTypes {
 
   discounted: HelperType<never, Promise<Array<OrderPricingDiscount>>>;
   order: HelperType<never, Promise<Order>>;
-  total: HelperType<never, Promise<OrderPrice>>;
+  total: HelperType<never, Promise<Price>>;
 }
 
 export const OrderDiscount: OrderDiscountHelperTypes = {
@@ -48,13 +44,13 @@ export const OrderDiscount: OrderDiscountHelperTypes = {
     const order = await context.modules.orders.findOrder({
       orderId: obj.orderId,
     });
-    return context.modules.orders.discountTotal(order, obj, context);
+    return context.services.orders.calculateDiscountTotal(order, obj);
   },
 
   discounted: async (obj, _, context) => {
     const order = await context.modules.orders.findOrder({
       orderId: obj.orderId,
     });
-    return context.modules.orders.discounted(order, obj, context);
+    return context.services.orders.discountedEntities(order, obj);
   },
 };

package/src/resolvers/type/order/order-discountable-types.ts

@@ -1,8 +1,11 @@
-import { Order, OrderPosition } from '@unchainedshop/core-orders';
-import { OrderDelivery } from '@unchainedshop/core-orders';
-import { OrderDiscount } from '@unchainedshop/core-orders';
-import { OrderPayment } from '@unchainedshop/core-orders';
-import { OrderPrice } from '@unchainedshop/core-orders';
+import {
+  Order,
+  OrderPosition,
+  OrderDelivery,
+  OrderDiscount,
+  OrderPayment,
+} from '@unchainedshop/core-orders';
+import { Price } from '@unchainedshop/utils';
 
 export const OrderDiscountableType = {
   OrderItemDiscount: 'OrderItemDiscount',
@@ -19,7 +22,7 @@ export const OrderDiscountable = {
     order?: Order;
     orderDiscount: OrderDiscount;
     payment?: OrderPayment;
-    total: OrderPrice;
+    total: Price;
   }) {
     if (obj.delivery) {
       return OrderDiscountableType.OrderDeliveryDiscount;

package/src/resolvers/type/order/order-global-discount-types.ts

@@ -1,41 +1,38 @@
-import crypto from 'crypto';
-import { OrderPrice } from '@unchainedshop/core-orders';
 import { Order } from '@unchainedshop/core-orders';
-import { OrderDiscount } from '@unchainedshop/core-orders';
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../../context.js';
+import { Price, sha256 } from '@unchainedshop/utils';
 
-type HelperType<P, T> = (
-  orderGlobalDiscount: OrderPrice & {
-    order: Order;
-    discountId: string;
-  },
-  params: P,
-  context: Context,
-) => T;
-
-export interface OrderGlobalDiscountHelperTypes {
-  _id: HelperType<never, string>;
-  orderDiscount: HelperType<never, Promise<OrderDiscount>>;
-  total: HelperType<never, OrderPrice>;
-}
-
-export const OrderGlobalDiscount: OrderGlobalDiscountHelperTypes = {
-  _id(obj) {
+export const OrderGlobalDiscount = {
+  _id(
+    obj: Price & {
+      order: Order;
+      discountId: string;
+    },
+  ) {
     return `${obj.order._id}:${obj.discountId}`;
   },
 
-  orderDiscount: async (obj, _, { modules }) => {
+  orderDiscount: async (
+    obj: Price & {
+      order: Order;
+      discountId: string;
+    },
+    _,
+    { modules }: Context,
+  ) => {
     return modules.orders.discounts.findOrderDiscount({
       discountId: obj.discountId,
     });
   },
 
-  total: (obj) => {
+  async total(
+    obj: Price & {
+      order: Order;
+      discountId: string;
+    },
+  ) {
     return {
-      _id: crypto
-        .createHash('sha256')
-        .update([`${obj.order._id}:${obj.discountId}`, obj.amount, obj.currency].join(''))
-        .digest('hex'),
+      _id: await sha256([`${obj.order._id}:${obj.discountId}`, obj.amount, obj.currency].join('')),
       amount: obj.amount,
       currency: obj.currency,
     };

package/src/resolvers/type/order/order-item-discount-types.ts

@@ -1,34 +1,21 @@
-import crypto from 'crypto';
-import { Context } from '@unchainedshop/api';
-import { OrderDiscount } from '@unchainedshop/core-orders';
-import { OrderPrice } from '@unchainedshop/core-orders';
+import { sha256 } from '@unchainedshop/utils';
+import { Context } from '../../../context.js';
 import { OrderPositionDiscount } from '@unchainedshop/core-orders';
 
-type HelperType<P, T> = (orderPositionDiscount: OrderPositionDiscount, params: P, context: Context) => T;
-
-export interface OrderItemDiscountHelperTypes {
-  _id: HelperType<never, string>;
-  orderDiscount: HelperType<never, Promise<OrderDiscount>>;
-  total: HelperType<never, OrderPrice>;
-}
-
-export const OrderItemDiscount: OrderItemDiscountHelperTypes = {
-  _id: (obj) => {
+export const OrderItemDiscount = {
+  _id: (obj: OrderPositionDiscount) => {
     return `${obj.item._id}:${obj.discountId}`;
   },
 
-  orderDiscount: async (obj, _, { modules }) => {
+  orderDiscount: async (obj: OrderPositionDiscount, _, { modules }: Context) => {
     return modules.orders.discounts.findOrderDiscount({
       discountId: obj.discountId,
     });
   },
 
-  total(obj) {
+  async total(obj: OrderPositionDiscount) {
     return {
-      _id: crypto
-        .createHash('sha256')
-        .update([`${obj.item._id}:${obj.discountId}`, obj.amount, obj.currency].join(''))
-        .digest('hex'),
+      _id: await sha256([`${obj.item._id}:${obj.discountId}`, obj.amount, obj.currency].join('')),
       amount: obj.amount,
       currency: obj.currency,
     };

package/src/resolvers/type/order/order-item-types.ts

@@ -1,12 +1,12 @@
-import crypto from 'crypto';
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../../context.js';
 import { DeliveryProvider } from '@unchainedshop/core-delivery';
 import { Order } from '@unchainedshop/core-orders';
 import { OrderPosition, OrderPositionDiscount } from '@unchainedshop/core-orders';
-import { OrderPrice } from '@unchainedshop/core-orders';
 import { Product } from '@unchainedshop/core-products';
 import { Quotation } from '@unchainedshop/core-quotations';
 import { TokenSurrogate, WarehousingProvider } from '@unchainedshop/core-warehousing';
+import { Price, sha256 } from '@unchainedshop/utils';
+import { ProductPricingSheet } from '@unchainedshop/core';
 
 const getPricingSheet = async (orderPosition: OrderPosition, context: Context) => {
   const { modules } = context;
@@ -14,9 +14,11 @@ const getPricingSheet = async (orderPosition: OrderPosition, context: Context) =
   const order = await modules.orders.findOrder({
     orderId: orderPosition.orderId,
   });
-  const pricingSheet = modules.orders.positions.pricingSheet(orderPosition, order.currency, context);
-
-  return pricingSheet;
+  return ProductPricingSheet({
+    calculation: orderPosition.calculation,
+    currency: order.currency,
+    quantity: orderPosition.quantity,
+  });
 };
 
 export const OrderItem = {
@@ -25,11 +27,11 @@ export const OrderItem = {
     _,
     context: Context,
   ): Promise<Array<OrderPositionDiscount>> {
-    const pricingSheet = await getPricingSheet(orderPosition, context);
+    const pricing = await getPricingSheet(orderPosition, context);
 
-    if (pricingSheet.isValid()) {
+    if (pricing.isValid()) {
       // IMPORTANT: Do not send any parameter to obj.discounts!
-      return pricingSheet.discountPrices().map((discount) => ({
+      return pricing.discountPrices().map((discount) => ({
         item: orderPosition,
         ...discount,
       }));
@@ -114,16 +116,13 @@ export const OrderItem = {
     orderPosition: OrderPosition,
     params: { category: string; useNetPrice: boolean },
     context: Context,
-  ): Promise<OrderPrice> {
-    const pricingSheet = await getPricingSheet(orderPosition, context);
+  ): Promise<Price> {
+    const pricing = await getPricingSheet(orderPosition, context);
 
-    if (pricingSheet.isValid()) {
-      const price = pricingSheet.total(params);
+    if (pricing.isValid()) {
+      const price = pricing.total(params);
       return {
-        _id: crypto
-          .createHash('sha256')
-          .update([orderPosition._id, JSON.stringify(params), JSON.stringify(price)].join(''))
-          .digest('hex'),
+        _id: await sha256([orderPosition._id, JSON.stringify(params), JSON.stringify(price)].join('')),
         ...price,
       };
     }
@@ -134,16 +133,13 @@ export const OrderItem = {
     orderPosition: OrderPosition,
     params: { useNetPrice: boolean },
     context: Context,
-  ): Promise<OrderPrice> {
-    const pricingSheet = await getPricingSheet(orderPosition, context);
+  ): Promise<Price> {
+    const pricing = await getPricingSheet(orderPosition, context);
 
-    if (pricingSheet.isValid()) {
-      const price = pricingSheet.unitPrice(params);
+    if (pricing.isValid()) {
+      const price = pricing.unitPrice(params);
       return {
-        _id: crypto
-          .createHash('sha256')
-          .update([`${orderPosition._id}-unit`, price.amount, pricingSheet.currency].join(''))
-          .digest('hex'),
+        _id: await sha256([`${orderPosition._id}-unit`, price.amount, pricing.currency].join('')),
         ...price,
       };
     }

package/src/resolvers/type/order/order-payment-card-types.ts

@@ -1,4 +1,5 @@
-import { Context } from '@unchainedshop/api';
+import { PaymentPricingSheet } from '@unchainedshop/core';
+import { Context } from '../../../context.js';
 import { OrderPayment, OrderPaymentDiscount } from '@unchainedshop/core-orders';
 import { PaymentProvider } from '@unchainedshop/core-payment';
 
@@ -24,10 +25,13 @@ export const OrderPaymentCard: OrderPaymentCardHelperTypes = {
   discounts: async (obj, _, context) => {
     const { modules } = context;
     const order = await modules.orders.findOrder({ orderId: obj.orderId });
-    const pricingSheet = modules.orders.payments.pricingSheet(obj, order.currency, context);
-    if (pricingSheet.isValid()) {
+    const pricing = PaymentPricingSheet({
+      calculation: obj.calculation,
+      currency: order.currency,
+    });
+    if (pricing.isValid()) {
       // IMPORTANT: Do not send any parameter to obj.discounts!
-      return pricingSheet.discountPrices().map((discount) => ({
+      return pricing.discountPrices().map((discount) => ({
         item: obj,
         ...discount,
       }));

package/src/resolvers/type/order/order-payment-discount-types.ts

@@ -1,35 +1,31 @@
-import crypto from 'crypto';
-import { Context } from '@unchainedshop/api';
-import { OrderDiscount } from '@unchainedshop/core-orders';
+import { Context } from '../../../context.js';
 import { OrderPayment } from '@unchainedshop/core-orders';
-import { OrderPrice } from '@unchainedshop/core-orders';
+import { Price, sha256 } from '@unchainedshop/utils';
 
-type HelperType<P, T> = (
-  orderDelivery: OrderPrice & { discountId: string; item: OrderPayment },
-  params: P,
-  context: Context,
-) => T;
+export const OrderPaymentDiscount = {
+  _id: (orderDelivery: Price & { discountId: string; item: OrderPayment }) =>
+    `${orderDelivery.item._id}:${orderDelivery.discountId}`,
 
-export interface OrderPaymentDiscountHelperTypes {
-  _id: HelperType<never, string>;
-  orderDiscount: HelperType<never, Promise<OrderDiscount>>;
-  total: HelperType<never, OrderPrice>;
-}
-
-export const OrderPaymentDiscount: OrderPaymentDiscountHelperTypes = {
-  _id: (obj) => `${obj.item._id}:${obj.discountId}`,
-
-  orderDiscount: (obj, _, { modules }) =>
+  orderDiscount: (
+    orderDelivery: Price & { discountId: string; item: OrderPayment },
+    _,
+    { modules }: Context,
+  ) =>
     modules.orders.discounts.findOrderDiscount({
-      discountId: obj.discountId,
+      discountId: orderDelivery.discountId,
     }),
 
-  total: (obj) => ({
-    _id: crypto
-      .createHash('sha256')
-      .update([`${obj.item._id}-${obj.discountId}`, obj.amount, obj.currency].join(''))
-      .digest('hex'),
-    amount: obj.amount,
-    currency: obj.currency,
-  }),
+  async total(orderDelivery: Price & { discountId: string; item: OrderPayment }) {
+    return {
+      _id: await sha256(
+        [
+          `${orderDelivery.item._id}-${orderDelivery.discountId}`,
+          orderDelivery.amount,
+          orderDelivery.currency,
+        ].join(''),
+      ),
+      amount: orderDelivery.amount,
+      currency: orderDelivery.currency,
+    };
+  },
 };

package/src/resolvers/type/order/order-payment-generic-types.ts

@@ -1,4 +1,5 @@
-import { Context } from '@unchainedshop/api';
+import { PaymentPricingSheet } from '@unchainedshop/core';
+import { Context } from '../../../context.js';
 import { OrderPayment, OrderPaymentDiscount } from '@unchainedshop/core-orders';
 import { PaymentProvider } from '@unchainedshop/core-payment';
 
@@ -24,10 +25,13 @@ export const OrderPaymentGeneric: OrderPaymentGenericHelperTypes = {
   discounts: async (obj, _, context) => {
     const { modules } = context;
     const order = await modules.orders.findOrder({ orderId: obj.orderId });
-    const pricingSheet = modules.orders.payments.pricingSheet(obj, order.currency, context);
-    if (pricingSheet.isValid()) {
+    const pricing = PaymentPricingSheet({
+      calculation: obj.calculation,
+      currency: order.currency,
+    });
+    if (pricing.isValid()) {
       // IMPORTANT: Do not send any parameter to obj.discounts!
-      return pricingSheet.discountPrices().map((discount) => ({
+      return pricing.discountPrices().map((discount) => ({
         item: obj,
         ...discount,
       }));

package/src/resolvers/type/order/order-payment-invoice-types.ts

@@ -1,4 +1,5 @@
-import { Context } from '@unchainedshop/api';
+import { PaymentPricingSheet } from '@unchainedshop/core';
+import { Context } from '../../../context.js';
 import { OrderPayment, OrderPaymentDiscount } from '@unchainedshop/core-orders';
 import { PaymentProvider } from '@unchainedshop/core-payment';
 
@@ -24,10 +25,13 @@ export const OrderPaymentInvoice: OrderPaymentInvoiceHelperTypes = {
   discounts: async (obj, _, context) => {
     const { modules } = context;
     const order = await modules.orders.findOrder({ orderId: obj.orderId });
-    const pricingSheet = modules.orders.payments.pricingSheet(obj, order.currency, context);
-    if (pricingSheet.isValid()) {
+    const pricing = PaymentPricingSheet({
+      calculation: obj.calculation,
+      currency: order.currency,
+    });
+    if (pricing.isValid()) {
       // IMPORTANT: Do not send any parameter to obj.discounts!
-      return pricingSheet.discountPrices().map((discount) => ({
+      return pricing.discountPrices().map((discount) => ({
         item: obj,
         ...discount,
       }));