@unchainedshop/api 4.0.0-rc.16 → 4.0.0-rc.18

package/src/resolvers/mutations/accounts/loginAsGuest.ts

@@ -2,6 +2,7 @@ import { log } from '@unchainedshop/logger';
 import moniker from 'moniker';
 import { Context } from '../../../context.js';
 import { generateDbObjectId } from '@unchainedshop/mongodb';
+import { User } from '@unchainedshop/core-users';
 
 export default async function loginAsGuest(root: never, _: any, context: Context) {
   log('mutation loginAsGuest');
@@ -17,13 +18,13 @@ export default async function loginAsGuest(root: never, _: any, context: Context
     { skipMessaging: true },
   );
 
-  const user = await context.modules.users.updateHeartbeat(guestUserId, {
+  const user = (await context.modules.users.updateHeartbeat(guestUserId, {
     remoteAddress: context.remoteAddress,
     remotePort: context.remotePort,
     userAgent: context.getHeader('user-agent'),
     locale: context.locale?.baseName,
     countryCode: context.countryCode,
-  });
+  })) as User;
 
   await context.services.orders.nextUserCart({ user, countryCode: context.countryCode });
 

package/src/resolvers/mutations/accounts/loginWithPassword.ts

@@ -1,6 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { InvalidCredentialsError, UsernameOrEmailRequiredError } from '../../../errors.js';
 import { Context } from '../../../context.js';
+import { User } from '@unchainedshop/core-users';
 
 export default async function loginWithPassword(
   root: never,
@@ -18,7 +19,7 @@ export default async function loginWithPassword(
 
   let user = username
     ? await context.modules.users.findUserByUsername(username)
-    : await context.modules.users.findUserByEmail(email);
+    : await context.modules.users.findUserByEmail(email!);
 
   if (!user) throw new InvalidCredentialsError({ username, email });
 
@@ -32,13 +33,13 @@ export default async function loginWithPassword(
     await context.modules.users.updateGuest(user, false);
   }
 
-  user = await context.modules.users.updateHeartbeat(user._id, {
+  user = (await context.modules.users.updateHeartbeat(user._id, {
     remoteAddress: context.remoteAddress,
     remotePort: context.remotePort,
     userAgent: context.getHeader('user-agent'),
     locale: context.locale?.baseName,
     countryCode: context.countryCode,
-  });
+  })) as User;
 
   if (context.userId) {
     await context.services.users.migrateUserData(context.userId, user._id);

package/src/resolvers/mutations/accounts/loginWithWebAuthn.ts

@@ -1,6 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { Context } from '../../../context.js';
 import { UserNotFoundError, WebAuthnDisabledError } from '../../../errors.js';
+import { User } from '@unchainedshop/core-users';
 
 export default async function loginWithWebAuthn(
   root: never,
@@ -19,19 +20,19 @@ export default async function loginWithWebAuthn(
 
   const verification = await context.modules.users.webAuthn.verifyCredentialRequest(
     user.services?.webAuthn,
-    user.username,
+    user.username!,
     params.webAuthnPublicKeyCredentials,
   );
 
   if (!verification) throw new WebAuthnDisabledError();
 
-  user = await context.modules.users.updateHeartbeat(user._id, {
+  user = (await context.modules.users.updateHeartbeat(user._id, {
     remoteAddress: context.remoteAddress,
     remotePort: context.remotePort,
     userAgent: context.getHeader('user-agent'),
     locale: context.locale?.baseName,
     countryCode: context.countryCode,
-  });
+  })) as User;
 
   if (context.userId) {
     await context.services.users.migrateUserData(context.userId, user._id);

package/src/resolvers/mutations/accounts/removeEmail.ts

@@ -11,10 +11,10 @@ export default async function removeEmail(
 
   log(`mutation removeEmail ${params.email} ${normalizedUserId}`, { userId });
 
-  if (!(await modules.users.userExists({ userId: normalizedUserId })))
+  if (!(await modules.users.userExists({ userId: normalizedUserId! })))
     throw new UserNotFoundError({ userId: normalizedUserId });
 
-  await modules.users.removeEmail(normalizedUserId, params.email);
+  await modules.users.removeEmail(normalizedUserId!, params.email);
 
-  return modules.users.findUserById(normalizedUserId);
+  return modules.users.findUserById(normalizedUserId!);
 }

package/src/resolvers/mutations/accounts/removeWeb3Address.ts

@@ -7,11 +7,11 @@ export default async function removeWeb3Address(
   { address }: { address: string },
   { modules, userId, user }: Context,
 ) {
-  log(`mutation removeWeb3Address ${address} ${user.username}`, {
+  log(`mutation removeWeb3Address ${address} ${user?.username}`, {
     userId,
   });
 
-  const foundCredentials = user.services?.web3?.find(
+  const foundCredentials = user?.services?.web3?.find(
     (service) => service.address.toLowerCase() === address.toLowerCase(),
   );
   if (!foundCredentials) {

package/src/resolvers/mutations/accounts/removeWebAuthnCredentials.ts

@@ -7,11 +7,11 @@ export default async function removeWebAuthnCredentials(
   { credentialsId }: { credentialsId: string },
   { modules, userId, user }: Context,
 ) {
-  log(`mutation removeWebAuthnCredentials ${credentialsId} ${user.username}`, {
+  log(`mutation removeWebAuthnCredentials ${credentialsId} ${user?.username}`, {
     userId,
   });
 
-  const foundCredentials = user.services?.webAuthn?.find((service) => service.id === credentialsId);
+  const foundCredentials = user?.services?.webAuthn?.find((service) => service.id === credentialsId);
   if (!foundCredentials) {
     throw new UserWebAuthnCredentialsNotFoundError({ userId, credentialsId });
   }

package/src/resolvers/mutations/accounts/verifyEmail.ts

@@ -1,6 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { InvalidEmailVerificationTokenError } from '../../../errors.js';
 import { Context } from '../../../context.js';
+import { User } from '@unchainedshop/core-users';
 
 export default async function verifyEmail(root: never, { token }: { token: any }, context: Context) {
   const { modules, userId } = context;
@@ -15,13 +16,13 @@ export default async function verifyEmail(root: never, { token }: { token: any }
 
   await modules.users.verifyEmail(unverifiedToken.userId, unverifiedToken.address);
 
-  const user = await context.modules.users.updateHeartbeat(unverifiedToken.userId, {
+  const user = (await context.modules.users.updateHeartbeat(unverifiedToken.userId, {
     remoteAddress: context.remoteAddress,
     remotePort: context.remotePort,
     userAgent: context.getHeader('user-agent'),
     locale: context.locale?.baseName,
     countryCode: context.countryCode,
-  });
+  })) as User;
 
   if (context.userId) {
     await context.services.users.migrateUserData(context.userId, user._id);

package/src/resolvers/mutations/accounts/verifyWeb3Address.ts

@@ -94,7 +94,7 @@ export default async function verifyWeb3Address(
   { address, hash }: { address: string; hash: `0x${string}` },
   { modules, userId, user }: Context,
 ) {
-  log(`mutation verifyWeb3Address ${address} ${user.username}`, {
+  log(`mutation verifyWeb3Address ${address} ${user?.username}`, {
     userId,
   });
 
@@ -106,7 +106,7 @@ export default async function verifyWeb3Address(
     );
   }
 
-  const foundCredentials = user.services?.web3?.find(
+  const foundCredentials = user?.services?.web3?.find(
     (service) => service.address.toLowerCase() === address.toLowerCase(),
   );
   if (!foundCredentials) {
@@ -132,7 +132,7 @@ export default async function verifyWeb3Address(
     throw new UserWeb3AddressSignatureError({ userId, address: foundCredentials.address });
   }
 
-  const web3Services: any[] = user.services.web3.map((service) => {
+  const web3Services: any[] = user?.services?.web3.map((service) => {
     if (foundCredentials.address === service.address) {
       return {
         ...service,

package/src/resolvers/mutations/assortments/removeAssortment.ts

@@ -11,10 +11,8 @@ export default async function removeAssortment(
 
   if (!assortmentId) throw new InvalidIdError({ assortmentId });
 
-  const assortment = await modules.assortments.findAssortment({ assortmentId });
-  if (!assortment) throw new AssortmentNotFoundError({ assortmentId });
+  const deletedAssortment = await modules.assortments.delete(assortmentId);
+  if (!deletedAssortment) throw new AssortmentNotFoundError({ assortmentId });
 
-  await modules.assortments.delete(assortmentId);
-
-  return assortment;
+  return deletedAssortment;
 }

package/src/resolvers/mutations/delivery/createDeliveryProvider.ts

@@ -6,7 +6,7 @@ import { DeliveryDirector } from '@unchainedshop/core';
 
 export default async function createDeliveryProvider(
   root: never,
-  { deliveryProvider }: { deliveryProvider: DeliveryProvider },
+  { deliveryProvider }: { deliveryProvider: Pick<DeliveryProvider, 'type' | 'adapterKey'> },
   { modules, userId }: Context,
 ) {
   log('mutation createDeliveryProvider', { userId });

package/src/resolvers/mutations/enrollments/createEnrollment.ts

@@ -45,7 +45,7 @@ export default async function createEnrollment(
     payment,
     productId,
     quantity,
-    userId,
+    userId: userId!,
   });
 
   return await services.enrollments.initializeEnrollment(enrollment, {

package/src/resolvers/mutations/enrollments/updateEnrollment.ts

@@ -38,23 +38,26 @@ export default async function updateEnrollment(
   }
 
   if (meta) {
-    enrollment = await modules.enrollments.updateContext(enrollmentId, meta);
+    enrollment = (await modules.enrollments.updateContext(enrollmentId, meta)) as Enrollment;
   }
 
   if (billingAddress) {
-    enrollment = await modules.enrollments.updateBillingAddress(enrollmentId, billingAddress);
+    enrollment = (await modules.enrollments.updateBillingAddress(
+      enrollmentId,
+      billingAddress,
+    )) as Enrollment;
   }
 
   if (contact) {
-    enrollment = await modules.enrollments.updateContact(enrollmentId, contact);
+    enrollment = (await modules.enrollments.updateContact(enrollmentId, contact)) as Enrollment;
   }
 
   if (payment) {
-    enrollment = await modules.enrollments.updatePayment(enrollmentId, payment);
+    enrollment = (await modules.enrollments.updatePayment(enrollmentId, payment)) as Enrollment;
   }
 
   if (delivery) {
-    enrollment = await modules.enrollments.updateDelivery(enrollmentId, delivery);
+    enrollment = (await modules.enrollments.updateDelivery(enrollmentId, delivery)) as Enrollment;
   }
 
   if (plan) {
@@ -64,7 +67,7 @@ export default async function updateEnrollment(
         'TODO: Unchained currently does not support order splitting for enrollments, therefore updates to quantity, product and configuration of a enrollment is forbidden for non initial enrollments',
       );
     }
-    enrollment = await modules.enrollments.updatePlan(enrollmentId, plan);
+    enrollment = (await modules.enrollments.updatePlan(enrollmentId, plan)) as Enrollment;
     enrollment = await services.enrollments.initializeEnrollment(enrollment, { reason: 'updated_plan' });
   }
 

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

@@ -18,7 +18,7 @@ export default async function createFilterOption(
   if (!(await modules.filters.filterExists({ filterId }))) throw new FilterNotFoundError({ filterId });
 
   const filter = await modules.filters.createFilterOption(filterId, { value: option });
-  await FilterDirector.invalidateProductIdCache(filter, context);
+  await FilterDirector.invalidateProductIdCache(filter!, context);
 
   if (texts) {
     await modules.filters.texts.updateTexts({ filterId, filterOptionValue: option }, texts);

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

@@ -19,7 +19,7 @@ export default async function removeFilterOption(
     filterId,
     filterOptionValue,
   });
-  await FilterDirector.invalidateProductIdCache(filter, context);
+  await FilterDirector.invalidateProductIdCache(filter!, context);
 
   return filter;
 }

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

@@ -18,7 +18,7 @@ export default async function updateFilter(
   if (!(await modules.filters.filterExists({ filterId }))) throw new FilterNotFoundError({ filterId });
 
   const updatedFilter = await modules.filters.update(filterId, filter);
-  await FilterDirector.invalidateProductIdCache(updatedFilter, context);
+  await FilterDirector.invalidateProductIdCache(updatedFilter!, context);
 
   return updatedFilter;
 }

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

@@ -18,7 +18,7 @@ export default async function addCartDiscount(
 
   const order = await services.orders.findOrInitCart({
     orderId,
-    user,
+    user: user!,
     countryCode: context.countryCode,
   });
   if (!order) throw new OrderNotFoundError({ orderId });

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

@@ -31,7 +31,7 @@ export default async function addCartProduct(
 
   const order = await services.orders.findOrInitCart({
     orderId,
-    user,
+    user: user!,
     countryCode: context.countryCode,
   });
   if (!order) throw new OrderNotFoundError({ orderId });

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

@@ -9,6 +9,7 @@ import {
   OrderWrongStatusError,
   ProductNotFoundError,
   OrderNotFoundError,
+  QuotationItemConfigurationError,
 } from '../../../errors.js';
 import { QuotationDirector } from '@unchainedshop/core';
 
@@ -45,7 +46,7 @@ export default async function addCartQuotation(
 
   const order = await services.orders.findOrInitCart({
     orderId,
-    user,
+    user: user!,
     countryCode: context.countryCode,
   });
   if (!order) throw new OrderNotFoundError({ orderId });
@@ -64,8 +65,10 @@ export default async function addCartQuotation(
     configuration,
   });
 
+  if (!quotationConfiguration) throw new QuotationItemConfigurationError({ configuration });
+
   const updatedOrderPosition = await modules.orders.positions.addProductItem({
-    quantity: quotationConfiguration.quantity,
+    quantity: quotationConfiguration.quantity || 1,
     configuration: quotationConfiguration.configuration,
     quotationId,
     productId: quotation.productId,

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

@@ -6,7 +6,7 @@ import {
   OrderWrongStatusError,
   OrderNotFoundError,
 } from '../../../errors.js';
-import { ordersSettings } from '@unchainedshop/core-orders';
+import { OrderPosition, ordersSettings } from '@unchainedshop/core-orders';
 
 export default async function addMultipleCartProducts(
   root: never,
@@ -43,7 +43,7 @@ export default async function addMultipleCartProducts(
 
   const order = await services.orders.findOrInitCart({
     orderId,
-    user,
+    user: user!,
     countryCode: context.countryCode,
   });
   if (!order) throw new OrderNotFoundError({ orderId });
@@ -52,7 +52,7 @@ export default async function addMultipleCartProducts(
   // Reduce is used to wait for each product to be added before processing the next (sequential processing)
   await itemsWithProducts.reduce(
     async (positionsPromise, { originalProduct, quantity, configuration }) => {
-      const positions = await positionsPromise;
+      const positions: OrderPosition[] = await positionsPromise;
       if (quantity < 1)
         throw new OrderQuantityTooLowError({
           quantity,

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

@@ -21,7 +21,7 @@ export default async function checkoutCart(
   // Do not check for order status here! The checkout method will act accordingly
   const order = await services.orders.findOrInitCart({
     orderId: forceOrderId,
-    user,
+    user: user!,
     countryCode: context.countryCode,
   });
   if (!order) throw new OrderNotFoundError({ orderId: forceOrderId });

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

@@ -14,7 +14,7 @@ export default async function createCart(
   if (order) throw new OrderNumberAlreadyExistsError({ orderNumber });
 
   return services.orders.nextUserCart({
-    user,
+    user: user!,
     orderNumber,
     countryCode: context.countryCode,
     forceCartCreation: true,

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

@@ -6,6 +6,7 @@ import {
   OrderWrongDeliveryStatusError,
   OrderWrongStatusError,
   InvalidIdError,
+  OrderDeliveryNotFoundError,
 } from '../../../errors.js';
 
 export default async function deliverOrder(
@@ -25,9 +26,13 @@ export default async function deliverOrder(
     throw new OrderWrongStatusError({ status: order.status });
   }
 
-  const orderDelivery = await modules.orders.deliveries.findDelivery({
-    orderDeliveryId: order.deliveryId,
-  });
+  const orderDelivery =
+    order.deliveryId &&
+    (await modules.orders.deliveries.findDelivery({
+      orderDeliveryId: order.deliveryId,
+    }));
+
+  if (!orderDelivery) throw new OrderDeliveryNotFoundError({ orderDeliveryId: order.deliveryId });
 
   if (
     modules.orders.deliveries.normalizedStatus(orderDelivery) !== OrderDeliveryStatus.OPEN &&

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

@@ -13,7 +13,7 @@ export default async function emptyCart(
 
   const order = await services.orders.findOrInitCart({
     orderId,
-    user,
+    user: user!,
     countryCode: context.countryCode,
   });
   if (!order) throw new OrderNotFoundError({ orderId });

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

@@ -6,6 +6,7 @@ import {
   OrderWrongPaymentStatusError,
   OrderWrongStatusError,
   InvalidIdError,
+  OrderPaymentNotFoundError,
 } from '../../../errors.js';
 
 export default async function payOrder(root: never, { orderId }: { orderId: string }, context: Context) {
@@ -22,9 +23,13 @@ export default async function payOrder(root: never, { orderId }: { orderId: stri
     throw new OrderWrongStatusError({ status: order.status });
   }
 
-  const payment = await modules.orders.payments.findOrderPayment({
-    orderPaymentId: order.paymentId,
-  });
+  const payment =
+    order.paymentId &&
+    (await modules.orders.payments.findOrderPayment({
+      orderPaymentId: order.paymentId,
+    }));
+
+  if (!payment) throw new OrderPaymentNotFoundError({ orderPaymentId: order.paymentId });
 
   if (modules.orders.payments.normalizedStatus(payment) !== OrderPaymentStatus.OPEN) {
     throw new OrderWrongPaymentStatusError({

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

@@ -1,7 +1,12 @@
 import { log } from '@unchainedshop/logger';
 import { Context } from '../../../context.js';
 
-import { OrderDiscountNotFoundError, OrderWrongStatusError, InvalidIdError } from '../../../errors.js';
+import {
+  OrderDiscountNotFoundError,
+  OrderWrongStatusError,
+  InvalidIdError,
+  OrderNotFoundError,
+} from '../../../errors.js';
 import { OrderDiscountTrigger } from '@unchainedshop/core-orders';
 import { OrderDiscountDirector } from '@unchainedshop/core';
 
@@ -24,8 +29,11 @@ export default async function removeCartDiscount(
   const order = await modules.orders.findOrder({
     orderId: orderDiscount.orderId,
   });
+
+  if (!order) throw new OrderNotFoundError({ orderId: orderDiscount.orderId });
+
   if (!modules.orders.isCart(order)) {
-    throw new OrderWrongStatusError({ status: order.status });
+    throw new OrderWrongStatusError({ status: order!.status });
   }
 
   if (orderDiscount.trigger === OrderDiscountTrigger.USER) {

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

@@ -1,6 +1,11 @@
 import { log } from '@unchainedshop/logger';
 import { Context } from '../../../context.js';
-import { OrderItemNotFoundError, OrderWrongStatusError, InvalidIdError } from '../../../errors.js';
+import {
+  OrderItemNotFoundError,
+  OrderWrongStatusError,
+  InvalidIdError,
+  OrderNotFoundError,
+} from '../../../errors.js';
 
 export default async function removeCartItem(
   root: never,
@@ -20,6 +25,8 @@ export default async function removeCartItem(
 
   const order = await modules.orders.findOrder({ orderId: orderItem.orderId });
 
+  if (!order) throw new OrderNotFoundError({ orderId: orderItem.orderId });
+
   if (!modules.orders.isCart(order)) {
     throw new OrderWrongStatusError({ status: order.status });
   }

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

@@ -7,6 +7,7 @@ import {
   OrderPaymentNotFoundError,
   OrderPaymentTypeError,
   OrderWrongPaymentStatusError,
+  PaymentProviderNotFoundError,
   UserNoCartError,
 } from '../../../errors.js';
 import { PaymentDirector } from '@unchainedshop/core';
@@ -33,18 +34,23 @@ export default async function signPaymentProviderForCheckout(
   } else {
     const order = await modules.orders.cart({
       countryCode: context.countryCode,
-      userId,
+      userId: userId!,
     });
     if (!order) throw new UserNoCartError({ userId });
-    orderPayment = await modules.orders.payments.findOrderPayment({
-      orderPaymentId: order.paymentId,
-    });
+    orderPayment =
+      order.paymentId &&
+      (await modules.orders.payments.findOrderPayment({
+        orderPaymentId: order.paymentId,
+      }));
     if (!orderPayment) throw new OrderPaymentNotFoundError({ orderPaymentId });
   }
 
   const provider = await modules.payment.paymentProviders.findProvider({
     paymentProviderId: orderPayment.paymentProviderId,
   });
+
+  if (!provider) throw new PaymentProviderNotFoundError({ id: orderPayment.paymentProviderId });
+
   const providerType = provider?.type;
 
   if (providerType !== PaymentProviderType.GENERIC)

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

@@ -21,7 +21,7 @@ export default async function updateCart(root: never, params: UpdateCartParams,
 
   const order = await services.orders.findOrInitCart({
     orderId,
-    user,
+    user: user!,
     countryCode: context.countryCode,
   });
   if (!order) throw new OrderNotFoundError({ orderId });

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

@@ -3,6 +3,7 @@ import { DeliveryProviderType } from '@unchainedshop/core-delivery';
 import { log } from '@unchainedshop/logger';
 import {
   InvalidIdError,
+  OrderDeliveryNotFoundError,
   OrderDeliveryTypeError,
   OrderNotFoundError,
   OrderWrongStatusError,
@@ -23,7 +24,7 @@ export default async function updateCartDeliveryPickUp(
 
   let order = await services.orders.findOrInitCart({
     orderId,
-    user,
+    user: user!,
     countryCode: context.countryCode,
   });
   if (!order) throw new OrderNotFoundError({ orderId });
@@ -43,6 +44,8 @@ export default async function updateCartDeliveryPickUp(
 
   order = (await modules.orders.setDeliveryProvider(order._id, deliveryProviderId)) || order;
 
+  if (!order.deliveryId) throw new OrderDeliveryNotFoundError({ orderId: order._id });
+
   await modules.orders.deliveries.updateContext(order.deliveryId, {
     orderPickUpLocationId,
     meta,

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

@@ -3,6 +3,7 @@ import { DeliveryProviderType } from '@unchainedshop/core-delivery';
 import { log } from '@unchainedshop/logger';
 import {
   InvalidIdError,
+  OrderDeliveryNotFoundError,
   OrderDeliveryTypeError,
   OrderNotFoundError,
   OrderWrongStatusError,
@@ -23,7 +24,7 @@ export default async function updateCartDeliveryShipping(
 
   let order = await services.orders.findOrInitCart({
     orderId,
-    user,
+    user: user!,
     countryCode: context.countryCode,
   });
   if (!order) throw new OrderNotFoundError({ orderId });
@@ -43,6 +44,8 @@ export default async function updateCartDeliveryShipping(
 
   order = (await modules.orders.setDeliveryProvider(order._id, deliveryProviderId)) || order;
 
+  if (!order.deliveryId) throw new OrderDeliveryNotFoundError({ orderId: order._id });
+
   await modules.orders.deliveries.updateContext(order.deliveryId, {
     address,
     meta,

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

@@ -6,6 +6,7 @@ import {
   OrderWrongStatusError,
   ProductNotFoundError,
   InvalidIdError,
+  OrderNotFoundError,
 } from '../../../errors.js';
 import { ordersSettings } from '@unchainedshop/core-orders';
 
@@ -19,7 +20,7 @@ export default async function updateCartItem(
   context: Context,
 ) {
   const { modules, services, userId } = context;
-  const { itemId, configuration = null, quantity = null } = params;
+  const { itemId, configuration, quantity = 1 } = params;
 
   log(`mutation updateCartItem ${itemId} ${quantity} ${JSON.stringify(configuration)}`, { userId });
 
@@ -29,6 +30,9 @@ export default async function updateCartItem(
   if (!item) throw new OrderItemNotFoundError({ itemId });
 
   const order = await modules.orders.findOrder({ orderId: item.orderId });
+
+  if (!order) throw new OrderNotFoundError({ orderId: item.orderId });
+
   if (!modules.orders.isCart(order)) {
     throw new OrderWrongStatusError({ status: order.status });
   }
@@ -50,11 +54,12 @@ export default async function updateCartItem(
     context,
   );
 
-  const updatedOrderPosition = await modules.orders.positions.updateProductItem({
+  await modules.orders.positions.updateProductItem({
     orderPositionId: item._id,
     quantity,
     configuration,
   });
+
   await services.orders.updateCalculation(order._id);
-  return modules.orders.positions.findOrderPosition({ itemId: updatedOrderPosition._id });
+  return modules.orders.positions.findOrderPosition({ itemId: item._id });
 }