@unchainedshop/api 3.1.13 → 4.0.0-rc.10

package/lib/resolvers/type/order/order-item-types.js

@@ -1,13 +1,11 @@
 import { ProductPricingSheet } from '@unchainedshop/core';
-const getPricingSheet = async (orderPosition, context) => {
-    const { modules } = context;
-    // TODO: use loader
-    const order = await modules.orders.findOrder({
+const getPricingSheet = async (orderPosition, { loaders }) => {
+    const order = await loaders.orderLoader.load({
         orderId: orderPosition.orderId,
     });
     return ProductPricingSheet({
         calculation: orderPosition.calculation,
-        currency: order.currency,
+        currencyCode: order.currencyCode,
         quantity: orderPosition.quantity,
     });
 };
@@ -25,22 +23,21 @@ export const OrderItem = {
     },
     async dispatches(orderPosition, _, { modules, loaders }) {
         const scheduling = orderPosition.scheduling || [];
-        // TODO: use loader
-        const order = await modules.orders.findOrder({ orderId: orderPosition.orderId });
+        const order = await loaders.orderLoader.load({
+            orderId: orderPosition.orderId,
+        });
         const { countryCode, userId } = order;
-        // TODO: use loader
         const orderDelivery = await modules.orders.deliveries.findDelivery({
             orderDeliveryId: order.deliveryId,
         });
-        // TODO: use loader
-        const deliveryProvider = await modules.delivery.findProvider({
+        const deliveryProvider = await loaders.deliveryProviderLoader.load({
             deliveryProviderId: orderDelivery.deliveryProviderId,
         });
         const product = await loaders.productLoader.load({
             productId: orderPosition.productId,
         });
         return Promise.all(scheduling.map(async (schedule) => {
-            // TODO: use loader
+            // TODO: use warehousing provider loader
             const warehousingProvider = await modules.warehousing.findProvider({
                 warehousingProviderId: schedule.warehousingProviderId,
             });
@@ -49,7 +46,7 @@ export const OrderItem = {
                 deliveryProvider,
                 product,
                 quantity: orderPosition.quantity,
-                country: countryCode,
+                countryCode,
                 userId,
                 // referenceDate,
             };
@@ -59,9 +56,10 @@ export const OrderItem = {
             };
         }));
     },
-    async order(orderPosition, _, { modules }) {
-        // TODO: use loader
-        return modules.orders.findOrder({ orderId: orderPosition.orderId });
+    async order(orderPosition, _, { loaders }) {
+        return loaders.orderLoader.load({
+            orderId: orderPosition.orderId,
+        });
     },
     async originalProduct(orderPosition, _, { loaders }) {
         const product = await loaders.productLoader.load({
@@ -78,7 +76,7 @@ export const OrderItem = {
     async quotation(orderPosition, _, { modules }) {
         if (!orderPosition.quotationId)
             return null;
-        // TODO: use loader
+        // TODO: use quotation loader
         return modules.quotations.findQuotation({ quotationId: orderPosition.quotationId });
     },
     async total(orderPosition, params, context) {
@@ -96,7 +94,6 @@ export const OrderItem = {
         return null;
     },
     async tokens(orderPosition, params, { modules }) {
-        // TODO: use loader?
         return modules.warehousing.findTokens({
             orderPositionId: orderPosition._id,
         });

package/lib/resolvers/type/order/order-item-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"order-item-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-item-types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"order-item-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-item-types.ts"],"names":[],"mappings":"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"}

package/lib/resolvers/type/order/order-payment-card-types.d.ts

@@ -1,12 +1,13 @@
 import { Context } from '../../../context.js';
-import { OrderPayment, OrderPaymentDiscount } from '@unchainedshop/core-orders';
-import { PaymentProvider } from '@unchainedshop/core-payment';
-type HelperType<T> = (orderPayment: OrderPayment, _: never, context: Context) => T;
-export interface OrderPaymentCardHelperTypes {
-    discounts: HelperType<Promise<Array<OrderPaymentDiscount>>>;
-    provider: HelperType<Promise<PaymentProvider>>;
-    status: HelperType<string>;
-}
-export declare const OrderPaymentCard: OrderPaymentCardHelperTypes;
-export {};
+import { OrderPayment } from '@unchainedshop/core-orders';
+export declare const OrderPaymentCard: {
+    status(obj: OrderPayment, _: never, { modules }: Context): import("@unchainedshop/core-orders").OrderPaymentStatus;
+    provider(obj: OrderPayment, _: never, { loaders }: Context): Promise<import("@unchainedshop/core-payment").PaymentProvider>;
+    discounts(obj: OrderPayment, _: never, { loaders }: Context): Promise<{
+        discountId: string;
+        amount: number;
+        currencyCode: string;
+        item: OrderPayment;
+    }[]>;
+};
 //# sourceMappingURL=order-payment-card-types.d.ts.map

package/lib/resolvers/type/order/order-payment-card-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order-payment-card-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-card-types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,KAAK,UAAU,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAEnF,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAC5D,QAAQ,EAAE,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IAC/C,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;CAC5B;AAED,eAAO,MAAM,gBAAgB,EAAE,2BA8B9B,CAAC"}
+{"version":3,"file":"order-payment-card-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-card-types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,eAAO,MAAM,gBAAgB;gBACf,YAAY,KAAK,KAAK,eAAe,OAAO;kBAIpC,YAAY,KAAK,KAAK,eAAe,OAAO;mBAM3C,YAAY,KAAK,KAAK,eAAe,OAAO;;;;;;CAelE,CAAC"}

package/lib/resolvers/type/order/order-payment-card-types.js

@@ -1,21 +1,18 @@
 import { PaymentPricingSheet } from '@unchainedshop/core';
 export const OrderPaymentCard = {
-    status: (obj, _, { modules }) => {
+    status(obj, _, { modules }) {
         return modules.orders.payments.normalizedStatus(obj);
     },
-    provider: async (obj, _, { modules }) => {
-        // TODO: use loader
-        return modules.payment.paymentProviders.findProvider({
+    async provider(obj, _, { loaders }) {
+        return loaders.paymentProviderLoader.load({
             paymentProviderId: obj.paymentProviderId,
         });
     },
-    discounts: async (obj, _, context) => {
-        const { modules } = context;
-        // TODO: use loader
-        const order = await modules.orders.findOrder({ orderId: obj.orderId });
+    async discounts(obj, _, { loaders }) {
+        const order = await loaders.orderLoader.load({ orderId: obj.orderId });
         const pricing = PaymentPricingSheet({
             calculation: obj.calculation,
-            currency: order.currency,
+            currencyCode: order.currencyCode,
         });
         if (pricing.isValid()) {
             // IMPORTANT: Do not send any parameter to obj.discounts!

package/lib/resolvers/type/order/order-payment-card-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"order-payment-card-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-card-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAa1D,MAAM,CAAC,MAAM,gBAAgB,GAAgC;IAC3D,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC9B,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACvD,CAAC;IAED,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACtC,mBAAmB;QACnB,OAAO,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;YACnD,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;SACzC,CAAC,CAAC;IACL,CAAC;IAED,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE;QACnC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAE5B,mBAAmB;QACnB,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,mBAAmB,CAAC;YAClC,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;SACzB,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YACtB,yDAAyD;YACzD,OAAO,OAAO,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBACjD,IAAI,EAAE,GAAG;gBACT,GAAG,QAAQ;aACZ,CAAC,CAAC,CAAC;QACN,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;CACF,CAAC"}
+{"version":3,"file":"order-payment-card-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-card-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAI1D,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,MAAM,CAAC,GAAiB,EAAE,CAAQ,EAAE,EAAE,OAAO,EAAW;QACtD,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAiB,EAAE,CAAQ,EAAE,EAAE,OAAO,EAAW;QAC9D,OAAO,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC;YACxC,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;SACzC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAiB,EAAE,CAAQ,EAAE,EAAE,OAAO,EAAW;QAC/D,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,mBAAmB,CAAC;YAClC,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,YAAY,EAAE,KAAK,CAAC,YAAY;SACjC,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YACtB,yDAAyD;YACzD,OAAO,OAAO,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBACjD,IAAI,EAAE,GAAG;gBACT,GAAG,QAAQ;aACZ,CAAC,CAAC,CAAC;QACN,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;CACF,CAAC"}

package/lib/resolvers/type/order/order-payment-discount-types.d.ts

@@ -15,7 +15,7 @@ export declare const OrderPaymentDiscount: {
         item: OrderPayment;
     }): {
         amount: number;
-        currency: string;
+        currencyCode: string;
     };
 };
 //# sourceMappingURL=order-payment-discount-types.d.ts.map

package/lib/resolvers/type/order/order-payment-discount-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order-payment-discount-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-discount-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAE7C,eAAO,MAAM,oBAAoB;yBACV,KAAK,GAAG;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,YAAY,CAAA;KAAE;mCAItD,KAAK,GAAG;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,YAAY,CAAA;KAAE,uBAEpD,OAAO;yBAOD,KAAK,GAAG;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,YAAY,CAAA;KAAE;;;;CAMxE,CAAC"}
+{"version":3,"file":"order-payment-discount-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-discount-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAE7C,eAAO,MAAM,oBAAoB;yBACV,KAAK,GAAG;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,YAAY,CAAA;KAAE;mCAItD,KAAK,GAAG;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,YAAY,CAAA;KAAE,uBAEpD,OAAO;yBAMD,KAAK,GAAG;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,YAAY,CAAA;KAAE;;;;CAMxE,CAAC"}

package/lib/resolvers/type/order/order-payment-discount-types.js

@@ -1,14 +1,12 @@
 export const OrderPaymentDiscount = {
     _id: (orderDelivery) => `${orderDelivery.item._id}:${orderDelivery.discountId}`,
-    orderDiscount: (orderDelivery, _, { modules }) => 
-    // TODO: use loader
-    modules.orders.discounts.findOrderDiscount({
+    orderDiscount: (orderDelivery, _, { modules }) => modules.orders.discounts.findOrderDiscount({
         discountId: orderDelivery.discountId,
     }),
     total(orderDelivery) {
         return {
             amount: orderDelivery.amount,
-            currency: orderDelivery.currency,
+            currencyCode: orderDelivery.currencyCode,
         };
     },
 };

package/lib/resolvers/type/order/order-payment-discount-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"order-payment-discount-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-discount-types.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,GAAG,EAAE,CAAC,aAAiE,EAAE,EAAE,CACzE,GAAG,aAAa,CAAC,IAAI,CAAC,GAAG,IAAI,aAAa,CAAC,UAAU,EAAE;IAEzD,aAAa,EAAE,CACb,aAAiE,EACjE,CAAC,EACD,EAAE,OAAO,EAAW,EACpB,EAAE;IACF,mBAAmB;IACnB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC;QACzC,UAAU,EAAE,aAAa,CAAC,UAAU;KACrC,CAAC;IAEJ,KAAK,CAAC,aAAiE;QACrE,OAAO;YACL,MAAM,EAAE,aAAa,CAAC,MAAM;YAC5B,QAAQ,EAAE,aAAa,CAAC,QAAQ;SACjC,CAAC;IACJ,CAAC;CACF,CAAC"}
+{"version":3,"file":"order-payment-discount-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-discount-types.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,GAAG,EAAE,CAAC,aAAiE,EAAE,EAAE,CACzE,GAAG,aAAa,CAAC,IAAI,CAAC,GAAG,IAAI,aAAa,CAAC,UAAU,EAAE;IAEzD,aAAa,EAAE,CACb,aAAiE,EACjE,CAAC,EACD,EAAE,OAAO,EAAW,EACpB,EAAE,CACF,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC;QACzC,UAAU,EAAE,aAAa,CAAC,UAAU;KACrC,CAAC;IAEJ,KAAK,CAAC,aAAiE;QACrE,OAAO;YACL,MAAM,EAAE,aAAa,CAAC,MAAM;YAC5B,YAAY,EAAE,aAAa,CAAC,YAAY;SACzC,CAAC;IACJ,CAAC;CACF,CAAC"}

package/lib/resolvers/type/order/order-payment-generic-types.d.ts

@@ -1,12 +1,13 @@
+import { OrderPayment } from '@unchainedshop/core-orders';
 import { Context } from '../../../context.js';
-import { OrderPayment, OrderPaymentDiscount } from '@unchainedshop/core-orders';
-import { PaymentProvider } from '@unchainedshop/core-payment';
-type HelperType<P, T> = (orderPayment: OrderPayment, params: P, context: Context) => T;
-export interface OrderPaymentGenericHelperTypes {
-    discounts: HelperType<never, Promise<Array<OrderPaymentDiscount>>>;
-    provider: HelperType<never, Promise<PaymentProvider>>;
-    status: HelperType<never, string>;
-}
-export declare const OrderPaymentGeneric: OrderPaymentGenericHelperTypes;
-export {};
+export declare const OrderPaymentGeneric: {
+    status(obj: OrderPayment, _: never, { modules }: Context): import("@unchainedshop/core-orders").OrderPaymentStatus;
+    provider(obj: OrderPayment, _: never, { loaders }: Context): Promise<import("@unchainedshop/core-payment").PaymentProvider>;
+    discounts(obj: OrderPayment, _: never, { loaders }: Context): Promise<{
+        discountId: string;
+        amount: number;
+        currencyCode: string;
+        item: OrderPayment;
+    }[]>;
+};
 //# sourceMappingURL=order-payment-generic-types.d.ts.map

package/lib/resolvers/type/order/order-payment-generic-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order-payment-generic-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-generic-types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAEvF,MAAM,WAAW,8BAA8B;IAC7C,SAAS,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;IACnE,QAAQ,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IACtD,MAAM,EAAE,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CACnC;AAED,eAAO,MAAM,mBAAmB,EAAE,8BA6BjC,CAAC"}
+{"version":3,"file":"order-payment-generic-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-generic-types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,eAAO,MAAM,mBAAmB;gBAClB,YAAY,KAAK,KAAK,eAAe,OAAO;kBAIpC,YAAY,KAAK,KAAK,eAAe,OAAO;mBAM3C,YAAY,KAAK,KAAK,eAAe,OAAO;;;;;;CAelE,CAAC"}

package/lib/resolvers/type/order/order-payment-generic-types.js

@@ -1,21 +1,18 @@
 import { PaymentPricingSheet } from '@unchainedshop/core';
 export const OrderPaymentGeneric = {
-    status: (obj, _, { modules }) => {
+    status(obj, _, { modules }) {
         return modules.orders.payments.normalizedStatus(obj);
     },
-    provider: async (obj, _, { modules }) => {
-        // TODO: use loader
-        return modules.payment.paymentProviders.findProvider({
+    async provider(obj, _, { loaders }) {
+        return loaders.paymentProviderLoader.load({
             paymentProviderId: obj.paymentProviderId,
         });
     },
-    discounts: async (obj, _, context) => {
-        const { modules } = context;
-        // TODO: use loader
-        const order = await modules.orders.findOrder({ orderId: obj.orderId });
+    async discounts(obj, _, { loaders }) {
+        const order = await loaders.orderLoader.load({ orderId: obj.orderId });
         const pricing = PaymentPricingSheet({
             calculation: obj.calculation,
-            currency: order.currency,
+            currencyCode: order.currencyCode,
         });
         if (pricing.isValid()) {
             // IMPORTANT: Do not send any parameter to obj.discounts!

package/lib/resolvers/type/order/order-payment-generic-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"order-payment-generic-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-generic-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAa1D,MAAM,CAAC,MAAM,mBAAmB,GAAmC;IACjE,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC9B,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACvD,CAAC;IAED,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACtC,mBAAmB;QACnB,OAAO,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;YACnD,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;SACzC,CAAC,CAAC;IACL,CAAC;IAED,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE;QACnC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAC5B,mBAAmB;QACnB,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,mBAAmB,CAAC;YAClC,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;SACzB,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YACtB,yDAAyD;YACzD,OAAO,OAAO,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBACjD,IAAI,EAAE,GAAG;gBACT,GAAG,QAAQ;aACZ,CAAC,CAAC,CAAC;QACN,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;CACF,CAAC"}
+{"version":3,"file":"order-payment-generic-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-generic-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAI1D,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,MAAM,CAAC,GAAiB,EAAE,CAAQ,EAAE,EAAE,OAAO,EAAW;QACtD,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAiB,EAAE,CAAQ,EAAE,EAAE,OAAO,EAAW;QAC9D,OAAO,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC;YACxC,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;SACzC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAiB,EAAE,CAAQ,EAAE,EAAE,OAAO,EAAW;QAC/D,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,mBAAmB,CAAC;YAClC,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,YAAY,EAAE,KAAK,CAAC,YAAY;SACjC,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YACtB,yDAAyD;YACzD,OAAO,OAAO,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBACjD,IAAI,EAAE,GAAG;gBACT,GAAG,QAAQ;aACZ,CAAC,CAAC,CAAC;QACN,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;CACF,CAAC"}

package/lib/resolvers/type/order/order-payment-invoice-types.d.ts

@@ -1,12 +1,13 @@
+import { OrderPayment } from '@unchainedshop/core-orders';
 import { Context } from '../../../context.js';
-import { OrderPayment, OrderPaymentDiscount } from '@unchainedshop/core-orders';
-import { PaymentProvider } from '@unchainedshop/core-payment';
-type HelperType<T> = (orderPayment: OrderPayment, _: never, context: Context) => T;
-export interface OrderPaymentInvoiceHelperTypes {
-    discounts: HelperType<Promise<Array<OrderPaymentDiscount>>>;
-    provider: HelperType<Promise<PaymentProvider>>;
-    status: HelperType<string>;
-}
-export declare const OrderPaymentInvoice: OrderPaymentInvoiceHelperTypes;
-export {};
+export declare const OrderPaymentInvoice: {
+    status(obj: OrderPayment, _: never, { modules }: Context): import("@unchainedshop/core-orders").OrderPaymentStatus;
+    provider(obj: OrderPayment, _: never, { loaders }: Context): Promise<import("@unchainedshop/core-payment").PaymentProvider>;
+    discounts(obj: OrderPayment, _: never, { loaders }: Context): Promise<{
+        discountId: string;
+        amount: number;
+        currencyCode: string;
+        item: OrderPayment;
+    }[]>;
+};
 //# sourceMappingURL=order-payment-invoice-types.d.ts.map

package/lib/resolvers/type/order/order-payment-invoice-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order-payment-invoice-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-invoice-types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,KAAK,UAAU,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAEnF,MAAM,WAAW,8BAA8B;IAC7C,SAAS,EAAE,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAC5D,QAAQ,EAAE,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IAC/C,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;CAC5B;AAED,eAAO,MAAM,mBAAmB,EAAE,8BA6BjC,CAAC"}
+{"version":3,"file":"order-payment-invoice-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-invoice-types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,eAAO,MAAM,mBAAmB;gBAClB,YAAY,KAAK,KAAK,eAAe,OAAO;kBAIpC,YAAY,KAAK,KAAK,eAAe,OAAO;mBAM3C,YAAY,KAAK,KAAK,eAAe,OAAO;;;;;;CAelE,CAAC"}

package/lib/resolvers/type/order/order-payment-invoice-types.js

@@ -1,21 +1,18 @@
 import { PaymentPricingSheet } from '@unchainedshop/core';
 export const OrderPaymentInvoice = {
-    status: (obj, _, { modules }) => {
+    status(obj, _, { modules }) {
         return modules.orders.payments.normalizedStatus(obj);
     },
-    provider: async (obj, _, { modules }) => {
-        // TODO: use loader
-        return modules.payment.paymentProviders.findProvider({
+    async provider(obj, _, { loaders }) {
+        return loaders.paymentProviderLoader.load({
             paymentProviderId: obj.paymentProviderId,
         });
     },
-    discounts: async (obj, _, context) => {
-        const { modules } = context;
-        // TODO: use loader
-        const order = await modules.orders.findOrder({ orderId: obj.orderId });
+    async discounts(obj, _, { loaders }) {
+        const order = await loaders.orderLoader.load({ orderId: obj.orderId });
         const pricing = PaymentPricingSheet({
             calculation: obj.calculation,
-            currency: order.currency,
+            currencyCode: order.currencyCode,
         });
         if (pricing.isValid()) {
             // IMPORTANT: Do not send any parameter to obj.discounts!

package/lib/resolvers/type/order/order-payment-invoice-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"order-payment-invoice-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-invoice-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAa1D,MAAM,CAAC,MAAM,mBAAmB,GAAmC;IACjE,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC9B,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACvD,CAAC;IAED,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACtC,mBAAmB;QACnB,OAAO,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;YACnD,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;SACzC,CAAC,CAAC;IACL,CAAC;IAED,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE;QACnC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAC5B,mBAAmB;QACnB,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,mBAAmB,CAAC;YAClC,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;SACzB,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YACtB,yDAAyD;YACzD,OAAO,OAAO,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBACjD,IAAI,EAAE,GAAG;gBACT,GAAG,QAAQ;aACZ,CAAC,CAAC,CAAC;QACN,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;CACF,CAAC"}
+{"version":3,"file":"order-payment-invoice-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-invoice-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAI1D,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,MAAM,CAAC,GAAiB,EAAE,CAAQ,EAAE,EAAE,OAAO,EAAW;QACtD,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAiB,EAAE,CAAQ,EAAE,EAAE,OAAO,EAAW;QAC9D,OAAO,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC;YACxC,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;SACzC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAiB,EAAE,CAAQ,EAAE,EAAE,OAAO,EAAW;QAC/D,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,mBAAmB,CAAC;YAClC,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,YAAY,EAAE,KAAK,CAAC,YAAY;SACjC,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YACtB,yDAAyD;YACzD,OAAO,OAAO,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBACjD,IAAI,EAAE,GAAG;gBACT,GAAG,QAAQ;aACZ,CAAC,CAAC,CAAC;QACN,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;CACF,CAAC"}

package/lib/resolvers/type/order/order-payment-types.d.ts

@@ -1,6 +1,6 @@
 import { Context } from '../../../context.js';
 import { OrderPayment as OrderPaymentType } from '@unchainedshop/core-orders';
 export declare const OrderPayment: {
-    __resolveType: (obj: OrderPaymentType, { modules }: Context) => Promise<string>;
+    __resolveType: (obj: OrderPaymentType, { loaders }: Context) => Promise<string>;
 };
 //# sourceMappingURL=order-payment-types.d.ts.map

package/lib/resolvers/type/order/order-payment-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order-payment-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,YAAY,IAAI,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAU9E,eAAO,MAAM,YAAY;yBACI,gBAAgB,eAAe,OAAO;CAYlE,CAAC"}
+{"version":3,"file":"order-payment-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,YAAY,IAAI,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAU9E,eAAO,MAAM,YAAY;yBACI,gBAAgB,eAAe,OAAO;CAWlE,CAAC"}

package/lib/resolvers/type/order/order-payment-types.js

@@ -6,9 +6,8 @@ const OrderPaymentMap = {
     OrderPaymentInvoice: PaymentProviderType.INVOICE,
 };
 export const OrderPayment = {
-    __resolveType: async (obj, { modules }) => {
-        // TODO: use loader
-        const provider = await modules.payment.paymentProviders.findProvider({
+    __resolveType: async (obj, { loaders }) => {
+        const provider = await loaders.paymentProviderLoader.load({
             paymentProviderId: obj.paymentProviderId,
         });
         const invertedProductTypes = objectInvert(OrderPaymentMap);

package/lib/resolvers/type/order/order-payment-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"order-payment-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-types.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,MAAM,eAAe,GAAG;IACtB,mBAAmB,EAAE,mBAAmB,CAAC,OAAO;IAChD,gBAAgB,EAAE,mBAAmB,CAAC,IAAI;IAC1C,mBAAmB,EAAE,mBAAmB,CAAC,OAAO;CACjD,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,aAAa,EAAE,KAAK,EAAE,GAAqB,EAAE,EAAE,OAAO,EAAW,EAAE,EAAE;QACnE,mBAAmB;QACnB,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;YACnE,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;SACzC,CAAC,CAAC;QAEH,MAAM,oBAAoB,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;QAC3D,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO,oBAAoB,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC3D,CAAC;CACF,CAAC"}
+{"version":3,"file":"order-payment-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-payment-types.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,MAAM,eAAe,GAAG;IACtB,mBAAmB,EAAE,mBAAmB,CAAC,OAAO;IAChD,gBAAgB,EAAE,mBAAmB,CAAC,IAAI;IAC1C,mBAAmB,EAAE,mBAAmB,CAAC,OAAO;CACjD,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,aAAa,EAAE,KAAK,EAAE,GAAqB,EAAE,EAAE,OAAO,EAAW,EAAE,EAAE;QACnE,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC;YACxD,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;SACzC,CAAC,CAAC;QAEH,MAAM,oBAAoB,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;QAC3D,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO,oBAAoB,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC3D,CAAC;CACF,CAAC"}

package/lib/resolvers/type/order/order-types.d.ts

@@ -7,20 +7,20 @@ import { Order as OrderType, OrderPosition, OrderPayment, OrderDiscount, OrderDe
 import { User } from '@unchainedshop/core-users';
 import { Price } from '@unchainedshop/utils';
 export declare const Order: {
-    supportedDeliveryProviders(order: OrderType, _: any, context: Context): Promise<Array<DeliveryProvider>>;
+    supportedDeliveryProviders(order: OrderType, _: any, context: Context): Promise<DeliveryProvider[]>;
     supportedPaymentProviders(order: OrderType, _: any, context: Context): Promise<import("@unchainedshop/core-payment").PaymentProvider[]>;
-    currency(order: OrderType, _: any, { modules }: Context): Promise<Currency>;
-    country(order: OrderType, _: any, { modules }: Context): Promise<Country>;
-    discounts(order: OrderType, _: any, { modules }: Context): Promise<Array<OrderDiscount>>;
+    currency(order: OrderType, _: any, { loaders }: Context): Promise<Currency>;
+    country(order: OrderType, _: any, { loaders }: Context): Promise<Country>;
+    discounts(order: OrderType, _: any, { modules }: Context): Promise<OrderDiscount[]>;
     delivery(order: OrderType, _: any, { modules }: Context): Promise<OrderDelivery>;
     enrollment(order: OrderType, _: any, { modules }: Context): Promise<Enrollment>;
-    items(order: OrderType, _: any, { modules }: Context): Promise<Array<OrderPosition>>;
+    items(order: OrderType, _: any, { modules }: Context): Promise<OrderPosition[]>;
     payment(order: OrderType, _: any, { modules }: Context): Promise<OrderPayment>;
     status(order: OrderType): string;
     total(order: OrderType, params: {
         category: string;
         useNetPrice: boolean;
     }): Price;
-    user(order: OrderType, _: any, { modules }: Context): Promise<User>;
+    user(order: OrderType, _: any, { loaders }: Context): Promise<User>;
 };
 //# sourceMappingURL=order-types.d.ts.map

package/lib/resolvers/type/order/order-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EACL,KAAK,IAAI,SAAS,EAClB,aAAa,EACb,YAAY,EACZ,aAAa,EACb,aAAa,EACd,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAG7C,eAAO,MAAM,KAAK;sCAEP,SAAS,mBAEP,OAAO,GACf,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;qCAMI,SAAS,mBAAc,OAAO;oBAM/C,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;mBAKvD,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;qBAKnD,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;oBAKnE,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;sBAOzD,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;iBAO7D,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;mBAOhE,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC;kBAOjE,SAAS,GAAG,MAAM;iBAOnB,SAAS,UAAU;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE,GAAG,KAAK;gBAYhE,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAIrE,CAAC"}
+{"version":3,"file":"order-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EACL,KAAK,IAAI,SAAS,EAClB,aAAa,EACb,YAAY,EACZ,aAAa,EACb,aAAa,EACd,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAG7C,eAAO,MAAM,KAAK;sCACwB,SAAS,mBAAc,OAAO,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;qCAM7D,SAAS,mBAAc,OAAO;oBAM/C,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;mBAIvD,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;qBAInD,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;oBAI9D,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;sBAMzD,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;iBAM7D,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;mBAM3D,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC;kBAMjE,SAAS,GAAG,MAAM;iBAOnB,SAAS,UAAU;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE,GAAG,KAAK;gBAYhE,SAAS,uBAAkB,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAGrE,CAAC"}

package/lib/resolvers/type/order/order-types.js

@@ -10,38 +10,31 @@ export const Order = {
             order,
         });
     },
-    async currency(order, _, { modules }) {
-        // TODO: use loader
-        return modules.currencies.findCurrency({ isoCode: order.currency });
+    async currency(order, _, { loaders }) {
+        return loaders.currencyLoader.load({ isoCode: order.currencyCode });
     },
-    async country(order, _, { modules }) {
-        // TODO: use loader
-        return modules.countries.findCountry({ isoCode: order.countryCode });
+    async country(order, _, { loaders }) {
+        return loaders.countryLoader.load({ isoCode: order.countryCode });
     },
     async discounts(order, _, { modules }) {
-        // TODO: use loader?
         return modules.orders.discounts.findOrderDiscounts({ orderId: order._id });
     },
     async delivery(order, _, { modules }) {
-        // TODO: use loader
         return modules.orders.deliveries.findDelivery({
             orderDeliveryId: order.deliveryId,
         });
     },
     async enrollment(order, _, { modules }) {
-        // TODO: use loader
         return modules.enrollments.findEnrollment({
             orderId: order._id,
         });
     },
     async items(order, _, { modules }) {
-        // TODO: use loader?
         return modules.orders.positions.findOrderPositions({
             orderId: order._id,
         });
     },
     async payment(order, _, { modules }) {
-        // TODO: use loader
         return modules.orders.payments.findOrderPayment({
             orderPaymentId: order.paymentId,
         });
@@ -55,16 +48,15 @@ export const Order = {
     total(order, params) {
         const pricing = OrderPricingSheet({
             calculation: order.calculation,
-            currency: order.currency,
+            currencyCode: order.currencyCode,
         });
         if (pricing.isValid()) {
             return pricing.total(params);
         }
         return null;
     },
-    async user(order, _, { modules }) {
-        // TODO: use loader
-        return modules.users.findUserById(order.userId);
+    async user(order, _, { loaders }) {
+        return loaders.userLoader.load({ userId: order.userId });
     },
 };
 //# sourceMappingURL=order-types.js.map

package/lib/resolvers/type/order/order-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"order-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"order-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-types.ts"],"names":[],"mappings":"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"}

package/lib/resolvers/type/payment/payment-credentials-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"payment-credentials-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/payment/payment-credentials-types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EACL,kBAAkB,IAAI,sBAAsB,EAC5C,eAAe,EAChB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAEjD,MAAM,MAAM,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAsB,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAEvG,MAAM,WAAW,6BAA6B;IAC5C,IAAI,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACvC,eAAe,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IAC7D,OAAO,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;CAC9C;AACD,eAAO,MAAM,kBAAkB,EAAE,6BA2BhC,CAAC"}
+{"version":3,"file":"payment-credentials-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/payment/payment-credentials-types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EACL,kBAAkB,IAAI,sBAAsB,EAC5C,eAAe,EAChB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAEjD,MAAM,MAAM,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAsB,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAEvG,MAAM,WAAW,6BAA6B;IAC5C,IAAI,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACvC,eAAe,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IAC7D,OAAO,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;CAC9C;AACD,eAAO,MAAM,kBAAkB,EAAE,6BAuBhC,CAAC"}

package/lib/resolvers/type/payment/payment-credentials-types.js

@@ -1,19 +1,16 @@
 import { PaymentDirector } from '@unchainedshop/core';
 export const PaymentCredentials = {
-    async user(obj, _, { modules }) {
-        // TODO: use loader
-        return modules.users.findUserById(obj.userId);
+    async user(obj, _, { loaders }) {
+        return loaders.userLoader.load({ userId: obj.userId });
     },
-    async paymentProvider(obj, _, { modules }) {
-        // TODO: use loader
-        return modules.payment.paymentProviders.findProvider({
+    async paymentProvider(obj, _, { loaders }) {
+        return loaders.paymentProviderLoader.load({
             paymentProviderId: obj.paymentProviderId,
         });
     },
     async isValid(obj, _, requestContext) {
-        const { modules, userId } = requestContext;
-        // TODO: use loader
-        const paymentProvider = await modules.payment.paymentProviders.findProvider({
+        const { loaders, userId } = requestContext;
+        const paymentProvider = await loaders.paymentProviderLoader.load({
             paymentProviderId: obj.paymentProviderId,
         });
         const actions = await PaymentDirector.actions(paymentProvider, { userId, token: obj }, requestContext);

package/lib/resolvers/type/payment/payment-credentials-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"payment-credentials-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/payment/payment-credentials-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAetD,MAAM,CAAC,MAAM,kBAAkB,GAAkC;IAC/D,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE;QAC5B,mBAAmB;QACnB,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE;QACvC,mBAAmB;QACnB,OAAO,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;YACnD,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;SACzC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,cAAc;QAClC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC;QAE3C,mBAAmB;QACnB,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;YAC1E,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;SACzC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,OAAO,CAC3C,eAAe,EACf,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,EACtB,cAAc,CACf,CAAC;QACF,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;IAC5B,CAAC;CACF,CAAC"}
+{"version":3,"file":"payment-credentials-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/payment/payment-credentials-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAetD,MAAM,CAAC,MAAM,kBAAkB,GAAkC;IAC/D,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE;QAC5B,OAAO,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE;QACvC,OAAO,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC;YACxC,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;SACzC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,cAAc;QAClC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC;QAC3C,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC;YAC/D,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;SACzC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,OAAO,CAC3C,eAAe,EACf,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,EACtB,cAAc,CACf,CAAC;QACF,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;IAC5B,CAAC;CACF,CAAC"}

package/lib/resolvers/type/payment/payment-provider-types.d.ts

@@ -8,8 +8,8 @@ export declare const PaymentProvider: {
     };
     configurationError(paymentProvider: PaymentProviderType, _: any, requestContext: Context): Promise<import("@unchainedshop/core").PaymentError>;
     isActive(paymentProvider: PaymentProviderType, _: any, requestContext: Context): Promise<boolean>;
-    simulatedPrice(paymentProvider: PaymentProviderType, { currency: currencyCode, orderId, useNetPrice, context: providerContext }: {
-        currency: any;
+    simulatedPrice(paymentProvider: PaymentProviderType, { currencyCode: forcedCurrencyCode, orderId, useNetPrice, context: providerContext }: {
+        currencyCode: any;
         orderId: any;
         useNetPrice: any;
         context: any;

package/lib/resolvers/type/payment/payment-provider-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"payment-provider-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/payment/payment-provider-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAGrF,eAAO,MAAM,eAAe;wBACN,mBAAmB;;;;;wCAUG,mBAAmB,0BAAqB,OAAO;8BAKzD,mBAAmB,0BAAqB,OAAO;oCAM5D,mBAAmB;;;;;uBAEpB,OAAO;;;;;;;CAmC1B,CAAC"}
+{"version":3,"file":"payment-provider-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/payment/payment-provider-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAGrF,eAAO,MAAM,eAAe;wBACN,mBAAmB;;;;;wCAUG,mBAAmB,0BAAqB,OAAO;8BAKzD,mBAAmB,0BAAqB,OAAO;oCAM5D,mBAAmB;;;;;uBAEpB,OAAO;;;;;;;CAkC1B,CAAC"}

package/lib/resolvers/type/payment/payment-provider-types.js

@@ -18,14 +18,13 @@ export const PaymentProvider = {
         const adapter = await PaymentDirector.actions(paymentProvider, {}, requestContext);
         return adapter.isActive();
     },
-    async simulatedPrice(paymentProvider, { currency: currencyCode, orderId, useNetPrice, context: providerContext }, requestContext) {
-        const { modules, countryContext: country, user } = requestContext;
-        // TODO: use loader
-        const order = await modules.orders.findOrder({ orderId });
-        const currency = currencyCode || order?.currency || requestContext.currencyContext;
+    async simulatedPrice(paymentProvider, { currencyCode: forcedCurrencyCode, orderId, useNetPrice, context: providerContext }, requestContext) {
+        const { loaders, countryCode, user } = requestContext;
+        const order = await loaders.orderLoader.load({ orderId });
+        const currencyCode = forcedCurrencyCode || order?.currencyCode || requestContext.currencyCode;
         const pricingContext = {
-            country,
-            currency,
+            countryCode,
+            currencyCode,
             provider: paymentProvider,
             order,
             providerContext,
@@ -38,8 +37,8 @@ export const PaymentProvider = {
         const orderPrice = pricing.total({ useNetPrice });
         return {
             amount: orderPrice.amount,
-            currencyCode: orderPrice.currency,
-            countryCode: country,
+            currencyCode: orderPrice.currencyCode,
+            countryCode,
             isTaxable: pricing.taxSum() > 0,
             isNetPrice: useNetPrice,
         };