@unchainedshop/api 2.12.2 → 3.0.0-alpha2

package/src/resolvers/mutations/index.ts

@@ -2,20 +2,13 @@ import { actions } from '../../roles/index.js';
 import { checkResolver as acl } from '../../acl.js';
 import loginWithPassword from './accounts/loginWithPassword.js';
 import loginWithWebAuthn from './accounts/loginWithWebAuthn.js';
-import impersonate from './accounts/impersonate.js';
-import stopImpersonation from './accounts/stopImpersonation.js';
 import loginAsGuest from './accounts/loginAsGuest.js';
 import logout from './accounts/logout.js';
-import logoutAllSessions from './accounts/logoutAllSessions.js';
-import buildSecretTOTPAuthURL from './accounts/buildSecretTOTPAuthURL.js';
-import enableTOTP from './accounts/enableTOTP.js';
-import disableTOTP from './accounts/disableTOTP.js';
 import changePassword from './accounts/changePassword.js';
 import createUser from './accounts/createUser.js';
 import verifyEmail from './accounts/verifyEmail.js';
 import sendVerificationEmail from './accounts/sendVerificationEmail.js';
 import sendEnrollmentEmail from './accounts/sendEnrollmentEmail.js';
-import addAssortmentMedia from './assortments/addAssortmentMedia.js';
 import forgotPassword from './accounts/forgotPassword.js';
 import resetPassword from './accounts/resetPassword.js';
 import addEmail from './accounts/addEmail.js';
@@ -27,7 +20,6 @@ import removeWebAuthnCredentials from './accounts/removeWebAuthnCredentials.js';
 import addWeb3Address from './accounts/addWeb3Address.js';
 import removeWeb3Address from './accounts/removeWeb3Address.js';
 import verifyWeb3Address from './accounts/verifyWeb3Address.js';
-import updateUserAvatar from './users/updateUserAvatar.js';
 import updateUserProfile from './users/updateUserProfile.js';
 import removeUser from './users/removeUser.js';
 import setUserTags from './users/setUserTags.js';
@@ -56,7 +48,6 @@ import removeProductVariation from './products/removeProductVariation.js';
 import updateProductVariationTexts from './products/updateProductVariationTexts.js';
 import removeProductVariationOption from './products/removeProductVariationOption.js';
 import confirmMediaUpload from './files/confirmMediaUpload.js';
-import addProductMedia from './products/addProductMedia.js';
 import removeProductMedia from './products/removeProductMedia.js';
 import reorderProductMedia from './products/reorderProductMedia.js';
 import updateProductCommerce from './products/updateProductCommerce.js';
@@ -159,13 +150,9 @@ import prepareUserAvatarUpload from './users/prepareUserAvatarUpload.js';
 import rejectOrder from './orders/rejectOrder.js';
 import removePushSubscription from './users/removePushSubscription.js';
 import addPushSubscription from './users/addPushSubscription.js';
