@darkpos/pricing 1.0.99 → 1.0.100

package/__TEST__/order/conditionsNotMet.test.js

@@ -26,25 +26,18 @@ describe('Conditions not met for the item', () => {
         ],
       },
     };
-    const conditionsBag = [];
     const { addItemModifier } = pricingService.order;
-    addItemModifier({
-      order,
-      modifier,
-      itemIndex: 0,
-      onConditionsNotMet: bag => {
-        bag.forEach(condition => {
-          conditionsBag.push(condition);
-        });
-      },
-    });
-    expect(conditionsBag).toEqual([
-      {
-        current: 1,
-        name: '$gt.itemPieces',
-        value: 5,
-      },
-    ]);
+    const calculatedOrder = pricingService.order.calculate(
+      addItemModifier({
+        order,
+        modifier,
+        itemIndex: 0,
+      })
+    );
+    expect(calculatedOrder.items[0].modifiers.length).toEqual(1);
+    expect(calculatedOrder.items[0].modifiers[0].conditions.valid).toEqual(
+      false
+    );
   });
   test('#2: Item quantity condition is not met, errors bag populated', () => {
     const order = {
@@ -65,25 +58,19 @@ describe('Conditions not met for the item', () => {
         ],
       },
     };
-    const conditionsBag = [];
     const { addItemModifier } = pricingService.order;
-    addItemModifier({
-      order,
-      modifier,
-      itemIndex: 0,
-      onConditionsNotMet: bag => {
-        bag.forEach(condition => {
-          conditionsBag.push(condition);
-        });
-      },
-    });
-    expect(conditionsBag).toEqual([
-      {
-        current: 1,
-        name: '$gt.itemQuantity',
-        value: 5,
-      },
-    ]);
+    const calculatedOrder = pricingService.order.calculate(
+      addItemModifier({
+        order,
+        modifier,
+        itemIndex: 0,
+      })
+    );
+
+    expect(calculatedOrder.items[0].modifiers.length).toEqual(1);
+    expect(calculatedOrder.items[0].modifiers[0].conditions.valid).toEqual(
+      false
+    );
   });
   test('#3: Required modifiers condition is not met, errors bag populated', () => {
     const order = {
@@ -108,30 +95,20 @@ describe('Conditions not met for the item', () => {
           },
         ],
       },
+      _id: '123',
     };
-    const conditionsBag = [];
     const { addItemModifier } = pricingService.order;
-    addItemModifier({
-      order,
-      modifier,
-      itemIndex: 0,
-      onConditionsNotMet: bag => {
-        bag.forEach(condition => {
-          conditionsBag.push(condition);
-        });
-      },
-    });
-    expect(conditionsBag).toEqual([
-      {
-        current: [],
-        name: '$in.modifiers',
-        value: [
-          {
-            modifierId: 'mod-1',
-          },
-        ],
-      },
-    ]);
+    const calculatedOrder = pricingService.order.calculate(
+      addItemModifier({
+        order,
+        modifier,
+        itemIndex: 0,
+      })
+    );
+    expect(calculatedOrder.items[0].modifiers.length).toEqual(1);
+    expect(calculatedOrder.items[0].modifiers[0].conditions.valid).toEqual(
+      false
+    );
   });
 
   test('#4: Item number condition is met, errors bag empty', () => {
@@ -1008,4 +985,278 @@ describe('Conditions not met for the item', () => {
       paymentId: undefined,
     });
   });
