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

package/package.json

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

package/src/controllers/revop.controller.js

@@ -406,40 +406,112 @@ 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', 'mappingInfo', 'revicedFootfall', 'revicedPerc', 'createdAt', 'updatedAt', 'footfallCount' ],
 
     };
 
     const getData = await getOpenSearchData( opensearch.footfallDirectory, query );
     const ticketDetails = getData?.body?.hits?.hits[0];
     let temp = [];
-   ticketDetails?._source? temp.push( ticketDetails?._source ) :null;
-   //  temp[0].status = 'open';
-   if ( ticketDetails?._source?.status == 'closed' ) {
-     delete temp[0].status;
-     temp.push( { ...ticketDetails?._source, status: 'closed' } );
-
-     temp[1].userName = getData?.body?.hits?.hits?.[0]?._source?.approverUserName;
-     temp[1].email = getData?.body?.hits?.hits?.[0]?._source?.approverEmail;
-     temp[1].role = getData?.body?.hits?.hits?.[0]?._source?.approverRole;
-     temp[1].employeeCount = getData?.body?.hits?.hits?.[0]?._source?.employeeACCount;
-     temp[1].houseKeepingCount = getData?.body?.hits?.hits?.[0]?._source?.houseKeepingACCount;
-     temp[1].duplicateCount = getData?.body?.hits?.hits?.[0]?._source?.duplicateACCount;
-     temp[1].junkCount = getData?.body?.hits?.hits?.[0]?._source?.junkACCount;
-   }
-   const LamdaURL = revop.getImages;
-   let resultData = await LamdaServiceCall( LamdaURL, inputData );
-   logger.info( { resultData: resultData } );
-   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?.footfallDirectoryConfigs } );
-   } else {
-     return res.sendError( 'No Content', 204 );
-   }
-   } else {
-     return res.sendError( 'No Content', 204 );
-   }
+    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 ) || {};
+    }
+
+    // List of actionTypes to process in sequence
+
+    if ( req.user.userType !== 'tango' && req.user.role !== 'superadmin' ) {
+      switch ( req.user.role ) {
+        case 'user':
+          const actionTypesUser = [ 'tagging', 'finalreview' ];
+          temp = actionTypesUser.map( ( type ) => {
+            const mapping = getMappingForType( type );
+
+            const revisedFootfall = mapping.revisedFootfall ?? 0;
+            // Do not divide by 0
+            const revisedPerc =
+             footfallValue > 0 ?
+               `${Math.round( ( revisedFootfall / footfallValue ) * 100 )}` :
+               '0';
+
+            // Since keys in count can be dynamic, just deep copy the count object or empty object
+            const countObj = mapping.count ? { ...mapping.count } : {};
+
+            return {
+              actionType: type,
+              footfall: footfallValue,
+              revicedFootfall: revisedFootfall,
+              revicedPerc: revisedPerc,
+              count: countObj,
+            };
+          } );
+          break;
+        case 'admin':
+          const actionTypesAdmin = [ 'tagging', 'review', 'finalreview' ];
+          temp = actionTypesAdmin.map( ( type ) => {
+            const mapping = getMappingForType( type );
+
+            const revisedFootfall = mapping.revisedFootfall ?? 0;
+            // Do not divide by 0
+            const revisedPerc =
+             footfallValue > 0 ?
+               `${Math.round( ( revisedFootfall / footfallValue ) * 100 )}` :
+               '0';
+
+            // Since keys in count can be dynamic, just deep copy the count object or empty object
+            const countObj = mapping.count ? { ...mapping.count } : {};
+
+            return {
+              actionType: type,
+              footfall: footfallValue,
+              revicedFootfall: revisedFootfall,
+              revicedPerc: revisedPerc,
+              count: countObj,
+            };
+          } );
+          break;
+      }
+    } else {
+      const actionTypes = [ 'tagging', 'review', 'approve', 'finalreview' ];
+      temp = actionTypes.map( ( type ) => {
+        const mapping = getMappingForType( type );
+
+        const revisedFootfall = mapping.revisedFootfall ?? 0;
+        // Do not divide by 0
+        const revisedPerc =
+         footfallValue > 0 ?
+           `${Math.round( ( revisedFootfall / footfallValue ) * 100 )}` :
+           '0';
+
+        // Since keys in count can be dynamic, just deep copy the count object or empty object
+        const countObj = mapping.count ? { ...mapping.count } : {};
+
+        return {
+          actionType: type,
+          footfall: footfallValue,
+          revicedFootfall: revisedFootfall,
+          revicedPerc: revisedPerc,
+          count: countObj,
+        };
+      } );
+    }
+
+
+    const LamdaURL = revop.getImages;
+    let resultData = await LamdaServiceCall( LamdaURL, inputData );
+    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?.footfallDirectoryConfigs } );
+      } else {
+        return res.sendError( 'No Content', 204 );
+      }
+    } else {
+      return res.sendError( 'No Content', 204 );
+    }
   } catch ( error ) {
     logger.error( { message: error, data: req.query, function: 'storeProcessedData' } );
     const err = error.message || 'Internal Server Error';
@@ -476,6 +548,7 @@ export async function tagTempId( req, res ) {
           action: 'submitted',
         },
       ],
+      comments: inputData.comments || '',
       createdAt: new Date(),
       updatedAt: new Date(),
 
@@ -529,6 +602,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( '' ),
 
 } );