tango-app-api-audit 1.0.44 → 1.0.47

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "1.0.44",
+    "version": "1.0.47",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",
@@ -24,7 +24,7 @@
         "mongodb": "^6.7.0",
         "nodemon": "^3.1.3",
         "swagger-ui-express": "^5.0.1",
-        "tango-api-schema": "^2.0.146",
+        "tango-api-schema": "^2.0.147",
         "tango-app-api-middleware": "^3.1.28",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/audit.controllers.js

@@ -257,6 +257,7 @@ export async function getAuditFile( req, res ) {
           queueName: inputData.queueName,
           beforeCount: reauditImg.length,
           auditStatus: 'inprogress',
+          moduleType: 'traffic',
           fileDateISO: start,
           timeSpent: 0,
           startTime: new Date(),
@@ -377,6 +378,7 @@ export async function getAuditFile( req, res ) {
           queueName: inputData.queueName,
           beforeCount: msg.total_count || files.length,
           auditStatus: 'inprogress',
+          moduleType: 'traffic',
           fileDateISO: start,
           timeSpent: 0,
           startTime: new Date(),

package/src/controllers/zoneAudit.controller.js

@@ -9,13 +9,14 @@ import dayjs from 'dayjs';
 import { aggregateUserAudit, findOneUserAudit, updateOneUserAudit } from '../service/userAudit.service.js';
 import { aggregateAssignAudit, createAssignAudit } from '../service/assignAudit.service.js';
 import { createAuditLog, findOneAuditLog } from '../service/auditLog.service.js';
-import { getZoneAuditImageData, mapCustomer, mapEmployee, mapJunk, splitB20000, splitE0, splitG20000, zipDownloadImage } from '../validation/audit.validation.js';
+import { mapCustomer, mapEmployee, mapJunk, splitB20000, splitE0, splitG20000, zipDownloadImage } from '../validation/audit.validation.js';
 import { aggregateClient, findClient, findOneClient } from '../service/client.service.js';
 import { aggregateAuditClientData } from '../service/auditClientData.service.js';
 import _ from 'lodash';
 import mongoose from 'mongoose';
 import { listQueue } from 'tango-app-api-middleware/src/utils/aws/sqs.js';
 import { getReauditImg } from './audit.controllers.js';
+import { getZoneAuditFilterData, getZoneAuditImageData } from '../validation/zoneAudit.validation.js';
 
 export async function getZoneAuditFile( req, res ) {
   try {
@@ -1369,7 +1370,7 @@ export async function zoneAuditImages( req, res ) {
 
       case 'AC':
 
-        const [ filterData, auditImageAC ] = await Promise.all( [ getAuditFilterData( inputData ), getAuditImageData( inputData ) ] );
+        const [ filterData, auditImageAC ] = await Promise.all( [ getZoneAuditFilterData( inputData ), getZoneAuditImageData( inputData ) ] );
 
         if ( filterData?.errorCode || auditImageAC?.errorCode ) {
           const error = filterData?.errorMsg || auditImageAC.errorMsg;
@@ -1678,6 +1679,7 @@ export async function reTrigger( req, res ) {
     const query ={
       storeId: inputData.storeId,
       fileDate: inputData.fileDate,
+      zoneName: inputData.zoneName,
     };
     const getQueueName = await findOneClient( { clientId: req.audit.clientId }, { 'auditConfigs': 1 } );
     logger.info( { queueName: getQueueName.auditConfigs.zoneQueueName } );
@@ -1815,3 +1817,14 @@ export async function reTrigger( req, res ) {
     return res.sendError( err, 500 );
   }
 }
+
+export async function viewLog( req, res ) {
+  try {
+    // const inputData = req.body;
+    // const result = await
+  } catch ( error ) {
+    const err = error.message;
+    logger.error( { error: error, message: req.body, function: 'viewLog' } );
+    return res.sendError( err, 500 );
+  }
+}

package/src/dtos/auditMetrics.dtos.js

@@ -184,3 +184,14 @@ export const auditImageValidSchema = joi.object(
 export const auditImageValid = {
   query: auditImageValidSchema,
 };
+
+export const viewLogSchema = joi.object(
+    {
+      fileDate: joi.string().required(),
+      storeId: joi.string().required(),
+    },
+);
+
+export const viewLogValid = {
+  query: viewLogSchema,
+};

package/src/dtos/zoneAudit.dtos.js

@@ -157,3 +157,15 @@ export const reTriggerValid = {
   body: reTriggerValidSchema,
 };
 
+export const viewLogSchema = joi.object(
+    {
+      fileDate: joi.string().required(),
+      storeId: joi.string().required(),
+      zoneName: joi.string().required(),
+    },
+);
+
+export const viewLogValid = {
+  body: viewLogSchema,
+};
+

package/src/routes/auditMetrics.routes.js

@@ -2,7 +2,7 @@
 import express from 'express';
 import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
 import { auditImages, clientMetrics, overAllAuditSummary, overViewCard, overViewTable, reTrigger, storeMetrics, summarySplit, userAuditHistory, userMetrics } from '../controllers/auditMetrics.controllers.js';
-import { auditImageValid, clientMetricsValid, overAllAuditSummaryValid, overViewCardValid, overViewTableValid, reTriggerValid, storeMetricsValid, summarySplitValid, userAuditHistoryValid, userMetricsValid } from '../dtos/auditMetrics.dtos.js';
+import { auditImageValid, clientMetricsValid, overAllAuditSummaryValid, overViewCardValid, overViewTableValid, reTriggerValid, storeMetricsValid, summarySplitValid, userAuditHistoryValid, userMetricsValid, viewLogValid } from '../dtos/auditMetrics.dtos.js';
 import { isAuditDocumentExist, isAuditInputFolderExist } from '../validation/audit.validation.js';
 
 export const auditMetricsRouter = express.Router();
@@ -17,5 +17,6 @@ auditMetricsRouter.post( '/overview-table', isAllowedSessionHandler, validate( o
 auditMetricsRouter.post( '/overall-audit-summary', isAllowedSessionHandler, validate( overAllAuditSummaryValid ), overAllAuditSummary );
 auditMetricsRouter.post( '/re-trigger', isAllowedSessionHandler, validate( reTriggerValid ), isAuditDocumentExist, isAuditInputFolderExist, reTrigger );
 auditMetricsRouter.get( '/audit-images', isAllowedSessionHandler, validate( auditImageValid ), isAuditInputFolderExist, auditImages );
+auditMetricsRouter.post( '/view-log', isAllowedSessionHandler, validate( viewLogValid ), isAuditInputFolderExist, auditImages );
 
 export default auditMetricsRouter;

package/src/routes/zone.routes.js

@@ -1,9 +1,10 @@
 import { Router } from 'express';
-import { clientMetricsValid, getDraftedDataValid, getFileValid, reTriggerValid, saveDraftValid, saveValid, workSpaceValid, zoneAuditImageValid } from '../dtos/zoneAudit.dtos.js';
-import { isAuditDocumentExist, isAuditInputFolderExist, isExistsQueue, isZoneAuditInputFolderExist, validateUserAudit } from '../validation/audit.validation.js';
+import { clientMetricsValid, getDraftedDataValid, getFileValid, reTriggerValid, saveDraftValid, saveValid, viewLogValid, workSpaceValid, zoneAuditImageValid } from '../dtos/zoneAudit.dtos.js';
+import { isExistsQueue, validateUserAudit } from '../validation/audit.validation.js';
 import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
-import { clientMetrics, getDraftedData, getZoneAuditFile, reTrigger, save, saveDraft, storeMetrics, workSpace, zoneAuditImages } from '../controllers/zoneAudit.controller.js';
+import { clientMetrics, getDraftedData, getZoneAuditFile, reTrigger, save, saveDraft, storeMetrics, viewLog, workSpace, zoneAuditImages } from '../controllers/zoneAudit.controller.js';
 import { storeMetricsValid } from '../dtos/auditMetrics.dtos.js';
+import { isZoneAuditInputFolderExist, isAuditInputFolderExist, isAuditDocumentExist } from '../validation/zoneAudit.validation.js';
 
 export const zoneAuditRouter=Router();
 
@@ -20,3 +21,4 @@ zoneAuditRouter.post( '/metrics/store-metrics', isAllowedSessionHandler, validat
 zoneAuditRouter.get( '/metrics/audit-images', isAllowedSessionHandler, validate( zoneAuditImageValid ), isZoneAuditInputFolderExist, zoneAuditImages );
 zoneAuditRouter.post( '/metrics/client-metrics', isAllowedSessionHandler, validate( clientMetricsValid ), clientMetrics );
 zoneAuditRouter.post( '/metrics/re-trigger', isAllowedSessionHandler, validate( reTriggerValid ), isAuditDocumentExist, isAuditInputFolderExist, reTrigger );
+zoneAuditRouter.post( '/view-log', isAllowedSessionHandler, validate( viewLogValid ), viewLog );

package/src/validation/audit.validation.js

@@ -329,90 +329,4 @@ export async function getAuditFilterData( data ) {
   }
 }
 
-// zone
-export async function isZoneAuditInputFolderExist( req, res, next ) {
-  try {
-    const bucket = JSON.parse( process.env.BUCKET );
-    const inputData = req.method === 'POST' ? req.body : req.query;
-    const params={
-      Bucket: bucket.auditInput,
-      Key: `${inputData.fileDate}/${inputData.storeId}/${inputData.zoneName}`,
-    };
-    const isExist = await checkFileExist( params );
-    if ( isExist ) {
-      next();
-    } else {
-      return res.sendError( `Audit Input folder not available : ${inputData.fileDate}/${inputData.storeId}`, 400 );
-    }
-  } catch ( error ) {
-    const err = error.message || 'Internal Server Error';
-    logger.error( { error: error, message: req.query, function: 'isAuidtInputFolderExist' } );
-    return res.sendError( err, 500 );
-  }
-}
-
-export async function getZoneAuditImageData( data ) {
-  try {
-    const bucket = JSON.parse( process.env.BUCKET );
-    const storeId = data.storeId;
-    const fileDate = data.fileDate;
-    const files = [];
-    const fetchData = {
-      Bucket: `${bucket.auditInput}`,
-      filePath: `${fileDate}/${storeId}/${data.zoneName}/`,
-    };
-
-    const folderPath = await listFileWithoutLimit( fetchData );
-    if ( folderPath.statusCode == 404 ) {
-      return folderPath;
-    }
-    const auditImages = folderPath;
 
-    if ( data.export==false ) {
-      if ( auditImages && auditImages?.length > 0 ) {
-        for ( let i = 0; i < auditImages.length; i++ ) {
-          const img = auditImages[i].Key.split( '/' );
-          const image = img[3].split( '.' );
-          const indexes = image[0].split( '_' );
-          const params = {
-            file_path: auditImages[i].Key,
-            Bucket: fetchData.Bucket,
-          };
-          const data = await signedUrl( params );
-          files.push( {
-            imgPath: data,
-            imgName: indexes[1],
-            imgId: image[0],
-            img_name: indexes[1],
-            // imgFile: auditImages[i],
-          } );
-        }
-        return files;
-      }
-    } else {
-      if ( auditImages && auditImages?.length > 0 ) {
-        for ( let i = 0; i < auditImages.length; i++ ) {
-          const img = auditImages[i].Key.split( '/' );
-          const image = img[3].split( '.' );
-          const indexes = image[0].split( '_' );
-          const params = {
-            file_path: auditImages[i].Key,
-            Bucket: fetchData.Bucket,
-          };
-          const data = await signedUrl( params );
-          files.push( {
-            imgPath: data,
-            imgName: indexes[1],
-            imgId: image[0],
-            imgFile: auditImages[i],
-            img_name: indexes[1],
-          } );
-        }
-        return files;
-      }
-    }
-  } catch ( error ) {
-    logger.error( { error: error, type: 'getAuditImageData' } );
-    return error;
-  }
-}

package/src/validation/zoneAudit.validation.js

@@ -1,4 +1,4 @@
-import { checkFileExist } from 'tango-app-api-middleware';
+import { checkFileExist, getJsonFileData, listFileWithoutLimit, signedUrl } from 'tango-app-api-middleware';
 import { findOneStoreZoneAudit } from '../service/storeZoneAudit.service.js';
 
 export async function isAuditDocumentExist( req, res, next ) {
@@ -43,3 +43,125 @@ export async function isAuditInputFolderExist( req, res, next ) {
     return res.sendError( err, 500 );
   }
 }
+
+export async function getZoneAuditFilterData( data ) {
+  try {
+    const bucket = JSON.parse( process.env.BUCKET );
+    const storeId = data.storeId;
+    const fileDate = data.fileDate;
+    const params = {
+      Bucket: `${bucket.auditOutput}`,
+      Key: `${storeId}/${data.zoneName}/${fileDate}/${bucket.masterJsonFile}`,
+    };
+    const mappingFile = await getJsonFileData( params );
+    if ( mappingFile.statusCode ) {
+      return mappingFile;
+    } else {
+      const mappingData = await JSON.parse( mappingFile.toString( 'utf-8' ) );
+      const filterData = await mappingData.person_data.filter(
+          ( item ) =>
+            item.temp_ids < 20000 &&
+          item.temp_ids > 0 &&
+          item.person_status === '',
+      );
+      const finalResult = await filterData.map( ( i ) => {
+        return { ...i, img: i.index.concat( '_', i.temp_ids ) };
+      } );
+      return finalResult;
+    }
+  } catch ( error ) {
+    logger.error( {
+      error: error,
+      type: 'MAPPING JSON getFilterData',
+      function: 'getZoneAuditFilterData',
+    } );
+    return error;
+  }
+}
+
+export async function isZoneAuditInputFolderExist( req, res, next ) {
+  try {
+    const bucket = JSON.parse( process.env.BUCKET );
+    const inputData = req.method === 'POST' ? req.body : req.query;
+    const params={
+      Bucket: bucket.auditInput,
+      Key: `${inputData.fileDate}/${inputData.storeId}/${inputData.zoneName}`,
+    };
+    const isExist = await checkFileExist( params );
+    if ( isExist ) {
+      next();
+    } else {
+      return res.sendError( `Audit Input folder not available : ${inputData.fileDate}/${inputData.storeId}`, 400 );
+    }
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.error( { error: error, message: req.query, function: 'isAuidtInputFolderExist' } );
+    return res.sendError( err, 500 );
+  }
+}
+
+export async function getZoneAuditImageData( data ) {
+  try {
+    const bucket = JSON.parse( process.env.BUCKET );
+    const storeId = data.storeId;
+    const fileDate = data.fileDate;
+    const files = [];
+    const fetchData = {
+      Bucket: `${bucket.auditInput}`,
+      filePath: `${fileDate}/${storeId}/${data.zoneName}/`,
+    };
+
+    const folderPath = await listFileWithoutLimit( fetchData );
+    if ( folderPath.statusCode == 404 ) {
+      return folderPath;
+    }
+    const auditImages = folderPath;
+
+    if ( data.export==false ) {
+      if ( auditImages && auditImages?.length > 0 ) {
+        for ( let i = 0; i < auditImages.length; i++ ) {
+          const img = auditImages[i].Key.split( '/' );
+          const image = img[3].split( '.' );
+          const indexes = image[0].split( '_' );
+          const params = {
+            file_path: auditImages[i].Key,
+            Bucket: fetchData.Bucket,
+          };
+          const data = await signedUrl( params );
+          files.push( {
+            imgPath: data,
+            imgName: indexes[1],
+            imgId: image[0],
+            img_name: indexes[1],
+            // imgFile: auditImages[i],
+          } );
+        }
+        return files;
+      }
+    } else {
+      if ( auditImages && auditImages?.length > 0 ) {
+        for ( let i = 0; i < auditImages.length; i++ ) {
+          const img = auditImages[i].Key.split( '/' );
+          const image = img[3].split( '.' );
+          const indexes = image[0].split( '_' );
+          const params = {
+            file_path: auditImages[i].Key,
+            Bucket: fetchData.Bucket,
+          };
+          const data = await signedUrl( params );
+          files.push( {
+            imgPath: data,
+            imgName: indexes[1],
+            imgId: image[0],
+            imgFile: auditImages[i],
+            img_name: indexes[1],
+          } );
+        }
+        return files;
+      }
+    }
+  } catch ( error ) {
+    logger.error( { error: error, type: 'getZoneAuditImageData' } );
+    return error;
+  }
+}