+
+  test('addModifiers should not be valid if the parent is not valid', () => {
+    const addModifier = {
+      _id: '6819114c06c23d37c1f19435',
+      name: 'Add Modifier',
+      type: 'discount',
+      tags: ['default'],
+      direct: true,
+    };
+    const modifier = {
+      _id: '6819114c06c23d37c1f19412',
+      name: 'parent modifier',
+      type: 'discount',
+      tags: ['default'],
+      direct: true,
+      conditions: {
+        valid: null,
+        rules: [
+          {
+            key: 'payment',
+            value: 'prepay',
+            operand: '$in',
+          },
+        ],
+      },
+      compute: {
+        type: 'fixed',
+        action: 'subtract',
+        amount: 1,
+      },
+      addModifiers: [addModifier],
+    };
+
+    const item = {
+      _id: 'abc',
+      price: 10,
+      quantity: 1,
+      modifiers: [],
+    };
+
+    let order = {
+      items: [item],
+    };
+
+    order = pricingService.order.addItemModifier({
+      order,
+      modifier,
+      itemIndex: 0,
+    });
+
+    expect(order.items[0].modifiers.length).toBe(2);
+
+    const resultedOrder = pricingService.order.calculate(order);
+
+    expect(resultedOrder.items[0].modifiers[0].modifierId).toBe(
+      '6819114c06c23d37c1f19412'
+    );
+    expect(resultedOrder.items[0].modifiers[0].name).toBe('parent modifier');
+    expect(resultedOrder.items[0].modifiers[0].conditions.valid).toBe(false);
+
+    expect(resultedOrder.items[0].modifiers[1].modifierId).toBe(
+      '6819114c06c23d37c1f19435'
+    );
+    expect(resultedOrder.items[0].modifiers[1].name).toBe('Add Modifier');
+    expect(resultedOrder.items[0].modifiers[1].conditions.valid).toBe(false);
+  });
+
+  test('delModifiers should be valid (remain untouched) if the parent is not valid', () => {
+    const delModifier = {
+      _id: '6819114c06c23d37c1f19435',
+      name: 'Del Modifier',
+      type: 'discount',
+      tags: ['default'],
+      direct: true,
+    };
+    const modifier = {
+      _id: '6819114c06c23d37c1f19412',
+      name: 'parent modifier',
+      type: 'discount',
+      tags: ['default'],
+      direct: true,
+      conditions: {
+        valid: null,
+        rules: [
+          {
+            key: 'payment',
+            value: 'prepay',
+            operand: '$in',
+          },
+        ],
+      },
+      compute: {
+        type: 'fixed',
+        action: 'subtract',
+        amount: 1,
+      },
+      delModifier: [delModifier],
+    };
+
+    const item = {
+      _id: 'abc',
+      price: 10,
+      quantity: 1,
+      modifiers: [],
+    };
+
+    let order = {
+      items: [item],
+    };
+
+    order = pricingService.order.addItemModifier({
+      order,
+      modifier,
+      itemIndex: 0,
+    });
+
+    order = pricingService.order.addItemModifier({
+      order,
+      modifier: delModifier,
+      itemIndex: 0,
+    });
+
+    expect(order.items[0].modifiers.length).toBe(2);
+
+    const resultedOrder = pricingService.order.calculate(order);
+
+    expect(resultedOrder.items[0].modifiers[0].modifierId).toBe(
+      '6819114c06c23d37c1f19412'
+    );
+    expect(resultedOrder.items[0].modifiers[0].name).toBe('parent modifier');
+    expect(resultedOrder.items[0].modifiers[0].conditions.valid).toBe(false);
+
+    expect(resultedOrder.items[0].modifiers[1].modifierId).toBe(
+      '6819114c06c23d37c1f19435'
+    );
+    expect(resultedOrder.items[0].modifiers[1].name).toBe('Del Modifier');
+    expect(resultedOrder.items[0].modifiers[1].conditions.valid).toBe(true);
+  });
+
+  test('delModifiers should be invalid if the parent is  valid', () => {
+    const delModifier = {
+      _id: '6819114c06c23d37c1f19435',
+      name: 'Del Modifier',
+      type: 'discount',
+      tags: ['default'],
+      direct: true,
+    };
+    const modifier = {
+      _id: '6819114c06c23d37c1f19412',
+      name: 'parent modifier',
+      type: 'discount',
+      tags: ['default'],
+      direct: true,
+      conditions: {
+        valid: null,
+        rules: [
+          {
+            key: 'payment',
+            value: 'prepay',
+            operand: '$in',
+          },
+        ],
+      },
+      compute: {
+        type: 'fixed',
+        action: 'subtract',
+        amount: 1,
+      },
+      delModifiers: [delModifier],
+    };
+
+    const item = {
+      _id: 'abc',
+      price: 10,
+      quantity: 1,
+      modifiers: [],
+    };
+
+    let order = {
+      items: [item],
+    };
+
+    order = pricingService.order.addItemModifier({
+      order,
+      modifier,
+      itemIndex: 0,
+    });
+
+    order = pricingService.order.addItemModifier({
+      order,
+      modifier: delModifier,
+      itemIndex: 0,
+    });
+
+    expect(order.items[0].modifiers.length).toBe(2);
+
+    const resultedOrder = pricingService.order.calculate(order, {
+      isPrepay: true,
+    });
+
+    expect(resultedOrder.items[0].modifiers[0].modifierId).toBe(
+      '6819114c06c23d37c1f19412'
+    );
+    expect(resultedOrder.items[0].modifiers[0].name).toBe('parent modifier');
+    expect(resultedOrder.items[0].modifiers[0].conditions.valid).toBe(true);
+
+    expect(resultedOrder.items[0].modifiers[1].modifierId).toBe(
+      '6819114c06c23d37c1f19435'
+    );
+    expect(resultedOrder.items[0].modifiers[1].name).toBe('Del Modifier');
+    expect(resultedOrder.items[0].modifiers[1].conditions.valid).toBe(false);
+  });
+
+  test('addModifiers should not be deleted if the parent gets deleted', () => {
+    const addModifier = {
+      _id: '6819114c06c23d37c1f19435',
+      name: 'Add Modifier',
+      type: 'discount',
+      tags: ['default'],
+      direct: true,
+    };
+    const modifier = {
+      _id: '6819114c06c23d37c1f19412',
+      name: 'parent modifier',
+      type: 'discount',
+      tags: ['default'],
+      direct: true,
+      conditions: {
+        valid: null,
+        rules: [
+          {
+            key: 'payment',
+            value: 'prepay',
+            operand: '$in',
+          },
+        ],
+      },
+      compute: {
+        type: 'fixed',
+        action: 'subtract',
+        amount: 1,
+      },
+      addModifiers: [addModifier],
+    };
+
+    const item = {
+      _id: 'abc',
+      price: 10,
+      quantity: 1,
+      modifiers: [],
+    };
+
+    let order = {
+      items: [item],
+    };
+
+    order = pricingService.order.addItemModifier({
+      order,
+      modifier,
+      itemIndex: 0,
+    });
+
+    expect(order.items[0].modifiers.length).toBe(2);
+
+    const parentModifier = order.items[0].modifiers[0];
+
+    const result = pricingService.item.removeModifier({
+      item: order.items[0],
+      modifier: parentModifier,
+      order,
+    });
+
+    expect(result.modifiers.length).toBe(0);
+  });
 });

