npm - tango-app-api-audit - Versions diffs - 3.4.19 → 3.4.21 - Mend

tango-app-api-audit 3.4.19 → 3.4.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/package.json +3 -3
package/src/controllers/audit.controllers.js +44 -11
package/src/controllers/traxAudit.controllers.js +450 -1062
package/src/docs/traxAudit.docs.js +2 -2
package/src/dtos/traxAudit.dtos.js +5 -3
package/src/routes/traxAudit.routes.js +2 -2
package/src/service/auditUsers.service.js +8 -0
package/src/validation/traxAuditValidation.js +5 -2

package/src/controllers/traxAudit.controllers.js CHANGED Viewed

@@ -17,454 +17,6 @@ import {
   findOneUserEmpDetection,
 } from '../service/userEmpDetection.service.js';
 import { updateOneEmpDetectionOutput } from '../service/empDetectionOutput.service.js';
-// export async function getDetectionAuditFile( req, res ) {
-//   try {
-//     const bucket = JSON.parse( process.env.BUCKET );
-//     const openSearch = JSON.parse( process.env.OPENSEARCH );
-//     const inputData = req.query;
-//     const previousDate = new Date( new Date() - 1 );
-//     const data = await getDate( previousDate, new Date() );
-//     logger.info( { data: data, function: 'data', newDate: new Date() } );
-//     logger.info( { userId: req.user._id, queueName: inputData.queueName, moduleType: inputData.moduleType } );
-//     const start = data.start;
-//     const end = data.end;
-//     const fetchData = {};
-//     let msg = {};
-//     const userQuery = [
-//       {
-//         $match: {
-//           $and: [
-//             { userId: req.user._id },
-//             { queueName: inputData.queueName },
-//             { auditStatus: { $nin: [ 'completed', 'skipped' ] } },
-//             { createdAt: { $gte: start } },
-//             { createdAt: { $lte: end } },
-//             { moduleType: inputData.moduleType },
-//           ],
-//         },
-//       },
-//       {
-//         $sort: { createdAt: -1 },
-//       },
-//       {
-//         $limit: 1,
-//       },
-//     ];
-//     const userDetails = await aggregateUserEmpDetection( userQuery );
-//     logger.info( { userDetails: userDetails, function: 'userDetails' } );
-//     const auditStatus =
-//         userDetails && userDetails.length > 0 ? userDetails[0].auditStatus : null;
-//     switch ( auditStatus ) {
-//       case null:
-//         const query = [
-//           {
-//             $match: {
-//               $and: [
-//                 { userId: { $eq: req.user._id } },
-//                 { isCompleted: { $eq: false } },
-//                 { queueName: inputData.queueName },
-//                 { moduleType: inputData.moduleType },
-//               ],
-//             },
-//           },
-//         ];
-//         const userAssign = await aggregateAssignAudit( query );
-//         if ( userAssign.length > 0 ) {
-//           logger.info( 'Hit in user assign', { inputData } );
-//             userAssign[0].auditType == 'Audit' ?
-//               ( msg = {
-//                 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].auditType,
-//                 total_count: userAssign[0].fileCount,
-//                 zone_id: userAssign[0].zoneName,
-//               } );
-//             await updateOneAssignAudit(
-//                 { _id: userAssign[0]._id },
-//                 { isCompleted: true },
-//             );
-//             logger.info( 'Hit in auditUserAssignModel updateOne', {
-//               _id: userAssign[0]._id,
-//               isCompleted: true,
-//             } );
-//         } else {
-//           logger.info( 'Hit in new file', { inputData } );
-//           const consumer = await sqsReceive( inputData.queueName );
-//           if ( !consumer ) {
-//             logger.error( {
-//               error: consumer,
-//               function: 'getAuditFile',
-//               message: 'SQS Receive queue is empty',
-//             } );
-//             return res.sendError( `${inputData.queueName} is Empty`, 204 );
-//           }
-//           msg = JSON.parse( consumer );
-//         }
-//         break;
-//       case 'drafted':
-//         logger.info( 'userDetails drafted', { inputData } );
-//         const log = await findOneAuditLog(
-//             {
-//               userId: userDetails[0].userId,
-//               fileDate: userDetails[0].fileDate,
-//               storeId: userDetails[0].storeId,
-//               totalCount: userDetails[0].beforeCount,
-//               moduleType: userDetails[0].moduleType,
-//               zoneName: userDetails[0].zoneName,
-//             },
-//             {},
-//             { createdAt: -1 },
-//         );
-//         if ( !log ) {
-//           await updateOneUserAudit(
-//               { _id: userDetails[0]._id },
-//               { $set: { isDraft: false, auditStatus: 'skipped' } },
-//           );
-//           logger.info( 'audit update in drafted', {
-//             _id: userDetails[0]._id,
-//             isDraft: false,
-//             auditStatus: 'skipped',
-//           } );
-//           return res.sendError( 'User saved data has been deleted', 204 );
-//         }
-//         const file = {
-//           auditId: userDetails[0]._id,
-//           store_id: userDetails[0].storeId,
-//           file_date: userDetails[0].fileDate,
-//           type: userDetails[0].auditType,
-//           queueName: log.queueName,
-//           userId: log.userId,
-//           moduleType: userDetails[0].moduleType,
-//           zoneName: userDetails[0].zoneName,
-//         };
-//         const result = {
-//           junk: log.junk,
-//           junk_count: log.junkCount,
-//           employee: log.employee,
-//           employee_count: log.employeeCount,
-//           customer: log.customer,
-//           customer_count: log.customerCount,
-//           retag_image: log.retagImage,
-//           retag_count: log.retagCount,
-//           total_count: log.totalCount,
-//         };
-//         const userdata = await findOneUser( { _id: log.userId } );
-//         if (
-//           !inputData.nextId ||
-//             inputData.nextId === '' ||
-//             inputData.nextId == null
-//         ) {
-//           const logData = {
-//             userId: log.userId,
-//             userName: userdata.name,
-//             logType: 'audit',
-//             logSubType: 'auditStart',
-//             logData: {
-//               fileDate: userDetails[0].fileDate,
-//               auditType: userDetails[0].auditType,
-//               storeId: userDetails[0].storeId,
-//               clientName: log.queueName,
-//               auditId: userDetails[0]._id,
-//               moduleType: userDetails[0].moduleType,
-//               zoneName: userDetails[0].zoneName,
-//             },
-//             createdAt: new Date(),
-//           };
-//           logger.info( { logData: logData } );
-//           await insertOpenSearchData( openSearch.auditLog, logData );
-//         }
-//         const storeQuery = {
-//           storeId: userDetails[0].storeId,
-//         };
-//         const storeFields = {
-//           storeId: 1,
-//           storeName: 1,
-//           address: '$storeProfile.address',
-//         };
-//         const storeDetails = await findOneStore( storeQuery, storeFields );
-//         res.sendSuccess( {
-//           result: result,
-//           storeId: storeDetails?.storeId,
-//           storeName: storeDetails?.storeName,
-//           address: storeDetails?.address || '',
-//           count: log.totalCount,
-//           file: file,
-//           isDraft: userDetails[0].isDraft,
-//         } );
-//         break;
-//       default:
-//         msg = {
-//           store_id: userDetails[0].storeId,
-//           curr_date: userDetails[0].fileDate,
-//           audit_type: userDetails[0].auditType,
-//           total_count: userDetails[0].beforeCount,
-//           zone_id: userDetails[0].zoneName,
-//         };
-//         break;
-//     }
-//     if ( msg.audit_type === 'ReAudit' ) {
-//       logger.info( 'Hit in user ReAudit', { inputData } );
-//       let reauditInsert = {};
-//       const [ filterData, auditImage ] = await Promise.all( [
-//         getFilterData( msg ),
-//         getAuditImage( msg ),
-//       ] );
-//       if ( filterData.statusCode == 404 || auditImage.statusCode == 404 ) {
-//         return res.sendError( 'No Data found', 204 );
-//       }
-//       const reauditImg = await getReauditImg( filterData, auditImage );
-//       if ( userDetails.length === 0 ) {
-//         const [ day, month, year ] = msg.curr_date.split( '-' );
-//         const temp = `${year}-${month}-${day}`;
-//         let start = new Date( temp );
-//         const userTimezoneOffset = start.getTimezoneOffset() * 60000;
-//         start = new Date( start.getTime() - userTimezoneOffset );
-//         start.setUTCHours( 0, 0, 0, 0 );
-//         const record = {
-//           userId: req.user._id,
-//           storeId: msg.store_id,
-//           clientId: msg.store_id.split( '-' )[0],
-//           auditType: msg.audit_type || 'ReAudit',
-//           fileDate: msg.curr_date,
-//           queueName: inputData.queueName,
-//           beforeCount: reauditImg.length,
-//           auditStatus: 'inprogress',
-//           fileDateISO: start,
-//           timeSpent: 0,
-//           startTime: new Date(),
-//           zoneName: msg.zone_id,
-//           moduleType: inputData.moduleType,
-//         };
-//         const query ={
-//           storeId: msg.store_id,
-//           zoneName: msg.zone_id,
-//           fileDate: msg.curr_date,
-//           moduleType: inputData.moduleType,
-//         };
-//         let storeRecord = {
-//           userId: req.user._id,
-//           auditType: msg.audit_type || 'ReAudit',
-//           status: 'inprogress',
-//           timeSpent: 0,
-//         };
-//         reauditInsert = await createUserAudit( record );
-//         await updateOneStoreAudit( query, storeRecord );
-//       } else {
-//         reauditInsert = userDetails[0];
-//       }
-//       const userdata = await findOneUser( { _id: req.user._id } );
-//       if ( inputData.nextId ) {
-//         const logData = {
-//           userId: req.user._id,
-//           userName: userdata.name,
-//           logType: 'audit',
-//           logSubType: 'auditStart',
-//           logData: {
-//             fileDate: msg.curr_date,
-//             auditType: msg.audit_type,
-//             storeId: msg.store_id,
-//             clientName: inputData.queueName,
-//             auditId: reauditInsert._id,
-//             zoneName: msg.zone_id,
-//             moduleType: inputData.moduleType,
-//           },
-//           createdAt: new Date(),
-//         };
-//         await insertOpenSearchData( openSearch.auditLog, logData );
-//       }
-//       const storeQuery = {
-//         storeId: msg.store_id,
-//       };
-//       const storeFields = {
-//         storeId: 1,
-//         storeName: 1,
-//         address: '$storeProfile.address',
-//       };
-//       const storeInfo = await findOneStore( storeQuery, storeFields );
-//       return res.sendSuccess( {
-//         result: reauditImg,
-//         count: reauditImg.length,
-//         storeId: storeInfo?.storeId,
-//         storeName: storeInfo?.storeName,
-//         address: storeInfo?.address || '',
-//         file: {
-//           store_id: msg.store_id,
-//           file_date: msg.curr_date,
-//           type: msg.audit_type || 'ReAudit',
-//           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}/${msg.zone_id}/`;
-//     if ( inputData.limit ) {
-//       fetchData.MaxKeys = inputData.limit;
-//     }
-//     if ( inputData.nextId ) {
-//       fetchData.ContinuationToken = decodeURIComponent( inputData.nextId );
-//     }
-//     const list = await listFileByPath( fetchData );
-//     const folderPath = list.data;
-//     const nextQuery = list.pageToken;
-//     if ( folderPath?.length > 0 ) {
-//       for ( let i = 0; i < folderPath.length; i++ ) {
-//         const img = folderPath[i].Key.split( '/' );
-//         const image = img[3].split( '.' );
-//         const indexes = image[0].split( '_' );
-//         fetchData.file_path = folderPath[i].Key;
-//         const data = await signedUrl( fetchData );
-//         const mapimg = {
-//           img_path: data,
-//           img_name: inputData.moduleType=='mobile-detection'?`${indexes[0]}-${indexes[3]}` :image[0],
-//           img_id: img[3],
-//         };
-//         files.push( {
-//           img_path: data,
-//          img_name: inputData.moduleType=='mobile-detection'?`${indexes[0]}-${indexes[3]}` :image[0],
-//           img_id: img[3],
-//           selected: false,
-//           dropped: false,
-// singleDetection: false,
-//           count: 1,
-//           mappedid: [ mapimg ],
-//         } );
-//       }
-//       if ( userDetails.length === 0 ) {
-//         const [ day, month, year ] = msg.curr_date.split( '-' );
-//         const temp = `${year}-${month}-${day}`;
-//         let start = new Date( temp );
-//         logger.info( { start: start, date: msg.curr_date } );
-//         const userTimezoneOffset = start.getTimezoneOffset() * 60000;
-//         start = new Date( start.getTime() - userTimezoneOffset );
-//         start.setUTCHours( 0, 0, 0, 0 );
-//         const record = {
-//           userId: req.user._id,
-//           storeId: msg.store_id,
-//           clientId: msg.store_id.split( '-' )[0],
-//           auditType: 'Audit',
-//           fileDate: msg.curr_date,
-//           queueName: inputData.queueName,
-//           beforeCount: msg.total_count || files.length,
-//           auditStatus: 'inprogress',
-//           fileDateISO: start,
-//           timeSpent: 0,
-//           startTime: new Date(),
-//           zoneName: msg.zone_id,
-//           moduleType: inputData.moduleType,
-//         };
-//         const query ={
-//           storeId: msg.store_id,
-//           zoneName: msg.zone_id,
-//           fileDate: msg.curr_date,
-//           moduleType: inputData.moduleType,
-//         };
-//         const storeRecord = {
-//           userId: req.user._id,
-//           storeId: msg.store_id,
-//           clientId: msg.store_id.split( '-' )[0],
-//           auditType: 'Audit',
-//           fileDate: msg.curr_date,
-//           queueName: inputData.queueName,
-//           beforeCount: msg.total_count || files.length,
-//           status: 'inprogress',
-//           fileDateISO: start,
-//           timeSpent: 0,
-//           zoneName: msg.zone_id,
-//           moduleType: inputData.moduleType,
-//         };
-//         insertData = await createUserEmpDetection( record );
-//         await updateManyStoreEmpDetection( query, storeRecord );
-//       } else {
-//         insertData = userDetails[0];
-//       }
-//     } else {
-//       logger.error( {
-//         error: { folderPath: folderPath, nextQuery: nextQuery },
-//         function: 'getAuditFile',
-//         message: 'Bucket image data not availale',
-//       } );
-//       return res.sendError( 'Bucket is Empty', 204 );
-//     }
-//     const userdata = await findOneUser( { _id: insertData.userId } );
-//     const storeQuery = {
-//       storeId: storeId,
-//     };
-//     const storeFields = {
-//       storeName: 1,
-//       address: '$storeProfile.address',
-//     };
-//     const storeInfo = await findOneStore( storeQuery, storeFields );
-//     if ( inputData.nextId ) {
-//       const logData = {
-//         userId: insertData.userId,
-//         userName: userdata.name,
-//         logType: 'audit',
-//         logSubType: 'auditStart',
-//         logData: {
-//           fileDate: insertData.fileDate,
-//           auditType: insertData.auditType,
-//           storeId: storeId,
-//           clientName: inputData.queueName,
-//           auditId: insertData._id,
-//           zoneName: msg.zone_id,
-//           moduleType: inputData.moduleType,
-//         },
-//         createdAt: new Date(),
-//       };
-//       await insertOpenSearchData( openSearch.auditLog, logData );
-//     }
-//     logger.info( { storeInfo: storeInfo } );
-//     return res.sendSuccess( {
-//       result: files,
-//       count: msg.total_count,
-//       storeId: storeId,
-//       storeName: storeInfo?.storeName,
-//       address: storeInfo?.address,
-//       file: {
-//         queueName: inputData.queueName,
-//         store_id: storeId,
-//         file_date: fileDate,
-//         type: 'Audit',
-//         auditId: insertData._id,
-//         userId: insertData.userId,
-//         zoneName: msg.zone_id,
-//         moduleType: inputData.moduleType,
-//         nextToken: nextQuery ? encodeURIComponent( nextQuery ) : null,
-//       },
-//       isDraft: insertData.isDraft,
-//     } );
-//   } catch ( error ) {
-//     logger.error( {
-//       error: error,
-//       message: req.query,
-//       function: 'getAuditFile',
-//     } );
-//     return res.sendError( error, 500 );
-//   }
-// }
 export async function workSpace( req, res ) {
   try {
@@ -476,7 +28,7 @@ export async function workSpace( req, res ) {
     const dateRange = await getDate( new Date(), new Date() );
     const filter =[
       { status: { $in: [ 'active', 'hold' ] } },
-      { 'auditConfigs.audit': { $eq: true } },
+      { 'auditConfigs.traxAudit': { $eq: true } },
       { clientId: { $in: inputData.clientId } },
     ];
@@ -501,7 +53,12 @@ export async function workSpace( req, res ) {
                     { $eq: [ inputData.moduleType, 'uniform-detection' ] }, '$auditConfigs.traxQueueName.uniformDetection',
                     {
                       $cond: [
-                        { $eq: [ inputData.moduleType, 'mobile-detection' ] }, '$auditConfigs.traxQueueName.mobileDetection', '$auditConfigs.traxQueueName.cameraAngleChange',
+                        { $eq: [ inputData.moduleType, 'mobile-detection' ] }, '$auditConfigs.traxQueueName.mobileDetection',
+                        {
+                          $cond: [
+                            { $eq: [ inputData.moduleType, 'hygiene' ] }, '$auditConfigs.traxQueueName.hygiene', '$auditConfigs.traxQueueName.cameraAngleChange',
+                          ],
+                        },
                       ],
                     },
                   ],
@@ -546,8 +103,10 @@ export async function workSpace( req, res ) {
     const clientDetails = await aggregateClient( clientQuery );
     const clientList = clientDetails.map( ( i ) => i.clientId );
     const fileDate = dayjs( dateRange.start ).subtract( 1, 'days' );
+    const traxDataQuery = inputData?.moduleType == 'hygine'? { moduleType: inputData.moduleType } : {};
     const getStoreData = await findOneTraxAuditData(
-        {},
+        traxDataQuery,
         { fileDate: 1 },
         { createdAt: -1 },
     );
@@ -566,7 +125,6 @@ export async function workSpace( req, res ) {
           clientId: { $last: '$clientId' },
           clientName: { $last: '$clientName' },
           installedStore: { $last: '$installedStore' },
-          // queueName: { $last: '$queueName' },
           totalCount: { $sum: 1 },
         },
       },
@@ -600,18 +158,10 @@ export async function workSpace( req, res ) {
           },
         },
       },
-      // {
-      //   $group: {
-      //     _id: { clientId: '$clientId', storeId: '$storeId' },
-      //     clientId: { $first: '$clientId' },
-      //     completedStoresCount: { $sum: '$completed' },
-      //   },
-      // },
       {
         $group: {
           _id: '$clientId',
           clientId: { $first: '$clientId' },
-          // completedStoresCount: { $first: '$completedStoresCount' },
           completedStoresCount: { $sum: '$completed' },
         },
       },
@@ -799,11 +349,11 @@ export async function workSpace( req, res ) {
       },
     ];
