@darkpos/pricing 1.0.102 → 1.0.103

package/__TEST__/modifier.test.js

@@ -676,7 +676,7 @@ describe('Modifier actions', () => {
             properties: {
               isManual: true,
             },
-            _id: 'ead6eb247a93bca8f802f9b2',
+            _id: '5d97805a91c31603f8fc6ab0',
           }),
           expect.objectContaining({
             name: 'Blue Label',
@@ -685,7 +685,7 @@ describe('Modifier actions', () => {
             properties: {
               isManual: true,
             },
-            _id: '4e23edf8fa734884f4618003',
+            _id: '49327d26c324cb709456a279',
           }),
         ])
       );
@@ -739,21 +739,21 @@ describe('Modifier actions', () => {
       expect(result).toStrictEqual([
         {
           name: 'Red Tag',
-          _id: 'ead6eb247a93bca8f802f9b2',
+          _id: '5d97805a91c31603f8fc6ab0',
           direct: true,
           group: 'colorGroup1',
           properties: { isManual: true, spreadFrom: 'abc123' },
         },
         {
           name: 'White Shirt',
-          _id: '4e23edf8fa734884f4618003',
+          _id: '3b115e8ff1d00d9ae4ea3601',
           direct: true,
           group: 'colorGroup1',
           properties: { isManual: true, spreadFrom: 'abc123' },
         },
         {
           name: 'Blue Label',
-          _id: '94b02ee7ba009b09a913a786',
+          _id: '49327d26c324cb709456a279',
           direct: true,
           group: 'colorGroup1',
           properties: { isManual: true, spreadFrom: 'abc123' },
@@ -815,21 +815,21 @@ describe('Modifier actions', () => {
       expect(result).toStrictEqual([
         {
           name: 'Red Tag',
-          _id: 'ead6eb247a93bca8f802f9b2',
+          _id: '5d97805a91c31603f8fc6ab0',
           direct: true,
           group: 'colorGroup1',
           properties: { isManual: true, spreadFrom: 'abc123' },
         },
         {
           name: 'White Shirt',
-          _id: '4e23edf8fa734884f4618003',
+          _id: '3b115e8ff1d00d9ae4ea3601',
           direct: true,
           group: 'colorGroup1',
           properties: { isManual: true, spreadFrom: 'abc123' },
         },
         {
           name: 'Blue Label',
-          _id: '94b02ee7ba009b09a913a786',
+          _id: '49327d26c324cb709456a279',
           direct: true,
           group: 'colorGroup1',
           properties: { isManual: true, spreadFrom: 'abc123' },

package/lib/modifier/createManualModifier.js

@@ -0,0 +1,48 @@
+module.exports = ({ sha256 }) => {
+  function combineHashParts(partA, partB) {
+    let combined = '';
+    try {
+      combined = partA
+        .split('')
+        .map((char, index) => {
+          const digitA = parseInt(char, 16);
+          const digitB = parseInt(partB[index], 16);
+
+          // eslint-disable-next-line no-bitwise
+          return (digitA ^ digitB).toString(16);
+        })
+        .join('')
+        .padStart(partA.length, '0');
+    } catch (err) {
+      console.log(JSON.stringify(err));
+    }
+
+    return combined;
+  }
+
+  function generateManualModifierId(parentId, name) {
+    const input = `${parentId}-${name}`;
+    const hash = sha256(input).toString(); // 64 hex characters
+
+    const firstPart = hash.slice(0, 24);
+    const lastPart = hash.slice(-24);
+
+    return combineHashParts(firstPart, lastPart); // 24-char hex string
+  }
+
+  return function createManualModifier({ parentId, name, group }) {
+    const _id = generateManualModifierId(parentId, name);
+
+    const manualModifier = {
+      name,
+      _id,
+      direct: true,
+      group,
+      properties: {
+        isManual: true,
+      },
+    };
+
+    return manualModifier;
+  };
+};

package/lib/modifier/getManualModifiers.js

@@ -1,4 +1,4 @@
-module.exports = ({ sha256 }) => {
+module.exports = ({ actions }) => {
   const csvToArray = input =>
     input
       .split(',')
@@ -39,23 +39,13 @@ module.exports = ({ sha256 }) => {
       ).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 = {
+        ...manualModifiersNames.map(each =>
+          actions.createManualModifier({
+            parentId: modifier._id,
             name: each,
-            _id,
-            direct: true,
             group: modifier.group,
-            properties: {
-              isManual: true,
-            },
-          };
-
-          return manualModifier;
-        })
+          })
+        )
       );
     }
 

package/lib/modifier/index.js

@@ -166,6 +166,7 @@ const getOverrideNote = require('./getOverrideNote');
 const isNotesOverride = require('./isNotesOverride');
 const isOverrideSubtotal = require('./isOverrideSubtotal');
 const validatePaymentCondition = require('./validatePaymentCondition');
+const createManualModifier = require('./createManualModifier');
 
 const modifierActions = (deps = {}) => {
   const actions = {};
@@ -345,6 +346,7 @@ const modifierActions = (deps = {}) => {
     isNotesOverride: isNotesOverride(innerDeps),
     isOverrideSubtotal: isOverrideSubtotal(innerDeps),
     validatePaymentCondition: validatePaymentCondition(innerDeps),
+    createManualModifier: createManualModifier(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.102",
+  "version": "1.0.103",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -54,5 +54,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "a4c2dff797325d1c452db5eab1e9bda8f9de4e97"
+  "gitHead": "032bea629a5c32d78886daca4d2382b847b5d075"
 }