tango-app-api-analysis-traffic 3.8.7-vms.26 → 3.8.7-vms.28

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-analysis-traffic",
-    "version": "3.8.7-vms.26",
+    "version": "3.8.7-vms.28",
     "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.5.2",
+        "tango-api-schema": "^2.5.5",
         "tango-app-api-middleware": "^3.6.5",
         "winston": "^3.13.1",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/revop.controller.js

@@ -613,7 +613,7 @@ export async function tagTempId( req, res ) {
       filePath: inputData.filePath,
       status: inputData?.revopsType == 'non-tagging' ?'':'submitted',
       description: inputData.comments || '',
-      isChecked: inputData.isChecked,
+      isChecked: null,
       // Add id to each object in duplicateImage if it exists and is an array
       duplicateImage: Array.isArray( inputData?.duplicateImage ) ?
         inputData.duplicateImage.map( ( img ) => ( {
@@ -687,7 +687,7 @@ export async function tagTempId( req, res ) {
         filePath: inputData.filePath,
         status: inputData?.revopsType == 'non-tagging' ?'':'submitted',
         description: inputData.comments || '',
-        isChecked: inputData.isChecked,
+        isChecked: null,
         createdByEmail: req?.user?.email,
         createdByUserName: req?.user?.userName,
         createdByRole: req?.user?.role,
@@ -706,7 +706,7 @@ export async function tagTempId( req, res ) {
           id: `${inputData?.storeId}_${inputData?.dateString}_${item?.tempId}`,
           dateString: inputData.dateString,
           timeRange: item.timeRange,
-          isChecked: item.isChecked,
+          isChecked: null,
           processType: inputData.processType,
           revopsType: item.revopsType,
           entryTime: item.entryTime,
@@ -746,12 +746,20 @@ export async function tagTempId( req, res ) {
           return { success: false, errors: res1.items };
         } else {
           logger.info( { msg: 'res1' } );
-          return res.sendSuccess( `ID tagged as duplicates` );
+          return res.sendSuccess( `ID tagged as Duplicates` );
           // return { success: true };
         }
       }
     } else {
-      const message = inputData?.revopsType == 'non-tagging' ? 'ID removed from tagging' :inputData?.revopsType == 'employee' ?'ID tagged as an employee/staff':inputData?.revopsType == 'junk'? 'ID tagged as a junk':'ID tagged as an house keeping';
+      // Convert camelCase revopsType to space-separated and capitalize first letter of each word
+      function camelCaseToTitle( str ) {
+        if ( !str ) return '';
+        return str.replace( /([A-Z])/g, ' $1' ).replace( /^./, ( s ) => s.toUpperCase() );
+      }
+      const titleRevopsType = camelCaseToTitle( inputData?.revopsType );
+      const message = inputData?.revopsType == 'non-tagging' ?
+        'ID removed from tagging' :
+        `ID tagged as ${titleRevopsType}`;
       return res.sendSuccess( message );
     }
   } catch ( error ) {

package/src/routes/revop.routes.js

@@ -17,7 +17,6 @@ revopRouter
     .get( '/store-processed-data', isAllowedSessionHandler, validate( storeProcessedDataValid ), storeProcessedData )
     .get( '/footfall-images', isAllowedSessionHandler, validate( footfallImagesValid ), getTaggingConfig, footFallImages )
     .post( '/tag-tempId', isAllowedSessionHandler, validate( tagTempIdValid ), deleteTaggedDuplicate, mappingConfig, tagTempId )
-
     .post( '/get-categorized-images', isAllowedSessionHandler, validate( getCategorizedImagesValid ), getCategorizedImages );
 
 

package/src/validations/revop.validation.js

@@ -1,6 +1,6 @@
 import { getOpenSearchCount, logger } from 'tango-app-api-middleware';
 import { deleteByQuery, getOpenSearchData } from 'tango-app-api-middleware/src/utils/openSearch.js';
-import { aggregate, findOne } from '../services/clients.services.js';
+import { aggregate } from '../services/clients.services.js';
 
 export async function getTaggingConfig( req, res, next ) {
   try {
@@ -80,7 +80,7 @@ export async function getTaggingConfig( req, res, next ) {
 
 
     const getData = await aggregate( configQuery );
-    logger.info( { getData } );
+
     // Convert "taggingLimitation" array (if present) to "config" object with expected key-value pairs
     let config = {};
     if ( getData && getData?.length > 0 && Array.isArray( getData?.[0]?.effectiveLimitation?.values ) ) {
@@ -168,9 +168,81 @@ export async function mappingConfig( req, res, next ) {
     }
     const getFootfallCount = footfallOutput?.body?.hits?.hits;
     const footfall = getFootfallCount?.[0]?._source?.footfall_count;
+    const clientId = inputData?.storeId?.split( '-' )[0];
+    const configQuery = [
+      {
+        $match: {
+          clientId: clientId,
+        },
+      },
+
+      // Convert all effectiveFrom to proper Date
+      {
+        $addFields: {
+          taggingLimitationWithDate: {
+            $map: {
+              input: '$footfallDirectoryConfigs.taggingLimitation',
+              as: 'item',
+              in: {
+                effectiveFrom: { $toDate: '$$item.effectiveFrom' },
+                values: '$$item.values',
+              },
+            },
+          },
+        },
+      },
+
+      // Filter items <= input date
+      {
+        $addFields: {
+          matchedLimitation: {
+            $filter: {
+              input: '$taggingLimitationWithDate',
+              as: 'item',
+              cond: {
+                $lte: [
+                  '$$item.effectiveFrom',
+                  { $toDate: inputData.dateString },
+                ],
+              },
+            },
+          },
+        },
+      },
+
+      // Sort DESC and pick ONLY top 1 -> latest effective record
+      {
+        $addFields: {
+          effectiveLimitation: {
+            $arrayElemAt: [
+              {
+                $slice: [
+                  {
+                    $sortArray: {
+                      input: '$matchedLimitation',
+                      sortBy: { effectiveFrom: -1 },
+                    },
+                  },
+                  1,
+                ],
+              },
+              0,
+            ],
+          },
+        },
+      },
+
+      {
+        $project: {
+          config: 1,
+          effectiveLimitation: 1,
+          footfallDirectoryConfigs: 1,
+        },
+      },
+    ];
+    const getConfig = await aggregate( configQuery );
+    const taggingLimitation = getConfig?.[0]?.effectiveLimitation?.values;
 
-    const getConfig = await findOne( { clientId: inputData?.storeId?.split( '-' )[0] }, { footfallDirectoryConfigs: 1 } );
-    const taggingLimitation = getConfig?.footfallDirectoryConfigs?.taggingLimitation;
     // Find the tagging limitation for the given revopsType
     let matchedLimitation = null;
     if ( Array.isArray( taggingLimitation ) ) {