-    const auditUserCount = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( auditFiles ) : await aggregateBinaryAudit( auditFiles );
-    const userIncompleteFilesCount = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( userIncompleteFiles ) : await aggregateBinaryAudit( userIncompleteFiles );
+    const auditUserCount = [ 'mobile-detection', 'uniform-detection', 'hygiene' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( auditFiles ) : await aggregateBinaryAudit( auditFiles );
+    const userIncompleteFilesCount = [ 'mobile-detection', 'uniform-detection', 'hygiene' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( userIncompleteFiles ) : await aggregateBinaryAudit( userIncompleteFiles );
     logger.info( { moduleType: inputData.moduleType, userIncompleteFiles: userIncompleteFilesCount } );
     const userAsignAuditCount = await aggregateAssignAudit( userAsignAudit );
-    const completedStoresCount = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( completedStores ) : await aggregateBinaryAudit( binarCompletedStores );
+    const completedStoresCount = [ 'mobile-detection', 'uniform-detection', 'hygiene' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( completedStores ) : await aggregateBinaryAudit( binarCompletedStores );
     const clientAssignedCount = await aggregateAssignAudit( clientAssign );
     const auditStoreData = await aggregateTraxAuditData(
         auditStoreDataQuery,
@@ -901,7 +451,7 @@ export async function workSpace( req, res ) {
     }
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
-    logger.info( { error: error, message: req.query, function: 'workSpace' } );
+    logger.error( { error: error, message: req.query, function: 'workSpace' } );
     return res.sendError( err, 500 );
   }
 }
@@ -1063,14 +613,6 @@ export async function getAuditFile( req, res ) {
               data,
           );
         }
-        //  else {
-        //   logger.error( {
-        //     error: { folderPath: folderPath },
-        //     function: `getAuditFile - ${inputData.moduleType}`,
-        //     message: 'Bucket image data not availale',
-        //   } );
-        //   return res.sendError( 'Bucket is Empty', 204 );
-        // }
         result.push( {
           type: 'image',
           file: files,
@@ -1743,6 +1285,7 @@ export async function userAuditHistory( req, res ) {
           tempId: 1,
           streamName: 1,
           question: 1,
+          zoneName: 1,
           questionType: 1,
           answer: 1,
           userComments: 1,
@@ -1826,6 +1369,7 @@ export async function userAuditHistory( req, res ) {
             { auditStatus: { $regex: inputData.searchValue, $options: 'i' } },
             { tempId: { $regex: inputData.searchValue, $options: 'i' } },
             { question: { $regex: inputData.searchValue, $options: 'i' } },
+            { zoneName: { $regex: inputData.searchValue, $options: 'i' } },
             { userComments: { $regex: inputData.searchValue, $options: 'i' } },
           ],
@@ -1841,7 +1385,7 @@ export async function userAuditHistory( req, res ) {
       },
       );
     }
-    const count = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )? await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const count = [ 'mobile-detection', 'uniform-detection', 'hygiene' ].includes( inputData.moduleType )? await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -1886,10 +1430,6 @@ export async function userAuditHistory( req, res ) {
               temp['User Comments'] = element.userComments;
               break;
             case 'uniform-detection':
-              // temp['Customer ID'] = element.tempId;
-              // temp['Question'] = element.question;
-              // temp['Result'] = element.answer;
-              // temp['User Comments'] = element.userComments;
               temp['Before Count'] = element.beforeCount;
               temp['After Count'] = element.afterCount;
               temp['Accuracy'] = element.accuracy || '';
@@ -1899,6 +1439,12 @@ export async function userAuditHistory( req, res ) {
               temp['After Count'] = element.afterCount;
               temp['Accuracy'] = element.accuracy || '';
               break;
+            case 'hygiene':
+              temp['Zone Name'] = element.zoneName;
+              temp['Before Count'] = element.beforeCount;
+              temp['After Count'] = element.afterCount;
+              temp['Accuracy'] = element.accuracy || '';
+              break;
           }
           exportData.push( temp );
         } );
