@faststore/api 1.10.34 → 1.11.3

package/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.11.3](https://github.com/vtex/faststore/compare/v1.11.2...v1.11.3) (2022-08-10)
+
+
+### Bug Fixes
+
+* Join cart items  ([#1434](https://github.com/vtex/faststore/issues/1434)) ([990b6a9](https://github.com/vtex/faststore/commit/990b6a920703f9004f7e0d6be6c2a316610db5c6))
+
+
+
 ## 1.10.34 (2022-08-04)
 
 

package/dist/api.cjs.development.js

@@ -933,7 +933,7 @@ const isAttachment = value => value.valueReference === VALUE_REFERENCES.attachme
 const getId = item => {
   var _item$itemOffered$add;
 
-  return [item.itemOffered.sku, item.seller.identifier, item.price, (_item$itemOffered$add = item.itemOffered.additionalProperty) == null ? void 0 : _item$itemOffered$add.filter(isAttachment).map(getPropertyId).join('-')].filter(Boolean).join('::');
+  return [item.itemOffered.sku, item.seller.identifier, item.price < 0.01 ? 'Gift' : undefined, (_item$itemOffered$add = item.itemOffered.additionalProperty) == null ? void 0 : _item$itemOffered$add.filter(isAttachment).map(getPropertyId).join('-')].filter(Boolean).join('::');
 };
 
 const orderFormItemToOffer = (item, index) => ({
@@ -971,7 +971,12 @@ const groupById = offers => offers.reduce((acc, item) => {
   var _acc$get;
 
   const id = getId(item);
-  acc.set(id, (_acc$get = acc.get(id)) != null ? _acc$get : item);
+
+  if (!acc.has(id)) {
+    acc.set(id, []);
+  }
+
+  (_acc$get = acc.get(id)) == null ? void 0 : _acc$get.push(item);
   return acc;
 }, new Map());
 
@@ -990,6 +995,30 @@ const equals = (storeOrder, orderForm) => {
   return isSameOrder && orderItemsAreSync;
 };
 
+const joinItems = form => {
+  const itemsById = form.items.reduce((acc, item) => {
+    const id = getId(orderFormItemToOffer(item));
+
+    if (!acc[id]) {
+      acc[id] = [];
+    }
+
+    acc[id].push(item);
+    return acc;
+  }, {});
+  return { ...form,
+    items: Object.values(itemsById).map(items => {
+      const [item] = items;
+      const quantity = items.reduce((acc, i) => acc + i.quantity, 0);
+      const totalPrice = items.reduce((acc, i) => acc + i.quantity * i.sellingPrice, 0);
+      return { ...item,
+        quantity,
+        sellingPrice: totalPrice / quantity
+      };
+    })
+  };
+};
+
 const orderFormToCart = async (form, skuLoader) => {
   return {
     order: {
@@ -1092,7 +1121,7 @@ const validateCart = async (_, {
     const isStale = isOrderFormStale(orderForm);
 
     if (isStale === true && orderNumber) {
-      const newOrderForm = await setOrderFormEtag(orderForm, commerce);
+      const newOrderForm = await setOrderFormEtag(orderForm, commerce).then(joinItems);
       return orderFormToCart(newOrderForm, skuLoader);
     }
   } // Step2: Process items from both browser and checkout so they have the same shape
@@ -1100,33 +1129,41 @@ const validateCart = async (_, {
 
   const browserItemsById = groupById(acceptedOffer);
   const originItemsById = groupById(orderForm.items.map(orderFormItemToOffer));
-  const browserItems = Array.from(browserItemsById.values()); // items on the user's browser
+  const originItems = Array.from(originItemsById.entries()); // items on the VTEX platform backend
 
-  const originItems = Array.from(originItemsById.values()); // items on the VTEX platform backend
+  const browserItems = Array.from(browserItemsById.entries()); // items on the user's browser
   // Step3: Compute delta changes
 
   const {
     itemsToAdd,
     itemsToUpdate
-  } = browserItems.reduce((acc, item) => {
-    const maybeOriginItem = originItemsById.get(getId(item));
+  } = browserItems.reduce((acc, [id, items]) => {
+    const maybeOriginItem = originItemsById.get(id); // Adding new items to cart
 
     if (!maybeOriginItem) {
-      acc.itemsToAdd.push(item);
-    } else {
-      acc.itemsToUpdate.push({ ...maybeOriginItem,
-        quantity: item.quantity
-      });
-    }
+      items.forEach(item => acc.itemsToAdd.push(item));
+      return acc;
+    } // Update existing items
+
 
+    const [head, ...tail] = maybeOriginItem;
+    const totalQuantity = items.reduce((acc, curr) => acc + curr.quantity, 0); // set total quantity to first item
+
+    acc.itemsToUpdate.push({ ...head,
+      quantity: totalQuantity
+    }); // Remove all the rest
+
+    tail.forEach(item => acc.itemsToUpdate.push({ ...item,
+      quantity: 0
+    }));
     return acc;
   }, {
     itemsToAdd: [],
     itemsToUpdate: []
   });
-  const itemsToDelete = originItems.filter(item => !browserItemsById.has(getId(item))).map(item => ({ ...item,
+  const itemsToDelete = originItems.filter(([id]) => !browserItemsById.has(id)).flatMap(([, items]) => items.map(item => ({ ...item,
     quantity: 0
-  }));
+  })));
   const changes = [...itemsToAdd, ...itemsToUpdate, ...itemsToDelete].map(offerToOrderItemInput);
 
   if (changes.length === 0) {
@@ -1139,7 +1176,7 @@ const validateCart = async (_, {
     id: orderForm.orderFormId,
     orderItems: changes
   }) // update orderForm etag so we know last time we touched this orderForm
-  .then(form => enableOrderFormSync ? setOrderFormEtag(form, commerce) : form); // Step5: If no changes detected before/after updating orderForm, the order is validated
+  .then(form => enableOrderFormSync ? setOrderFormEtag(form, commerce) : form).then(joinItems); // Step5: If no changes detected before/after updating orderForm, the order is validated
 
   if (equals(order, updatedOrderForm)) {
     return null;