tango-app-api-audit 1.0.56 → 1.0.58

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "1.0.56",
+    "version": "1.0.58",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",
@@ -25,7 +25,7 @@
         "nodemon": "^3.1.3",
         "swagger-ui-express": "^5.0.1",
         "tango-api-schema": "^2.0.152",
-        "tango-app-api-middleware": "^3.1.28",
+        "tango-app-api-middleware": "^3.1.30",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/audit.controllers.js

@@ -17,11 +17,12 @@ import {
 } from '../service/userAudit.service.js';
 import {
   aggregateAssignAudit,
+  createAssignAudit,
   updateOneAssignAudit,
 } from '../service/assignAudit.service.js';
 import { aggregateUser, findOneUser } from '../service/user.service.js';
 import dayjs from 'dayjs';
-import { aggregateClient, findClient } from '../service/client.service.js';
+import { aggregateClient, findClient, findOneClient } from '../service/client.service.js';
 import { logger } from 'tango-app-api-middleware';
 import {
   listQueue,
@@ -532,7 +533,6 @@ 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(),
@@ -1207,8 +1207,22 @@ export async function save( req, res ) {
   try {
     const bucket = JSON.parse( process.env.BUCKET );
     const sqs = JSON.parse( process.env.SQS );
-
     const inputData = req.body;
+    let storeAuditData = await findOneStoreAudit( {
+      storeId: inputData.storeId,
+      fileDate: inputData.fileDate,
+      moduleType: inputData.moduleType,
+      zoneName: inputData.zoneName,
+      auditType: inputData.auditType,
+    } );
+    logger.info( { storeAuditData: storeAuditData } );
+    if ( storeAuditData==null ) {
+      logger.error( {
+        error: `No data found: ${inputData.storeId}/${inputData.zoneName}/${inputData.fileDate}/${bucket.masterJsonFile}`,
+        type: 'DATABASE_RECORD_NOTFOUND',
+      } );
+      return res.sendError( storeAuditData, 204 );
+    }
     const params = {
       Key: `${inputData.storeId}/${inputData.zoneName}/${inputData.fileDate}/${bucket.masterJsonFile}`,
     };
@@ -1300,13 +1314,6 @@ export async function save( req, res ) {
           clientId: 1,
         },
     );
-    let storeAuditData = await findOneStoreAudit( {
-      storeId: inputData.storeId,
-      fileDate: inputData.fileDate,
-      moduleType: inputData.moduleType,
-      zoneName: inputData.zoneName,
-      auditType: inputData.auditType,
-    } );
 
     let clientData = await findClient( { clientId: storeConfig.clientId } );
 
@@ -2698,6 +2705,152 @@ export async function overAllAuditSummary( req, res ) {
   }
 }
 
+export async function reTrigger( req, res ) {
+  try {
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
+    const inputData = req.body;
+    const sqs = JSON.parse( process.env.SQS );
+    const query ={
+      storeId: inputData.storeId,
+      fileDate: inputData.fileDate,
+      zoneName: inputData.zoneName,
+    };
+    const getQueueName = await findOneClient( { clientId: req.audit.clientId }, { 'auditConfigs': 1 } );
+    const queueName = inputData.moduleType == 'zone' ? getQueueName?.auditConfigs?.zoneQueueName : getQueueName?.auditConfigs?.trafficQueueName;
+    if ( !getQueueName || queueName == '' ) {
+      return res.sendError( 'queueName does not create', 400 );
+    }
+    switch ( inputData.triggerType ) {
+      case 'queue':
+        const msg = {
+          store_id: inputData.storeId,
+          zone_id: inputData.zoneName,
+          curr_date: inputData.fileDate,
+          audit_type: inputData.auditType,
+          total_count: inputData.totalCount,
+        };
+
+        const sqsProduceQueue = {
+          QueueUrl: `${sqs.url}${queueName}`,
+          MessageBody: JSON.stringify( msg ),
+        };
+        const sqsQueue = await sendMessageToQueue( sqsProduceQueue.QueueUrl, sqsProduceQueue.MessageBody );
+        if ( sqsQueue?.errorCode ) {
+          const error = sqsQueue?.errorMsg;
+          const code = sqsQueue?.errorCode;
+          return res.sendError( error, code );
+        } else {
+          if ( req.audit.status !== 'completed' ) {
+            const userRecord ={
+              auditStatus: 'skipped',
+              isDraft: false,
+            };
+            const query ={
+              storeId: inputData.storeId,
+              zoneName: inputData.zoneName,
+              fileDate: inputData.fileDate,
+              auditStatus: req.audit.status,
+
+            };
+            await updateOneUserAudit( query, userRecord );
+          }
+
+          const storeRecord ={
+            status: req.audit.status !== 'completed' ? 'skipped': 'not_assign',
+          };
+
+          await updateOneStoreAudit( query, storeRecord );
+          const logData = {
+            userId: req.user._id,
+            userName: req.user.userName,
+            logType: 'audit',
+            logSubType: 'reTrigger',
+            logData: {
+              beforeCount: inputData.totalCount,
+              afterCount: '',
+              fileDate: inputData.fileDate,
+              auditType: inputData.auditType,
+              storeId: inputData.storeId,
+              zoneName: inputData.zoneName,
+              moduleType: inputData.moduleType,
+              queueName: queueName,
+              message: inputData.comments,
+              triggerBy: req.user.userName,
+              triggerId: req.user._id,
+              triggerType: inputData.triggerType,
+            },
+          };
+          await insertOpenSearchData( openSearch.activityLog, logData );
+        }
+        break;
+      case 'user':
+        const assignUser = await findOneUser( { _id: new mongoose.Types.ObjectId( inputData.userId ) } );
+        const assignUserRecord = {
+          storeId: inputData.storeId,
+          clientId: req.audit.clientId,
+          zoneName: inputData.zoneName,
+          fileDate: inputData.fileDate,
+          moduleType: inputData.moduleType,
+          fileDateISO: dayjs( new Date( ( inputData.fileDate ).split( '-' ).reverse().join( '-' ) ) ).format(),
+          auditType: inputData.auditType,
+          fileCount: inputData.beforeCount,
+          queueName: queueName,
+          userId: inputData.userId,
+          userName: assignUser.userName,
+        };
+        await createAssignAudit( assignUserRecord );
+
+        if ( req.audit.status !== 'completed' ) {
+          const userRecord ={
+            auditStatus: 'skipped',
+            isDraft: false,
+          };
+          const query ={
+            storeId: inputData.storeId,
+            zoneName: inputData.zoneName,
+            fileDate: inputData.fileDate,
+            auditStatus: req.audit.status,
+
+          };
+          await updateOneUserAudit( query, userRecord );
+        }
+
+        const storeRecord ={
+          status: req.audit.status !== 'completed' ? 'skipped': 'assigned',
+        };
+
+        await updateOneStoreAudit( query, storeRecord );
+        const logData = {
+          userId: req.user._id,
+          userName: req.user.userName,
+          logType: 'audit',
+          logSubType: 'reTrigger',
+          logData: {
+            beforeCount: inputData.totalCount,
+            afterCount: '',
+            fileDate: inputData.fileDate,
+            auditType: inputData.auditType,
+            storeId: inputData.storeId,
+            zoneName: inputData.zoneName,
+            moduleType: inputData.moduleType,
+            queueName: queueName,
+            message: inputData.comments,
+            triggerBy: req.user.userName,
+            triggerId: req.user._id,
+            triggerType: inputData.triggerType,
+          },
+        };
+        await insertOpenSearchData( openSearch.activityLog, logData );
+    }
+
+    return res.sendSuccess( { result: 'The File has been Re Trigger Succesfully' } );
+  } catch ( error ) {
+    const err = error.message;
+    logger.error( { error: error, message: req.body } );
+    return res.sendError( err, 500 );
+  }
+}
+
 export async function overViewCard( req, res ) {
   try {
     const inputData = req.body;

package/src/controllers/auditMetrics.controllers.js

@@ -1,155 +1,9 @@
-import { insertOpenSearchData, logger, sendMessageToQueue } from 'tango-app-api-middleware';
-import { updateOneUserAudit } from '../service/userAudit.service.js';
-import mongoose from 'mongoose';
-import { updateOneStoreAudit } from '../service/storeAudit.service.js';
-import { findOneUser } from '../service/user.service.js';
-import dayjs from 'dayjs';
-import { createAssignAudit } from '../service/assignAudit.service.js';
-import { findOneClient } from '../service/client.service.js';
+import { logger } from 'tango-app-api-middleware';
 import { getAuditFilterData, getAuditImageData, zipDownloadImage } from '../validation/audit.validation.js';
 import { getReauditImg } from './audit.controllers.js';
 // import { listQueue } from 'tango-app-api-middleware/src/utils/aws/sqs.js';
 
 
-export async function reTrigger( req, res ) {
-  try {
-    const openSearch = JSON.parse( process.env.OPENSEARCH );
-    const inputData = req.body;
-    const sqs = JSON.parse( process.env.SQS );
-    const query ={
-      storeId: inputData.storeId,
-      fileDate: inputData.fileDate,
-    };
-    const getQueueName = await findOneClient( { clientId: req.audit.clientId }, { 'auditConfigs.queueName': 1 } );
-
-    if ( !getQueueName || getQueueName?.auditConfigs?.queueName == '' ) {
-      return res.sendError( 'queueName does not create', 400 );
-    }
-    const queueName = getQueueName?.auditConfigs?.queueName;
-    logger.info( { queueName: queueName } );
-    switch ( inputData.triggerType ) {
-      case 'queue':
-        const msg = {
-          store_id: inputData.storeId,
-          curr_date: inputData.fileDate,
-          audit_type: inputData.type,
-          total_count: inputData.totalCount,
-        };
-
-        const sqsProduceQueue = {
-          QueueUrl: `${sqs.url}${queueName}`,
-          MessageBody: JSON.stringify( msg ),
-        };
-        const sqsQueue = await sendMessageToQueue( sqsProduceQueue.QueueUrl, sqsProduceQueue.MessageBody );
-        if ( sqsQueue?.errorCode ) {
-          const error = sqsQueue?.errorMsg;
-          const code = sqsQueue?.errorCode;
-          return res.sendError( error, code );
-        } else {
-          if ( req.audit.status !== 'completed' ) {
-            const userRecord ={
-              auditStatus: 'skipped',
-              isDraft: false,
-            };
-            const query ={
-              storeId: inputData.storeId,
-              fileDate: inputData.fileDate,
-              auditStatus: req.audit.status,
-
-            };
-            await updateOneUserAudit( query, userRecord );
-          }
-
-          const storeRecord ={
-            status: req.audit.status !== 'completed' ? 'skipped': 'not_assign',
-          };
-
-          await updateOneStoreAudit( query, storeRecord );
-          const logData = {
-            userId: req.user._id,
-            userName: req.user.userName,
-            logType: 'audit',
-            logSubType: 'reTrigger',
-            logData: {
-              beforeCount: inputData.totalCount,
-              afterCount: '',
-              fileDate: inputData.fileDate,
-              auditType: inputData.type,
-              storeId: inputData.storeId,
-              queueName: queueName,
-              message: inputData.comments,
-              triggerBy: req.user.userName,
-              triggerId: req.user._id,
-              triggerType: inputData.triggerType,
-            },
-          };
-          await insertOpenSearchData( openSearch.activityLog, logData );
-        }
-        break;
-      case 'user':
-        const assignUser = await findOneUser( { _id: new mongoose.Types.ObjectId( inputData.userId ) } );
-        const assignUserRecord = {
-          storeId: inputData.storeId,
-          clientId: req.audit.clientId,
-          fileDate: inputData.fileDate,
-          moduleType: 'traffic',
-          fileDateISO: dayjs( inputData.fileDate, 'DD-MM-YYYY' ).format(),
-          auditType: inputData.type,
-          fileCount: inputData.beforeCount,
-          queueName: queueName,
-          userId: inputData.userId,
-          userName: assignUser.userName,
-        };
-        await createAssignAudit( assignUserRecord );
-
-        if ( req.audit.status !== 'completed' ) {
-          const userRecord ={
-            auditStatus: 'skipped',
-            isDraft: false,
-          };
-          const query ={
-            storeId: inputData.storeId,
-            fileDate: inputData.fileDate,
-            auditStatus: req.audit.status,
-
-          };
-          await updateOneUserAudit( query, userRecord );
-        }
-
-        const storeRecord ={
-          status: req.audit.status !== 'completed' ? 'skipped': 'assigned',
-        };
-
-        await updateOneStoreAudit( query, storeRecord );
-        const logData = {
-          userId: req.user._id,
-          userName: req.user.userName,
-          logType: 'audit',
-          logSubType: 'reTrigger',
-          logData: {
-            beforeCount: inputData.totalCount,
-            afterCount: '',
-            fileDate: inputData.fileDate,
-            auditType: inputData.type,
-            storeId: inputData.storeId,
-            queueName: queueName,
-            message: inputData.comments,
-            triggerBy: req.user.userName,
-            triggerId: req.user._id,
-            triggerType: inputData.triggerType,
-          },
-        };
-        await insertOpenSearchData( openSearch.activityLog, logData );
-    }
-
-    return res.sendSuccess( { result: 'The File has been Re Trigger Succesfully' } );
-  } catch ( error ) {
-    const err = error.message;
-    logger.error( { error: error, message: req.body } );
-    return res.sendError( err, 500 );
-  }
-}
-
 export async function auditImages( req, res ) {
   try {
     const inputData = req.query;

package/src/docs/audit.docs.js

@@ -1,4 +1,4 @@
-import { auditStoreSchema, clientMetricsSchema, clientSchema, getDraftedDataSchema, getFileSchema, overAllAuditSummarySchema, overViewCardSchema, overViewTableSchema, saveDraftSchema, saveSchema, storeMetricsSchema, summarySplitSchema, userAuditHistorySchema, userMetricsSchema, userSchema, workSpaceSchema } from '../dtos/audit.dtos.js';
+import { auditStoreSchema, clientMetricsSchema, clientSchema, getDraftedDataSchema, getFileSchema, overAllAuditSummarySchema, overViewCardSchema, overViewTableSchema, reTriggerValidSchema, saveDraftSchema, saveSchema, storeMetricsSchema, summarySplitSchema, userAuditHistorySchema, userMetricsSchema, userSchema, workSpaceSchema, auditImageValidSchema } from '../dtos/audit.dtos.js';
 import j2s from 'joi-to-swagger';
 
 export const auditDocs = {
@@ -398,6 +398,29 @@ export const auditDocs = {
     },
   },
 
+  '/v3/audit/metrics/re-trigger': {
+    post: {
+      tags: [ 'Audit Metrics' ],
+      description: `Manual re trigger a file`,
+      operationId: 'metrics/re-trigger',
+      parameters: {},
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( reTriggerValidSchema ).swagger,
+          },
+        },
+      },
+      responses: {
+        200: { description: 'Successful' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
+
   '/v3/audit/metrics/overview-card': {
     post: {
       tags: [ 'Audit Metrics' ],
@@ -443,4 +466,58 @@ export const auditDocs = {
       },
     },
   },
+
+  '/v3/audit/audit-images': {
+    get: {
+      tags: [ 'Audit Metrics' ],
+      description: `View and Download audit images`,
+      operationId: 'audit-images',
+      parameters: [
+        {
+          in: 'query',
+          name: 'fileDate',
+          scema: j2s( auditImageValidSchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'storeId',
+          scema: j2s( auditImageValidSchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'imageType',
+          scema: j2s( auditImageValidSchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'export',
+          scema: j2s( auditImageValidSchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'moduleType',
+          scema: j2s( auditImageValidSchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'zoneName',
+          scema: j2s( auditImageValidSchema ).swagger,
+          require: true,
+        },
+      ],
+      responses: {
+        200: { description: 'Successful' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+
+    },
+  },
 };

package/src/docs/auditMetrics.docs.js

@@ -1,5 +1,5 @@
 import j2s from 'joi-to-swagger';
-import { auditImageValidSchema, getAuditImagesSchema, reTriggerValidSchema } from '../dtos/auditMetrics.dtos.js';
+import { auditImageValidSchema, getAuditImagesSchema } from '../dtos/auditMetrics.dtos.js';
 
 export const auditMetricsDocs = {
 
@@ -27,28 +27,6 @@ export const auditMetricsDocs = {
   },
 
 
-  '/v3/audit-metrics/re-trigger': {
-    post: {
-      tags: [ 'Audit Metrics' ],
-      description: `Manual re trigger a file`,
-      operationId: 're-trigger',
-      parameters: {},
-      requestBody: {
-        content: {
-          'application/json': {
-            schema: j2s( reTriggerValidSchema ).swagger,
-          },
-        },
-      },
-      responses: {
-        200: { description: 'Successful' },
-        401: { description: 'Unauthorized User' },
-        422: { description: 'Field Error' },
-        500: { description: 'Server Error' },
-        204: { description: 'Not Found' },
-      },
-    },
-  },
   '/v3/audit-metrics/audit-images': {
     get: {
       tags: [ 'Audit Metrics' ],

package/src/dtos/audit.dtos.js

@@ -261,6 +261,24 @@ export const overAllAuditSummaryValid = {
   body: overAllAuditSummarySchema,
 };
 
+export const reTriggerValidSchema = joi.object(
+    {
+      fileDate: joi.string().required(),
+      storeId: joi.string().required(),
+      zoneName: joi.string().required(),
+      moduleType: joi.string().required(),
+      auditType: joi.string().required(),
+      triggerType: joi.string().optional(),
+      totalCount: joi.number().required(),
+      userId: joi.string().optional(),
+      comments: joi.string().optional().allow( '' ),
+    },
+);
+
+export const reTriggerValid = {
+  body: reTriggerValidSchema,
+};
+
 export const overViewCardSchema = joi.object(
     {
       fromDate: joi.string().required(),
@@ -284,3 +302,19 @@ export const summarySplitSchema = joi.object(
 export const summarySplitValid = {
   body: summarySplitSchema,
 };
+
+
+export const auditImageValidSchema = joi.object(
+    {
+      fileDate: joi.string().required(),
+      storeId: joi.string().required(),
+      imageType: joi.string().required(),
+      export: joi.boolean().required(),
+      moduleType: joi.string().required(),
+      zoneName: joi.string().required(),
+    },
+);
+
+export const auditImageValid = {
+  query: auditImageValidSchema,
+};

package/src/dtos/auditMetrics.dtos.js

@@ -14,22 +14,6 @@ export const getAuditImagesValid = {
 };
 
 
-export const reTriggerValidSchema = joi.object(
-    {
-      fileDate: joi.string().required(),
-      storeId: joi.string().required(),
-      type: joi.string().optional(),
-      triggerType: joi.string().optional(),
-      totalCount: joi.number().required(),
-      userId: joi.string().optional(),
-      comments: joi.string().optional().allow( '' ),
-    },
-);
-
-export const reTriggerValid = {
-  body: reTriggerValidSchema,
-};
-
 export const auditImageValidSchema = joi.object(
     {
       fileDate: joi.string().required(),

package/src/routes/audit.routes.js

@@ -1,8 +1,9 @@
 import express from 'express';
-import { isExistsQueue, validateUserAudit } from '../validation/audit.validation.js';
+import { isAuditDocumentExist, isAuditInputFolderExist, isExistsQueue, validateUserAudit } from '../validation/audit.validation.js';
 import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
-import { auditStoreList, auditUserList, clientMetrics, clients, getAuditFile, getDraftedData, overAllAuditSummary, overViewCard, overViewTable, save, saveDraft, storeMetrics, summarySplit, userAuditHistory, userMetrics, workSpace } from '../controllers/audit.controllers.js';
-import { auditStoreValid, clientMetricsValid, clientValid, getDraftedDataValid, getFileValid, overAllAuditSummaryValid, overViewCardValid, overViewTableValid, saveDraftValid, saveValid, storeMetricsValid, summarySplitValid, userAuditHistoryValid, userMetricsValid, workSpaceValid } from '../dtos/audit.dtos.js';
+import { auditStoreList, auditUserList, clientMetrics, clients, getAuditFile, getDraftedData, overAllAuditSummary, overViewCard, overViewTable, reTrigger, save, saveDraft, storeMetrics, summarySplit, userAuditHistory, userMetrics, workSpace } from '../controllers/audit.controllers.js';
+import { auditStoreValid, clientMetricsValid, clientValid, getDraftedDataValid, getFileValid, overAllAuditSummaryValid, overViewCardValid, overViewTableValid, reTriggerValid, saveDraftValid, saveValid, storeMetricsValid, summarySplitValid, userAuditHistoryValid, userMetricsValid, workSpaceValid, auditImageValid } from '../dtos/audit.dtos.js';
+import { auditImages } from '../controllers/auditMetrics.controllers.js';
 
 export const auditRouter = express.Router();
 
@@ -26,6 +27,8 @@ auditRouter.post( '/metrics/store-metrics', isAllowedSessionHandler, validate( s
 auditRouter.post( '/metrics/user-metrics', isAllowedSessionHandler, validate( userMetricsValid ), userMetrics );
 auditRouter.post( '/metrics/overview-table', isAllowedSessionHandler, validate( overViewTableValid ), overViewTable );
 auditRouter.post( '/metrics/overall-audit-summary', isAllowedSessionHandler, validate( overAllAuditSummaryValid ), overAllAuditSummary );
+auditRouter.post( '/metrics/re-trigger', isAllowedSessionHandler, validate( reTriggerValid ), isAuditDocumentExist, isAuditInputFolderExist, reTrigger );
+auditRouter.get( '/audit-images', isAllowedSessionHandler, validate( auditImageValid ), isAuditInputFolderExist, auditImages );
 
 
 // hold

package/src/routes/auditMetrics.routes.js

@@ -1,14 +1,13 @@
 
 import express from 'express';
 import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
-import { auditImages, reTrigger } from '../controllers/auditMetrics.controllers.js';
-import { auditImageValid, reTriggerValid, viewLogValid } from '../dtos/auditMetrics.dtos.js';
-import { isAuditDocumentExist, isAuditInputFolderExist } from '../validation/audit.validation.js';
+import { auditImages } from '../controllers/auditMetrics.controllers.js';
+import { auditImageValid, viewLogValid } from '../dtos/auditMetrics.dtos.js';
+import { isAuditInputFolderExist } from '../validation/audit.validation.js';
 
 export const auditMetricsRouter = express.Router();
 
 
-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 );
 

package/src/validation/audit.validation.js

@@ -167,7 +167,7 @@ export async function isAuditInputFolderExist( req, res, next ) {
     const inputData = req.method === 'POST' ? req.body : req.query;
     const params={
       Bucket: bucket.auditInput,
-      Key: `${inputData.fileDate}/${inputData.storeId}`,
+      Key: `${inputData.fileDate}/${inputData.storeId}/${inputData.zoneName}`,
     };
     const isExist = await checkFileExist( params );
     if ( isExist ) {
@@ -188,6 +188,8 @@ export async function isAuditDocumentExist( req, res, next ) {
     const query={
       storeId: inputData.storeId,
       fileDate: inputData.fileDate,
+      zoneName: inputData.zoneName,
+      moduleType: inputData.moduleType,
     };
     const auditInfo = await findOneStoreAudit( query );
     if ( auditInfo ) {
@@ -211,7 +213,7 @@ export async function getAuditImageData( data ) {
     const files = [];
     const fetchData = {
       Bucket: `${bucket.auditInput}`,
-      filePath: `${fileDate}/${storeId}/`,
+      filePath: `${fileDate}/${storeId}/${data.zoneName}/`,
     };
     const folderPath = await listFileWithoutLimit( fetchData );
     if ( folderPath.statusCode == 404 ) {
@@ -223,7 +225,7 @@ export async function getAuditImageData( data ) {
       if ( auditImages && auditImages?.length > 0 ) {
         for ( let i = 0; i < auditImages.length; i++ ) {
           const img = auditImages[i].Key.split( '/' );
-          const image = img[2].split( '.' );
+          const image = img[3].split( '.' );
           const indexes = image[0].split( '_' );
           const params = {
             file_path: auditImages[i].Key,
@@ -301,7 +303,7 @@ export async function getAuditFilterData( data ) {
     const fileDate = data.fileDate;
     const params = {
       Bucket: `${bucket.auditOutput}`,
-      Key: `${storeId}/${fileDate}/${bucket.masterJsonFile}`,
+      Key: `${storeId}/${data.zoneName}/${fileDate}/${bucket.masterJsonFile}`,
     };
     const mappingFile = await getJsonFileData( params );
     if ( mappingFile.statusCode ) {