tango-app-api-audit 1.0.47 → 1.0.49

package/src/controllers/audit.controllers.js

@@ -19,7 +19,7 @@ import {
   aggregateAssignAudit,
   updateOneAssignAudit,
 } from '../service/assignAudit.service.js';
-import { findOneUser } from '../service/user.service.js';
+import { aggregateUser, findOneUser } from '../service/user.service.js';
 import dayjs from 'dayjs';
 import { aggregateClient, findClient } from '../service/client.service.js';
 import { logger } from 'tango-app-api-middleware';
@@ -34,13 +34,12 @@ import {
   findOneStoreAudit,
   updateOneStoreAudit,
 } from '../service/storeAudit.service.js';
-import { aggregateAuditClientData } from '../service/auditClientData.service.js';
 import _ from 'lodash';
 import {
   createAuditLog,
   findOneAuditLog,
 } from '../service/auditLog.service.js';
-import { findOneStore } from '../service/store.service.js';
+import { aggregateStore, findOneStore } from '../service/store.service.js';
 import {
   mapCustomer,
   mapEmployee,
@@ -50,6 +49,140 @@ import {
   splitG20000,
 } from '../validation/audit.validation.js';
 import mongoose from 'mongoose';
+import {
+  aggregateAuditStoreDataSchema,
+  findOneStoreData,
+} from '../service/auditStoreData.service.js';
+
+/*           < -- *** Configuration ***   -->      */
+
+//   client
+export async function clients( req, res ) {
+  try {
+    const inputData = req.query;
+    const query = [
+      {
+        $match: {
+          'status': { $in: [ 'active', 'hold' ] },
+          'auditConfigs.audit': true,
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          clientName: 1,
+          clientId: 1,
+        },
+      },
+    ];
+
+    const count = await aggregateClient( query );
+    if ( count.length == 0 ) {
+      return res.sendSuccess( { result: [], count: 0 } );
+    }
+    if ( inputData.limit ) {
+      const offset = inputData.offset ?
+        ( inputData.offset - 1 ) * inputData.limit :
+        0;
+      query.push( { $skip: offset }, { $limit: limit } );
+    }
+    const getAuditClients = await aggregateClient( query );
+
+    return res.sendSuccess( { result: getAuditClients, count: count.length } );
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.info( { error: error, messgae: req.query, function: 'clients' } );
+    return res.sendError( err, 500 );
+  }
+}
+
+export async function auditStoreList( req, res ) {
+  try {
+    const inputData = req.body;
+    const query = [
+      {
+        $match: {
+          clientId: { $in: inputData.clientId },
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          clientId: 1,
+          storeId: 1,
+          storeName: 1,
+        },
+      },
+    ];
+
+    const count = await aggregateStore( query );
+    if ( count.length == 0 ) {
+      return res.sendSuccess( { result: [], count: 0 } );
+    }
+    if ( inputData.limit ) {
+      const offset = inputData.offset ?
+        ( inputData.offset - 1 ) * inputData.limit :
+        0;
+      query.push( { $skip: offset }, { $limit: limit } );
+    }
+    const result = await aggregateStore( query );
+
+    return res.sendSuccess( { result: result, count: count.length } );
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.info( {
+      error: error,
+      messgae: req.body,
+      function: 'auditStoreList',
+    } );
+    return res.sendError( err, 500 );
+  }
+}
+
+export async function auditUserList( req, res ) {
+  try {
+    const inputData = req.query;
+    const query = [
+      {
+        $match: {
+          userType: { $eq: 'tango' },
+        },
+      },
+      {
+        $project: {
+          userName: 1,
+          userId: '$_id',
+          _id: 0,
+        },
+      },
+    ];
+
+    const count = await aggregateUser( query );
+    if ( count.length == 0 ) {
+      return res.sendSuccess( { result: [], count: 0 } );
+    }
+    if ( inputData.limit ) {
+      const offset = inputData.offset ?
+        ( inputData.offset - 1 ) * inputData.limit :
+        0;
+      query.push( { $skip: offset }, { $limit: limit } );
+    }
+    const result = await aggregateUser( query );
+
+    return res.sendSuccess( { result: result, count: count.length } );
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.info( {
+      error: error,
+      messgae: req.query,
+      function: 'auditUserList',
+    } );
+    return res.sendError( err, 500 );
+  }
+}
+
+/*           < -- *** Audit  Mapping ***   -->      */
+
 export async function getAuditFile( req, res ) {
   try {
     const bucket = JSON.parse( process.env.BUCKET );
@@ -69,6 +202,7 @@ export async function getAuditFile( req, res ) {
             { auditStatus: { $nin: [ 'completed', 'skipped' ] } },
             { createdAt: { $gte: start } },
             { createdAt: { $lte: end } },
+            { moduleType: inputData.moduleType },
           ],
         },
       },
@@ -83,7 +217,6 @@ export async function getAuditFile( req, res ) {
     const userDetails = await aggregateUserAudit( userQuery );
     const auditStatus =
       userDetails && userDetails.length > 0 ? userDetails[0].auditStatus : null;
-
     switch ( auditStatus ) {
       case null:
         const query = [
@@ -93,6 +226,7 @@ export async function getAuditFile( req, res ) {
                 { userId: { $eq: req.user._id } },
                 { isCompleted: { $eq: false } },
                 { queueName: inputData.queueName },
+                { moduleType: inputData.moduleType },
               ],
             },
           },
@@ -105,12 +239,14 @@ export async function getAuditFile( req, res ) {
               store_id: userAssign[0].storeId,
               curr_date: userAssign[0].fileDate,
               total_count: userAssign[0].fileCount,
+              zone_id: userAssign[0].zoneName,
             } ) :
             ( msg = {
               store_id: userAssign[0].storeId,
               curr_date: userAssign[0].fileDate,
               audit_type: userAssign[0].fileType,
               total_count: userAssign[0].fileCount,
+              zone_id: userAssign[0].zoneName,
             } );
           await updateOneAssignAudit(
               { _id: userAssign[0]._id },
@@ -143,6 +279,8 @@ export async function getAuditFile( req, res ) {
               fileDate: userDetails[0].fileDate,
               storeId: userDetails[0].storeId,
               totalCount: userDetails[0].beforeCount,
+              moduleType: userDetails[0].moduleType,
+              zoneName: userDetails[0].zoneName,
             },
             {},
             { createdAt: -1 },
@@ -166,6 +304,8 @@ export async function getAuditFile( req, res ) {
           type: userDetails[0].auditType,
           queueName: log.queueName,
           userId: log.userId,
+          moduleType: userDetails[0].moduleType,
+          zoneName: userDetails[0].zoneName,
         };
         const result = {
           junk: log.junk,
@@ -196,6 +336,8 @@ export async function getAuditFile( req, res ) {
               storeId: userDetails[0].storeId,
               clientName: log.queueName,
               auditId: userDetails[0]._id,
+              moduleType: userDetails[0].moduleType,
+              zoneName: userDetails[0].zoneName,
             },
           };
           logger.info( { logData: logData } );
@@ -227,6 +369,7 @@ export async function getAuditFile( req, res ) {
           curr_date: userDetails[0].fileDate,
           audit_type: userDetails[0].auditType,
           total_count: userDetails[0].beforeCount,
+          zone_id: userDetails[0].zoneName,
         };
         break;
     }
@@ -261,6 +404,8 @@ export async function getAuditFile( req, res ) {
           fileDateISO: start,
           timeSpent: 0,
           startTime: new Date(),
+          zoneName: msg.zone_id,
+          moduleType: inputData.moduleType,
         };
         const storeRecord = {
           userId: req.user._id,
@@ -273,6 +418,8 @@ export async function getAuditFile( req, res ) {
           status: 'inprogress',
           fileDateISO: start,
           timeSpent: 0,
+          zoneName: msg.zone_id,
+          moduleType: inputData.moduleType,
         };
         reauditInsert = await createUserAudit( record );
         await createStoreAudit( storeRecord );
@@ -292,6 +439,8 @@ export async function getAuditFile( req, res ) {
             storeId: msg.store_id,
             clientName: inputData.queueName,
             auditId: reauditInsert._id,
+            zoneName: msg.zone_id,
+            moduleType: inputData.moduleType,
           },
         };
         await insertOpenSearchData( openSearch.activityLog, logData );
@@ -319,16 +468,19 @@ export async function getAuditFile( req, res ) {
           queueName: inputData.queueName,
           auditId: reauditInsert._id,
           userId: reauditInsert.userId,
+          zoneName: msg.zone_id,
+          moduleType: inputData.moduleType,
         },
         isDraft: reauditInsert.isDraft,
       } );
     }
     const storeId = msg.store_id;
     const fileDate = msg.curr_date;
