@darkpos/pricing 1.0.72 → 1.0.75

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',
         },
       },
     });
@@ -1761,4 +1751,39 @@ describe('hasModifier Function', () => {
 
     expect(result2).toBe(true);
   });
+
+  test('hasModifier, matching by spreadFrom', () => {
+    const groupMod = {
+      _id: 'groupMod10',
+      attributes: ['group'],
+      properties: {
+        group: {},
+      },
+      modifierId: 'abcd123',
+    };
+
+    const spreadedManualModifier = {
+      _id: 'abc',
+      name: 'related item abc',
+      itemId: 'abc',
+      properties: {
+        spreadFrom: groupMod.modifierId,
+      },
+    };
+
+    const item = {
+      _id: 1,
+      itemId: 'ab',
+      modifiers: [groupMod, spreadedManualModifier],
+      price: 500,
+      total: 10000,
+    };
+
+    const result = pricingService.item.hasModifier({
+      item,
+      modifier: groupMod,
+    });
+
+    expect(result).toBe(true);
+  });
 });

package/__TEST__/modifier.test.js

@@ -680,4 +680,197 @@ describe('Modifier actions', () => {
       })
     );
   });
+
+  describe('getManualModifiers', () => {
+    it('should generate manual modifiers correctly for dry cleaning tags', () => {
+      const modifier = {
+        _id: 'abc123',
+        name: 'Base Modifier',
+        group: 'colorGroup1',
+        properties: {
+          group: {
+            manualModifiers: 'Red Tag, White Shirt, White Shirt , Blue Label',
+          },
+        },
+      };
+
+      const relatedModifiers = [{ name: 'White Shirt' }];
+
+      const result = pricingService.modifier.getManualModifiers({
+        modifier,
+        relatedModifiers,
+      });
+
+      expect(result).toHaveLength(2);
+      expect(result).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            name: 'Red Tag',
+            direct: true,
+            group: 'colorGroup1',
+            properties: {
+              isManual: true,
+            },
+            _id: 'ead6eb247a93bca8f802f9b2',
+          }),
+          expect.objectContaining({
+            name: 'Blue Label',
+            direct: true,
+            group: 'colorGroup1',
+            properties: {
+              isManual: true,
+            },
+            _id: '4e23edf8fa734884f4618003',
+          }),
+        ])
+      );
+    });
+
+    it('should return an empty array if no manual modifiers are present', () => {
+      const modifier = {
+        _id: 'xyz789',
+        properties: {
+          group: {
+            manualModifiers: '',
+          },
+        },
+      };
+
+      const result = pricingService.modifier.getManualModifiers({
+        modifier,
+        relatedModifiers: [],
+      });
+      expect(result).toEqual([]);
+    });
+
+    it('should return an empty array if required fields are missing', () => {
+      expect(
+        pricingService.modifier.getManualModifiers({ modifier: null })
+      ).toEqual([]);
+      expect(
+        pricingService.modifier.getManualModifiers({ modifier: {} })
+      ).toEqual([]);
+    });
+  });
+
+  describe('spreadSingleGroupModifiers', () => {
+    it('should spread the modifiers from a group, including its manual modifiers', () => {
+      const modifier = {
+        _id: 'abc123',
+        name: 'Base Modifier',
+        group: 'colorGroup1',
+        attributes: ['group'],
+        properties: {
+          group: {
+            manualModifiers: 'Red Tag, White Shirt, White Shirt , Blue Label',
+          },
+        },
+      };
+
+      const result = pricingService.modifier.spreadSingleGroupModifiers([
+        modifier,
+      ]);
+
+      expect(result).toStrictEqual([
+        {
+          name: 'Red Tag',
+          _id: 'ead6eb247a93bca8f802f9b2',
+          direct: true,
+          group: 'colorGroup1',
+          properties: { isManual: true, spreadFrom: 'abc123' },
+        },
+        {
+          name: 'White Shirt',
+          _id: '4e23edf8fa734884f4618003',
+          direct: true,
+          group: 'colorGroup1',
+          properties: { isManual: true, spreadFrom: 'abc123' },
+        },
+        {
+          name: 'Blue Label',
+          _id: '94b02ee7ba009b09a913a786',
+          direct: true,
+          group: 'colorGroup1',
+          properties: { isManual: true, spreadFrom: 'abc123' },
+        },
+      ]);
+    });
+
+    it('should not spread the modifiers from a group, as there are other modifiers with the same group', () => {
+      const modifier = {
+        _id: 'abc123',
+        name: 'Base Modifier',
+        group: 'colorGroup1',
+        attributes: ['group'],
+        properties: {
+          group: {
+            manualModifiers: 'Red Tag, White Shirt, White Shirt , Blue Label',
+          },
+        },
+      };
+
+      const otherModifier = {
+        _id: 'bcd123',
+        name: 'other Modifier',
+        group: 'colorGroup1',
+      };
+
+      const result = pricingService.modifier.spreadSingleGroupModifiers([
+        modifier,
+        otherModifier,
+      ]);
+
+      expect(result).toStrictEqual([modifier, otherModifier]);
+    });
+
+    it('should spread the modifiers from a group, as there are  no other modifiers with the same group', () => {
+      const modifier = {
+        _id: 'abc123',
+        name: 'Base Modifier',
+        group: 'colorGroup1',
+        attributes: ['group'],
+        properties: {
+          group: {
+            manualModifiers: 'Red Tag, White Shirt, White Shirt , Blue Label',
+          },
+        },
+      };
+
+      const otherModifier = {
+        _id: 'bcd123',
+        name: 'other Modifier',
+        group: 'Repair',
+      };
+
+      const result = pricingService.modifier.spreadSingleGroupModifiers([
+        modifier,
+        otherModifier,
+      ]);
+
+      expect(result).toStrictEqual([
+        {
+          name: 'Red Tag',
+          _id: 'ead6eb247a93bca8f802f9b2',
+          direct: true,
+          group: 'colorGroup1',
+          properties: { isManual: true, spreadFrom: 'abc123' },
+        },
+        {
+          name: 'White Shirt',
+          _id: '4e23edf8fa734884f4618003',
+          direct: true,
+          group: 'colorGroup1',
+          properties: { isManual: true, spreadFrom: 'abc123' },
+        },
+        {
+          name: 'Blue Label',
+          _id: '94b02ee7ba009b09a913a786',
+          direct: true,
+          group: 'colorGroup1',
+          properties: { isManual: true, spreadFrom: 'abc123' },
+        },
+        { _id: 'bcd123', name: 'other Modifier', group: 'Repair' },
+      ]);
+    });
+  });
 });