-import loginWithOAuth from './accounts/loginWithOAuth.js';
-import linkOAuthAccount from './accounts/linkOAuthAccount.js';
-import unlinkOAuthAccount from './accounts/unlinkOAuthAccount.js';
 
 export default {
   logout: acl(actions.logout)(logout),
-  logoutAllSessions: acl(actions.logoutAllSessions)(logoutAllSessions),
   loginAsGuest: acl(actions.loginAsGuest)(loginAsGuest),
   createWebAuthnCredentialCreationOptions: acl(actions.useWebAuthn)(
     createWebAuthnCredentialCreationOptions,
@@ -180,17 +167,9 @@ export default {
   addWeb3Address: acl(actions.updateUser)(addWeb3Address),
   removeWeb3Address: acl(actions.updateUser)(removeWeb3Address),
   verifyWeb3Address: acl(actions.updateUser)(verifyWeb3Address),
-  linkOAuthAccount: acl(actions.updateUser)(linkOAuthAccount),
-  unlinkOAuthAccount: acl(actions.updateUser)(unlinkOAuthAccount),
   verifyEmail: acl(actions.verifyEmail)(verifyEmail),
   loginWithPassword: acl(actions.loginWithPassword)(loginWithPassword),
   loginWithWebAuthn: acl(actions.loginWithWebAuthn)(loginWithWebAuthn),
-  loginWithOAuth: acl(actions.loginWithOAuth)(loginWithOAuth),
-  impersonate: acl(actions.impersonate)(impersonate),
-  stopImpersonation: acl(actions.stopImpersonation)(stopImpersonation),
-  buildSecretTOTPAuthURL: acl(actions.authTwoFactor)(buildSecretTOTPAuthURL),
-  enableTOTP: acl(actions.authTwoFactor)(enableTOTP),
-  disableTOTP: acl(actions.manageTwoFactor)(disableTOTP),
   pageView: acl(actions.pageView)(pageView),
   createUser: acl(actions.createUser)(createUser),
   forgotPassword: acl(actions.forgotPassword)(forgotPassword),
@@ -201,7 +180,6 @@ export default {
   heartbeat: acl(actions.heartbeat)(heartbeat),
   addEmail: acl(actions.updateUser)(addEmail),
   removeEmail: acl(actions.updateUser)(removeEmail),
-  updateUserAvatar: acl(actions.updateUser)(updateUserAvatar),
   prepareUserAvatarUpload: acl(actions.updateUser)(prepareUserAvatarUpload),
   updateUserProfile: acl(actions.updateUser)(updateUserProfile),
   removeUser: acl(actions.updateUser)(removeUser),
@@ -228,7 +206,6 @@ export default {
   updateProduct: acl(actions.manageProducts)(updateProduct),
   updateProductTexts: acl(actions.manageProducts)(updateProductTexts),
   updateProductMediaTexts: acl(actions.manageProducts)(updateProductMediaTexts),
-  addProductMedia: acl(actions.manageProducts)(addProductMedia),
   confirmMediaUpload: acl(actions.confirmMediaUpload)(confirmMediaUpload),
   prepareProductMediaUpload: acl(actions.manageProducts)(prepareProductMediaUpload),
   reorderProductMedia: acl(actions.manageProducts)(reorderProductMedia),
@@ -295,7 +272,6 @@ export default {
   removeFilterOption: acl(actions.manageFilters)(removeFilterOption),
   createFilterOption: acl(actions.manageFilters)(createFilterOption),
   createAssortment: acl(actions.manageAssortments)(createAssortment),
-  addAssortmentMedia: acl(actions.manageAssortments)(addAssortmentMedia),
   prepareAssortmentMediaUpload: acl(actions.manageAssortments)(prepareAssortmentMediaUpload),
   updateAssortment: acl(actions.manageAssortments)(updateAssortment),
   setBaseAssortment: acl(actions.manageAssortments)(setBaseAssortment),

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

@@ -16,5 +16,7 @@ export default async function addCartDiscount(
 
   if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
 
-  return modules.orders.discounts.createManualOrderDiscount({ order, code }, context);
+  const discount = await modules.orders.discounts.createManualOrderDiscount({ order, code }, context);
+  await modules.orders.updateCalculation(order._id, context);
+  return discount;
 }

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

@@ -39,6 +39,6 @@ export default async function addCartProduct(
     { order, product },
     context,
   );
-
+  await modules.orders.updateCalculation(order._id, context);
   return orderPosition;
 }

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

@@ -58,7 +58,7 @@ export default async function addCartQuotation(
     context,
   );
 
-  return modules.orders.positions.addProductItem(
+  const updatedOrderPosition = await modules.orders.positions.addProductItem(
     {
       quantity: quotationConfiguration.quantity,
       configuration: quotationConfiguration.configuration,
@@ -67,4 +67,6 @@ export default async function addCartQuotation(
     { order, product },
     context,
   );
+  await modules.orders.updateCalculation(order._id, context);
+  return updatedOrderPosition;
 }

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

@@ -45,25 +45,29 @@ export default async function addMultipleCartProducts(
   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)
-  return itemsWithProducts.reduce(async (positionsPromise, { product, quantity, configuration }) => {
-    const positions = await positionsPromise;
-    if (quantity < 1)
-      throw new OrderQuantityTooLowError({
-        quantity,
-        productId: product._id,
-      });
+  const updatedOrderPositions = await itemsWithProducts.reduce(
+    async (positionsPromise, { product, quantity, configuration }) => {
+      const positions = await positionsPromise;
+      if (quantity < 1)
+        throw new OrderQuantityTooLowError({
+          quantity,
+          productId: product._id,
+        });
 
-    const position = await modules.orders.positions.addProductItem(
-      {
-        quantity,
-        configuration,
-      },
-      { order, product },
-      context,
-    );
-
-    positions.push(position);
+      const position = await modules.orders.positions.addProductItem(
+        {
+          quantity,
+          configuration,
+        },
+        { order, product },
+        context,
+      );
+      positions.push(position);
+      return positions;
+    },
+    Promise.resolve([]),
+  );
 
-    return positions;
-  }, Promise.resolve([]));
+  await modules.orders.updateCalculation(order._id, context);
+  return updatedOrderPositions;
 }

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

@@ -17,6 +17,6 @@ export default async function emptyCart(
 
   if (!order) return null;
 
-  await modules.orders.positions.removePositions({ orderId: order._id }, context);
-  return modules.orders.findOrder({ orderId: order._id });
+  await modules.orders.positions.removePositions({ orderId: order._id });
+  return modules.orders.updateCalculation(order._id, context);
 }

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

@@ -26,5 +26,7 @@ export default async function removeCartDiscount(
     throw new OrderWrongStatusError({ status: order.status });
   }
 
-  return modules.orders.discounts.delete(discountId, context);
+  const deletedDiscount = await modules.orders.discounts.delete(discountId, context);
+  await modules.orders.updateCalculation(order._id, context);
+  return deletedDiscount;
 }

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

@@ -24,5 +24,7 @@ export default async function removeCartItem(
     throw new OrderWrongStatusError({ status: order.status });
   }
 
-  return modules.orders.positions.delete(itemId, context);
+  const removedOrderPosition = await modules.orders.positions.delete(itemId);
+  await modules.orders.updateCalculation(order._id, context);
+  return removedOrderPosition;
 }

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

@@ -20,7 +20,6 @@ export default async function setOrderDeliveryProvider(
 
   if (!(await modules.orders.orderExists({ orderId }))) throw new OrderNotFoundError({ orderId });
 
-  const order = await modules.orders.setDeliveryProvider(orderId, deliveryProviderId, context);
-
-  return order;
+  await modules.orders.setDeliveryProvider(orderId, deliveryProviderId, context);
+  return modules.orders.updateCalculation(orderId, context);
 }

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

@@ -21,5 +21,6 @@ export default async function setOrderPaymentProvider(
   const order = await modules.orders.findOrder({ orderId });
   if (!order) throw new OrderNotFoundError({ orderId });
 
-  return modules.orders.setPaymentProvider(orderId, paymentProviderId, context);
+  await modules.orders.setPaymentProvider(orderId, paymentProviderId, context);
+  return modules.orders.updateCalculation(orderId, context);
 }

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

@@ -24,15 +24,15 @@ export default async function updateCart(root: Root, params: UpdateCartParams, c
   if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
 
   if (meta) {
-    order = await modules.orders.updateContext(order._id, meta, context);
+    order = await modules.orders.updateContext(order._id, meta);
   }
 
   if (billingAddress) {
-    order = await modules.orders.updateBillingAddress(order._id, billingAddress, context);
+    order = await modules.orders.updateBillingAddress(order._id, billingAddress);
   }
 
   if (contact) {
-    order = await modules.orders.updateContact(order._id, contact, context);
+    order = await modules.orders.updateContact(order._id, contact);
   }
 
   if (paymentProviderId) {
@@ -43,5 +43,6 @@ export default async function updateCart(root: Root, params: UpdateCartParams, c
     order = await modules.orders.setDeliveryProvider(order._id, deliveryProviderId, context);
   }
 
-  return order;
+  // Recalculate, then return
+  return modules.orders.updateCalculation(order._id, context);
 }

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

@@ -41,7 +41,7 @@ export default async function updateCartItem(
 
   if (quantity !== null && quantity < 1) throw new OrderQuantityTooLowError({ quantity });
 
-  return modules.orders.positions.updateProductItem(
+  const updatedOrderPosition = await modules.orders.positions.updateProductItem(
     { quantity, configuration },
     {
       order,
@@ -50,4 +50,6 @@ export default async function updateCartItem(
     },
     context,
   );
+  await modules.orders.updateCalculation(order._id, context);
+  return updatedOrderPosition;
 }

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

@@ -33,12 +33,12 @@ export default async function updateOrderDeliveryPickUp(
       required: DeliveryProviderType.PICKUP,
     });
 
-  return modules.orders.deliveries.updateContext(
+  await modules.orders.deliveries.updateContext(orderDeliveryId, {
+    orderPickUpLocationId,
+    meta,
+  });
+  await modules.orders.updateCalculation(orderDelivery.orderId, context);
+  return modules.orders.deliveries.findDelivery({
     orderDeliveryId,
-    {
-      orderPickUpLocationId,
-      meta,
-    },
-    context,
-  );
+  });
 }

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

@@ -32,5 +32,12 @@ export default async function updateOrderDeliveryShipping(
       required: DeliveryProviderType.SHIPPING,
     });
 
-  return modules.orders.deliveries.updateContext(orderDeliveryId, { address, meta }, context);
+  await modules.orders.deliveries.updateContext(orderDeliveryId, {
+    address,
+    meta,
+  });
+  await modules.orders.updateCalculation(orderDelivery.orderId, context);
+  return modules.orders.deliveries.findDelivery({
+    orderDeliveryId,
+  });
 }

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

@@ -31,5 +31,7 @@ export default async function updateOrderPaymentCard(
       required: PaymentProviderType.CARD,
     });
 
-  return modules.orders.payments.updateContext(orderPayment._id, { meta }, context);
+  await modules.orders.payments.updateContext(orderPayment._id, { meta });
+  await modules.orders.updateCalculation(orderPayment.orderId, context);
+  return modules.orders.payments.findOrderPayment({ orderPaymentId });
 }

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

@@ -32,5 +32,7 @@ export default async function updateOrderPaymentGeneric(
       required: PaymentProviderType.GENERIC,
     });
 
