tango-app-api-analysis-traffic 3.8.2-alpha.6 → 3.8.3

package/package.json

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

package/src/controllers/tangoTrafficV3.controllers.js

@@ -1479,10 +1479,16 @@ export const summaryTableV3 = async ( req, res ) => {
           if ( resultData.summaryData.length > 0 ) {
             const exportdata = [];
             resultData.summaryData.forEach( ( element ) => {
+              const hasStoreCode = resultData.summaryData.some(
+                  ( element ) => element.storeCode != null && element.storeCode !== '',
+              );
               if ( reqestData.clientId === '193' ) {
                 exportdata.push( {
                   'Store Name': element.storeName,
                   'Store ID': element.storeId,
+                  ...( hasStoreCode ?
+        { 'Store Code': element.storeCode != null && element.storeCode !== '' ? element.storeCode : '-' } :
+        {} ),
                   ...( req.body.storeId.length ==1 ) ? { Date: dayjs( element['date'] ).format( 'MMM DD,YYYY' ) }:{},
                   'Footfall': element.footfallCount,
                   'Bounced Footfall': element.bouncedCount,
@@ -1507,6 +1513,9 @@ export const summaryTableV3 = async ( req, res ) => {
                 exportdata.push( {
                   'Store Name': element.storeName,
                   'Store ID': element.storeId,
+                  ...( hasStoreCode ?
+        { 'Store Code': element.storeCode != null && element.storeCode !== '' ? element.storeCode : '-' } :
+        {} ),
                   ...( req.body.storeId.length ==1 ) ? { Date: dayjs( element['date'] ).format( 'MMM DD,YYYY' ) }:{},
                   'Footfall': element.footfallCount,
                   ...( bouncedLabel ? { [bouncedLabel]: element.bouncedCount } : {} ),
@@ -1530,6 +1539,9 @@ export const summaryTableV3 = async ( req, res ) => {
                 exportdata.push( {
                   'Store Name': element.storeName,
                   'Store ID': element.storeId,
+                  ...( hasStoreCode ?
+        { 'Store Code': element.storeCode != null && element.storeCode !== '' ? element.storeCode : '-' } :
+        {} ),
                   ...( req.body.storeId.length ==1 ) ? { Date: dayjs( element['date'] ).format( 'MMM DD,YYYY' ) }:{},
                   'Footfall': element.footfallCount,
                   'Avg Infra DownTime': element.avgInfraDowntime,
@@ -1538,6 +1550,9 @@ export const summaryTableV3 = async ( req, res ) => {
                 exportdata.push( {
                   'Store Name': element.storeName,
                   'Store ID': element.storeId,
+                  ...( hasStoreCode ?
+        { 'Store Code': element.storeCode != null && element.storeCode !== '' ? element.storeCode : '-' } :
+        {} ),
                   ...( req.body.storeId.length ==1 ) ? { Date: dayjs( element['date'] ).format( 'MMM DD,YYYY' ) }:{},
                   'Footfall': element.footfallCount,
                   'Bounced Footfall': element.bouncedCount,

package/src/routes/revop.routes.js

@@ -3,7 +3,7 @@ import express from 'express';
 import { storeProcessedData, getconfig, revoptagging, getrevoptagging, revoptaggingcount, footFallImages, tagTempId, getCategorizedImages } from '../controllers/revop.controller.js';
 import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
 import { footfallImagesValid, getCategorizedImagesValid, storeProcessedDataValid, tagTempIdValid } from '../dtos/revop.dtos.js';
-import { deletetagedDuplicate, getTaggingConfig, mappingConfig } from '../validations/revop.validation.js';
+import { deleteTaggedDuplicate, getTaggingConfig, mappingConfig } from '../validations/revop.validation.js';
 
 export const revopRouter = express.Router();
 
@@ -16,7 +16,7 @@ revopRouter
 // new enhnacemnet (for footfall directory)
     .get( '/store-processed-data', isAllowedSessionHandler, validate( storeProcessedDataValid ), storeProcessedData )
     .get( '/footfall-images', isAllowedSessionHandler, validate( footfallImagesValid ), getTaggingConfig, footFallImages )
-    .post( '/tag-tempId', isAllowedSessionHandler, validate( tagTempIdValid ), deletetagedDuplicate, mappingConfig, tagTempId )
+    .post( '/tag-tempId', isAllowedSessionHandler, validate( tagTempIdValid ), deleteTaggedDuplicate, mappingConfig, tagTempId )
 
 
     .post( '/get-categorized-images', isAllowedSessionHandler, validate( getCategorizedImagesValid ), getCategorizedImages );

package/src/validations/revop.validation.js

@@ -196,22 +196,28 @@ export async function mappingConfig( req, res, next ) {
   }
 }
 
-export async function deletetagedDuplicate( req, res, next ) {
+export async function deleteTaggedDuplicate( req, res, next ) {
   try {
     const inputData = req.body;
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const getQuery = {
-      query: {
-        term: {
-          parent: inputData?.tempId,
+      'query': {
+        'bool': {
+          'must': [
+            {
+              'term': { parent: inputData?.tempId },
+            },
+            {
+              'term': { dateString: inputData?.dateString },
+            },
+          ],
         },
       },
-
     };
     await deleteByQuery( openSearch.revop, getQuery );
     next();
   } catch ( error ) {
-    logger.error( { error: error, message: req.body, function: 'traffic-revop-deletetagedDuplicate' } );
+    logger.error( { error: error, message: req.body, function: 'traffic-revop-deleteTaggedDuplicate' } );
     next();
   }
 }