fix: avoid infinite looping when taxes are enabled

fixes #4620
reactioncommerce · Sep 20, 2018 · 11e95ba · 11e95ba
1 parent e90da0d
commit 11e95ba
Showing 1 changed file with 25 additions and 10 deletions.
diff --git a/imports/plugins/core/taxes/server/methods/methods.js b/imports/plugins/core/taxes/server/methods/methods.js
@@ -1,3 +1,4 @@
+import _ from "lodash";
 import Logger from "@reactioncommerce/logger";
 import ReactionError from "@reactioncommerce/reaction-error";
 import { Meteor } from "meteor/meteor";
@@ -123,17 +124,31 @@ export const methods = {
 
     const { cartTaxData, cartTaxRate, itemsWithTax, taxRatesByShop } = options;
 
-    const result = Cart.update({ _id: cartId }, {
-      $set: {
-        taxes: cartTaxData,
-        tax: cartTaxRate,
-        items: itemsWithTax,
-        taxRatesByShop
-      }
-    });
+    const cart = Cart.findOne({ _id: cartId });
+
+    // Compare only the props we care about for tax purposes
+    const oldCartItems = (cart.items || []).map(({ taxData, taxRate, tax }) => ({ taxData, taxRate, tax }));
+    const newCartItems = (itemsWithTax || []).map(({ taxData, taxRate, tax }) => ({ taxData, taxRate, tax }));
+
+    let result;
+    if (
+      !_.isEqual(cart.taxes, cartTaxData) ||
+      !_.isEqual(cart.tax, cartTaxRate) ||
+      !_.isEqual(oldCartItems, newCartItems) ||
+      !_.isEqual(cart.taxRatesByShop, taxRatesByShop)
+    ) {
+      result = Cart.update({ _id: cartId }, {
+        $set: {
+          taxes: cartTaxData,
+          tax: cartTaxRate,
+          items: itemsWithTax,
+          taxRatesByShop
+        }
+      });
 
-    const updatedCart = Cart.findOne({ _id: cartId });
-    Promise.await(appEvents.emit("afterCartUpdate", cartId, updatedCart));
+      const updatedCart = Cart.findOne({ _id: cartId });
+      Promise.await(appEvents.emit("afterCartUpdate", cartId, updatedCart));
+    }
 
     return result;
   },