tango-app-api-analysis-traffic 3.8.7-vms.4 → 3.8.7-vms.6

package/package.json

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

package/src/controllers/revop.controller.js

@@ -415,7 +415,6 @@ export async function footFallImages( req, res ) {
     let temp = [];
     const footfallValue = ticketDetails?._source?.footfallCount ?? 0;
     const mappingInfoArray = ticketDetails?._source?.mappingInfo ?? [];
-
     // Helper to get mappingInfo for an actionType
     function getMappingForType( type ) {
       return mappingInfoArray.find( ( m ) => m.type === type ) || {};
@@ -429,7 +428,6 @@ export async function footFallImages( req, res ) {
           const actionTypesUser = [ 'tagging', 'finalreview' ];
           temp = actionTypesUser.map( ( type ) => {
             const mapping = getMappingForType( type );
-
             const revisedFootfall = mapping.revisedFootfall ?? 0;
             // Do not divide by 0
             const revisedPerc =
@@ -438,7 +436,7 @@ export async function footFallImages( req, res ) {
                '0';
 
             // Since keys in count can be dynamic, just deep copy the count object or empty object
-            const countObj = mapping.count ? { ...mapping.count } : {};
+            const countObj = mapping.count ? [ ...mapping.count ] : [];
 
             return {
               actionType: type,
@@ -446,6 +444,10 @@ export async function footFallImages( req, res ) {
               revicedFootfall: revisedFootfall,
               revicedPerc: revisedPerc,
               count: countObj,
+              createdAt: mapping.createdAt ?? '',
+              createdByEmail: mapping.createdByEmail ??'',
+              createdByUserName: mapping.createdByUserName ??'',
+              createdByRole: mapping.createdByRole ??'',
             };
           } );
           break;
@@ -462,7 +464,7 @@ export async function footFallImages( req, res ) {
                '0';
 
             // Since keys in count can be dynamic, just deep copy the count object or empty object
-            const countObj = mapping.count ? { ...mapping.count } : {};
+            const countObj = mapping.count ? [ ...mapping.count ] : [];
 
             return {
               actionType: type,
@@ -470,6 +472,10 @@ export async function footFallImages( req, res ) {
               revicedFootfall: revisedFootfall,
               revicedPerc: revisedPerc,
               count: countObj,
+              createdAt: mapping.createdAt ?? '',
+              createdByEmail: mapping.createdByEmail ??'',
+              createdByUserName: mapping.createdByUserName ??'',
+              createdByRole: mapping.createdByRole ??'',
             };
           } );
           break;
@@ -478,8 +484,7 @@ export async function footFallImages( req, res ) {
       const actionTypes = [ 'tagging', 'review', 'approve', 'finalreview' ];
       temp = actionTypes.map( ( type ) => {
         const mapping = getMappingForType( type );
-
-        const revisedFootfall = mapping.revisedFootfall ?? 0;
+        const revisedFootfall = mapping.revicedFootfall ?? 0;
         // Do not divide by 0
         const revisedPerc =
          footfallValue > 0 ?
@@ -487,7 +492,7 @@ export async function footFallImages( req, res ) {
            '0';
 
         // Since keys in count can be dynamic, just deep copy the count object or empty object
-        const countObj = mapping.count ? { ...mapping.count } : {};
+        const countObj = mapping.count ? [ ...mapping.count ] : [];
 
         return {
           actionType: type,
@@ -495,6 +500,10 @@ export async function footFallImages( req, res ) {
           revicedFootfall: revisedFootfall,
           revicedPerc: revisedPerc,
           count: countObj,
+          createdAt: mapping.createdAt ?? '',
+          createdByEmail: mapping.createdByEmail ??'',
+          createdByUserName: mapping.createdByUserName ??'',
+          createdByRole: mapping.createdByRole ??'',
         };
       } );
     }
@@ -548,6 +557,7 @@ export async function tagTempId( req, res ) {
           action: 'submitted',
         },
       ],
+      comments: inputData.comments || '',
       createdAt: new Date(),
       updatedAt: new Date(),
 
@@ -601,6 +611,7 @@ export async function tagTempId( req, res ) {
           isParent: false,
           type: 'tagging-reflect',
           ticketStatus: 'submitted',
+          comments: inputData.comments || '',
           actions: [
             {
               actionType: 'tagging',

package/src/dtos/revop.dtos.js

@@ -84,6 +84,7 @@ export const tagTempIdSchema = joi.object( {
   entryTime: joi.string().required(),
   exitTime: joi.string().required(),
   filePath: joi.string().required(),
+  comments: joi.string().optional().allow( '' ),
 
 } );
 

package/src/validations/revop.validation.js

@@ -1,6 +1,5 @@
 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 { deleteByQuery, getOpenSearchData } from 'tango-app-api-middleware/src/utils/openSearch.js';
 import { findOne } from '../services/clients.services.js';
 
 export async function getTaggingConfig( req, res, next ) {
@@ -65,41 +64,54 @@ export async function getFootfallCount( req, res, next ) {
 export async function mappingConfig( req, res, next ) {
   try {
     const inputData = req.body;
+
     const openSearch = JSON.parse( process.env.OPENSEARCH );
-    const config =await findOneStore( { storeId: inputData.storeId }, { revopTagging: 1 } );
-    if ( inputData.revopsType == 'employee' ) {
-      const getQuery = {
-        query: {
-          bool: {
-            must: [
-              {
-                term: {
-                  'storeId.keyword': inputData.storeId,
-                },
-              },
-              {
-                term: {
-                  'dateString': inputData.dateString,
-                },
+    const footfallQuery ={
+      query: {
+        bool: {
+          must: [
+            {
+              term: {
+                'store_id.keyword': inputData.storeId,
               },
-              {
-                term: {
-                  'revopsType.keyword': inputData.revopsType,
-                },
+            },
+            {
+              term: {
+                'date_string': inputData.dateString,
               },
-            ],
-          },
+            },
+
+          ],
         },
-      };
+      },
+    };
 
-      const getData = await getOpenSearchCount( openSearch.revop, getQuery );
-      if ( getData && getData?.body?.count >= config?.revopTagging?.employee ) {
-        return res.sendError( `Select up to ${config?.revopTagging?.employee} items only`, 400 );
-      } else {
-        next();
-      }
-    } else if ( inputData.revopsType == 'house-keeping' ) {
-      const getQuery = {
+
+    const footfallOutput = await getOpenSearchData( openSearch.footfall, footfallQuery );
+    if ( footfallOutput?.body?.hits?.hits?.length === 0 ) {
+      return res.sendError( 'No updated footfall for this date', 400 );
+    }
+    const getFootfallCount = footfallOutput?.body?.hits?.hits;
+    const footfall = getFootfallCount?.[0]?._source?.footfall_count;
+
+    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 ) ) {
+      matchedLimitation = taggingLimitation.find(
+          ( l ) => l.type === inputData.revopsType,
+      );
+    }
+
+    if ( matchedLimitation ) {
+      // Determine the limit value
+      let limitValue = Number( matchedLimitation.value ) || 0;
+      let unit = matchedLimitation.unit;
+
+      // Assuming getData and/or getOpenSearchCount provides the actual tagged count for revopsType
+      // Query OpenSearch for current tagged count for this revopsType
+      const taggedCountQuery = {
         query: {
           bool: {
             must: [
@@ -118,92 +130,51 @@ export async function mappingConfig( req, res, next ) {
                   'revopsType.keyword': inputData.revopsType,
                 },
               },
+              {
+                term: {
+                  'isParent': false,
+                },
+              },
             ],
           },
         },
       };
-      const getData = await getOpenSearchCount( openSearch.revop, getQuery );
-      if ( getData && getData?.body?.count >= config?.revopTagging?.houseKeeping ) {
-        return res.sendError( `Select up to ${config?.revopTagging?.houseKeeping} items only`, 400 );
+      const taggedData = await getOpenSearchCount( openSearch.revop, taggedCountQuery );
+      const taggedValue = ( taggedData?.body?.count || 0 )+ ( inputData.revopsType == 'duplicate'? inputData?.duplicateImage?.length : 1 );
+      // If the unit is %, compare percentage of taggedValue/footfall, otherwise compare taggedValue to limitValue directly
+      let isLimitExceeded = false;
+      if ( unit === '%' ) {
+        // footfall may be undefined, treat as 0 (avoid division by zero)
+        const totalFootfall = Number( footfall ) || 0;
+        const taggedPercent = totalFootfall > 0 ? ( taggedValue / totalFootfall ) * 100 : 0;
+        isLimitExceeded = taggedPercent > limitValue;
+        logger.info( {
+          limitType: 'PERCENT',
+          taggedValue,
+          totalFootfall,
+          taggedPercent,
+          limitValue,
+          isLimitExceeded,
+          forRevopsType: inputData.revopsType,
+        } );
       } else {
-        next();
+        // Non-percent, treat limitValue as an absolute number
+        isLimitExceeded = taggedValue > limitValue;
+        logger.info( {
+          limitType: 'ABSOLUTE',
+          taggedValue,
+          limitValue,
+          isLimitExceeded,
+          forRevopsType: inputData.revopsType,
+        } );
       }
-    } else if ( inputData.revopsType === 'junk' ) {
-      if ( ( req?.user?.userType == 'client' && req?.user?.userType !== 'user ' ) || req?.user?.userType === 'tango' ) {
-        next();
-        return;
-      } else {
-        return res.sendError( 'Forbidden to junk mapping', 500 );
+      if ( isLimitExceeded ) {
+        return res.sendError( `Limit exceed: Only ${limitValue}${unit || ''} items allowed for ${inputData.revopsType}`, 400 );
       }
+      return next();
     } else {
-      next();
+      return next();
     }
-    // else if ( inputData.revopsType == 'duplicate' ) {
-    //   const getFootfallQuery = {
-    //     query: {
-    //       terms: {
-    //         _id: [ inputData?.dateString ],
-    //       },
-    //     },
-    //     _source: [ 'footfall', 'date_string', 'store_id', 'down_time', 'footfall_count' ],
-    //     sort: [
-    //       {
-    //         date_iso: {
-    //           order: 'desc',
-    //         },
-    //       },
-    //     ],
-    //   };
-
-    //   const getFootfall = await getOpenSearchData( openSearch.footfall, getFootfallQuery );
-    //   const footfall = getFootfall?.body?.hites?.hits?.[0]?._source?.footfall_count;
-    //   const getQuery = {
-    //     query: {
-    //       bool: {
-    //         must: [
-    //           {
-    //             term: {
-    //               'storeId.keyword': inputData.storeId,
-    //             },
-    //           },
-    //           {
-    //             term: {
-    //               'dateString': inputData.dateString,
-    //             },
-    //           },
-    //           {
-    //             term: {
-    //               'revopsType.keyword': inputData.revopsType,
-    //             },
-    //           },
-    //           {
-    //             term: {
-    //               'parent.keyword': null,
-    //             },
-    //           },
-    //         ],
-    //       },
-    //     },
-    //   };
-    //   const getData = await getOpenSearchCount( openSearch.revop, getQuery );
-    //   logger.info( { getData: getData, footfall: footfall, duplicate: config?.revopTagging?.duplicate } );
-    //   if ( getData && footfall && config?.revopTagging?.duplicate ) {
-    //     const data = config?.revopTagging?.duplicate;
-    //     // Convert "20%" → 0.2 (handle both "20%" and 20)
-    //     const percentStr = typeof data === 'string' ? data.replace( '%', '' ) : data;
-    //     logger.info( { percentStr: percentStr } );
-    //     const percentValue =percentStr / 100;
-
-    //     const result = percentValue * footfall;
-
-    //     logger.info( { result: result, footfall: footfall } );
-    //   }
-    //   if ( getData && getData?.body?.count >= Math.round( result ) ) {
-    //     return res.sendError( `Select up to ${config?.revopTagging?.duplicate} items only`, 400 );
-    //   } else {
-    //     next();
-    //   }
-    // }
   } catch ( error ) {
     logger.error( { error: error, message: req.body, function: 'traffic-revop-getTaggingConfig' } );
     next();