-  return modules.orders.payments.updateContext(orderPayment._id, { meta }, context);
+  await modules.orders.payments.updateContext(orderPayment._id, { meta });
+  await modules.orders.updateCalculation(orderPayment.orderId, context);
+  return modules.orders.payments.findOrderPayment({ orderPaymentId });
 }

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

@@ -32,5 +32,7 @@ export default async function updateOrderPaymentInvoice(
       required: PaymentProviderType.INVOICE,
     });
 
-  return modules.orders.payments.updateContext(orderPayment._id, { meta }, context);
+  await modules.orders.payments.updateContext(orderPayment._id, { meta });
+  await modules.orders.updateCalculation(orderPayment.orderId, context);
+  return modules.orders.payments.findOrderPayment({ orderPaymentId });
 }

package/src/resolvers/mutations/products/createProduct.ts

@@ -1,16 +1,18 @@
 import { Context, Root } from '@unchainedshop/types/api.js';
-import { Product } from '@unchainedshop/types/products.js';
+import { Product, ProductText } from '@unchainedshop/types/products.js';
 import { log } from '@unchainedshop/logger';
 
 export default async function createProduct(
   root: Root,
-  { product }: { product: Product & { title: string } },
-  { modules, userId, localeContext }: Context,
+  { product: productData, texts }: { product: Product; texts?: ProductText[] },
+  { modules, userId }: Context,
 ) {
   log('mutation createProduct', { userId });
+  const newProduct = await modules.products.create(productData);
 
-  return modules.products.create({
-    ...product,
-    locale: localeContext.language,
-  });
+  if (texts) {
+    await modules.products.texts.updateTexts(newProduct._id, texts);
+  }
+
+  return newProduct;
 }