@@ -1918,12 +1464,12 @@ export async function userAuditHistory( req, res ) {
     }
-    const result = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )? await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'mobile-detection', 'uniform-detection', 'hygiene' ].includes( inputData.moduleType )? await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     return res.sendSuccess( { result: result, count: count.length } );
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
-    logger.info( { error: error, message: req.body, function: 'userAuditHistory' } );
+    logger.error( { error: error, message: req.body, function: 'userAuditHistory' } );
     return res.sendError( err, 500 );
   }
 }
@@ -1952,241 +1498,240 @@ export async function clientMetrics( req, res ) {
           { clientId: { $in: inputData.filterByClient } },
       );
     }
-    const query = [
-      {
-        $match: {
-          $and: filter,
+    let query = [];
+    if ( [ 'mobile-detection', 'uniform-detection', 'hygiene' ].includes( inputData.moduleType ) ) {
+      query =[
+        {
+          $match: {
+            $and: filter,
+          },
         },
-      },
-      {
-        $group: {
-          _id: { clientId: '$clientId', fileDate: '$fileDate', moduleType: '$moduleType' },
-          fileDate: { $last: '$fileDate' },
-          clientId: { $last: '$clientId' },
-          clientName: { $last: '$clientName' },
-          moduleType: { $last: '$moduleType' },
-          installedStore: { $last: '$installedStore' },
-          queueName: { $last: '$queueName' },
-          totalFilesCount: { $sum: 1 },
+        {
+          $group: {
+            _id: { clientId: '$clientId', fileDate: '$fileDate', moduleType: '$moduleType' },
+            fileDate: { $last: '$fileDate' },
+            clientId: { $last: '$clientId' },
+            clientName: { $last: '$clientName' },
+            moduleType: { $last: '$moduleType' },
+            installedStore: { $last: '$installedStore' },
+            queueName: { $last: '$queueName' },
+            totalFilesCount: { $sum: 1 },
+          },
         },
-      },
-      {
-        $project: {
-          fileDate: 1,
-          clientId: 1,
-          clientName: 1,
-          queueName: 1,
-          installedStore: 1,
-          totalFilesCount: 1,
-          moduleType: 1,
-          notAssignedCount: { $ifNull: [ 0, 0 ] },
-          clientStatus: { $ifNull: [ '', '' ] },
+        {
+          $project: {
+            fileDate: 1,
+            clientId: 1,
+            clientName: 1,
+            queueName: 1,
+            installedStore: 1,
+            totalFilesCount: 1,
+            moduleType: 1,
+            notAssignedCount: { $ifNull: [ 0, 0 ] },
+            clientStatus: { $ifNull: [ '', '' ] },
+          },
         },
-      },
-      {
-        $lookup: {
-          'from': 'binaryAudit',
-          'let': { clientId: '$clientId', fileDate: '$fileDate', totalAuditFiles: '$totalFilesCount' },
-          'pipeline': [
+        {
+          $lookup: {
+            'from': 'storeEmpDetection',
+            'let': { clientId: '$clientId', fileDate: '$fileDate', totalAuditFiles: '$totalFilesCount' },
+            'pipeline': [
-            {
-              $match: {
-                $expr: {
-                  $and: storeAuditFilter,
+              {
+                $match: {
+                  $expr: {
+                    $and: storeAuditFilter,
+                  },
                 },
               },
-            },
-            {
-              $project: {
-                completedStores: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, 1, 0 ] },
-                notAssignedStores: { $cond: [ { $eq: [ '$auditStatus', 'not_assign' ] }, 1, 0 ] },
-                inprogressStores: { $cond: [ { $in: [ '$auditStatus', [ 'inprogress', 'drafted', 'assigned' ] ] }, 1, 0 ] },
+              {
+                $project: {
+                  completedStores: { $cond: [ { $eq: [ '$status', 'completed' ] }, 1, 0 ] },
+                  notAssignedStores: { $cond: [ { $eq: [ '$status', 'not_assign' ] }, 1, 0 ] },
+                  inprogressStores: { $cond: [ { $in: [ '$status', [ 'inprogress', 'drafted', 'assigned' ] ] }, 1, 0 ] },
+                },
               },
-            },
-            {
-              $group: {
-                _id: { clientId: '$clientId', fileDate: '$fileDate' },
-                completedStores: { $sum: '$completedStores' },
-                inprogressStores: { $sum: '$inprogressStores' },
-                notAssignedStores: { $sum: '$notAssignedStores' },
-                fileCount: { $sum: 1 },
+              {
+                $group: {
+                  _id: { clientId: '$clientId', fileDate: '$fileDate' },
+                  completedStores: { $sum: '$completedStores' },
+                  inprogressStores: { $sum: '$inprogressStores' },
+                  notAssignedStores: { $sum: '$notAssignedStores' },
+                  fileCount: { $sum: 1 },
+                },
               },
-            },
-            {
-              $project: {
-                _id: 0,
-                completedStores: 1,
-                inprogressStores: 1,
-                notAssignedStores: 1,
-                fileCount: { $ifNull: [ '$fileCount', 0 ] },
-                completionPercentage: { $ifNull: [
-                  {
-                    $round: [ {
-                      $multiply: [
-                        100, {
-                          $divide: [
-                            '$completedStores', '$$totalAuditFiles',
-                          ],
-                        },
-                      ],
-                    }, 1 ],
+              {
+                $project: {
+                  _id: 0,
+                  completedStores: 1,
+                  inprogressStores: 1,
+                  notAssignedStores: 1,
+                  fileCount: { $ifNull: [ '$fileCount', 0 ] },
+                  completionPercentage: { $ifNull: [
+                    {
+                      $round: [ {
+                        $multiply: [
+                          100, {
+                            $divide: [
+                              '$completedStores', '$$totalAuditFiles',
+                            ],
+                          },
+                        ],
+                      }, 1 ],
+                    },
+                    0,
+                  ],
                   },
-                  0,
-                ],
                 },
               },
-            },
-          ], 'as': 'binaryAudit',
-        },
-      },
-      {
-        $unwind: {
-          path: '$binaryAudit',
-          preserveNullAndEmptyArrays: true,
+            ], 'as': 'binaryAudit',
+          },
         },
-      },
-      {
-        $project: {
-          _id: 0,
-          fileDate: 1,
-          clientId: 1,
-          clientName: 1,
-          totalFilesCount: 1,
-          moduleType: 1,
-          value: {
-            $replaceAll: { input: '$moduleType', find: '-', replacement: ' ' }, // Replacing "-" with " "
+        {
+          $unwind: {
+            path: '$binaryAudit',
+            preserveNullAndEmptyArrays: true,
           },
-          installedStore: 1,
-          // notAssignedStores: '$binaryAudit.notAssignedStores',
-          inprogressStoresCount: '$binaryAudit.inprogressStores',
-          // fileCount: '$binaryAudit.fileCount',
-          notAssignedCount: { $subtract: [ '$totalFilesCount', { $subtract: [ { $ifNull: [ '$binaryAudit.fileCount', 0 ] }, { $ifNull: [ '$binaryAudit.notAssignedStores', 0 ] } ] } ] },
-          clientStatus: { $cond: [ { $eq: [ { $ifNull: [ '$binaryAudit.fileCount', 0 ] }, 0 ] }, 'not-taken', { $cond: [ { $gte: [ '$binaryAudit.completedStores', '$totalFilesCount' ] }, 'completed', 'pending' ] } ] }, // { $cond: [ { $or: [ { $gt: [ '$notAssignedCount', 0 ] }, { $gt: [ '$binaryAudit.notAssignedStores', 0 ] } ] }
-          completedStores: '$binaryAudit.completedStores',
-          completionPercentage: '$binaryAudit.completionPercentage',
         },
-      },
-    ];
+        {
+          $project: {
+            _id: 0,
+            fileDate: 1,
+            clientId: 1,
+            clientName: 1,
+            totalFilesCount: 1,
+            moduleType: 1,
+            value: {
+              $replaceAll: { input: '$moduleType', find: '-', replacement: ' ' }, // Replacing "-" with " "
+            },
+            installedStore: 1,
+            inprogressStoresCount: '$binaryAudit.inprogressStores',
+            notAssignedCount: { $subtract: [ '$totalFilesCount', { $subtract: [ { $ifNull: [ '$binaryAudit.fileCount', 0 ] }, { $ifNull: [ '$binaryAudit.notAssignedStores', 0 ] } ] } ] },
+            clientStatus: { $cond: [ { $eq: [ { $ifNull: [ '$binaryAudit.fileCount', 0 ] }, 0 ] }, 'not-taken', { $cond: [ { $gte: [ '$binaryAudit.completedStores', '$totalFilesCount' ] }, 'completed', 'pending' ] } ] }, // { $cond: [ { $or: [ { $gt: [ '$notAssignedCount', 0 ] }, { $gt: [ '$binaryAudit.notAssignedStores', 0 ] } ] }
+            completedStores: '$binaryAudit.completedStores',
+            completionPercentage: '$binaryAudit.completionPercentage',
-    const MappingQuery =[
-      {
-        $match: {
-          $and: filter,
+          },
         },
-      },
-      {
-        $group: {
-          _id: { clientId: '$clientId', fileDate: '$fileDate', moduleType: '$moduleType' },
-          fileDate: { $last: '$fileDate' },
-          clientId: { $last: '$clientId' },
-          clientName: { $last: '$clientName' },
-          moduleType: { $last: '$moduleType' },
-          installedStore: { $last: '$installedStore' },
-          queueName: { $last: '$queueName' },
-          totalFilesCount: { $sum: 1 },
+      ];
+    } else {
+      query = [
+        {
+          $match: {
+            $and: filter,
+          },
         },
-      },
-      {
-        $project: {
-          fileDate: 1,
-          clientId: 1,
-          clientName: 1,
-          queueName: 1,
-          installedStore: 1,
-          totalFilesCount: 1,
-          moduleType: 1,
-          notAssignedCount: { $ifNull: [ 0, 0 ] },
-          clientStatus: { $ifNull: [ '', '' ] },
+        {
+          $group: {
+            _id: { clientId: '$clientId', fileDate: '$fileDate', moduleType: '$moduleType' },
+            fileDate: { $last: '$fileDate' },
+            clientId: { $last: '$clientId' },
+            clientName: { $last: '$clientName' },
+            moduleType: { $last: '$moduleType' },
+            installedStore: { $last: '$installedStore' },
+            queueName: { $last: '$queueName' },
+            totalFilesCount: { $sum: 1 },
+          },
         },
-      },
-      {
-        $lookup: {
-          'from': 'storeEmpDetection',
-          'let': { clientId: '$clientId', fileDate: '$fileDate', totalAuditFiles: '$totalFilesCount' },
-          'pipeline': [
+        {
+          $project: {
+            fileDate: 1,
+            clientId: 1,
+            clientName: 1,
+            queueName: 1,
+            installedStore: 1,
+            totalFilesCount: 1,
+            moduleType: 1,
+            notAssignedCount: { $ifNull: [ 0, 0 ] },
+            clientStatus: { $ifNull: [ '', '' ] },
+          },
+        },
+        {
+          $lookup: {
+            'from': 'binaryAudit',
+            'let': { clientId: '$clientId', fileDate: '$fileDate', totalAuditFiles: '$totalFilesCount' },
+            'pipeline': [
-            {
-              $match: {
-                $expr: {
-                  $and: storeAuditFilter,
+              {
+                $match: {
+                  $expr: {
+                    $and: storeAuditFilter,
+                  },
                 },
               },
-            },
-            {
-              $project: {
-                completedStores: { $cond: [ { $eq: [ '$status', 'completed' ] }, 1, 0 ] },
-                notAssignedStores: { $cond: [ { $eq: [ '$status', 'not_assign' ] }, 1, 0 ] },
-                inprogressStores: { $cond: [ { $in: [ '$status', [ 'inprogress', 'drafted', 'assigned' ] ] }, 1, 0 ] },
+              {
+                $project: {
+                  completedStores: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, 1, 0 ] },
+                  notAssignedStores: { $cond: [ { $eq: [ '$auditStatus', 'not_assign' ] }, 1, 0 ] },
+                  inprogressStores: { $cond: [ { $in: [ '$auditStatus', [ 'inprogress', 'drafted', 'assigned' ] ] }, 1, 0 ] },
+                },
               },
-            },
-            {
-              $group: {
-                _id: { clientId: '$clientId', fileDate: '$fileDate' },
-                completedStores: { $sum: '$completedStores' },
-                inprogressStores: { $sum: '$inprogressStores' },
-                notAssignedStores: { $sum: '$notAssignedStores' },
-                fileCount: { $sum: 1 },
+              {
+                $group: {
+                  _id: { clientId: '$clientId', fileDate: '$fileDate' },
+                  completedStores: { $sum: '$completedStores' },
+                  inprogressStores: { $sum: '$inprogressStores' },
+                  notAssignedStores: { $sum: '$notAssignedStores' },
+                  fileCount: { $sum: 1 },
+                },
               },
-            },
-            {
-              $project: {
-                _id: 0,
-                completedStores: 1,
-                inprogressStores: 1,
-                notAssignedStores: 1,
-                fileCount: { $ifNull: [ '$fileCount', 0 ] },
-                completionPercentage: { $ifNull: [
-                  {
-                    $round: [ {
-                      $multiply: [
-                        100, {
-                          $divide: [
-                            '$completedStores', '$$totalAuditFiles',
-                          ],
-                        },
-                      ],
-                    }, 1 ],
+              {
+                $project: {
+                  _id: 0,
+                  completedStores: 1,
+                  inprogressStores: 1,
+                  notAssignedStores: 1,
+                  fileCount: { $ifNull: [ '$fileCount', 0 ] },
+                  completionPercentage: { $ifNull: [
+                    {
+                      $round: [ {
+                        $multiply: [
+                          100, {
+                            $divide: [
+                              '$completedStores', '$$totalAuditFiles',
+                            ],
+                          },
+                        ],
+                      }, 1 ],
+                    },
+                    0,
+                  ],
                   },
-                  0,
-                ],
                 },
               },
-            },
-          ], 'as': 'binaryAudit',
-        },
-      },
-      {
-        $unwind: {
-          path: '$binaryAudit',
-          preserveNullAndEmptyArrays: true,
+            ], 'as': 'binaryAudit',
+          },
         },
-      },
-      {
-        $project: {
-          _id: 0,
-          fileDate: 1,
-          clientId: 1,
-          clientName: 1,
-          totalFilesCount: 1,
-          moduleType: 1,
-          value: {
-            $replaceAll: { input: '$moduleType', find: '-', replacement: ' ' }, // Replacing "-" with " "
+        {
+          $unwind: {
+            path: '$binaryAudit',
+            preserveNullAndEmptyArrays: true,
           },
-          installedStore: 1,
-          // notAssignedStores: '$binaryAudit.notAssignedStores',
-          inprogressStoresCount: '$binaryAudit.inprogressStores',
-          // fileCount: '$binaryAudit.fileCount',
-          notAssignedCount: { $subtract: [ '$totalFilesCount', { $subtract: [ { $ifNull: [ '$binaryAudit.fileCount', 0 ] }, { $ifNull: [ '$binaryAudit.notAssignedStores', 0 ] } ] } ] },
-          clientStatus: { $cond: [ { $eq: [ { $ifNull: [ '$binaryAudit.fileCount', 0 ] }, 0 ] }, 'not-taken', { $cond: [ { $gte: [ '$binaryAudit.completedStores', '$totalFilesCount' ] }, 'completed', 'pending' ] } ] }, // { $cond: [ { $or: [ { $gt: [ '$notAssignedCount', 0 ] }, { $gt: [ '$binaryAudit.notAssignedStores', 0 ] } ] }
-          completedStores: '$binaryAudit.completedStores',
-          completionPercentage: '$binaryAudit.completionPercentage',
+        },
+        {
+          $project: {
+            _id: 0,
+            fileDate: 1,
+            clientId: 1,
+            clientName: 1,
+            totalFilesCount: 1,
+            moduleType: 1,
+            value: {
+              $replaceAll: { input: '$moduleType', find: '-', replacement: ' ' }, // Replacing "-" with " "
+            },
+            installedStore: 1,
+            inprogressStoresCount: '$binaryAudit.inprogressStores',
+            notAssignedCount: { $subtract: [ '$totalFilesCount', { $subtract: [ { $ifNull: [ '$binaryAudit.fileCount', 0 ] }, { $ifNull: [ '$binaryAudit.notAssignedStores', 0 ] } ] } ] },
+            clientStatus: { $cond: [ { $eq: [ { $ifNull: [ '$binaryAudit.fileCount', 0 ] }, 0 ] }, 'not-taken', { $cond: [ { $gte: [ '$binaryAudit.completedStores', '$totalFilesCount' ] }, 'completed', 'pending' ] } ] }, // { $cond: [ { $or: [ { $gt: [ '$notAssignedCount', 0 ] }, { $gt: [ '$binaryAudit.notAssignedStores', 0 ] } ] }
+            completedStores: '$binaryAudit.completedStores',
+            completionPercentage: '$binaryAudit.completionPercentage',
+          },
         },
-      },
-    ];
+      ];
+    }
     if ( inputData?.filterByStatus?.length> 0 ) {
@@ -2196,12 +1741,6 @@ export async function clientMetrics( req, res ) {
           },
       );
-      MappingQuery.push(
-          {
-            $match: { clientStatus: { $in: inputData.filterByStatus } },
-          },
-      );
     }
     if ( inputData.searchValue && inputData.searchValue!== '' ) {
@@ -2216,18 +1755,6 @@ export async function clientMetrics( req, res ) {
         },
       } );
-      MappingQuery.push( {
-        $match: {
-          $or: [
-            { clientId: { $regex: inputData.searchValue, $options: 'i' } },
-            { clientName: { $regex: inputData.searchValue, $options: 'i' } },
-            { moduleType: { $regex: inputData.searchValue, $options: 'i' } },
-            { clientStatus: { $regex: inputData.searchValue, $options: 'i' } },
-          ],
-        },
-      } );
     }
     if ( inputData.sortColumnName ) {
       const sortBy = inputData.sortBy || -1;
@@ -2236,23 +1763,15 @@ export async function clientMetrics( req, res ) {
         $sort: { [sortColumn]: sortBy },
       },
       );
-      MappingQuery.push( {
-        $sort: { [sortColumn]: sortBy },
-      },
-      );
     }
-    const count = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )? await aggregateTraxAuditData( MappingQuery ) : await aggregateTraxAuditData( query );
-    logger.info( { count: count } );
+    const count = await aggregateTraxAuditData( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
     if ( inputData.isExport ) {
       query.push( { $limit: 10000 } );
-      MappingQuery.push( { $limit: 10000 } );
     } else {
       query.push( {
         $skip: offset,
@@ -2260,13 +1779,6 @@ export async function clientMetrics( req, res ) {
       {
         $limit: limit,
       } );
-      MappingQuery.push( {
-        $skip: offset,
-      },
-      {
-        $limit: limit,
-      } );
     }
     if ( inputData.isExport ) {
       query.push(
@@ -2277,32 +1789,10 @@ export async function clientMetrics( req, res ) {
               'Brand Name': '$clientName',
               'Brand Id': '$clientId',
               'Product Type': '$value',
-              // 'Completed Percentage': '$completionPercentage',
-              'Installed Stores': '$installedStore',
-              'Audit Stores': '$totalFilesCount',
-              'Inprogress Stores': '$inprogressStoresCount',
-              'Not Assigned Stores': '$notAssignedCount',
-              // 'Not Assigned Stores': '$notAssignedStores',
-              'Completed Stores': '$completedStores',
-              'Status': '$clientStatus',
-            },
-          },
-      );
-      MappingQuery.push(
-          {
-            $project: {
-              '_id': 0,
-              'File Date': '$fileDate',
-              'Brand Name': '$clientName',
-              'Brand Id': '$clientId',
-              'Product Type': '$value',
-              // 'Completed Percentage': '$completionPercentage',
               'Installed Stores': '$installedStore',
               'Audit Stores': '$totalFilesCount',
               'Inprogress Stores': '$inprogressStoresCount',
               'Not Assigned Stores': '$notAssignedCount',
-              // 'Not Assigned Stores': '$notAssignedStores',
               'Completed Stores': '$completedStores',
               'Status': '$clientStatus',
             },
@@ -2310,7 +1800,7 @@ export async function clientMetrics( req, res ) {
       );
     }
-    const result = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )? await aggregateTraxAuditData( MappingQuery ) : await aggregateTraxAuditData( query );
+    const result = await aggregateTraxAuditData( query );
     if ( result.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -2321,7 +1811,7 @@ export async function clientMetrics( req, res ) {
     return res.sendSuccess( { result: result, count: count.length } );
   } catch ( error ) {
     const err = error.error || 'Internal Server Error';
-    logger.info( { error: error, message: req.body, function: 'clientMetrics' } );
+    logger.error( { error: error, message: req.body, function: 'clientMetrics' } );
     return res.sendError( err, 500 );
   }
 }
@@ -2345,7 +1835,7 @@ export async function storeMetrics( req, res ) {
     }
     if ( inputData.filterByStatus && inputData.filterByStatus?.length > 0 ) {
-      [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )? filter.push( { status: { $in: inputData.filterByStatus } } ) : filter.push( { auditStatus: { $in: inputData.filterByStatus } } );
+      [ 'mobile-detection', 'uniform-detection', 'hygiene' ].includes( inputData.moduleType )? filter.push( { status: { $in: inputData.filterByStatus } } ) : filter.push( { auditStatus: { $in: inputData.filterByStatus } } );
     }
     if ( inputData.filterByAuditType && inputData.filterByAuditType?.length > 0 ) {
@@ -2394,6 +1884,7 @@ export async function storeMetrics( req, res ) {
           fileDate: 1,
           storeId: 1,
           storeName: '$stores.storeName',
+          zoneName: 1,
           clientName: '',
           clientId: 1,
           moduleType: 1,
@@ -2409,7 +1900,6 @@ export async function storeMetrics( req, res ) {
           userId: {
             $arrayElemAt: [ '$userId', { $subtract: [ { $size: '$userId' }, 1 ] } ], // need to check if no data
           },
-          // userId: 1,
           auditType: 1,
           beforeCount: 1,
           afterCount: { $ifNull: [ '$afterCount', null ] },
@@ -2485,6 +1975,7 @@ export async function storeMetrics( req, res ) {
           fileDate: 1,
           storeId: 1,
           storeName: 1,
+          zoneName: 1,
           userName: '$users.userName',
           userEmail: '$users.userEmail',
           clientId: 1,
@@ -2591,9 +2082,6 @@ export async function storeMetrics( req, res ) {
           questionType: 1,
           userComments: 1,
           answer: 1,
-          // userId: {
-          //   $arrayElemAt: [ '$userId', { $subtract: [ { $size: '$userId' }, 1 ] } ],    //need to check if no data
-          // },
           userId: 1,
           auditType: 1,
           beforeCount: 1,
@@ -2731,6 +2219,7 @@ export async function storeMetrics( req, res ) {
             { clientName: { $regex: inputData.searchValue, $options: 'i' } },
             { storeId: { $regex: inputData.searchValue, $options: 'i' } },
             { storeName: { $regex: inputData.searchValue, $options: 'i' } },
+            { zoneName: { $regex: inputData.searchValue, $options: 'i' } },
             { userName: { $regex: inputData.searchValue, $options: 'i' } },
             { status: { $regex: inputData.searchValue, $options: 'i' } },
             { auditType: { $regex: inputData.searchValue, $options: 'i' } },
@@ -2778,7 +2267,7 @@ export async function storeMetrics( req, res ) {
       },
       );
     }
-    const count = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryQuery );
+    const count = [ 'mobile-detection', 'uniform-detection', 'hygiene' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryQuery );
     if ( count.length == 0 ) {
@@ -2802,7 +2291,10 @@ export async function storeMetrics( req, res ) {
         $limit: limit,
       } );
     }
-    const result = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryQuery );
+    const result = [ 'mobile-detection', 'uniform-detection', 'hygiene' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryQuery );
+    if ( result.length == 0 ) {
+      return res.sendError( 'No data Found', 204 );
+    }
     if ( inputData.isExport ) {
       const exportdata = [];
       result.forEach( ( element ) => {
@@ -2843,11 +2335,13 @@ export async function storeMetrics( req, res ) {
             temp['Accuracy'] = element.accuracy;
             break;
           case 'uniform-detection':
-            // temp['Customer ID'] = element.tempId;
-            // temp['Question'] = element.question;
-            // temp['User Comments'] = element.userComments;
-            // temp['Status'] = toCamelCase( element.auditStatus );
-            // temp['Result'] = element.answer;
+            temp['Before Count'] = element.beforeCount;
+            temp['After Count'] = element.afterCount;
+            temp['Status'] = toCamelCase( element.status );
+            temp['Accuracy'] = element.accuracy;
+            break;
+          case 'hygiene':
+            temp['Zone Name'] = element.zoneName;
             temp['Before Count'] = element.beforeCount;
             temp['After Count'] = element.afterCount;
             temp['Status'] = toCamelCase( element.status );
@@ -2963,11 +2457,6 @@ export async function userMetrics( req, res ) {
           beforeCount: 1,
           afterCount: 1,
           createdAt: 1,
-          // mappingPerc: { $round: [
-          //   { $multiply: [
-          //     { $divide: [ '$afterCount', '$beforeCount' ] }, 100,
-          //   ] }, 2,
-          // ] },
           checkIntime: 1,
           checkOutTime: 1,
           differenceInSeconds: {
@@ -2986,7 +2475,6 @@ export async function userMetrics( req, res ) {
           checkOutTime: 1,
           moduleType: 1,
           value: 1,
-          // mappingPerc: 1,
           hours: { $floor: { $divide: [ '$differenceInSeconds', 3600 ] } },
           minutes: { $floor: { $divide: [ { $mod: [ '$differenceInSeconds', 3600 ] }, 60 ] } },
           seconds: { $mod: [ '$differenceInSeconds', 60 ] },
@@ -3006,7 +2494,6 @@ export async function userMetrics( req, res ) {
           moduleType: 1,
           value: 1,
           createdAt: 1,
-          // mappingPerc: 1,
           hours: {
             $cond: {
               if: { $lt: [ '$hours', 10 ] },
@@ -3045,7 +2532,6 @@ export async function userMetrics( req, res ) {
           value: {
             $replaceAll: { input: '$moduleType', find: '-', replacement: ' ' },
           },
-          // mappingPerc: 1,
           workingHours: {
             $concat: [ '$hours', ':', '$minutes', ':', '$seconds' ],
           },
@@ -3090,7 +2576,6 @@ export async function userMetrics( req, res ) {
           value: {
             $replaceAll: { input: '$moduleType', find: '-', replacement: ' ' },
           },
-          // mappingPerc: 1,
           checkIntime: {
             $dateToString: {
               format: '%Y-%m-%d %H:%M:%S',
@@ -3130,7 +2615,7 @@ export async function userMetrics( req, res ) {
       );
     }
-    const count = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const count = [ 'mobile-detection', 'uniform-detection', 'hygiene' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -3152,8 +2637,8 @@ export async function userMetrics( req, res ) {
         'Check OutTime': '$checkOutTime',
         'Working Hours': '$workingHours',
         'Audited Date': { $dateToString: { format: '%Y-%m-%d', date: '$createdAt' } },
-        // 'Mapping Percentage': '$mappingPerc',
       };
       const YesNo = {
         '_id': 0,
         'User Name': '$userName',
@@ -3164,9 +2649,8 @@ export async function userMetrics( req, res ) {
         'Check OutTime': '$checkOutTime',
         'Working Hours': '$workingHours',
         'Audited Date': { $dateToString: { format: '%Y-%m-%d', date: '$createdAt' } },
-        // 'Mapping Percentage': '$mappingPerc',
       };
-      [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )?
+      [ 'mobile-detection', 'uniform-detection', 'hygiene' ].includes( inputData.moduleType )?
       query.push(
           {
             $project: detection,
@@ -3180,7 +2664,10 @@ export async function userMetrics( req, res ) {
     }
-    const result = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'mobile-detection', 'uniform-detection', 'hygiene' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    if ( result.length == 0 ) {
+      return res.sendError( 'No Data Found', 204 );
+    }
     if ( inputData.isExport ) {
       await download( result, res );
       return;
@@ -3188,7 +2675,7 @@ export async function userMetrics( req, res ) {
     return res.sendSuccess( { result: result, count: count.length } );
   } catch ( error ) {
     const err = error.error || 'Internal Server Error';
-    logger.info( { error: error, message: req.body, function: 'userMetrics' } );
+    logger.error( { error: error, message: req.body, function: 'userMetrics' } );
     return res.sendError( err, 500 );
   }
 }
@@ -3305,6 +2792,7 @@ export async function pendingSummaryTable( req, res ) {
         $match: {
           $or: [
             { storeId: { $regex: inputData.searchValue, $options: 'i' } },
+            { zoneName: { $regex: inputData.searchValue, $options: 'i' } },
             { fileDate: { $regex: inputData.searchValue, $options: 'i' } },
             { auditType: { $regex: inputData.searchValue, $options: 'i' } },
             { auditStatus: { $regex: inputData.searchValue, $options: 'i' } },
@@ -3324,7 +2812,7 @@ export async function pendingSummaryTable( req, res ) {
       },
       );
     }
-    const count = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const count = [ 'mobile-detection', 'uniform-detection', 'hygiene' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -3340,7 +2828,7 @@ export async function pendingSummaryTable( req, res ) {
       } );
     }
-    const result = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'mobile-detection', 'uniform-detection', 'hygiene' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( inputData.isExport ) {
       const exportdata = [];
       result.forEach( ( element ) => {
@@ -3369,8 +2857,10 @@ export async function pendingSummaryTable( req, res ) {
             temp['Before Count'] = element.beforeCount;
             break;
           case 'uniform-detection':
-            // temp['Customer ID'] = element.tempId;
-            // temp['Question'] = element.question;
+            temp['Before Count'] = element.beforeCount;
+            break;
+          case 'hygiene':
+            temp['Zone Name'] = element.zoneName;
             temp['Before Count'] = element.beforeCount;
             break;
         }
@@ -3536,7 +3026,7 @@ export async function overAllAuditSummary( req, res ) {
       },
     ];
-    const storeAudit = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( storeAuditQuery ) : await aggregateBinaryAudit( binaryAuditQuery );
+    const storeAudit = [ 'mobile-detection', 'uniform-detection', 'hygiene' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( storeAuditQuery ) : await aggregateBinaryAudit( binaryAuditQuery );
     if ( storeAudit.length > 0 ) {
       temp.inprogressStores= storeAudit[0].inprogressStores;
       temp.completedStores = storeAudit[0].completedStores;
@@ -3724,7 +3214,7 @@ export async function summarySplit( req, res ) {
         },
       },
     ];
-    const result = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryAuditQuery );
+    const result = [ 'mobile-detection', 'uniform-detection', 'hygiene' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryAuditQuery );
     const totalCount = await aggregateTraxAuditData( totalQuery );
     result[0].totalCount = totalCount[0]?.total;
     return res.sendSuccess( { result: result.length> 0? result[0]: temp } );
@@ -3754,7 +3244,7 @@ export async function overviewTable( req, res ) {
     }
     if ( inputData.filterByStatus.length > 0 ) {
-      [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )? filters.push( { status: { $in: inputData.filterByStatus } } ):filters.push( { auditStatus: { $in: inputData.filterByStatus } } );
+      [ 'mobile-detection', 'uniform-detection', 'hygiene' ].includes( inputData.moduleType )? filters.push( { status: { $in: inputData.filterByStatus } } ):filters.push( { auditStatus: { $in: inputData.filterByStatus } } );
     }
     const query =[
@@ -3769,6 +3259,7 @@ export async function overviewTable( req, res ) {
           _id: 0,
           storeId: 1,
           clientId: 1,
+          zoneName: 1,
           streamName: 1,
           tempId: 1,
           question: 1,
@@ -3786,41 +3277,14 @@ export async function overviewTable( req, res ) {
           auditType: 1,
           status: 1,
           auditStatus: 1,
-          // userId: 1,
         },
       },
-      // {
-      //   $lookup: {
-      //     from: 'users',
-      //     let: { userId: '$userId' },
-      //     pipeline: [
-      //       {
-      //         $match: {
-      //           $expr: {
-      //             $eq: [ '$_id', '$$userId' ],
-      //           },
-      //         },
-      //       },
-      //       {
-      //         $project: {
-      //           userName: 1,
-      //           userEmail: '$email',
-      //         },
-      //       },
-      //     ], as: 'user',
-      //   },
-      // },
-      // {
-      //   $unwind: {
-      //     path: '$user',
-      //     preserveNullAndEmptyArrays: true,
-      //   },
-      // },
       {
         $project: {
           storeId: 1,
           clientId: 1,
           streamName: 1,
+          zoneName: 1,
           tempId: 1,
           question: 1,
           questionType: 1,
@@ -3834,8 +3298,6 @@ export async function overviewTable( req, res ) {
           auditType: 1,
           status: 1,
           auditStatus: 1,
-          // userName: '$user.userName',
-          // userEmail: '$user.userEmail',
         },
       },
@@ -3846,6 +3308,7 @@ export async function overviewTable( req, res ) {
           $or: [
             { storeId: { $regex: inputData.searchValue, $options: 'i' } },
             { clientId: { $regex: inputData.searchValue, $options: 'i' } },
+            { zoneName: { $regex: inputData.searchValue, $options: 'i' } },
             { fileDate: { $regex: inputData.searchValue, $options: 'i' } },
             { auditType: { $regex: inputData.searchValue, $options: 'i' } },
             { status: { $regex: inputData.searchValue, $options: 'i' } },
@@ -3856,8 +3319,6 @@ export async function overviewTable( req, res ) {
             { question: { $regex: inputData.searchValue, $options: 'i' } },
             { answer: { $regex: inputData.searchValue, $options: 'i' } },
             { userComments: { $regex: inputData.searchValue, $options: 'i' } },
-            // { userName: { $regex: inputData.searchValue, $options: 'i' } },
-            // { userEmail: { $regex: inputData.searchValue, $options: 'i' } },
           ],
         },
@@ -3871,7 +3332,7 @@ export async function overviewTable( req, res ) {
       },
       );
     }
-    const count = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const count = [ 'mobile-detection', 'uniform-detection', 'hygiene' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -3886,7 +3347,7 @@ export async function overviewTable( req, res ) {
         $limit: limit,
       } );
     }
-    const result = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'mobile-detection', 'uniform-detection', 'hygiene' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( inputData.isExport ) {
       const exportdata = [];
       result.forEach( ( element ) => {
@@ -3923,11 +3384,13 @@ export async function overviewTable( req, res ) {
             temp['Status'] = toCamelCase( element.status );
             break;
           case 'uniform-detection':
-            // temp['Customer ID'] = element.tempId;
-            // temp['Question'] = element.question;
-            // temp['User Comments'] = element.userComments;
-            // temp['Audit Type'] = element.auditType;
-            // temp['Status'] = toCamelCase( element.auditStatus );
+            temp['Before Count'] = element.beforeCount;
+            temp['After Count'] = element.afterCount;
+            temp['Audit Type'] = element.auditType;
+            temp['Status'] = toCamelCase( element.status );
+            break;
+          case 'hygiene':
+            temp['Zone Name'] = element.zoneName;
             temp['Before Count'] = element.beforeCount;
             temp['After Count'] = element.afterCount;
             temp['Audit Type'] = element.auditType;
@@ -3951,6 +3414,7 @@ export async function overviewTable( req, res ) {
 export async function getDetectionAuditFile( req, res ) {
   try {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
+    const url = JSON.parse( process.env.URL );
     const inputData = req.query;
     const previousDate = dayjs( new Date() ).subtract( 1, 'days' );
     const data = await getDate( new Date( dayjs( previousDate ).format( 'YYYY-MM-DD' ) ), new Date() );
@@ -3960,6 +3424,7 @@ export async function getDetectionAuditFile( req, res ) {
     const end = data.end;
     const fetchData = {};
     let msg = {};
+    // get user's inprogress files
     const userQuery = [
       {
         $match: {
@@ -3983,62 +3448,61 @@ export async function getDetectionAuditFile( req, res ) {
     const userDetails = await aggregateUserEmpDetection( userQuery );
     logger.info( { userDetails: userDetails, function: 'userDetails' } );
-    const auditStatus =
-      userDetails && userDetails.length > 0 ? userDetails[0].auditStatus : null;
+    const auditStatus = userDetails && userDetails.length > 0 ? userDetails[0].auditStatus : null;
     switch ( auditStatus ) {
       case null:
-        const query = [
-          {
-            $match: {
-              $and: [
-                { userId: { $eq: req.user._id } },
-                { isCompleted: { $eq: false } },
-                { queueName: inputData.queueName },
-                { moduleType: inputData.moduleType },
-              ],
-            },
-          },
-        ];
-        const userAssign = await aggregateAssignAudit( query );
-        if ( userAssign.length > 0 ) {
-          logger.info( 'Hit in user assign', { inputData } );
-          userAssign[0].auditType == 'Audit' ?
-            ( msg = {
-              storeId: userAssign[0].storeId,
-              fileDate: userAssign[0].fileDate,
-              fileCount: userAssign[0].fileCount,
-              inputBucketName: userAssign[0].inputBucketName,
-              folderPath: userAssign[0].folderPath,
-            } ) :
-            ( msg = {
-              storeId: userAssign[0].storeId,
-              fileDate: userAssign[0].fileDate,
-              auditType: userAssign[0].auditType,
-              fileCount: userAssign[0].fileCount,
-              inputBucketName: userAssign[0].inputBucketName,
-              folderPath: userAssign[0].folderPath,
-            } );
-          await updateOneAssignAudit(
-              { _id: userAssign[0]._id },
-              { isCompleted: true },
-          );
-          logger.info( 'Hit in auditUserAssignModel updateOne', {
-            _id: userAssign[0]._id,
-            isCompleted: true,
+        // const query = [
+        //   {
+        //     $match: {
+        //       $and: [
+        //         { userId: { $eq: req.user._id } },
+        //         { isCompleted: { $eq: false } },
+        //         { queueName: inputData.queueName },
+        //         { moduleType: inputData.moduleType },
+        //       ],
+        //     },
+        //   },
+        // ];
+        // const userAssign = await aggregateAssignAudit( query );
+        // if ( userAssign.length > 0 ) {
+        //   logger.info( 'Hit in user assign', { inputData } );
+        //   userAssign[0].auditType == 'Audit' ?
+        //     ( msg = {
+        //       storeId: userAssign[0].storeId,
+        //       fileDate: userAssign[0].fileDate,
+        //       fileCount: userAssign[0].fileCount,
+        //       inputBucketName: userAssign[0].inputBucketName,
+        //       folderPath: userAssign[0].folderPath,
+        //     } ) :
+        //     ( msg = {
+        //       storeId: userAssign[0].storeId,
+        //       fileDate: userAssign[0].fileDate,
+        //       auditType: userAssign[0].auditType,
+        //       fileCount: userAssign[0].fileCount,
+        //       inputBucketName: userAssign[0].inputBucketName,
+        //       folderPath: userAssign[0].folderPath,
+        //     } );
+        //   await updateOneAssignAudit(
+        //       { _id: userAssign[0]._id },
+        //       { isCompleted: true },
+        //   );
+        //   logger.info( 'Hit in auditUserAssignModel updateOne', {
+        //     _id: userAssign[0]._id,
+        //     isCompleted: true,
+        //   } );
+        // } else {
+        logger.info( 'Hit in new file', { inputData } );
+        const consumer = await sqsReceive( inputData.queueName );
+        if ( !consumer ) {
+          logger.error( {
+            error: consumer,
+            function: `getAuditFile - ${inputData.moduleType}`,
+            message: 'SQS Receive queue is empty',
           } );
-        } else {
-          logger.info( 'Hit in new file', { inputData } );
-          const consumer = await sqsReceive( inputData.queueName );
-          if ( !consumer ) {
-            logger.error( {
-              error: consumer,
-              function: 'getAuditFile',
-              message: 'SQS Receive queue is empty',
-            } );
-            return res.sendError( `${inputData.queueName} is Empty`, 204 );
-          }
-          msg = JSON.parse( consumer );
+          return res.sendError( `${inputData.queueName} is Empty`, 204 );
         }
+        msg = JSON.parse( consumer );
+        // }
         break;
       case 'drafted':
@@ -4069,6 +3533,7 @@ export async function getDetectionAuditFile( req, res ) {
         const file = {
           auditId: userDetails[0]._id,
           storeId: userDetails[0].storeId,
+          zoneName: userDetails[0].zoneName,
           fileDate: userDetails[0].fileDate,
           auditType: userDetails[0].auditType,
           queueName: log.queueName,
@@ -4133,6 +3598,7 @@ export async function getDetectionAuditFile( req, res ) {
       default:
         msg = {
           storeId: userDetails[0].storeId,
+          zoneName: userDetails[0].zoneName,
           fileDate: userDetails[0].fileDate,
           auditType: userDetails[0].auditType,
           fileCount: userDetails[0].beforeCount,
@@ -4141,112 +3607,12 @@ export async function getDetectionAuditFile( req, res ) {
         };
         break;
     }
-    // if ( msg.auditType === 'ReAudit' ) {
-    //   logger.info( 'Hit in user ReAudit', { inputData } );
-    //   let reauditInsert = {};
-    //   const [ filterData, auditImage ] = await Promise.all( [
-    //     getFilterData( msg ),
-    //     getAuditImage( msg ),
-    //   ] );
-    //   if ( filterData.statusCode == 404 || auditImage.statusCode == 404 ) {
-    //     return res.sendError( 'No Data found', 204 );
-    //   }
-    //   const reauditImg = await getReauditImg( filterData, auditImage );
-    //   if ( userDetails.length === 0 ) {
-    //     const [ day, month, year ] = msg.curr_date.split( '-' );
-    //     const temp = `${year}-${month}-${day}`;
-    //     let start = new Date( temp );
-    //     const userTimezoneOffset = start.getTimezoneOffset() * 60000;
-    //     start = new Date( start.getTime() - userTimezoneOffset );
-    //     start.setUTCHours( 0, 0, 0, 0 );
-    //     const record = {
-    //       userId: req.user._id,
-    //       storeId: msg.store_id,
-    //       clientId: msg.store_id.split( '-' )[0],
-    //       auditType: msg.audit_type || 'ReAudit',
-    //       fileDate: msg.curr_date,
-    //       queueName: inputData.queueName,
-    //       beforeCount: reauditImg.length,
-    //       auditStatus: 'inprogress',
-    //       fileDateISO: start,
-    //       timeSpent: 0,
-    //       startTime: new Date(),
-    //       zoneName: msg.zone_id,
-    //       moduleType: inputData.moduleType,
-    //     };
-    //     const query = {
-    //       storeId: msg.store_id,
-    //       zoneName: msg.zone_id,
-    //       fileDate: msg.curr_date,
-    //       moduleType: inputData.moduleType,
-    //     };
-    //     let storeRecord = {
-    //       userId: req.user._id,
-    //       auditType: msg.audit_type || 'ReAudit',
-    //       status: 'inprogress',
-    //       timeSpent: 0,
-    //     };
-    //     reauditInsert = await createUserAudit( record );
-    //     await updateOneStoreAudit( query, storeRecord );
-    //   } else {
-    //     reauditInsert = userDetails[0];
-    //   }
-    //   const userdata = await findOneUser( { _id: req.user._id } );
-    //   if ( inputData.nextId ) {
-    //     const logData = {
-    //       userId: req.user._id,
-    //       userName: userdata.name,
-    //       logType: 'audit',
-    //       logSubType: 'auditStart',
-    //       logData: {
-    //         fileDate: msg.curr_date,
-    //         auditType: msg.audit_type,
-    //         storeId: msg.store_id,
-    //         clientName: inputData.queueName,
-    //         auditId: reauditInsert._id,
-    //         zoneName: msg.zone_id,
-    //         moduleType: inputData.moduleType,
-    //       },
-    //       createdAt: new Date(),
-    //     };
-    //     await insertOpenSearchData( openSearch.auditLog, logData );
-    //   }
-    //   const storeQuery = {
-    //     storeId: msg.store_id,
-    //   };
-    //   const storeFields = {
-    //     storeId: 1,
-    //     storeName: 1,
-    //     address: '$storeProfile.address',
-    //   };
-    //   const storeInfo = await findOneStore( storeQuery, storeFields );
-    //   return res.sendSuccess( {
-    //     result: reauditImg,
-    //     count: reauditImg.length,
-    //     storeId: storeInfo?.storeId,
-    //     storeName: storeInfo?.storeName,
-    //     address: storeInfo?.address || '',
-    //     file: {
-    //       store_id: msg.store_id,
-    //       file_date: msg.curr_date,
-    //       type: msg.audit_type || 'ReAudit',
-    //       queueName: inputData.queueName,
-    //       auditId: reauditInsert._id,
-    //       userId: reauditInsert.userId,
-    //       zoneName: msg.zone_id,
-    //       moduleType: inputData.moduleType,
-    //     },
-    //     isDraft: reauditInsert.isDraft,
-    //   } );
-    // }     to wor for reAudit concept
     const storeId = msg.storeId;
     const fileDate = msg.fileDate;
     const files = [];
     let insertData = {};
-    fetchData.Bucket = msg.inputBucketName; // need to change
+    fetchData.Bucket = msg.inputBucketName;
     fetchData.file_path = msg.folderPath;
     if ( inputData.limit ) {
       fetchData.MaxKeys = inputData.limit;
@@ -4257,22 +3623,22 @@ export async function getDetectionAuditFile( req, res ) {
     const list = await listFileByPath( fetchData );
     const folderPath = list.data;
     const nextQuery = list.pageToken;
+    const bucketCDN = inputData.moduleType=='hygiene' ? url.hygieneInput : url.traxAuditInput;
     if ( folderPath?.length > 0 ) {
       for ( let i = 0; i < folderPath.length; i++ ) {
         const img = folderPath[i].Key.split( '/' );
         const image = img[3].split( '.' );
         const indexes = image[0].split( '_' );
-        fetchData.file_path = folderPath[i].Key;
-        const data = await signedUrl( fetchData );
+        const Key = folderPath[i].Key;
+        const data = `${bucketCDN}${Key}`;// await signedUrl( fetchData );
         const mapimg = {
           img_path: data,
-          img_name: inputData.moduleType=='mobile-detection'?`${indexes[0]}-${indexes[3]}` :image[0],
+          img_name: inputData.moduleType=='mobile-detection'?`${indexes[0]}-${indexes[3]}` : inputData.moduleType=='hygiene'?`${indexes[2]}-${indexes[3]}`:image[0],
           img_id: img[3],
         };
         files.push( {
           img_path: data,
-          img_name: inputData.moduleType=='mobile-detection'?`${indexes[0]}-${indexes[3]}` :image[0],
+          img_name: inputData.moduleType=='mobile-detection'?`${indexes[0]}-${indexes[3]}`: inputData.moduleType=='hygiene'?`${indexes[2]}-${indexes[3]}`:image[0],
           img_id: img[3],
           selected: false,
           dropped: false,
@@ -4292,6 +3658,7 @@ export async function getDetectionAuditFile( req, res ) {
         const record = {
           userId: req.user._id,
           storeId: msg.storeId,
+          zoneName: msg.zoneName,
           clientId: msg.storeId.split( '-' )[0],
           auditType: msg.auditType || 'Audit',
           fileDate: msg.fileDate,
@@ -4307,12 +3674,14 @@ export async function getDetectionAuditFile( req, res ) {
         };
         const query = {
           storeId: msg.storeId,
+          zoneName: msg.zoneName,
           fileDate: msg.fileDate,
           moduleType: inputData.moduleType,
         };
         const storeRecord = {
           userId: req.user._id,
           storeId: msg.storeId,
+          zoneName: msg.zoneName,
           clientId: msg.storeId.split( '-' )[0],
           auditType: msg.auditType || 'Audit',
           fileDate: msg.fileDate,
@@ -4334,7 +3703,7 @@ export async function getDetectionAuditFile( req, res ) {
     } else {
       logger.error( {
         error: { folderPath: folderPath, nextQuery: nextQuery },
-        function: 'getAuditFile',
+        function: `getAuditFile - ${inputData.moduleType }`,
         message: 'Bucket image data not availale',
       } );
       return res.sendError( 'Bucket is Empty', 204 );
@@ -4358,6 +3727,7 @@ export async function getDetectionAuditFile( req, res ) {
           fileDate: insertData.fileDate,
           auditType: insertData.auditType,
           storeId: storeId,
+          zoneName: insertData.zoneName,
           clientName: inputData.queueName,
           auditId: insertData._id,
           moduleType: inputData.moduleType,
@@ -4376,6 +3746,7 @@ export async function getDetectionAuditFile( req, res ) {
       file: {
         queueName: inputData.queueName,
         storeId: storeId,
+        zoneName: insertData.zoneName,
         fileDate: fileDate,
         auditType: msg.auditType || 'Audit',
         auditId: insertData._id,
@@ -4416,11 +3787,13 @@ export async function saveDraft( req, res ) {
       isDraft: true,
       auditStatus: 'drafted',
     };
-    const storeQuery = {
+    let storeQuery = {
       storeId: inputData.storeId,
       fileDate: inputData.fileDate,
     };
+    inputData?.zoneName ? storeQuery['zoneName'] = inputData?.zoneName : null;
     let storeRecord = {
       status: 'drafted',
     };
@@ -4447,6 +3820,7 @@ export async function saveDraft( req, res ) {
           fileDate: inputData.fileDate,
           auditType: inputData.auditType,
           storeId: inputData.storeId,
+          zoneName: inputData?.zoneName,
           clientName: inputData.queueName,
           beforeCount: inputData.totalCount,
           afterCount: inputData.employeeCount,
@@ -4512,7 +3886,8 @@ export async function save( req, res ) {
     const timeDifferenceInMinutes = currentTime.diff( isoDateTime, 'seconds' );
     const getUserAuditData = await findOneUserEmpDetection( { _id: inputData.auditId } );
     inputData.clientId = getUserAuditData.clientId;
-    const query ={ storeId: inputData.storeId, moduleType: inputData.moduleType, fileDate: inputData.fileDate };
+    let query ={ storeId: inputData.storeId, moduleType: inputData.moduleType, fileDate: inputData.fileDate };
+    inputData?.zoneName? query['zoneName'] = inputData.zoneName : null;
     const data = await updateOneEmpDetectionOutput( query, { $set: inputData }, { upsert: true } );
     if ( data ) {
       const userUpdated ={
@@ -4535,11 +3910,12 @@ export async function save( req, res ) {
           {
             fileDate: inputData.fileDate,
             storeId: inputData.storeId,
+            zoneName: inputData.zoneName,
             moduleType: inputData.moduleType,
           },
       );
       if ( !getFilePath ) {
-        return res.sendError( ' SQS is not sent due to Inserted Data is not there', 400 );
+        return res.sendError( 'SQS is not sent due to Inserted Data is not there', 400 );
       }
       const [ getStore, getClient ] = await Promise.all( [ findOneStore( { storeId: inputData.storeId }, { storeName: 1, storeProfile: 1, spocDetails: 1 } ), findOneClient( { clientId: inputData.clientId }, { clientName: 1 } ) ] );
@@ -4548,31 +3924,33 @@ export async function save( req, res ) {
         for ( let i =0; i<inputData?.employee.length; i++ ) {
           tempId.push( inputData?.employee[i].img_id );
         }
+        if ( inputData.moduleType !== 'hygiene' ) {
+          const sqsProduceQueue = {
+            QueueUrl: `${sqs.url}${sqs.uniformOutput}`,
+            MessageBody: JSON.stringify( {
+              storeId: inputData.storeId,
+              storeName: getStore?.storeName,
+              zoneName: inputData?.zoneName,
+              fileDate: inputData?.fileDate,
+              moduleType: inputData?.moduleType,
+              inputBucketName: getFilePath?.sqs?.Body?.inputBucketName,
+              tempId: tempId,
+              count: inputData?.employeeCount,
+              folderPath: getFilePath?.sqs?.Body?.folderPath,
+            } ),
+          };
+          const sqsQueue = await sendMessageToQueue(
+              sqsProduceQueue.QueueUrl,
+              sqsProduceQueue.MessageBody,
+          );
-        const sqsProduceQueue = {
-          QueueUrl: `${sqs.url}${sqs.uniformOutput}`,
-          MessageBody: JSON.stringify( {
-            storeId: inputData.storeId,
-            storeName: getStore?.storeName,
-            fileDate: inputData.fileDate,
-            moduleType: inputData.moduleType,
-            inputBucketName: getFilePath?.sqs?.Body?.inputBucketName,
-            tempId: tempId,
-            count: inputData.employeeCount,
-            folderPath: getFilePath?.sqs?.Body?.folderPath,
-          } ),
-        };
-        const sqsQueue = await sendMessageToQueue(
-            sqsProduceQueue.QueueUrl,
-            sqsProduceQueue.MessageBody,
-        );
-        if ( sqsQueue.statusCode ) {
-          logger.error( {
-            error: `${sqsQueue}`,
-            type: 'UPLOAD_ERROR',
-          } );
-          return res.sendError( 'SQS not sent', 500 );
+          if ( sqsQueue.statusCode ) {
+            logger.error( {
+              error: `${sqsQueue}`,
+              type: 'UPLOAD_ERROR',
+            } );
+            return res.sendError( 'SQS not sent', 500 );
+          }
         }
       }
@@ -4583,6 +3961,7 @@ export async function save( req, res ) {
         clientName: getClient?.clientName,
         storeId: inputData.storeId,
         storeName: getStore?.storeName,
+        zoneName: inputData?.zoneName,
         spocName: getStore?.spocDetails? getStore?.spocDetails[0]?.name : '',
         spocEmail: getStore?.spocDetails? getStore?.spocDetails[0]?.email:'',
         spocContact: getStore?.spocDetails? getStore?.spocDetails[0].contact:'',
@@ -4605,6 +3984,7 @@ export async function save( req, res ) {
           fileDate: getUserAuditData?.fileDate,
           auditType: getUserAuditData?.auditType,
           storeId: getUserAuditData?.storeId,
+          zoneName: inputData?.zoneName,
           moduleType: getUserAuditData?.moduleType,
           queueName: req.userAudit?.queueName,
           clientId: req.userAudit?.clientId,
@@ -4640,82 +4020,90 @@ export async function reTrigger( req, res ) {
     const message = req.sqs;
     const sqs = JSON.parse( process.env.SQS );
     const getQueueName = await findOneClient( { clientId: req.audit.clientId }, { 'auditConfigs': 1 } );
-    const queueName = inputData.moduleType == 'uniform-detection' ? getQueueName?.auditConfigs?.traxQueueName?.uniformDetection : getQueueName?.auditConfigs?.traxQueueName?.mobileDetection;
+    const queueName = inputData.moduleType == 'uniform-detection' ? getQueueName?.auditConfigs?.traxQueueName?.uniformDetection : inputData.moduleType == 'mobile-detection' ?getQueueName?.auditConfigs?.traxQueueName?.mobileDetection : getQueueName?.auditConfigs?.traxQueueName?.hygiene;
     if ( !getQueueName || queueName == '' ) {
       return res.sendError( 'queueName does not create', 400 );
     }
-    const getRecord = await countDocumentsUserEmpDetection( { storeId: message.storeId,
-      fileDate: message.fileDate,
-      moduleType: message.moduleType, auditStatus: 'completed' } );
-    const msg = {
+    let getQuery ={
       storeId: message.storeId,
       fileDate: message.fileDate,
-      moduleType: message.moduleType,
-      inputBucketName: message.inputBucketName,
-      questionType: message.questionType,
-      question: message.question,
-      folderPath: message.folderPath,
-      fileCount: message.fileCount,
-      auditType: getRecord > 0? 'ReAudit':'Audit',
-    };
-    const sqsProduceQueue = {
-      QueueUrl: `${sqs.url}${queueName}`,
-      MessageBody: JSON.stringify( msg ),
+      moduleType: message.moduleType, auditStatus: 'completed',
     };
-    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 = {
+      inputData.moduleType == 'hygiene'? getQuery.zoneName = inputData?.zoneName : null;
+      const getRecord = await countDocumentsUserEmpDetection( getQuery );
+      const msg = {
+        storeId: message.storeId,
+        zoneName: message.zoneName,
+        fileDate: message.fileDate,
+        moduleType: message.moduleType,
+        inputBucketName: message.inputBucketName,
+        questionType: message.questionType,
+        question: message.question,
+        folderPath: message.folderPath,
+        fileCount: message.fileCount,
+        auditType: getRecord > 0? 'ReAudit':'Audit',
+      };
+      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,
+            moduleType: inputData.moduleType,
+          };
+          inputData.moduleType == 'hygiene'? query.zoneName = inputData?.zoneName : null;
+          await updateOneUserEmpDetection( query, userRecord );
+        }
+        const storeQuery = {
           storeId: inputData.storeId,
           fileDate: inputData.fileDate,
-          auditStatus: req.audit.status,
           moduleType: inputData.moduleType,
         };
-        await updateOneUserEmpDetection( query, userRecord );
-      }
-      const storeQuery = {
-        storeId: inputData.storeId,
-        fileDate: inputData.fileDate,
-        moduleType: inputData.moduleType,
-      };
+        inputData.moduleType == 'hygiene'? storeQuery.zoneName = inputData?.zoneName : null;
-      const storeRecord = {
-        status: 'not_assign',
-      };
+        const storeRecord = {
+          status: 'not_assign',
+        };
-      await updateOneStoreEmpDetection( storeQuery, storeRecord );
-      const logData = {
-        userId: req.user._id,
-        userName: req.user.userName,
-        logType: 'traxAudit',
-        logSubType: 'reTrigger',
-        logData: {
-          beforeCount: message.fileCount,
-          afterCount: '',
-          fileDate: inputData.fileDate,
-          auditType: req.audit.auditType,
-          storeId: inputData.storeId,
-          moduleType: inputData.moduleType,
-          queueName: queueName,
-          triggerBy: req.user.userName,
-          triggerId: req.user._id,
-        },
-        createdAt: new Date(),
-      };
-      await insertOpenSearchData( openSearch.auditLog, logData );
-    }
-    return res.sendSuccess( { result: 'The File has been Re-Triggered Succesfully' } );
+        await updateOneStoreEmpDetection( storeQuery, storeRecord );
+        const logData = {
+          userId: req.user._id,
+          userName: req.user.userName,
+          logType: 'traxAudit',
+          logSubType: 'reTrigger',
+          logData: {
+            beforeCount: message.fileCount,
+            afterCount: '',
+            fileDate: inputData.fileDate,
+            auditType: req.audit.auditType,
+            storeId: inputData.storeId,
+            zoneName: inputData.zoneName,
+            moduleType: inputData.moduleType,
+            queueName: queueName,
+            triggerBy: req.user.userName,
+            triggerId: req.user._id,
+          },
+          createdAt: new Date(),
+        };
+        await insertOpenSearchData( openSearch.auditLog, logData );
+      }
+      return res.sendSuccess( { result: 'The File has been Re-Triggered Succesfully' } );
   } catch ( error ) {
     const err = error.message;
     logger.error( { error: error, message: req.body, function: 'reTrigger' } );