tango-app-api-analysis-traffic 3.8.7-vms.0 → 3.8.7-vms.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-analysis-traffic",
-    "version": "3.8.7-vms.0",
+    "version": "3.8.7-vms.2",
     "description": "Traffic Analysis",
     "main": "index.js",
     "type": "module",
@@ -23,7 +23,7 @@
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
         "swagger-ui-express": "^5.0.1",
-        "tango-api-schema": "^2.4.9",
+        "tango-api-schema": "^2.4.23",
         "tango-app-api-middleware": "^3.6.5",
         "winston": "^3.13.1",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/revop.controller.js

@@ -2,7 +2,8 @@ import { logger, insertOpenSearchData, getOpenSearchData, updateOpenSearchData }
 import { findOnerevopConfig } from '../services/revopConfig.service.js';
 import * as clientService from '../services/clients.services.js';
 import { bulkUpdate, upsertWithScript } from 'tango-app-api-middleware/src/utils/openSearch.js';
-import dayjs from 'dayjs';
+import { findOneVmsStoreRequest } from '../services/vmsStoreRequest.service.js';
+// import dayjs from 'dayjs';
 // Lamda Service Call //
 async function LamdaServiceCall( url, data ) {
   try {
@@ -211,44 +212,135 @@ export async function storeProcessedData( req, res ) {
   try {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.query;
-    const previousDate = dayjs( inputData.dateString ).subtract( 1, 'day' ).format( 'YYYY-MM-DD' );
-    const dateString = `${inputData.storeId}_${inputData.dateString}`;
-    const dateStringPrevious = `${inputData.storeId}_${previousDate}`;
-    const getQuery = {
-      query: {
-        terms: {
-          _id: [ dateString, dateStringPrevious ],
-        },
-      },
-      _source: [ 'footfall', 'date_string', 'store_id', 'down_time', 'footfall_count' ],
-      sort: [
-        {
-          date_iso: {
-            order: 'desc',
+    const { fromDate, toDate, storeId } = inputData;
+
+    // Multi-date range handling for a single store
+    if ( fromDate && toDate && storeId ) {
+      const dayjs = ( await import( 'dayjs' ) ).default;
+      const isSameOrBefore = ( await import( 'dayjs/plugin/isSameOrBefore.js' ) ).default;
+      dayjs.extend( isSameOrBefore );
+
+      let start = dayjs( fromDate );
+      let end = dayjs( toDate );
+
+      if ( !start.isValid() || !end.isValid() ) {
+        return res.sendError( 'Invalid date range supplied', 400 );
+      }
+
+      if ( end.isBefore( start ) ) {
+        [ start, end ] = [ end, start ];
+      }
+
+      const allDateStrings = [];
+      const orderedDates = [];
+
+      while ( start.isSameOrBefore( end ) ) {
+        const formatted = start.format( 'YYYY-MM-DD' );
+        orderedDates.push( formatted );
+        allDateStrings.push( `${storeId}_${formatted}` );
+        start = start.add( 1, 'day' );
+      }
+
+      if ( allDateStrings.length === 0 ) {
+        return res.sendSuccess( [] );
+      }
+
+      const footfallQuery = {
+        query: {
+          terms: {
+            _id: allDateStrings,
           },
         },
-      ],
-    };
+        _source: [ 'footfall', 'date_string', 'store_id', 'down_time', 'footfall_count' ],
+        sort: [
+          { date_iso: { order: 'asc' } },
+        ],
+        size: allDateStrings.length,
+      };
 
-    const getData = await getOpenSearchData( openSearch.footfall, getQuery );
-    const hits = getData?.body?.hits?.hits || [];
+      const multiGet = await getOpenSearchData( openSearch.footfall, footfallQuery );
+      const multiHits = multiGet?.body?.hits?.hits || [];
+      const hitsMap = new Map();
+      multiHits.forEach( ( hit ) => {
+        hitsMap.set( hit?._id, hit?._source || null );
+      } );
 
-    const processedData = hits.find( ( d ) => d._id === dateString )?._source || null;
-    const previousData = hits.find( ( d ) => d._id === dateStringPrevious )?._source || null;
+      const responseArray = [];
 
-    let footfallCountTrend = 0;
+      for ( let i = 0; i < orderedDates.length; i++ ) {
+        const currentDate = orderedDates[i];
+        const currentId = `${storeId}_${currentDate}`;
+        const processedData = hitsMap.get( currentId );
+        if ( !processedData ) {
+          responseArray.push( {
+            date: currentDate,
+            footfallCount: 0,
+            footfallCountTrend: 0,
+            downtime: 0,
+          } );
+          continue;
+        }
 
-    if ( processedData && previousData && previousData.footfall_count ) {
-      footfallCountTrend = Math.round(
-          ( ( processedData.footfall_count - previousData.footfall_count ) / previousData.footfall_count ) * 100,
-      );
-    }
+        const prevDate = dayjs( currentDate ).subtract( 1, 'day' ).format( 'YYYY-MM-DD' );
+        const prevId = `${storeId}_${prevDate}`;
+        const previousData = hitsMap.get( prevId );
 
-    return res.sendSuccess( {
-      footfallCount: processedData?.footfall_count || 0,
-      footfallCountTrend,
-      downtime: processedData?.down_time || 0,
-    } );
+        let footfallCountTrend = 0;
+        if ( previousData && previousData.footfall_count ) {
+          footfallCountTrend = Math.round(
+              ( ( processedData.footfall_count - previousData.footfall_count ) / previousData.footfall_count ) * 100,
+          );
+        }
+        // Add ticket status from openSearch.footfallDirectory (_source.status)
+        let ticketStatus = null;
+        // Try to find a matching footfallDirectory record for this date+storeId
+        // const ticketKey = `${storeId}_${currentDate}`;
+        const footfallDirQuery = {
+          query: {
+            bool: {
+              must: [
+                { term: { 'storeId.keyword': storeId } },
+                { term: { 'dateString': currentDate } },
+                { term: { 'ticketName.keyword': 'footfall-directory' } },
+              ],
+            },
+          },
+          size: 1,
+          _source: [ 'status' ],
+        };
+        try {
+          const footfallDirRes = await getOpenSearchData( openSearch.footfallDirectory, footfallDirQuery );
+          const hit = footfallDirRes?.body?.hits?.hits?.[0];
+          ticketStatus = hit?._source?.status || null;
+        } catch ( err ) {
+          logger.warn( { message: 'Could not get ticket status from footfallDirectory', error: err } );
+        }
+        // Check if request status ("raised") should be enabled or disabled by querying MongoDB config
+        // We'll assume findOnerevopConfig can fetch the record with status for this storeId and dateString
+        let raisedStatusEnabled = 'reset'; // default: enabled
+        try {
+          const mongoConfig = await findOneVmsStoreRequest( { storeId: storeId, dateString: currentDate } );
+          if ( mongoConfig && mongoConfig.status ) {
+            raisedStatusEnabled = mongoConfig.status;
+          }
+        } catch ( err ) {
+          logger.warn( { message: 'Could not get request status from MongoDB', error: err } );
+          // Leave raisedStatusEnabled as default
+        }
+
+        responseArray.push( {
+          date: processedData?.date_string || currentDate,
+          footfallCount: processedData?.footfall_count || 0,
+          footfallCountTrend,
+          downtime: processedData?.down_time || 0,
+          ticketStatus,
+          raisedStatusEnabled,
+        } );
+      }
+
+      return res.sendSuccess( responseArray );
+    }
+    return res.sendError( 'Required parameters missing', 400 );
   } catch ( error ) {
     logger.error( { message: error, data: req.query, function: 'storeProcessedData' } );
     const err = error.message || 'Internal Server Error';
@@ -287,7 +379,7 @@ export async function footFallImages( req, res ) {
           ],
         },
       },
-      '_source': [ 'dateString', 'storeId', 'duplicateCount', 'footfallCount', 'employeeCount', 'houseKeepingCount', 'junkCount', 'status', 'ticketId', 'comments', 'userName', 'role', 'createdAt', 'email', 'houseKeepingACCount', 'duplicateACCount', 'employeeACCount', 'junkACCount', 'approverEmail', 'approverRole', 'approverUserName' ],
+      // '_source': [ 'dateString', 'storeId', 'duplicateCount', 'footfallCount', 'employeeCount', 'houseKeepingCount', 'junkCount', 'status', 'ticketId', 'comments', 'userName', 'role', 'createdAt', 'email', 'houseKeepingACCount', 'duplicateACCount', 'employeeACCount', 'junkACCount', 'approverEmail', 'approverRole', 'approverUserName' ],
 
     };
 
@@ -314,7 +406,7 @@ export async function footFallImages( req, res ) {
    if ( resultData ) {
    temp.length? temp[0].status = 'open': null;
    if ( resultData.status_code == '200' ) {
-     return res.sendSuccess( { ...resultData, ticketStatus: temp?.length > 0? temp : null, config: req?.store?.revopTagging } );
+     return res.sendSuccess( { ...resultData, ticketStatus: temp?.length > 0? temp : null, config: req?.store?.footfallDirectoryConfigs } );
    } else {
      return res.sendError( 'No Content', 204 );
    }

package/src/dtos/revop.dtos.js

@@ -4,7 +4,8 @@ import dayjs from 'dayjs';
 export const storeProcessedDataSchema = joi.object( {
 
   storeId: joi.string().required(),
-  dateString: joi.string().required(),
+  fromDate: joi.string().required(),
+  toDate: joi.string().required(),
 
 } );
 
@@ -65,6 +66,9 @@ export const tagTempIdSchema = joi.object( {
   revopsType: joi.string().required(),
   timeRange: joi.string().required(),
   isChecked: joi.boolean().required().allow( null ),
+  mode: joi.string().valid( 'web', 'mobile' ).required().messages( {
+    'any.only': 'type must be one of [mobile,web]',
+  } ),
   duplicateImage: joi.array().items( joi.object(
       {
         tempId: joi.number().required(),

package/src/services/vmsStoreRequest.service.js

@@ -0,0 +1,5 @@
+import vmsStoreRequestModel from 'tango-api-schema/schema/vmsStoreRequest.model.js';
+
+export async function findOneVmsStoreRequest( query = {} ) {
+  return await vmsStoreRequestModel.findOne( query );
+};

package/src/validations/revop.validation.js

@@ -1,11 +1,25 @@
 import { getOpenSearchCount, logger } from 'tango-app-api-middleware';
 import { findOneStore } from '../services/stores.service.js';
 import { deleteByQuery } from 'tango-app-api-middleware/src/utils/openSearch.js';
+import { findOne } from '../services/clients.services.js';
 
 export async function getTaggingConfig( req, res, next ) {
   try {
     const inputData= req.query;
-    const getData = await findOneStore( { storeId: inputData.storeId }, { revopTagging: 1 } );
+    const clientId = inputData.storeId.split( '-' )[0];
+    const getData = await findOne( { clientId: clientId }, { footfallDirectoryConfigs: 1 } );
+
+    // Convert "taggingLimitation" array (if present) to "config" object with expected key-value pairs
+    let config = {};
+    if ( getData && Array.isArray( getData.taggingLimitation ) ) {
+      for ( const item of getData.taggingLimitation ) {
+        if ( item && item.type && typeof item.value !== 'undefined' && item.unit ) {
+          config[item.type] = `${item.value}${item.unit}`;
+        }
+      }
+    }
+    getData.config = config;
+
     req.store = getData;
     next();
   } catch ( error ) {