@darkpos/pricing 1.0.72 → 1.0.73

package/__TEST__/modifier/hasModifier.test.js

@@ -1664,15 +1664,6 @@ describe('hasModifier Function', () => {
       modifiers: [],
     };
 
-    // const modifier = groupMod;
-    // const relatedItems = [];
-
-    // const result = pricingService.item.hasModifier({
-    //   item,
-    //   modifier,
-    //   relatedItems,
-    // });
-
     const { updatedOrder } = pricingService.order.addItem({
       order,
       item: {
@@ -1682,13 +1673,12 @@ describe('hasModifier Function', () => {
           parentItemId: item.itemId,
           parentId: item._id,
           includeParent: true,
-          relatedItemId: relatedModItem._id,
+          groupPath: ',groupMod10',
         },
       },
     });
 
     expect(updatedOrder.items.length).toBe(2);
-
     expect(updatedOrder.items[1]).toMatchObject({
       _id: 1,
       itemId: 'ab',
@@ -1728,7 +1718,7 @@ describe('hasModifier Function', () => {
           parentItemId: item.itemId,
           parentId: item._id,
           includeParent: false,
-          relatedItemId: relatedModItem._id,
+          groupPath: ',groupMod10',
         },
       },
     });

package/lib/item/getInvalidRequiredModifiers.js

@@ -6,7 +6,7 @@ module.exports = ({ modifierActions, actions }) =>
     item.modifiers.forEach(modifier => {
       if (
         modifierActions.isRequired(modifier) &&
-        modifierActions.isGroupOfModifiers(modifier) &&
+        modifierActions.isGroup(modifier) &&
         !actions.hasModifier({ item, modifier, relatedItems })
       ) {
         invalidModifiers.push(modifier);

package/lib/item/hasModifier.js

@@ -1,36 +1,36 @@
 module.exports = ({ modifierActions }) =>
-  function hasModifier({ item, modifier, relatedItems, originalModifier }) {
+  function hasModifier({ item, modifier, relatedItems }) {
     if (!item || !modifier || !item.modifiers) return false;
 
-    const originalMod = originalModifier || modifier;
+    const isGroupPath = groupPath =>
+      groupPath &&
+      (groupPath.includes(modifier.modifierId) ||
+        groupPath.includes(modifier._id));
 
-    if (modifierActions.isGroupOfModifiers(modifier)) {
-      const relatedModifiers = modifier.properties.group.modifiers;
-      return [
-        modifierActions.removeGroupData({ modifier }),
-        ...relatedModifiers,
-      ].some(relatedModifier =>
-        hasModifier({
-          item,
-          modifier: relatedModifier,
-          relatedItems,
-          originalModifier: originalMod,
-        })
-      );
+    if (modifierActions.isGroup(modifier)) {
+      const matchByRelatedModifier = item.modifiers.some(itemMod => {
+        if (
+          modifierActions.isGroup(itemMod) ||
+          !itemMod.properties ||
+          !itemMod.properties.groupPath
+        )
+          return false;
+        return isGroupPath(itemMod.properties.groupPath);
+      });
+
+      const matchByRelatedItems =
+        !!relatedItems &&
+        modifierActions.isGroup(modifier) &&
+        relatedItems.some(relatedItem =>
+          isGroupPath(
+            relatedItem.properties && relatedItem.properties.groupPath
+          )
+        );
+
+      return matchByRelatedModifier || matchByRelatedItems;
     }
 
-    const matchByModifier = item.modifiers.some(
+    return item.modifiers.some(
       each => !modifierActions.isGroup(each) && each.modifierId === modifier._id
     );
-
-    const matchByRelatedItems =
-      !!relatedItems &&
-      modifierActions.isGroupOfItems(originalMod) &&
-      relatedItems.some(relatedItem =>
-        originalMod.properties.group.items.some(
-          modItem => modItem._id === relatedItem.properties.relatedItemId
-        )
-      );
-
-    return matchByModifier || matchByRelatedItems;
   };

package/lib/item/removeModifier.js

@@ -37,7 +37,6 @@ module.exports = ({ modifierActions, _, actions }) => {
                 items: order.items,
                 item,
               }),
-              originalModifier: addMod,
             }))
       ),
     ];

package/lib/modifier/index.js

@@ -142,6 +142,7 @@ const isCompute = require('./isCompute');
 const isFixedOverride = require('./isFixedOverride');
 const isLocked = require('./isLocked');
 const hasAddModifier = require('./hasAddModifier');
+const removeGroupRelations = require('./removeGroupRelations');
 
 const modifierActions = (deps = {}) => {
   const actions = {};
@@ -297,6 +298,7 @@ const modifierActions = (deps = {}) => {
     isFixedOverride: isFixedOverride(innerDeps),
     isLocked: isLocked(innerDeps),
     hasAddModifier: hasAddModifier(innerDeps),
+    removeGroupRelations: removeGroupRelations(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/modifier/removeGroupRelations.js

@@ -0,0 +1,22 @@
+module.exports = ({ actions }) =>
+  function removeGroupRelations(modifier) {
+    if (
+      !actions.isGroup(modifier) ||
+      !modifier.properties ||
+      !modifier.properties.group
+    )
+      return modifier;
+
+    return {
+      ...modifier,
+      properties: {
+        ...modifier.properties,
+        group: {
+          ...modifier.properties.group,
+          modifiers: [],
+          items: [],
+          manualModifiers: '',
+        },
+      },
+    };
+  };

package/lib/order/addItemModifier.js

@@ -92,7 +92,7 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     originalItem,
     onConditionsNotMet,
   }) => {
-    const modifier = _modifier; // to avoid no param reassign lint rule
+    const modifier = modifierActions.removeGroupRelations(_modifier); // to avoid no param reassign lint rule
     let item = { ...itemProp };
     const compute = getComputeModField(modifier);
     const conditionsBag = areConditionsMet(item, modifier.conditions);

package/lib/order/removeItem.js

@@ -38,7 +38,6 @@ module.exports = ({ actions, itemActions }) => {
                   order: prevOrder,
                   item: parentItem,
                 }),
-                originalModifier: addModifier,
               })
             ) {
               const updatedItem = itemActions.removeModifier({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.72",
+  "version": "1.0.73",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -17,6 +17,7 @@
     "test:validateConditions": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/order/validateConditionsCalculate.test.js",
     "test:hasModifier": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/modifier/hasModifier.test.js",
     "test:item": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/item.test.js",
+    "test:manualTest": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/manualTest.test.js",
     "test:split": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/order/split.test.js",
     "test:getModifierTags": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/item/getModifierTags.test.js",
     "test:createIndirectModifier": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/modifier/createIndirectModifier.test.js",
@@ -49,5 +50,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "2dc88094c2dbcebc04e0fbd817b45809a44dc403"
+  "gitHead": "276e28f676960107d60027bc70e22f698e6e124e"
 }