package/src/resolvers/mutations/products/createProductVariation.ts

@@ -1,5 +1,5 @@
 import { Context, Root } from '@unchainedshop/types/api.js';
-import { ProductVariationType } from '@unchainedshop/types/products.variations.js';
+import { ProductVariationType, VariationInputText } from '@unchainedshop/types/products.variations.js';
 import { ProductTypes } from '@unchainedshop/core-products';
 import { log } from '@unchainedshop/logger';
 import { InvalidIdError, ProductNotFoundError, ProductWrongTypeError } from '../../../errors.js';
@@ -11,12 +11,12 @@ export default async function F(
     variation: {
       key: string;
       type: ProductVariationType;
-      title: string;
     };
+    texts?: VariationInputText[];
   },
-  { modules, localeContext, userId }: Context,
+  { modules, userId }: Context,
 ) {
-  const { variation, productId } = params;
+  const { variation, productId, texts } = params;
 
   log(`mutation createProductVariation ${productId}`, { userId });
 
@@ -32,10 +32,15 @@ export default async function F(
       required: ProductTypes.ConfigurableProduct,
     });
 
-  return modules.products.variations.create({
-    locale: localeContext.language,
+  const newVariation = await modules.products.variations.create({
     options: [],
     productId,
     ...variation,
   });
+
+  if (texts) {
+    await modules.products.variations.texts.updateVariationTexts(newVariation._id, texts);
+  }
+
+  return newVariation;
 }

package/src/resolvers/mutations/products/createProductVariationOption.ts

@@ -1,16 +1,18 @@
 import { Context, Root } from '@unchainedshop/types/api.js';
 import { log } from '@unchainedshop/logger';
+import { VariationInputText } from '@unchainedshop/types/products.variations.js';
 import { InvalidIdError, ProductVariationNotFoundError } from '../../../errors.js';
 
 export default async function createProductVariationOption(
   root: Root,
   params: {
-    option: { value: string; title: string };
+    option: string;
+    texts?: VariationInputText[];
     productVariationId: string;
   },
-  { modules, localeContext, userId }: Context,
+  { modules, userId }: Context,
 ) {
-  const { option: inputData, productVariationId } = params;
+  const { option, productVariationId, texts } = params;
 
   log(`mutation createProductVariationOption ${productVariationId}`, {
     userId,
@@ -23,8 +25,13 @@ export default async function createProductVariationOption(
   });
   if (!variation) throw new ProductVariationNotFoundError({ productVariationId });
 
-  return modules.products.variations.addVariationOption(productVariationId, {
-    ...inputData,
-    locale: localeContext.language,
+  const newOption = await modules.products.variations.addVariationOption(productVariationId, {
+    value: option,
   });
+
+  if (texts) {
+    await modules.products.variations.texts.updateVariationTexts(productVariationId, texts, option);
+  }
+
+  return newOption;
 }

package/src/resolvers/mutations/warehousing/exportToken.ts

@@ -1,7 +1,7 @@
 import { Context, Root } from '@unchainedshop/types/api.js';
 import { log } from '@unchainedshop/logger';
 import { WorkStatus } from '@unchainedshop/types/worker.js';
-import { InvalidIdError, TokenWrongStatusError } from '../../../errors.js';
+import { InvalidIdError, TokenNotFoundError, TokenWrongStatusError } from '../../../errors.js';
 
 export default async function exportToken(
   root: Root,
@@ -19,27 +19,26 @@ export default async function exportToken(
   if (!tokenId) throw new InvalidIdError({ tokenId });
 
   const token = await modules.warehousing.findToken({ tokenId });
+  if (!token) throw new TokenNotFoundError({ tokenId });
 
-  if (token) {
-    if (token.walletAddress && !token.userId) {
-      throw new TokenWrongStatusError({ tokenId });
-    }
-    const workItems = await modules.worker.findWorkQueue({
-      types: ['EXPORT_TOKEN'],
-      status: [WorkStatus.NEW, WorkStatus.ALLOCATED],
+  if (token.walletAddress && !token.userId) {
+    throw new TokenWrongStatusError({ tokenId });
+  }
+  const workItems = await modules.worker.findWorkQueue({
+    types: ['EXPORT_TOKEN'],
+    status: [WorkStatus.NEW, WorkStatus.ALLOCATED],
+  });
+  const existingWork = workItems.find((item) => item.input?.token?._id === token._id);
+  if (!existingWork) {
+    await modules.worker.addWork({
+      type: 'EXPORT_TOKEN',
+      retries: 5,
+      input: {
+        token,
+        quantity,
+        recipientWalletAddress,
+      },
     });
-    const existingWork = workItems.find((item) => item.input?.token?._id === token._id);
-    if (!existingWork) {
-      await modules.worker.addWork({
-        type: 'EXPORT_TOKEN',
-        retries: 5,
-        input: {
-          token,
-          quantity,
-          recipientWalletAddress,
-        },
-      });
-    }
   }
 
   return modules.warehousing.findToken({ tokenId });

package/src/resolvers/queries/events/events.ts

@@ -9,7 +9,7 @@ export default async function events(
   { modules, userId }: Context,
 ) {
   log(
-    `query events ${params.types}  limit: ${params.limit} offset: ${params.offset} queryString: ${params.queryString}`,
+    `query events ${params.types?.join(',') || '*'} limit: ${params.limit} offset: ${params.offset} queryString: ${params.queryString}`,
     {
       userId,
     },

package/src/resolvers/queries/index.ts

@@ -66,13 +66,11 @@ import tokens from './warehousing/tokens.js';
 import work from './worker/work.js';
 import workQueue from './worker/workQueue.js';
 import workQueueCount from './worker/workQueueCount.js';
-import impersonator from './users/impersonator.js';
 import validateResetPasswordToken from './users/validateResetPasswordToken.js';
 import validateVerifyEmailToken from './users/validateVerifyEmailToken.js';
 
 export default {
   me,
-  impersonator,
   user: acl(actions.viewUser)(user),
   users: acl(actions.viewUsers)(users),
   usersCount: acl(actions.viewUsers)(usersCount),

package/src/resolvers/queries/shopInfo.ts

@@ -1,6 +1,5 @@
 import { Context, Root } from '@unchainedshop/types/api.js';
 import { log } from '@unchainedshop/logger';
-import { IOAuth2Adapter } from '@unchainedshop/types/accounts.js';
 
 export default function shopInfo(
   root: Root,
@@ -11,7 +10,6 @@ export default function shopInfo(
   externalLinks: () => Array<string>;
   adminUiConfig?: Record<string, any>;
   vapidPublicKey?: string;
-  oAuthProviders?: () => Promise<Array<IOAuth2Adapter>>;
 } {
   const { adminUiConfig } = context;
   log('query shopInfo', { userId: context.userId });
@@ -29,9 +27,6 @@ export default function shopInfo(
     adminUiConfig: {
       customProperties: adminUiConfig?.customProperties ?? [],
     },
-    async oAuthProviders() {
-      return context.modules.accounts.oAuth2.getProviders();
-    },
     vapidPublicKey: process.env?.PUSH_NOTIFICATION_PUBLIC_KEY,
   };
 }

package/src/resolvers/queries/users/validateResetPasswordToken.ts

@@ -10,7 +10,7 @@ export default async function validateResetPasswordToken(
 
   log('query validateResetPasswordToken', { userId, token: params.token });
 
-  const user = await modules.users.findUserByToken({ resetToken: params.token });
+  const user = await modules.users.findUserByResetToken(params.token);
 
   return !!user;
 }

package/src/resolvers/queries/users/validateVerifyEmailToken.ts

@@ -10,7 +10,7 @@ export default async function validateVerifyEmailToken(
 
   log(`query validateVerifyEmailToken ${userId}`, { userId, token });
 
-  const unverifiedToken = await modules.users.findUserByToken({ verifyEmailToken: token });
+  const unverifiedToken = await modules.users.findUnverifiedEmailToken(token);
 
   return !!unverifiedToken;
 }

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

@@ -92,6 +92,7 @@ export const Assortment: AssortmentHelperTypes = {
     });
   },
 
+  // TODO: Use a loader!
   async media(obj, params, { modules }) {
     return modules.assortments.media.findAssortmentMedias({
       assortmentId: obj._id,

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

@@ -13,9 +13,9 @@ export interface CountryHelperTypes {
 
 export const Country: CountryHelperTypes = {
   defaultCurrency: async (country, _, { modules }) => {
-    if (country.defaultCurrencyId) {
+    if (country.defaultCurrencyCode) {
       return modules.currencies.findCurrency({
-        currencyId: country.defaultCurrencyId,
+        isoCode: country.defaultCurrencyCode,
       });
     }
     return null;

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

@@ -59,17 +59,9 @@ export const DeliveryProvider: DeliveryProviderHelperTypes = {
     { currency: currencyCode, orderId, useNetPrice, context: providerContext },
     requestContext,
   ) {
-    const { modules, services, countryContext: country, user } = requestContext;
+    const { modules, countryContext: country, user } = requestContext;
     const order = await modules.orders.findOrder({ orderId });
-
-    const currency =
-      currencyCode ||
-      (await services.countries.resolveDefaultCurrencyCode(
-        {
-          isoCode: country,
-        },
-        requestContext,
-      ));
+    const currency = currencyCode || requestContext.currencyContext;
 
     const pricingDirector = await DeliveryPricingDirector.actions(
       {

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

@@ -1,5 +1,5 @@
 import { Context } from '@unchainedshop/types/api.js';
-import { Event as EventType } from '@unchainedshop/core-events';
+import type { Event as EventType } from '@unchainedshop/core-events';
 
 export type HelperType<P, T> = (work: EventType, params: P, context: Context) => T;