tango-app-api-analysis-zone 3.7.1-alpha.3 → 3.7.1-alpha.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-analysis-zone",
-    "version": "3.7.1-alpha.3",
+    "version": "3.7.1-alpha.5",
     "description": "zone Analysis",
     "main": "index.js",
     "type": "module",

package/src/controllers/analysisZoneV1.controllers.js

@@ -812,6 +812,27 @@ export const ZonewiseCustomerFunnelExport = async ( req, res ) => {
 
 
 // new Pantprojects api for Zone FF V2
+export const getZoneAPIFFV2 = async ( req, res ) => {
+  try {
+    let reqestData = req.body;
+    let LamdaURL = 'https://kxz75vd4lsgpf4ykytgmyllmoa0xwixt.lambda-url.ap-south-1.on.aws/';
+    let resultData = await LamdaServiceCall( LamdaURL, reqestData );
+    if ( resultData ) {
+      // if ( resultData. == '200' ) {
+      // console.log( 'resultData =>', resultData );
+      return res.sendSuccess( resultData );
+      // } else {
+      //   return res.sendError( 'No Content', 204 );
+      // }
+    } else {
+      return res.sendError( 'No Content', 204 );
+    }
+  } catch ( error ) {
+    logger.error( { error: error, message: req.query, function: 'getZoneAPIFFV2' } );
+    return res.sendError( { error: error }, 500 );
+  }
+};
+
 export const getNewZoneFFV2 = async ( req, res ) => {
   try {
     let reqestData = req.body;
@@ -832,7 +853,6 @@ export const getNewZoneFFV2 = async ( req, res ) => {
     return res.sendError( { error: error }, 500 );
   }
 };
-
 export const getSelectedZoneFFV2 = async ( req, res ) => {
   try {
     let reqestData = req.body;
@@ -855,14 +875,20 @@ export const getSelectedZoneFFV2 = async ( req, res ) => {
           // Conditionally add zone values if present
           if ( element.zone1FF !== undefined && element.zone1FF !== null ) {
             row['Zone 1 FF'] = element.zone1FF;
-            row['Zone 1 Conc %'] = element.zone1Percentage !== undefined ? `${element.zone1Percentage}%` : '--';
           }
           if ( element.zone2FF !== undefined && element.zone2FF !== null ) {
             row['Zone 2 FF'] = element.zone2FF;
-            row['Zone 2 Conc %'] = element.zone2Percentage !== undefined ? `${element.zone2Percentage}%` : '--';
           }
           if ( element.zone3FF !== undefined && element.zone3FF !== null ) {
             row['Zone 3 FF'] = element.zone3FF;
+          }
+          if ( element.zone1Percentage !== undefined && element.zone1Percentage !== null ) {
+            row['Zone 1 Conc %'] = element.zone1Percentage !== undefined ?`${element.zone1Percentage}%` : '--';
+          }
+          if ( element.zone2Percentage !== undefined && element.zone2Percentage !== null ) {
+            row['Zone 2 Conc %'] = element.zone2Percentage !== undefined ? `${element.zone2Percentage}%` : '--';
+          }
+          if ( element.zone3Percentage !== undefined && element.zone3Percentage !== null ) {
             row['Zone 3 Conc %'] = element.zone3Percentage !== undefined ? `${element.zone3Percentage}%` : '--';
           }
 

package/src/routes/analysisZone.js

@@ -41,6 +41,7 @@ import {
   ZonewiseCustomerFunnelExport,
   getNewZoneFFV2,
   getSelectedZoneFFV2,
+  getZoneAPIFFV2,
 } from '../controllers/analysisZoneV1.controllers.js';
 
 analysisZoneRouter
@@ -165,5 +166,6 @@ analysisZoneRouter
 
 
     .post( '/getNewZoneFF_v2', getNewZoneFFV2 )
-    .post( '/getSelectedZoneFF_v2', getSelectedZoneFFV2 );
+    .post( '/getSelectedZoneFF_v2', getSelectedZoneFFV2 )
+    .post( '/getZoneAPI_v2', getZoneAPIFFV2 );
 export default analysisZoneRouter;