+
     const files = [];
     let insertData = {};
     fetchData.Bucket = bucket.auditInput; // need to change
-    fetchData.file_path = `${fileDate}/${storeId}/`;
+    fetchData.file_path = `${fileDate}/${storeId}/${msg.zone_id}/`;
     if ( inputData.limit ) {
       fetchData.MaxKeys = inputData.limit;
     }
@@ -342,7 +494,7 @@ export async function getAuditFile( req, res ) {
     if ( folderPath?.length > 0 ) {
       for ( let i = 0; i < folderPath.length; i++ ) {
         const img = folderPath[i].Key.split( '/' );
-        const image = img[2].split( '.' );
+        const image = img[3].split( '.' );
         const indexes = image[0].split( '_' );
         fetchData.file_path = folderPath[i].Key;
         const data = await signedUrl( fetchData );
@@ -382,6 +534,8 @@ export async function getAuditFile( req, res ) {
           fileDateISO: start,
           timeSpent: 0,
           startTime: new Date(),
+          zoneName: msg.zone_id,
+          moduleType: inputData.moduleType,
         };
         const storeRecord = {
           userId: req.user._id,
@@ -394,10 +548,12 @@ export async function getAuditFile( req, res ) {
           status: 'inprogress',
           fileDateISO: start,
           timeSpent: 0,
+          zoneName: msg.zone_id,
+          moduleType: inputData.moduleType,
         };
 
         insertData = await createUserAudit( record );
-        await createAssignZoneAudit( storeRecord );
+        await createStoreAudit( storeRecord );
       } else {
         insertData = userDetails[0];
       }
@@ -430,6 +586,8 @@ export async function getAuditFile( req, res ) {
           storeId: storeId,
           clientName: inputData.queueName,
           auditId: insertData._id,
+          zoneName: msg.zone_id,
+          moduleType: inputData.moduleType,
         },
       };
       await insertOpenSearchData( openSearch.activityLog, logData );
@@ -448,6 +606,8 @@ export async function getAuditFile( req, res ) {
         type: 'Audit',
         auditId: insertData._id,
         userId: insertData.userId,
+        zoneName: msg.zone_id,
+        moduleType: inputData.moduleType,
         nextToken: nextQuery ? encodeURIComponent( nextQuery ) : null,
       },
       isDraft: insertData.isDraft,
@@ -467,7 +627,7 @@ export async function getFilterData( msg ) {
     const bucket = JSON.parse( process.env.BUCKET );
     const params = {
       Bucket: `${bucket.auditOutput}`,
-      Key: `${msg.store_id}/${msg.curr_date}/${bucketName.masterJsonFile}`,
+      Key: `${msg.store_id}/${msg.zone_id}/${msg.curr_date}/${bucketName.masterJsonFile}`,
     };
     const mappingFile = await getJsonFileData( params );
     if ( mappingFile.statusCode ) {
@@ -503,7 +663,7 @@ export async function getAuditImage( msg ) {
     const files = [];
     const fetchData = {};
     fetchData.Bucket = `${bucket.auditInput}`;
-    fetchData.filePath = `${fileDate}/${storeId}/`;
+    fetchData.filePath = `${fileDate}/${storeId}/${msg.zone_id}`;
     const folderPath = await listFileWithoutLimit( fetchData );
     if ( folderPath.statusCode == 404 ) {
       return folderPath;
@@ -512,7 +672,7 @@ export async function getAuditImage( msg ) {
     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,
@@ -537,7 +697,7 @@ export async function getAuditImage( msg ) {
       return files;
     }
   } catch ( error ) {
-    logger.error( { error: error, type: 'GCP BUCKET --getAuditImage' } );
+    logger.error( { error: error, type: 'AWS BUCKET --getAuditImage' } );
     return error;
   }
 }
@@ -601,50 +761,59 @@ export async function workSpace( req, res ) {
       } );
     }
     const count = await aggregateClient( clientQuery );
-    logger.info( { count: count } );
     if ( count?.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
 
-    if ( inputData.limit && !inputData.isExport ) {
+    if ( !inputData.isExport ) {
       clientQuery.push( { $skip: offset }, { $limit: limit } );
     }
 
     const clientDetails = await aggregateClient( clientQuery );
     const clientList = clientDetails.map( ( i ) => i.clientId );
-    const query = [
+    const fileDate = dayjs( dateRange.start ).subtract( 1, 'days' );
+    const getStoreData = await findOneStoreData(
+        {},
+        { fileDate: 1 },
+        { createdAt: -1 },
+    );
+    const latestDate = getStoreData?.fileDate || dayjs( fileDate ).format( 'DD-MM-YYYY' );
+    const auditStoreDataQuery = [
       {
         $match: {
           clientId: { $in: clientList },
+          moduleType: { $eq: inputData.moduleType },
+          fileDate: { $eq: latestDate },
         },
       },
       {
         $group: {
           _id: '$clientId',
           clientId: { $last: '$clientId' },
-          totalFilesCount: { $last: '$totalFilesCount' },
           clientName: { $last: '$clientName' },
+          installedStore: { $last: '$installedStore' },
           queueName: { $last: '$queueName' },
+          totalCount: { $sum: 1 },
         },
       },
       {
         $project: {
+          _id: 0,
           clientId: 1,
-          totalFilesCount: 1,
           clientName: 1,
+          installedStore: 1,
           queueName: 1,
+          totalCount: 1,
         },
       },
     ];
 
-    const fileDate = dayjs( dateRange.start ).subtract( 1, 'days' );
-
-    const completedFiles = [
+    const completedStores = [
       {
         $match: {
           $and: [
             { clientId: { $in: clientList } },
-            { fileDateISO: { $eq: new Date( fileDate ) } },
+            { fileDate: { $eq: latestDate } },
           ],
         },
       },
@@ -656,18 +825,26 @@ export async function workSpace( req, res ) {
           },
         },
       },
+      // {
+      //   $group: {
+      //     _id: { clientId: '$clientId', storeId: '$storeId' },
+      //     clientId: { $first: '$clientId' },
+      //     completedStoresCount: { $sum: '$completed' },
+      //   },
+      // },
       {
         $group: {
-          _id: { clientId: '$clientId', storeId: '$storeId' },
+          _id: '$clientId',
           clientId: { $first: '$clientId' },
-          completedCount: { $sum: '$completed' },
+          // completedStoresCount: { $first: '$completedStoresCount' },
+          completedStoresCount: { $sum: '$completed' },
         },
       },
       {
-        $group: {
-          _id: '$clientId',
-          clientId: { $first: '$clientId' },
-          completedCount: { $first: '$completedCount' },
+        $project: {
+          _id: 0,
+          clientId: 1,
+          completedStoresCount: 1,
         },
       },
     ];
@@ -699,7 +876,7 @@ export async function workSpace( req, res ) {
           _id: { clientId: '$clientId', storeId: '$storeId' },
           clientId: { $first: '$clientId' },
           pendingCount: { $sum: '$pending' },
-          totalCount: { $sum: 1 },
+          totalFilesCount: { $sum: 1 },
         },
       },
       {
@@ -707,17 +884,16 @@ export async function workSpace( req, res ) {
           _id: '$clientId',
           clientId: { $first: '$clientId' },
           pendingCount: { $first: { $ifNull: [ '$pendingCount', 0 ] } },
-          totalCount: { $first: '$totalCount' },
+          totalFilesCount: { $first: '$totalFilesCount' },
         },
       },
     ];
-
-    const draftedFiles = [
+    const userIncompleteFiles = [
       {
         $match: {
           $and: [
             { clientId: { $in: clientList } },
-            { userId: { $eq: inputData.userId } },
+            { userId: { $eq: req.user._id } },
             { createdAt: { $gte: dateRange.start } },
             { createdAt: { $lte: dateRange.end } },
           ],
@@ -745,13 +921,13 @@ export async function workSpace( req, res ) {
           _id: '$clientId',
           clientId: { $first: '$clientId' },
           isDrafted: { $first: '$isDraft' },
-          draftCount: { $sum: '$draft' },
-          inprogressCount: { $sum: '$inprogress' },
+          userDraftCount: { $sum: '$draft' },
+          userInprogressCount: { $sum: '$inprogress' },
         },
       },
     ];
 
-    const userAsign = [
+    const userAsignAudit = [
       {
         $match: {
           $and: [
@@ -765,14 +941,14 @@ export async function workSpace( req, res ) {
         $group: {
           _id: '$clientId',
           clientId: { $first: '$clientId' },
-          asignedCount: { $sum: 1 },
+          userAsignedCount: { $sum: 1 },
         },
       },
       {
         $project: {
           _id: 0,
           clientId: 1,
-          asignedCount: 1,
+          userAsignedCount: 1,
         },
       },
     ];
@@ -787,44 +963,47 @@ export async function workSpace( req, res ) {
         $group: {
           _id: '$clientId',
           clientId: { $first: '$clientId' },
-          ClientAsignedCount: { $sum: 1 },
+          clientAsignedCount: { $sum: 1 },
         },
       },
       {
         $project: {
           _id: 0,
           clientId: 1,
-          ClientAsignedCount: { $ifNull: [ '$ClientAsignedCount', 0 ] },
+          clientAsignedCount: { $ifNull: [ '$clientAsignedCount', 0 ] },
         },
       },
     ];
 
-    const auditDetails = await aggregateAuditClientData( query );
-    const auditCount = await aggregateUserAudit( auditFiles );
-    const draftedCount = await aggregateUserAudit( draftedFiles );
-    const CompletedCount = await aggregateStoreAudit( completedFiles );
+    const auditUserCount = await aggregateUserAudit( auditFiles );
+    const userIncompleteFilesCount = await aggregateUserAudit(
+        userIncompleteFiles,
+    );
+    const userAsignAuditCount = await aggregateAssignAudit( userAsignAudit );
+    const completedStoresCount = await aggregateStoreAudit( completedStores );
+    const clientAssignedCount = await aggregateAssignAudit( clientAssign );
+    const auditStoreData = await aggregateAuditStoreDataSchema(
+        auditStoreDataQuery,
+    );
 
-    const clientAssignresult = await aggregateAssignAudit( clientAssign );
-    const userAsignCount = await aggregateAssignAudit( userAsign );
     const mergeAll = _.merge(
         _.keyBy( clientDetails, 'clientId' ),
-        _.keyBy( auditCount, 'clientId' ),
-        _.keyBy( draftedCount, 'clientId' ),
-        _.keyBy( clientAssignresult, 'clientId' ),
+        _.keyBy( auditUserCount, 'clientId' ),
+        _.keyBy( userIncompleteFilesCount, 'clientId' ),
+        _.keyBy( clientAssignedCount, 'clientId' ),
     );
     const finalResult = _.values( mergeAll );
     const merge = _.values(
         _.merge(
             _.keyBy( finalResult, 'clientId' ),
-            _.keyBy( auditDetails, 'clientId' ),
-            _.keyBy( userAsignCount, 'clientId' ),
-            _.keyBy( CompletedCount, 'clientId' ),
+            _.keyBy( auditStoreData, 'clientId' ),
+            _.keyBy( userAsignAuditCount, 'clientId' ),
+            _.keyBy( completedStoresCount, 'clientId' ),
         ),
     );
-    logger.info( { merge: merge } );
     let totalStores = 0;
     for ( let i = 0; i < merge.length; i++ ) {
-      totalStores = totalStores + merge[i].totalFilesCount;
+      totalStores = merge[i]?.totalFilesCount || 0;
 
       const pending = await listQueue( merge[i].queueName );
 
@@ -832,41 +1011,43 @@ export async function workSpace( req, res ) {
         temp.push( {
           clientId: merge[i].clientId,
           clientName: merge[i].clientName,
-          completedCount: merge[i].completedCount ?
-            Number( merge[i].completedCount ) :
+          completedStoresCount: merge[i].completedStoresCount ?
+            Number( merge[i].completedStoresCount ) :
             0,
           pendingByQueue: Number( pending ),
           pendingByUser:
             merge[i].pendingCount >= 0 ?
               Number( merge[i].pendingCount ) +
-              ( merge[i].ClientAsignedCount ?
-                Number( merge[i].ClientAsignedCount ) :
-                0 ) :
+                ( merge[i].clientAsignedCount ?
+                  Number( merge[i].clientAsignedCount ) :
+                  0 ) :
               0,
           totalCount: merge[i].totalFilesCount,
           queueName: merge[i].queueName,
-          isDraft: merge[i].isDrafted ? merge[i].isDrafted : false,
+          isDraft: merge[i]?.isDrafted || false,
           isEnable:
             Number( pending ) > 0 ||
-              merge[i].isDrafted ||
-              ( merge[i].asignedCount && merge[i].asignedCount > 0 ) ||
-              ( merge[i].inprogressCount && merge[i].inprogressCount > 0 ) ?
-              true :
-              false,
+            merge[i].isDrafted ||
+            ( merge[i].userAsignedCount && merge[i].userAsignedCount > 0 ) ||
+            ( merge[i].userInprogressCount && merge[i].userInprogressCount > 0 ) ?
+              1 :
+              0,
           completedRatio: merge[i].totalFilesCount ?
-            merge[i].completedCount ?
+            merge[i].completedStoresCount ?
               Math.round(
-                  ( Number( merge[i].completedCount ) /
-                  Number( merge[i].totalFilesCount ) ) *
-                100,
+                  ( Number( merge[i].completedStoresCount ) /
+                    Number( merge[i].totalFilesCount ) ) *
+                    100,
               ) :
               0 :
             0,
           isAssigned:
-            merge[i].asignedCount && merge[i].asignedCount > 0 ? true : false,
+            merge[i].userAsignedCount && merge[i].userAsignedCount > 0 ?
+              true :
+              false,
           Assignedcount:
-            merge[i].asignedCount && merge[i].asignedCount > 0 ?
-              merge[i].asignedCount :
+            merge[i].userAsignedCount && merge[i].userAsignedCount > 0 ?
+              merge[i].userAsignedCount :
               0,
         } );
       }
@@ -878,10 +1059,10 @@ export async function workSpace( req, res ) {
         exportdata.push( {
           'Client Name': element.clientName,
           'Client Id': element.clientId,
+          'Completed stores Count': element.completedStoresCount,
           'Completed Percentage': element.completedRatio + ' %',
           'Pending Queue': element.pendingByQueue,
           'Pending User': element.pendingByUser,
-          'Completed': element.completedCount,
           'Draft': element.isDraft ? 1 : 0,
           'Assigned': element.Assignedcount,
         } );
@@ -890,7 +1071,7 @@ export async function workSpace( req, res ) {
       return;
     } else {
       return res.sendSuccess( {
-        result: temp,
+        result: temp.sort( ( a, b ) => a.isEnable-b.isEnable ),
         count: count.length,
         totalStores: totalStores,
       } );
@@ -956,6 +1137,8 @@ export async function saveDraft( req, res ) {
           beforeCount: inputData.totalCount,
           afterCount: inputData.customerCount,
           auditId: inputData.auditId,
+          moduleType: inputData.moduleType,
+          zoneName: inputData.zoneName,
         },
       };
       await insertOpenSearchData( openSearch.activityLog, logData );
@@ -981,6 +1164,8 @@ export async function getDraftedData( req, res ) {
       fileDate: inputData.fileDate,
       storeId: inputData.storeId,
       userId: userId,
+      moduleType: inputData.moduleType,
+      zoneName: inputData.zoneName,
     };
     const result = await findOneAuditLog( query, {}, { createdAt: -1 }, 1 );
 
@@ -1006,7 +1191,7 @@ export async function save( req, res ) {
 
     const inputData = req.body;
     const params = {
-      Key: `${inputData.storeId}/${inputData.fileDate}/${bucket.masterJsonFile}`,
+      Key: `${inputData.storeId}/${inputData.zoneName}/${inputData.fileDate}/${bucket.masterJsonFile}`,
     };
 
     if ( inputData.auditType === 'ReAudit' ) {
@@ -1044,7 +1229,7 @@ export async function save( req, res ) {
 
     const uploadDataParams = {
       Bucket: bucket.auditUploadBucket,
-      Key: `${inputData.storeId}/${inputData.fileDate}/`,
+      Key: `${inputData.storeId}/${inputData.zoneName}/${inputData.fileDate}/`,
       ContentType: 'application/json',
       fileName: `${bucket.masterJsonFile}`,
       body: JSON.stringify( tempObject ),
@@ -1053,7 +1238,7 @@ export async function save( req, res ) {
 
     if ( mappingUpload?.statusCode ) {
       logger.error( {
-        error: `ERROR IN UPLOAD PATH: ${inputData.storeId}/${inputData.fileDate}/${bucket.masterJsonFile}`,
+        error: `ERROR IN UPLOAD PATH: ${inputData.storeId}/${inputData.zoneName}/${inputData.fileDate}/${bucket.masterJsonFile}`,
         type: 'UPLOAD_ERROR',
       } );
       return res.sendError( mappingUpload, 500 );
@@ -1061,6 +1246,8 @@ export async function save( req, res ) {
 
     let getUserAuditData = await findOneUserAudit( {
       _id: new mongoose.Types.ObjectId( inputData.auditId ),
+      moduleType: inputData.moduleType,
+      zoneName: inputData.zoneName,
     } );
     const isoDate = getUserAuditData.startTime;
     const currentTime = dayjs();
@@ -1097,15 +1284,20 @@ export async function save( req, res ) {
     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 } );
 
-    if ( (
+    if (
       ( storeAuditData.beforeCount - inputData.customerCount ) /
-      storeAuditData.beforeCount <
-      storeConfig.auditConfigs.ratio
-    ) && inputData.auditType == 'Audit' ) {
+        storeAuditData.beforeCount <
+        storeConfig.auditConfigs.ratio &&
+      inputData.auditType == 'Audit' &&
+      inputData.moduleType == 'traffic'
+    ) {
       logger.info(
           `Hit in Reaudit pushing queue  Store Id=${inputData.storeId},File Date=${inputData.fileDate}, /n \nQueue Name = ${clientData[0].auditConfigs.queueName}`,
           'Reaudit',
@@ -1121,32 +1313,52 @@ export async function save( req, res ) {
           before_count: storeAuditData.beforeCount,
         } ),
       };
-      const sqsQueue = await sendMessageToQueue( sqsProduceQueue.QueueUrl, sqsProduceQueue.MessageBody );
-      logger.info( { sqsQueue: sqsQueue } );
+      const sqsQueue = await sendMessageToQueue(
+          sqsProduceQueue.QueueUrl,
+          sqsProduceQueue.MessageBody,
+      );
 
       if ( sqsQueue.statusCode ) {
         logger.error( {
-          error: `ERROR IN UPLOAD PATH: ${inputData.storeId}/${inputData.fileDate}/${bucket.masterJsonFile}`,
+          error: `${sqsQueue}`,
           type: 'UPLOAD_ERROR',
         } );
         return res.sendError( mappingUpload, 500 );
       }
 
-      await updateOneStoreAudit( { storeId: inputData.storeId },
+      await updateOneStoreAudit(
+          {
+            storeId: inputData.storeId,
+            fileDate: inputData.fileDate,
+            moduleType: inputData.moduleType,
+            zoneName: inputData.zoneName,
+            auditType: inputData.auditType,
+          },
           {
             status: 'not_assign',
             afterCount: inputData.customerCount,
             auditType: 'ReAudit',
             timeSpent: timeDifferenceInMinutes,
-          } );
+          },
+      );
     } else {
-      logger.info( 'Hit in Features', { data: ( _.omit( inputData, [ 'junk', 'employee', 'customer' ] ) ) } );
-      await updateOneStoreAudit( { storeId: inputData.storeId },
+      logger.info( 'Hit in Features', {
+        data: _.omit( inputData, [ 'junk', 'employee', 'customer' ] ),
+      } );
+      await updateOneStoreAudit(
+          {
+            storeId: inputData.storeId,
+            fileDate: inputData.fileDate,
+            moduleType: inputData.moduleType,
+            zoneName: inputData.zoneName,
+            auditType: inputData.auditType,
+          },
           {
             status: 'completed',
             afterCount: inputData.customerCount,
             timeSpent: timeDifferenceInMinutes,
-          } );
+          },
+      );
 
       const sqsProduceQueue = {
         QueueUrl: `${sqs.url}${sqs.feature}`,
@@ -1155,10 +1367,15 @@ export async function save( req, res ) {
           store_id: inputData.storeId,
           store_date: inputData.fileDate,
           bucket_name: `${bucket.auditUploadBucket}`,
+          zone_id: inputData.zoneName,
+          process_type: 'audit',
         } ),
       };
       logger.info( { sqsProduceQueue: sqsProduceQueue } );
-      const sqsQueue = await sendMessageToQueue( sqsProduceQueue.QueueUrl, sqsProduceQueue.MessageBody );
+      const sqsQueue = await sendMessageToQueue(
+          sqsProduceQueue.QueueUrl,
+          sqsProduceQueue.MessageBody,
+      );
       logger.info( { sqsQueue: sqsQueue } );
     }