adds updateCart mutation for convenience, closes #11

unchainedshop · Feb 26, 2019 · 1775615 · 1775615
1 parent 80f9486
commit 1775615
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 24 deletions.
diff --git a/packages/api/resolvers/mutations/index.js b/packages/api/resolvers/mutations/index.js
@@ -41,8 +41,9 @@ import updateCartItemQuantity from './updateCartItemQuantity';
 import removeCartItem from './removeCartItem';
 import addCartDiscount from './addCartDiscount';
 import removeCartDiscount from './removeCartDiscount';
-import removeOrder from './removeOrder';
+import updateCart from './updateCart';
 import updateOrder from './updateOrder';
+import removeOrder from './removeOrder';
 import setOrderPaymentProvider from './setOrderPaymentProvider';
 import setOrderDeliveryProvider from './setOrderDeliveryProvider';
 import updateOrderDelivery from './updateOrderDelivery';
@@ -138,10 +139,11 @@ export default {
   removeCartItem: acl(actions.updateCart)(removeCartItem),
   addCartDiscount: acl(actions.updateCart)(addCartDiscount),
   removeCartDiscount: acl(actions.updateCart)(removeCartDiscount),
+  updateCart: acl(actions.updateCart)(updateCart),
+  updateOrder: acl(actions.updateOrder)(updateOrder),
   removeOrder: acl(actions.updateOrder)(removeOrder),
   setOrderPaymentProvider: acl(actions.updateOrder)(setOrderPaymentProvider),
   setOrderDeliveryProvider: acl(actions.updateOrder)(setOrderDeliveryProvider),
-  updateOrder: acl(actions.updateOrder)(updateOrder),
   updateOrderDeliveryShipping: acl(actions.updateOrderDelivery)(updateOrderDelivery),
   updateOrderDeliveryPickUp: acl(actions.updateOrderDelivery)(updateOrderDelivery),
   updateOrderPaymentCard: acl(actions.updateOrderPayment)(updateOrderPayment),

diff --git a/packages/api/resolvers/mutations/updateCart.js b/packages/api/resolvers/mutations/updateCart.js
@@ -0,0 +1,22 @@
+import { log } from 'meteor/unchained:core-logger';
+import { Users } from 'meteor/unchained:core-users';
+import { UserNotFoundError } from '../../errors';
+
+export default function (root, {
+  address, contact, meta,
+}, { countryContext, userId }) {
+  log('mutation updateCart', { userId });
+  const user = Users.findOne({ _id: userId });
+  if (!user) throw new UserNotFoundError({ userId });
+  let order = user.initCart({ countryContext });
+  if (meta) {
+    order = order.updateContext(meta);
+  }
+  if (address) {
+    order = order.updateAddress({ ...address, countryCode: countryContext });
+  }
+  if (contact) {
+    order = order.updateContact({ contact });
+  }
+  return order;
+}
diff --git a/packages/api/resolvers/mutations/updateOrder.js b/packages/api/resolvers/mutations/updateOrder.js
@@ -2,30 +2,20 @@ import { log } from 'meteor/unchained:core-logger';
 import { Orders } from 'meteor/unchained:core-orders';
 import { OrderNotFoundError } from '../../errors';
 
-const logger = console;
-
 export default function (root, {
   address, contact, orderId, meta,
 }, { countryContext, userId }) {
   log('mutation updateOrder', { orderId, userId });
   let order = Orders.findOne({ _id: orderId });
   if (!order) throw new OrderNotFoundError({ data: { orderId } });
-  try {
-    if (meta) {
-      order = order.updateContext(meta);
-    }
-    if (address) {
-      order = order.updateAddress({ ...address, countryCode: countryContext });
-    }
-    if (contact) {
-      order = order.updateContact({ contact });
-    }
-    return order;
-  } catch (error) {
-    logger.error(error);
-    log('could not update order', {
-      userId, countryCode: countryContext, orderId, level: 'error',
-    });
-    throw error;
+  if (meta) {
+    order = order.updateContext(meta);
+  }
+  if (address) {
+    order = order.updateAddress({ ...address, countryCode: countryContext });
+  }
+  if (contact) {
+    order = order.updateContact({ contact });
   }
+  return order;
 }
diff --git a/packages/api/schema/mutation.js b/packages/api/schema/mutation.js
@@ -302,15 +302,20 @@ export default [/* GraphQL */`
     removeCartDiscount(discountId: ID!): OrderDiscount!
 
     """
-    Remove an order while it's still open
+    Change billing address and order contact of the current cart
     """
-    removeOrder(orderId: ID!): Order!
+    updateCart(address: AddressInput, contact: ContactInput, meta: JSON): Order!
 
     """
-    Change billing address and order conact of an open order
+    Change billing address and order contact of an open order
     """
     updateOrder(orderId: ID!, address: AddressInput, contact: ContactInput, meta: JSON): Order!
 
+    """
+    Remove an order while it's still open
+    """
+    removeOrder(orderId: ID!): Order!
+
     """
     Change the delivery method/provider
     """