@unchainedshop/api 2.14.2 → 3.0.0-alpha3

package/src/resolvers/mutations/filters/createFilterOption.ts

@@ -1,14 +1,15 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import { log } from '@unchainedshop/logger';
+import { FilterInputText } from '@unchainedshop/core-filters';
 import { FilterNotFoundError, InvalidIdError } from '../../../errors.js';
 
 export default async function createFilterOption(
-  root: Root,
-  params: { filterId: string; option: { value: string; title: string } },
+  root: never,
+  params: { filterId: string; option: string; texts?: FilterInputText[] },
   context: Context,
 ) {
   const { modules, userId } = context;
-  const { filterId, option } = params;
+  const { filterId, option, texts } = params;
 
   log(`mutation createFilterOption ${filterId}`, { userId });
 
@@ -16,10 +17,11 @@ export default async function createFilterOption(
 
   if (!(await modules.filters.filterExists({ filterId }))) throw new FilterNotFoundError({ filterId });
 
-  const filter = await modules.filters.createFilterOption(
-    filterId,
-    { ...option, locale: context.localeContext.language },
-    context,
-  );
+  const filter = await modules.filters.createFilterOption(filterId, { value: option }, context);
+
+  if (texts) {
+    await modules.filters.texts.updateTexts({ filterId, filterOptionValue: option }, texts);
+  }
+
   return filter;
 }

package/src/resolvers/mutations/filters/removeFilter.ts

@@ -1,9 +1,9 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context } from '@unchainedshop/types/api.js';
 import { FilterNotFoundError, InvalidIdError } from '../../../errors.js';
+import { Context } from '../../../types.js';
 
 export default async function removeFilter(
-  root: Root,
+  root: never,
   { filterId }: { filterId: string },
   context: Context,
 ) {

package/src/resolvers/mutations/filters/removeFilterOption.ts

@@ -1,9 +1,9 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context } from '@unchainedshop/types/api.js';
 import { FilterNotFoundError, InvalidIdError } from '../../../errors.js';
+import { Context } from '../../../types.js';
 
 export default async function removeFilterOption(
-  root: Root,
+  root: never,
   { filterId, filterOptionValue }: { filterId: string; filterOptionValue: string },
   context: Context,
 ) {

package/src/resolvers/mutations/filters/updateFilter.ts

@@ -1,10 +1,10 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context } from '@unchainedshop/types/api.js';
-import { Filter } from '@unchainedshop/types/filters.js';
+import { Filter } from '@unchainedshop/core-filters';
 import { FilterNotFoundError, InvalidIdError } from '../../../errors.js';
+import { Context } from '../../../types.js';
 
 export default async function updateFilter(
-  root: Root,
+  root: never,
   { filter, filterId }: { filter: Filter; filterId: string },
   context: Context,
 ) {
@@ -16,7 +16,5 @@ export default async function updateFilter(
 
   if (!(await modules.filters.filterExists({ filterId }))) throw new FilterNotFoundError({ filterId });
 
-  await modules.filters.update(filterId, filter, context);
-
-  return modules.filters.findFilter({ filterId });
+  return modules.filters.update(filterId, filter, context);
 }

package/src/resolvers/mutations/filters/updateFilterTexts.ts

@@ -1,9 +1,9 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context } from '@unchainedshop/types/api.js';
 import { FilterNotFoundError, InvalidIdError } from '../../../errors.js';