package/__TEST__/order/order-payment-modifier.test.js

@@ -1106,7 +1106,7 @@ describe('Order actions', () => {
 
   test('Applies fixed and percentage discounts with fixed modifier added first (both payment modifiers)', () => {
     const prePayDiscount1Usd = {
-      _id: '6819114c06c23d37c1f19412',
+      _id: '6819114c06c23d37c55522',
       name: '1 usd pre pay disc',
       type: 'discount',
       tags: ['default'],
@@ -1129,7 +1129,7 @@ describe('Order actions', () => {
     };
 
     const cashDiscount10Percent = {
-      _id: '6819114c06c23d37c1f19412',
+      _id: '6819114c06c23d37c1f4543',
       name: '10 % cash discount',
       type: 'discount',
       tags: ['default'],
@@ -1177,7 +1177,7 @@ describe('Order actions', () => {
 
   test('Applies percentage and fixed discounts with percentage modifier added first (both paymentModifiers)', () => {
     const prePayDiscount1Usd = {
-      _id: '6819114c06c23d37c1f19412',
+      _id: '6819114c06c23d37c1f22233',
       name: '1 usd pre pay disc',
       type: 'discount',
       tags: ['default'],
@@ -1200,7 +1200,7 @@ describe('Order actions', () => {
     };
 
     const cashDiscount10Percent = {
-      _id: '6819114c06c23d37c1f19412',
+      _id: '6819114c06c23d3744544',
       name: '10 % cash discount',
       type: 'discount',
       tags: ['default'],
@@ -1265,7 +1265,7 @@ describe('Order actions', () => {
     };
 
     const cashDiscount10Percent = {
-      _id: '6819114c06c23d37c1f19412',
+      _id: '6819114c06c23d37c9999',
       name: '10 % cash discount',
       type: 'discount',
       tags: ['default'],
@@ -1312,7 +1312,7 @@ describe('Order actions', () => {
 
   test('Applies one payment discount and one regular percentage discount (fixed first)', () => {
     const prePayDiscount1Usd = {
-      _id: '6819114c06c23d37c1f19412',
+      _id: '6819114c06c23d37c1f194444',
       name: '1 usd pre pay disc',
       type: 'discount',
       tags: ['default'],
@@ -1329,7 +1329,7 @@ describe('Order actions', () => {
     };
 
     const cashDiscount10Percent = {
-      _id: '6819114c06c23d37c1f19412',
+      _id: '6819114c06c23d37c1f1555',
       name: '10 % cash discount',
       type: 'discount',
       tags: ['default'],
@@ -1376,7 +1376,7 @@ describe('Order actions', () => {
 
   test('Applies one payment discount and one regular percentage discount (fixed first) withouth sending amountToPay', () => {
     const prePayDiscount1Usd = {
-      _id: '6819114c06c23d37c1f19412',
+      _id: '6819114c06c23d37c1f19234',
       name: '1 usd pre pay disc',
       type: 'discount',
       tags: ['default'],
@@ -1390,6 +1390,7 @@ describe('Order actions', () => {
         action: 'subtract',
         amount: 1,
       },
+      modifierId: '321545',
     };
 
     const cashDiscount10Percent = {
@@ -1413,6 +1414,7 @@ describe('Order actions', () => {
         action: 'subtract',
         amount: 10,
       },
+      modifierId: '3232332',
     };
 
     const item = {

package/__TEST__/order/order.test.js

@@ -14,6 +14,7 @@ describe('Order actions', () => {
   test('Get calculated Order, one item', () => {
     const modifiers = [
       {
+        _id: '1123213',
         compute: {
           amount: 20,
           type: 'percentage',
@@ -26,6 +27,7 @@ describe('Order actions', () => {
         },
       },
       {
+        _id: '22222',
         compute: {
           amount: 20,
           type: 'percentage',
@@ -38,6 +40,7 @@ describe('Order actions', () => {
         },
       },
       {
+        _id: '333',
         compute: { amount: 2, type: 'fixed', action: 'subtract' },
         name: 'modifier3',
         type: 'discount',
@@ -2822,7 +2825,7 @@ describe('Order actions', () => {
       _id: 1,
       price: 10,
       quantity: 1,
-      modifiers: [discountMod100Fixed, discountMod100Fixed],
+      modifiers: [discountMod100Fixed, { ...discountMod100Fixed, _id: 222 }],
     };
 
     const calculatedItem = pricingService.item.calculate(item1);
@@ -2865,7 +2868,7 @@ describe('Order actions', () => {
       _id: 1,
       price: 10,
       quantity: 2,
-      modifiers: [discountMod100Fixed, discountMod100Fixed],
+      modifiers: [discountMod100Fixed, { ...discountMod100Fixed, _id: 222 }],
     };
 
     const calculatedItem = pricingService.item.calculate(item1);
@@ -2911,7 +2914,10 @@ describe('Order actions', () => {
       _id: 1,
       price: 10,
       quantity: 2,
-      modifiers: [discountMod100Percentage, discountMod100Percentage],
+      modifiers: [
+        discountMod100Percentage,
+        { ...discountMod100Percentage, _id: 2 },
+      ],
     };
 
     const calculatedItem = pricingService.item.calculate(item1);
@@ -2940,7 +2946,7 @@ describe('Order actions', () => {
 
   test('CU-861n7pum9 - Calculate order -> discountMod100Percentage discountMod100Fixed  qt=2', () => {
     const discountMod100Percentage = {
-      _id: 1,
+      _id: 2222,
       compute: {
         amount: 100,
         type: 'percentage',
@@ -2954,7 +2960,7 @@ describe('Order actions', () => {
     };
 
     const discountMod100Fixed = {
-      _id: 1,
+      _id: 333333,
       compute: {
         amount: 100,
         type: 'fixed',
@@ -2971,8 +2977,8 @@ describe('Order actions', () => {
       modifiers: [
         discountMod100Percentage,
         discountMod100Fixed,
-        discountMod100Percentage,
-        discountMod100Fixed,
+        { ...discountMod100Percentage, _id: 4444 },
+        { ...discountMod100Fixed, _id: 5555 },
       ],
     };
 
@@ -3002,7 +3008,7 @@ describe('Order actions', () => {
 
   test('CU-861n7pum9 - Calculate order -> discountMod60Percentage discountMod100Fixed, sort,  qt=2', () => {
     const discountMod60Percentage = {
-      _id: 1,
+      _id: 222,
       compute: {
         amount: 60,
         type: 'percentage',
@@ -3017,7 +3023,7 @@ describe('Order actions', () => {
     };
 
     const discountMod100Fixed = {
-      _id: 1,
+      _id: 3333,
       compute: {
         amount: 100,
         type: 'fixed',
@@ -3063,7 +3069,7 @@ describe('Order actions', () => {
 
   test('CU-861n7pum9 - Calculate order -> discountMod9Fixed , sort,  qt=2', () => {
     const discountMod9Fixed = {
-      _id: 1,
+      _id: 11111,
       compute: {
         amount: 12,
         type: 'fixed',
@@ -3077,10 +3083,10 @@ describe('Order actions', () => {
     };
 
     const item1 = {
-      _id: 1,
+      _id: 22222,
       price: 10,
       quantity: 2,
-      modifiers: [discountMod9Fixed, discountMod9Fixed],
+      modifiers: [discountMod9Fixed, { ...discountMod9Fixed, _id: 5555 }],
     };
 
     const calculatedItem = pricingService.item.calculate(item1);

package/lib/item/calculate.js

@@ -52,17 +52,16 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
         modifierActions.isLocked(mod)
     );
 
-    const validatedModifiers = itemModifiers.map(each =>
-      modifierActions.validate(each, {
-        item,
-        startRequestDate,
-        endRequestDate,
-        allItems,
-        paymentMethod,
-        paymentType,
-        isPrepay,
-      })
-    );
+    const validatedModifiers = actions.validateModifiers({
+      item,
+      itemModifiers,
+      startRequestDate,
+      endRequestDate,
+      allItems,
+      paymentMethod,
+      paymentType,
+      isPrepay,
+    });
 
     const modifiersToCompute = validatedModifiers.filter(
       each =>

package/lib/item/index.js

@@ -65,6 +65,7 @@ const getUpdatedStatus = require('./getUpdatedStatus');
 const isOverwrittenPrice = require('./isOverwrittenPrice');
 const isOverwrittenQuantity = require('./isOverwrittenQuantity');
 const overrideNotes = require('./overrideNotes');
+const validateModifiers = require('./validateModifiers');
 
 const itemActions = (deps = {}) => {
   const actions = {};
@@ -143,6 +144,7 @@ const itemActions = (deps = {}) => {
     isOverwrittenPrice: isOverwrittenPrice(innerDeps),
     isOverwrittenQuantity: isOverwrittenQuantity(innerDeps),
     overrideNotes: overrideNotes(innerDeps),
+    validateModifiers: validateModifiers(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/item/removeModifier.js

@@ -15,24 +15,21 @@ module.exports = ({ modifierActions, _, actions }) => {
 
     const modifiersToApply = [
       modifier,
-      ...addModifiers.filter(
-        addMod =>
-          !addMod.required &&
-          (!order ||
-            !actions.hasModifier({
-              item: {
-                ...item,
-                modifiers: item.modifiers.filter(
-                  mod => mod._id !== modifier._id
-                ),
-              },
-              modifier: addMod,
-              relatedItems: actions.getRelatedItems({
-                items: order.items,
-                item,
-              }),
-            }))
-      ),
+      ...addModifiers.filter(addMod => {
+        if (addMod.required) return false;
+        const hasModifier = actions.hasModifier({
+          item: {
+            ...item,
+            modifiers: item.modifiers.filter(mod => mod._id !== modifier._id),
+          },
+          modifier: addMod,
+          relatedItems: actions.getRelatedItems({
+            items: order ? order.items : [],
+            item,
+          }),
+        });
+        return modifierActions.isGroup(addMod) ? !hasModifier : !!hasModifier;
+      }),
     ];
 
     // Remove