tango-app-api-analysis-traffic 3.8.7-vms.1 → 3.8.7-vms.3

package/package.json

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

package/src/controllers/revop.controller.js

@@ -306,12 +306,19 @@ export async function storeProcessedData( req, res ) {
             },
           },
           size: 1,
-          _source: [ 'status' ],
+          _source: [ 'status', 'mappingInfo' ],
         };
         try {
           const footfallDirRes = await getOpenSearchData( openSearch.footfallDirectory, footfallDirQuery );
           const hit = footfallDirRes?.body?.hits?.hits?.[0];
-          ticketStatus = hit?._source?.status || null;
+          if ( hit?._source?.mappingInfo && Array.isArray( hit._source.mappingInfo ) ) {
+            for ( let i = 0; i < hit._source.mappingInfo.length; i++ ) {
+              if ( hit._source.mappingInfo[i].type === 'tagging' ) {
+                ticketStatus = hit._source.mappingInfo[i].status;
+                break;
+              }
+            }
+          }
         } catch ( err ) {
           logger.warn( { message: 'Could not get ticket status from footfallDirectory', error: err } );
         }
@@ -335,7 +342,27 @@ export async function storeProcessedData( req, res ) {
           downtime: processedData?.down_time || 0,
           ticketStatus,
           raisedStatusEnabled,
+
         } );
+
+        if ( raisedStatusEnabled === 'block' ) {
+          // Calculate the number of days from currentDate + 1 to the end of the month
+          // Assume currentDate is in format 'YYYY-MM-DD'
+          const currentDateObj = new Date( currentDate );
+          // Move to next day
+          const nextDay = new Date( currentDateObj );
+          nextDay.setDate( currentDateObj.getDate() + 1 );
+
+          // Get the last date of the current month
+          const endOfMonth = new Date( currentDateObj.getFullYear(), currentDateObj.getMonth() + 1, 0 );
+
+          // Calculate number of days (inclusive of end date, exclusive of nextDay)
+          let noOfBlockedDays = Math.floor( ( endOfMonth - nextDay ) / ( 1000 * 60 * 60 * 24 ) ) + 1;
+          if ( noOfBlockedDays < 0 ) noOfBlockedDays = 0;
+
+          // Add to response
+          responseArray[responseArray.length - 1].noOfBlockedDays = noOfBlockedDays;
+        }
       }
 
       return res.sendSuccess( responseArray );
@@ -379,7 +406,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' ],
 
     };
 
@@ -406,7 +433,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

@@ -66,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/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 ) {