package/lib/index.js

@@ -2,6 +2,8 @@ const utils = require('@darkpos/utils');
 const _ = require('lodash');
 const moment = require('moment-timezone');
 /** services  */
+const sha256 = require('crypto-js/sha256');
+
 const makeStoreActions = require('./store');
 const makeItemActions = require('./item');
 const makeOrderActions = require('./order');
@@ -18,6 +20,7 @@ module.exports = session => {
     utils,
     localization,
     _,
+    sha256,
     moment,
     constants,
   };

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,43 @@
 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,
-        })
-      );
+    const isSpreadFrom = spreadFromId =>
+      spreadFromId &&
+      (spreadFromId === modifier.modifierId || spreadFromId === modifier._id);
+
+    if (modifierActions.isGroup(modifier)) {
+      const matchByRelatedModifier = item.modifiers.some(itemMod => {
+        if (
+          modifierActions.isGroup(itemMod) ||
+          !itemMod.properties ||
+          (!itemMod.properties.groupPath && !itemMod.properties.spreadFrom)
+        )
+          return false;
+        return (
+          isGroupPath(itemMod.properties.groupPath) ||
+          isSpreadFrom(itemMod.properties.spreadFrom)
+        );
+      });
+
+      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/getManualModifiers.js

@@ -0,0 +1,64 @@
+module.exports = ({ sha256 }) => {
+  const csvToArray = input =>
+    input
+      .split(',')
+      .map(item => item.trim())
+      .filter(item => item !== '');
+
+  const cleanCSV = input => {
+    if (!input) return '';
+    return Array.from(
+      new Set(
+        input
+          .split(',')
+          .map(item => item.trim())
+          .filter(item => item !== '')
+      )
+    ).join(',');
+  };
+
+  return function getManualModifiers({ modifier, relatedModifiers }) {
+    if (
+      !modifier ||
+      !modifier.properties ||
+      !modifier.properties.group ||
+      !modifier.properties.group.manualModifiers
+    )
+      return [];
+
+    const otherModifiers = Array.isArray(relatedModifiers)
+      ? relatedModifiers
+      : [];
+
+    const manualModifiersCsv = modifier.properties.group.manualModifiers;
+    const modifiers = [];
+
+    if (manualModifiersCsv) {
+      const manualModifiersNames = csvToArray(
+        cleanCSV(manualModifiersCsv)
+      ).filter(modName => otherModifiers.every(mod => mod.name !== modName));
+
+      modifiers.push(
+        ...manualModifiersNames.map((each, index) => {
+          const hash = sha256(`${index}-${modifier._id}`).toString();
+
+          const _id = hash.substring(0, 24);
+
+          const manualModifier = {
+            name: each,
+            _id,
+            direct: true,
+            group: modifier.group,
+            properties: {
+              isManual: true,
+            },
+          };
+
+          return manualModifier;
+        })
+      );
+    }
+
+    return modifiers;
+  };
+};

package/lib/modifier/index.js

@@ -142,6 +142,10 @@ const isCompute = require('./isCompute');
 const isFixedOverride = require('./isFixedOverride');
 const isLocked = require('./isLocked');
 const hasAddModifier = require('./hasAddModifier');
+const removeGroupRelations = require('./removeGroupRelations');
+const getManualModifiers = require('./getManualModifiers');
+const shouldSpreadModifier = require('./shouldSpreadModifier');
+const spreadSingleGroupModifiers = require('./spreadSingleGroupModifiers');
 
 const modifierActions = (deps = {}) => {
   const actions = {};
@@ -297,6 +301,10 @@ const modifierActions = (deps = {}) => {
     isFixedOverride: isFixedOverride(innerDeps),
     isLocked: isLocked(innerDeps),
     hasAddModifier: hasAddModifier(innerDeps),
+    removeGroupRelations: removeGroupRelations(innerDeps),
+    getManualModifiers: getManualModifiers(innerDeps),
+    shouldSpreadModifier: shouldSpreadModifier(innerDeps),
+    spreadSingleGroupModifiers: spreadSingleGroupModifiers(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/modifier/shouldSpreadModifier.js

@@ -0,0 +1,10 @@
+module.exports = ({ actions }) =>
+  function shouldSpreadModifier(modifier, all) {
+    return (
+      actions.isGroupOfModifiers(modifier) &&
+      !actions.enableAutoPopup(modifier) &&
+      !actions.isGroupOfItems(modifier) &&
+      modifier.group &&
+      !all.some(m => m._id !== modifier._id && m.group === modifier.group)
+    );
+  };

package/lib/modifier/spreadSingleGroupModifiers.js

@@ -0,0 +1,30 @@
+module.exports = ({ actions }) =>
+  function spreadSingleGroupModifiers(modifiersParam) {
+    const result = [];
+
+    if (!Array.isArray(modifiersParam)) return [];
+
+    modifiersParam.forEach(modifier => {
+      if (actions.shouldSpreadModifier(modifier, modifiersParam)) {
+        const relatedModifiers = actions.getGroupRelatedModifiers({
+          modifier,
+        });
+        const manual = actions.getManualModifiers({
+          modifier,
+          relatedModifiers,
+        });
+
+        const nextModifiers = [...relatedModifiers, ...manual].map(mod => ({
+          ...mod,
+          properties: {
+            ...(mod.properties || {}),
+            spreadFrom: modifier._id,
+          },
+        }));
+        result.push(...nextModifiers);
+      } else {
+        result.push(modifier);
+      }
+    });
+    return result;
+  };

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.75",
   "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",
@@ -33,6 +34,7 @@
   },
   "dependencies": {
     "@darkpos/utils": "^1.0.11",
+    "crypto-js": "^4.2.0",
     "lodash": "^4.17.21",
     "moment-timezone": "^0.5.34"
   },
@@ -49,5 +51,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "2dc88094c2dbcebc04e0fbd817b45809a44dc403"
+  "gitHead": "b0331c1d450926e0feb4f79146c6dd4f81e5af61"
 }