tango-app-api-analysis-traffic 3.3.1-alpha.21 → 3.3.1-alpha.22

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-analysis-traffic",
-    "version": "3.3.1-alpha.21",
+    "version": "3.3.1-alpha.22",
     "description": "Traffic Analysis",
     "main": "index.js",
     "type": "module",

package/src/controllers/tangoTrafficV3.controllers.js

@@ -791,27 +791,47 @@ export const performanceMatrixV3 = async ( req, res ) => {
     if ( resultData ) {
       if ( resultData.status_code == '200' ) {
         let data = [];
-        resultData.performanceData.forEach( ( item, index ) => {
-          let findprevIndex = data.findLastIndex( ( ele ) => ele.position == item.position );
-          if ( findprevIndex != -1 ) {
-            item.top = data[findprevIndex].top + 7;
-            item.left = data[findprevIndex].left + 5;
+        let performanceData = resultData.performanceData.reduce( ( acc, ele ) => {
+          if ( !acc[ele.position] ) {
+            console.log( ele );
+            acc[ele.position] = [ ele ];
           } else {
-            if ( item.position == 'High_Low' ) {
-              item.left = 5;
-              item.top = 10;
-            } else if ( item.position == 'High_High' ) {
-              item.left = 50;
-              item.top = 10;
-            } else if ( item.position == 'Low_Low' ) {
-              item.left = 5;
-              item.top = 55;
+            acc[ele.position].push( ele );
+          }
+          return acc;
+        }, {} );
+        Object.keys( performanceData ).forEach( ( key ) => {
+          performanceData[key].forEach( ( item, index ) => {
+            let findprevIndex = data.findIndex( ( ele ) => ele.position == item.position );
+            let findLastIndex = data.findLastIndex( ( ele ) => ele.position == item.position );
+            if ( findprevIndex != -1 ) {
+              let num = index < 5 ? 0 : index < 10 ? 10 : 20;
+              let left = data[findLastIndex].left;
+              let leftNum = 8;
+              if ( [ 0, 5, 10 ].includes( index ) ) {
+                left = data[findprevIndex].left;
+                leftNum = 0;
+              }
+              console.log( leftNum );
+              item.top = data[findprevIndex].top + num;
+              item.left = left + leftNum;
             } else {
-              item.left = 50;
-              item.top = 55;
+              if ( item.position == 'High_Low' ) {
+                item.left = 3;
+                item.top = 10;
+              } else if ( item.position == 'High_High' ) {
+                item.left = 55;
+                item.top = 10;
+              } else if ( item.position == 'Low_Low' ) {
+                item.left = 3;
+                item.top = 55;
+              } else {
+                item.left = 55;
+                item.top = 55;
+              }
             }
-          }
-          data.push( item );
+            data.push( item );
+          } );
         } );
         resultData.performanceData = data;
         return res.sendSuccess( resultData );

package/src/dtos/validation.dtos.js

@@ -194,6 +194,7 @@ export const validateperformanceMatrixSchema = joi.object( {
   ...baseSchema,
   processtype1: joi.string().required(),
   processtype2: joi.string().required(),
+  topStores: joi.number().optional().allow( '' ),
 } );
 
 export const validateperformanceMatrixParams = {