+import { Context } from '../../../types.js';
 
 export default async function updateFilterTexts(
-  root: Root,
+  root: never,
   params: {
     texts: Array<{ locale: string; title?: string; subtitle?: string }>;
     filterId: string;

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/languages/createLanguage.ts

@@ -1,9 +1,9 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
-import { Language } from '@unchainedshop/types/languages.js';
+import { Context } from '../../../types.js';
+import { Language } from '@unchainedshop/core-languages';
 import { log } from '@unchainedshop/logger';
 
 export default async function createLanguage(
-  root: Root,
+  root: never,
   { language }: { language: Language },
   { modules, userId }: Context,
 ) {

package/src/resolvers/mutations/languages/removeLanguage.ts

@@ -1,9 +1,9 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import { log } from '@unchainedshop/logger';
 import { InvalidIdError, LanguageNotFoundError } from '../../../errors.js';
 
 export default async function removeLanguage(
-  root: Root,
+  root: never,
   { languageId }: { languageId: string },
   { userId, modules }: Context,
 ) {

package/src/resolvers/mutations/languages/updateLanguage.ts

@@ -1,10 +1,10 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
-import { Language } from '@unchainedshop/types/languages.js';
+import { Context } from '../../../types.js';
+import { Language } from '@unchainedshop/core-languages';
 import { log } from '@unchainedshop/logger';
 import { InvalidIdError, LanguageNotFoundError } from '../../../errors.js';
 
 export default async function updateLanguage(
-  root: Root,
+  root: never,
   { language, languageId }: { language: Language; languageId: string },
   { userId, modules }: Context,
 ) {

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

@@ -1,10 +1,10 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import { log } from '@unchainedshop/logger';
 import { getOrderCart } from '../utils/getOrderCart.js';
 import { OrderWrongStatusError } from '../../../errors.js';
 
 export default async function addCartDiscount(
-  root: Root,
+  root: never,
   { orderId, code }: { orderId?: string; code: string },
   context: Context,
 ) {
@@ -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

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import {
   ProductNotFoundError,
   OrderQuantityTooLowError,
@@ -9,7 +9,7 @@ import {
 import { getOrderCart } from '../utils/getOrderCart.js';
 
 export default async function addCartProduct(
-  root: Root,
+  root: never,
   { orderId, productId, quantity, configuration },
   context: Context,
 ) {
@@ -39,6 +39,6 @@ export default async function addCartProduct(
     { order, product },
     context,
   );
-
-  return orderPosition;
+  await modules.orders.updateCalculation(order._id, context);
+  return modules.orders.positions.findOrderPosition({ itemId: orderPosition._id });
 }

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

@@ -1,7 +1,6 @@
 import { log } from '@unchainedshop/logger';
 import { QuotationStatus } from '@unchainedshop/core-quotations';
-import { Context, Root } from '@unchainedshop/types/api.js';
-import { Configuration } from '@unchainedshop/types/common.js';
+import { Context } from '../../../types.js';
 import {
   QuotationNotFoundError,
   QuotationWrongStatusError,
@@ -12,12 +11,12 @@ import {
 import { getOrderCart } from '../utils/getOrderCart.js';
 
 export default async function addCartQuotation(
-  root: Root,
+  root: never,
   params: {
     orderId?: string;
     quotationId: string;
     quantity: number;
-    configuration: Configuration;
+    configuration: Array<{ key: string; value: string }>;
   },
   context: Context,
 ) {
@@ -58,7 +57,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 +66,6 @@ export default async function addCartQuotation(
     { order, product },
     context,
   );
+  await modules.orders.updateCalculation(order._id, context);
+  return modules.orders.positions.findOrderPosition({ itemId: updatedOrderPosition._id });
 }

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

@@ -1,6 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root } from '@unchainedshop/types/api.js';
-import { Configuration } from '@unchainedshop/types/common.js';
+import { Context } from '../../../types.js';
 import {
   ProductNotFoundError,
   OrderQuantityTooLowError,
@@ -9,13 +8,13 @@ import {
 import { getOrderCart } from '../utils/getOrderCart.js';
 
 export default async function addMultipleCartProducts(
-  root: Root,
+  root: never,
   params: {
     orderId: string;
     items: Array<{
       productId: string;
       quantity: number;
-      configuration?: Configuration;
+      configuration?: Array<{ key: string; value: string }>;
     }>;
   },
   context: Context,
@@ -45,7 +44,7 @@ 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 }) => {
+  await itemsWithProducts.reduce(async (positionsPromise, { product, quantity, configuration }) => {
     const positions = await positionsPromise;
     if (quantity < 1)
       throw new OrderQuantityTooLowError({
@@ -61,9 +60,9 @@ export default async function addMultipleCartProducts(
       { order, product },
       context,
     );
-
     positions.push(position);
-
     return positions;
   }, Promise.resolve([]));
+
+  return modules.orders.updateCalculation(order._id, context);
 }

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

@@ -1,10 +1,10 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import { log, LogLevel } from '@unchainedshop/logger';
 import { OrderCheckoutError } from '../../../errors.js';
 import { getOrderCart } from '../utils/getOrderCart.js';
 
 export default async function checkoutCart(
-  root: Root,
+  root: never,
   params: {
     orderId: string;
     paymentContext?: any;

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

@@ -1,10 +1,10 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
-import { OrderStatus } from '@unchainedshop/types/orders.js';
+import { Context } from '../../../types.js';
+import { OrderStatus } from '@unchainedshop/core-orders';
 import { log } from '@unchainedshop/logger';
 import { InvalidIdError, OrderNotFoundError, OrderWrongStatusError } from '../../../errors.js';
 
 export default async function confirmOrder(
-  root: Root,
+  root: never,
   params: {
     orderId: string;
     paymentContext?: any;

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

@@ -1,9 +1,9 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context } from '@unchainedshop/types/api.js';
 import { OrderNumberAlreadyExistsError } from '../../../errors.js';
+import { Context } from '../../../types.js';
 
 export default async function createCart(
-  root: Root,
+  root: never,
   { orderNumber }: { orderNumber: string },
   context: Context,
 ) {

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

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context } from '@unchainedshop/types/api.js';
-import { OrderDeliveryStatus } from '@unchainedshop/types/orders.deliveries.js';
+import { Context } from '../../../types.js';
+import { OrderDeliveryStatus } from '@unchainedshop/core-orders';
 import {
   OrderNotFoundError,
   OrderWrongDeliveryStatusError,
@@ -9,7 +9,7 @@ import {
 } from '../../../errors.js';
 
 export default async function deliverOrder(
-  root: Root,
+  root: never,
   { orderId }: { orderId: string },
   context: Context,
 ) {

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

@@ -1,10 +1,10 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import { getOrderCart } from '../utils/getOrderCart.js';
 import { OrderWrongStatusError } from '../../../errors.js';
 
 export default async function emptyCart(
-  root: Root,
+  root: never,
   { orderId }: { orderId?: string },
   context: Context,
 ) {
@@ -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/payOrder.ts

@@ -1,6 +1,6 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root } from '@unchainedshop/types/api.js';
-import { OrderPaymentStatus } from '@unchainedshop/types/orders.payments.js';
+import { Context } from '../../../types.js';
+import { OrderPaymentStatus } from '@unchainedshop/core-orders';
 import {
   OrderNotFoundError,
   OrderWrongPaymentStatusError,
@@ -8,7 +8,7 @@ import {
   InvalidIdError,
 } from '../../../errors.js';
 
-export default async function payOrder(root: Root, { orderId }: { orderId: string }, context: Context) {
+export default async function payOrder(root: never, { orderId }: { orderId: string }, context: Context) {
   const { modules, userId } = context;
 
   log('mutation payOrder', { orderId, userId });

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

@@ -1,10 +1,10 @@
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import { OrderStatus } from '@unchainedshop/core-orders';
 import { log } from '@unchainedshop/logger';
 import { InvalidIdError, OrderNotFoundError, OrderWrongStatusError } from '../../../errors.js';
 
 export default async function rejectOrder(
-  root: Root,
+  root: never,
   params: {
     orderId: string;
     paymentContext?: any;

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

@@ -1,10 +1,10 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 
 import { OrderDiscountNotFoundError, OrderWrongStatusError, InvalidIdError } from '../../../errors.js';
 
 export default async function removeCartDiscount(
-  root: Root,
+  root: never,
   { discountId }: { discountId: string },
   context: Context,
 ) {
@@ -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

@@ -1,9 +1,9 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import { OrderItemNotFoundError, OrderWrongStatusError, InvalidIdError } from '../../../errors.js';
 
 export default async function removeCartItem(
-  root: Root,
+  root: never,
   { itemId }: { itemId: string },
   context: Context,
 ) {
@@ -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/removeOrder.ts

@@ -1,9 +1,9 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context } from '@unchainedshop/types/api.js';
 import { OrderNotFoundError, OrderWrongStatusError, InvalidIdError } from '../../../errors.js';
+import { Context } from '../../../types.js';
 
 export default async function removeOrder(
-  root: Root,
+  root: never,
   { orderId }: { orderId: string },
   { modules, userId }: Context,
 ) {

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

@@ -1,9 +1,9 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context } from '@unchainedshop/types/api.js';
 import { OrderNotFoundError, InvalidIdError } from '../../../errors.js';
+import { Context } from '../../../types.js';
 
 export default async function setOrderDeliveryProvider(
-  root: Root,
+  root: never,
   params: { orderId: string; deliveryProviderId: string },
   context: Context,
 ) {
@@ -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

@@ -1,9 +1,9 @@
 import { log } from '@unchainedshop/logger';
-import { Root, Context } from '@unchainedshop/types/api.js';
 import { OrderNotFoundError, InvalidIdError } from '../../../errors.js';
+import { Context } from '../../../types.js';
 
 export default async function setOrderPaymentProvider(
-  root: Root,
+  root: never,
   params: { orderId: string; paymentProviderId: string },
   context: Context,
 ) {
@@ -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/signPaymentProviderForCheckout.ts

@@ -1,7 +1,7 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root } from '@unchainedshop/types/api.js';
+import { Context } from '../../../types.js';
 import { PaymentProviderType } from '@unchainedshop/core-payment';
-import { OrderPaymentStatus } from '@unchainedshop/types/orders.payments.js';
+import { OrderPaymentStatus } from '@unchainedshop/core-orders';
 import {
   OrderPaymentConfigurationError,
   OrderPaymentNotFoundError,
@@ -11,7 +11,7 @@ import {
 } from '../../../errors.js';
 
 export default async function signPaymentProviderForCheckout(
-  root: Root,
+  root: never,
   params: { orderPaymentId: string; transactionContext: any },
   context: Context,
 ) {

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

@@ -1,8 +1,8 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root } from '@unchainedshop/types/api.js';
-import { Address, Contact } from '@unchainedshop/types/common.js';
+import { Context } from '../../../types.js';
 import { getOrderCart } from '../utils/getOrderCart.js';
 import { OrderWrongStatusError } from '../../../errors.js';
+import type { Address, Contact } from '@unchainedshop/mongodb';
 
 interface UpdateCartParams {
   orderId?: string;
@@ -13,7 +13,7 @@ interface UpdateCartParams {
   meta?: any;
 }
 
-export default async function updateCart(root: Root, params: UpdateCartParams, context: Context) {
+export default async function updateCart(root: never, params: UpdateCartParams, context: Context) {
   const { orderId, billingAddress, contact, paymentProviderId, deliveryProviderId, meta } = params;
 
   const { modules, userId, user } = context;
@@ -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);
 }