@unchainedshop/api 2.9.4 → 2.10.1

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

@@ -1,6 +1,11 @@
 import { log } from '@unchainedshop/logger';
 import { Context, Root } from '@unchainedshop/types/api.js';
-import { ProductNotFoundError, OrderQuantityTooLowError, InvalidIdError } from '../../../errors.js';
+import {
+  ProductNotFoundError,
+  OrderQuantityTooLowError,
+  InvalidIdError,
+  OrderWrongStatusError,
+} from '../../../errors.js';
 import { getOrderCart } from '../utils/getOrderCart.js';
 
 export default async function addCartProduct(
@@ -24,6 +29,8 @@ export default async function addCartProduct(
   if (!product) throw new ProductNotFoundError({ productId });
 
   const order = await getOrderCart({ orderId, user }, context);
+  if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
+
   const orderPosition = await modules.orders.positions.addProductItem(
     {
       quantity,

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

@@ -7,6 +7,7 @@ import {
   QuotationWrongStatusError,
   OrderQuantityTooLowError,
   InvalidIdError,
+  OrderWrongStatusError,
 } from '../../../errors.js';
 import { getOrderCart } from '../utils/getOrderCart.js';
 
@@ -42,6 +43,8 @@ export default async function addCartQuotation(
   }
 
   const order = await getOrderCart({ orderId, user }, context);
+  if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
+
   const product = await modules.products.findProduct({
     productId: quotation.productId,
   });

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

@@ -1,7 +1,11 @@
 import { log } from '@unchainedshop/logger';
 import { Context, Root } from '@unchainedshop/types/api.js';
 import { Configuration } from '@unchainedshop/types/common.js';
-import { ProductNotFoundError, OrderQuantityTooLowError } from '../../../errors.js';
+import {
+  ProductNotFoundError,
+  OrderQuantityTooLowError,
+  OrderWrongStatusError,
+} from '../../../errors.js';
 import { getOrderCart } from '../utils/getOrderCart.js';
 
 export default async function addMultipleCartProducts(
@@ -38,6 +42,7 @@ export default async function addMultipleCartProducts(
   );
 
   const order = await getOrderCart({ orderId, user }, context);
+  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 }) => {

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

@@ -7,7 +7,6 @@ export default async function checkoutCart(
   root: Root,
   params: {
     orderId: string;
-    orderContext?: any;
     paymentContext?: any;
     deliveryContext?: any;
   },
@@ -18,16 +17,17 @@ export default async function checkoutCart(
 
   log('mutation checkoutCart', { orderId: forceOrderId, userId });
 
-  const orderId = (await getOrderCart({ orderId: forceOrderId, user }, context))._id;
+  // Do not check for order status here! The checkout method will act accordingly
+  let order = await getOrderCart({ orderId: forceOrderId, user }, context);
 
   try {
-    const order = await modules.orders.checkout(orderId, transactionContext, context);
+    order = await modules.orders.checkout(order._id, transactionContext, context);
     return order;
   } catch (error) {
-    log(error.message, { userId, orderId, level: LogLevel.Error });
+    log(error.message, { userId, orderId: order._id, level: LogLevel.Error });
     throw new OrderCheckoutError({
       userId,
-      orderId,
+      orderId: order._id,
       ...transactionContext,
       detailCode: error.name || error.code,
       detailMessage: error.message,

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

@@ -7,7 +7,6 @@ export default async function confirmOrder(
   root: Root,
   params: {
     orderId: string;
-    orderContext?: any;
     paymentContext?: any;
     deliveryContext?: any;
   },
@@ -27,5 +26,5 @@ export default async function confirmOrder(
     throw new OrderWrongStatusError({ status: order.status });
   }
 
-  return modules.orders.confirm(order._id, transactionContext, context);
+  return modules.orders.confirm(order, transactionContext, context);
 }

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

@@ -13,8 +13,8 @@ export default async function createCart(
   const order = await modules.orders.findOrder({ orderNumber });
   if (order) throw new OrderNumberAlreadyExistsError({ orderNumber });
 
-  return services.orders.createUserCart(
-    { user, orderNumber, countryCode: context.countryContext },
+  return services.orders.nextUserCart(
+    { user, orderNumber, countryCode: context.countryContext, forceCartCreation: true },
     context,
   );
 }

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

@@ -1,6 +1,7 @@
 import { log } from '@unchainedshop/logger';
 import { Context, Root } from '@unchainedshop/types/api.js';
 import { getOrderCart } from '../utils/getOrderCart.js';
+import { OrderWrongStatusError } from '../../../errors.js';
 
 export default async function emptyCart(
   root: Root,
@@ -11,9 +12,11 @@ export default async function emptyCart(
 
   log('mutation emptyCart', { userId, orderId });
 
-  const cart = await getOrderCart({ orderId, user }, context);
-  if (!cart) return null;
+  const order = await getOrderCart({ orderId, user }, context);
+  if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
 
-  await modules.orders.positions.removePositions({ orderId: cart._id }, context);
-  return modules.orders.findOrder({ orderId: cart._id });
+  if (!order) return null;
+
+  await modules.orders.positions.removePositions({ orderId: order._id }, context);
+  return modules.orders.findOrder({ orderId: order._id });
 }

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

@@ -7,7 +7,6 @@ export default async function rejectOrder(
   root: Root,
   params: {
     orderId: string;
-    orderContext?: any;
     paymentContext?: any;
     deliveryContext?: any;
   },
@@ -25,5 +24,5 @@ export default async function rejectOrder(
   if (order.status !== OrderStatus.PENDING) {
     throw new OrderWrongStatusError({ status: order.status });
   }
-  return modules.orders.reject(order._id, transactionContext, context);
+  return modules.orders.reject(order, transactionContext, context);
 }

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

@@ -7,8 +7,8 @@ import {
   OrderPaymentNotFoundError,
   OrderPaymentTypeError,
   OrderWrongPaymentStatusError,
+  UserNoCartError,
 } from '../../../errors.js';
-import { getOrderCart } from '../utils/getOrderCart.js';
 
 export default async function signPaymentProviderForCheckout(
   root: Root,
@@ -30,7 +30,11 @@ export default async function signPaymentProviderForCheckout(
     });
     if (!orderPayment) throw new OrderPaymentNotFoundError({ orderPaymentId });
   } else {
-    const order = await getOrderCart({ user: context.user }, context);
+    const order = await modules.orders.cart({
+      countryContext: context.countryContext || context.user.lastLogin?.countryCode,
+      userId,
+    });
+    if (!order) throw new UserNoCartError({ userId });
     orderPayment = await modules.orders.payments.findOrderPayment({
       orderPaymentId: order.paymentId,
     });

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

@@ -2,6 +2,7 @@ import { log } from '@unchainedshop/logger';
 import { Context, Root } from '@unchainedshop/types/api.js';
 import { Address, Contact } from '@unchainedshop/types/common.js';
 import { getOrderCart } from '../utils/getOrderCart.js';
+import { OrderWrongStatusError } from '../../../errors.js';
 
 interface UpdateCartParams {
   orderId?: string;
@@ -20,10 +21,10 @@ export default async function updateCart(root: Root, params: UpdateCartParams, c
   log('mutation updateCart', { userId });
 
   let order = await getOrderCart({ orderId, user }, context);
+  if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
 
   if (meta) {
-    await modules.orders.updateContext(order._id, meta, context);
-    order = await modules.orders.findOrder({ orderId: order._id });
+    order = await modules.orders.updateContext(order._id, meta, context);
   }
 
   if (billingAddress) {

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

@@ -33,7 +33,7 @@ export default async function updateOrderDeliveryPickUp(
       required: DeliveryProviderType.PICKUP,
     });
 
-  await modules.orders.deliveries.updateContext(
+  return modules.orders.deliveries.updateContext(
     orderDeliveryId,
     {
       orderPickUpLocationId,
@@ -41,8 +41,4 @@ export default async function updateOrderDeliveryPickUp(
     },
     context,
   );
-
-  return modules.orders.deliveries.findDelivery({
-    orderDeliveryId,
-  });
 }

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

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

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

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

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

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

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

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

package/src/resolvers/mutations/utils/getOrderCart.ts

@@ -1,21 +1,19 @@
 import { Context } from '@unchainedshop/types/api.js';
 import { User } from '@unchainedshop/types/user.js';
-import { OrderNotFoundError, OrderWrongStatusError } from '../../../errors.js';
+import { OrderNotFoundError } from '../../../errors.js';
 
 export const getOrderCart = async (params: { orderId?: string; user: User }, context: Context) => {
-  const { countryContext, modules, services } = context;
+  const { modules, services } = context;
   const { orderId, user } = params;
 
   if (orderId) {
     const order = await modules.orders.findOrder({ orderId });
     if (!order) throw new OrderNotFoundError({ orderId });
-
-    if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
     return order;
   }
 
-  const cart = await modules.orders.cart({ countryContext }, user);
-  if (cart) return cart;
-
-  return services.orders.createUserCart({ user, countryCode: context.countryContext }, context);
+  return services.orders.nextUserCart(
+    { user, countryCode: context.countryContext, forceCartCreation: true },
+    context,
+  );
 };

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

@@ -167,7 +167,11 @@ export const User: UserHelperTypes = {
   async cart(user, params, context) {
     const { modules, countryContext } = context;
     await checkAction(context, viewUserOrders, [user, params]);
-    return modules.orders.cart({ countryContext, orderNumber: params.orderNumber }, user);
+    return modules.orders.cart({
+      countryContext: countryContext || user.lastLogin?.countryCode,
+      orderNumber: params.orderNumber,
+      userId: user._id,
+    });
   },
 
   async tokens(user, params, context) {
@@ -175,12 +179,12 @@ export const User: UserHelperTypes = {
     return context.modules.warehousing.findTokensForUser(user);
   },
 
-  country: async (user, params, context) => {
+  async country(user, params, context) {
     await checkAction(context, viewUserPrivateInfos, [user, params]);
     return context.services.users.getUserCountry(user, context);
   },
 
-  enrollments: async (user, params, context) => {
+  async enrollments(user, params, context) {
     await checkAction(context, viewUserEnrollments, [user, params]);
     return context.modules.enrollments.findEnrollments({
       ...(params || {}),

package/src/schema/mutation.ts

@@ -193,7 +193,7 @@ export default [
       Process the checkout (automatically charge & deliver if possible), the cart will get
       transformed to an ordinary order if everything goes well.
       """
-      checkoutCart(orderId: ID, orderContext: JSON, paymentContext: JSON, deliveryContext: JSON): Order!
+      checkoutCart(orderId: ID, paymentContext: JSON, deliveryContext: JSON): Order!
 
       """
       Change the quantity or configuration of an item in an open order.align-baselineAll
@@ -304,12 +304,12 @@ export default [
       """
       Manually confirm an order which is in progress
       """
-      confirmOrder(orderId: ID!, orderContext: JSON, paymentContext: JSON, deliveryContext: JSON): Order!
+      confirmOrder(orderId: ID!, paymentContext: JSON, deliveryContext: JSON): Order!
 
       """
       Manually reject an order which is in progress
       """
-      rejectOrder(orderId: ID!, orderContext: JSON, paymentContext: JSON, deliveryContext: JSON): Order!
+      rejectOrder(orderId: ID!, paymentContext: JSON, deliveryContext: JSON): Order!
 
       """
       Manually mark an unpaid/partially paid order as fully paid