npm - tango-app-api-audit - Versions diffs - 3.4.18 → 3.4.20 - Mend

tango-app-api-audit 3.4.18 → 3.4.20

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 (7) hide show

package/package.json +3 -3
package/src/controllers/audit.controllers.js +15 -3
package/src/controllers/traxAudit.controllers.js +126 -663
package/src/dtos/traxAudit.dtos.js +2 -0
package/src/routes/audit.routes.js +24 -22
package/src/routes/traxAudit.routes.js +19 -17
package/src/service/auditUsers.service.js +8 -0

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.4.18",
+    "version": "3.4.20",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",
@@ -24,8 +24,8 @@
         "mongodb": "^6.7.0",
         "nodemon": "^3.1.3",
         "swagger-ui-express": "^5.0.1",
-        "tango-api-schema": "^2.1.53",
-        "tango-app-api-middleware": "^3.1.33",
+        "tango-api-schema": "^2.2.12",
+        "tango-app-api-middleware": "^3.1.48",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

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

@@ -3917,11 +3917,23 @@ export async function getUserCredit( req, res ) {
 export async function getUserAuditCount( req, res ) {
   try {
-    for ( let i =4; i<15; i++ ) {
+    // const options = { timeZone: 'Asia/Kolkata', year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit', second: '2-digit' };
+    // const istTime = new Intl.DateTimeFormat( 'en-IN', options ).format( new Date( '' ) );
+    // // Get the day of the week (0 = Sunday, 1 = Monday, ..., 6 = Saturday)
+    // const dayOfWeek = istTime.getDay();
+    // // Check if today is Monday (if weeks start on Monday)
+    // const isFirstDay = dayOfWeek === 1; // Monday = 1
+    // logger.info( { isFirstDay: isFirstDay } );
+    // if ( isFirstDay ) {
+    //   await updateManyAuditUsers( {}, { lateLogin: 0 } );
+    // }
+    for ( let i =1; i<7; i++ ) {
       const userWallet = JSON.parse( process.env.USER_WALLET );
       const previousDate = dayjs( new Date() ).subtract( i, 'days' );
       const fileDate = dayjs( previousDate ).format( 'DD-MM-YYYY' );
-      const configTimeSpentSec = userWallet.minTimeSpentSec; // 18000;
+      const configTimeSpentSec = userWallet.minTimeSpentSec; // 21600 seconds / 6 hours;
       // const beforeCountX = userWallet.beforeCountCreditPerc; // 0.0335;
       // const afterCountY = userWallet.afterCountCreditPerc; // 0.0035;
       const reduce = userWallet.reductionPerc; // 0.05;
@@ -4312,7 +4324,7 @@ export async function getUserAuditCount( req, res ) {
       if ( result.length == 0 ) {
         return res.sendError( 'No Record Inserted', 500 );
       }
-      if ( i == 14 ) {
+      if ( i == 6 ) {
         return res.sendSuccess( { message: 'Inserted successfully!' } );
       }
     }

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,
@@ -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,7 +1464,7 @@ 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 ) {
@@ -3951,6 +3497,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 +3507,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 +3531,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 +3616,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 +3681,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 +3690,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 +3706,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 +3741,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 +3757,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 +3786,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 +3810,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 +3829,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 +3870,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 +3903,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 +3969,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 +3993,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 +4007,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 +4044,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 +4067,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,

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

@@ -43,6 +43,7 @@ export const saveDraftSchema = joi.object(
     {
       userCommands: joi.string().optional().allow( '' ),
       storeId: joi.string().required(),
+      zoneName: joi.string().optional(),
       auditId: joi.string().required(),
       moduleType: joi.string().required(),
       auditType: joi.string().required(),
@@ -269,6 +270,7 @@ export const overviewTableValid= {
 export const saveSchema = joi.object( {
   auditId: joi.string().required(),
   storeId: joi.string().required(),
+  zoneName: joi.string().optional(),
   fileDate: joi.string().required(),
   auditType: joi.string().required(),
   moduleType: joi.string().required(),

package/src/routes/audit.routes.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import express from 'express';
 import { isAuditDocumentExist, isAuditInputFolderExist, isAuditUser, isExistsQueue, validateUserAudit } from '../validation/audit.validation.js';
-import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
+import { accessVerification, isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
 import { auditImages, auditStoreList, auditUserList, clientMetrics, clients, getAuditFile, getDraftedData, overAllAuditSummary, overViewCard, overviewTable, pendingSummaryTable, reTrigger, save, saveDraft, storeMetrics, summarySplit, totalNotAssignedCount, userAuditHistory, userMetrics, workSpace, getUserAuditCount, getUserAuditCountMTD, auditViewLogs, getUserCredit } from '../controllers/audit.controllers.js';
 import { auditStoreValid, clientMetricsValid, clientValid, getDraftedDataValid, getFileValid, overAllAuditSummaryValid, overViewCardValid, pendingSummaryTableValid, reTriggerValid, saveDraftValid, saveValid, storeMetricsValid, summarySplitValid, userAuditHistoryValid, userMetricsValid, workSpaceValid, auditImageValid, overviewTableValid, auditViewLogValid } from '../dtos/audit.dtos.js';
@@ -8,33 +8,35 @@ export const auditRouter = express.Router();
 // Configuration
-auditRouter.get( '/clients', isAllowedSessionHandler, validate( clientValid ), clients );
-auditRouter.post( '/audit-stores', isAllowedSessionHandler, validate( auditStoreValid ), auditStoreList );
-auditRouter.get( '/tango-users', isAllowedSessionHandler, auditUserList );
+auditRouter.get( '/clients', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( clientValid ), clients );
+auditRouter.post( '/audit-stores', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( auditStoreValid ), auditStoreList );
+auditRouter.get( '/tango-users', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), auditUserList );
 // Audit Mapping
-auditRouter.get( '/get-file', isAllowedSessionHandler, validate( getFileValid ), isExistsQueue, getAuditFile );
-auditRouter.post( '/save-draft', isAllowedSessionHandler, validate( saveDraftValid ), saveDraft );
-auditRouter.get( '/get-drafted-data', isAllowedSessionHandler, validate( getDraftedDataValid ), getDraftedData );
-auditRouter.post( '/save', isAllowedSessionHandler, validate( saveValid ), validateUserAudit, save );
-auditRouter.post( '/work-space', isAllowedSessionHandler, validate( workSpaceValid ), workSpace );
+auditRouter.get( '/get-file', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( getFileValid ), isExistsQueue, getAuditFile );
+auditRouter.post( '/save-draft', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( saveDraftValid ), saveDraft );
+auditRouter.get( '/get-drafted-data', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( getDraftedDataValid ), getDraftedData );
+auditRouter.post( '/save', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( saveValid ), validateUserAudit, save );
+auditRouter.post( '/work-space', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( workSpaceValid ), workSpace );
 // Audit Metrics
-auditRouter.post( '/metrics/user-audit-history', isAllowedSessionHandler, validate( userAuditHistoryValid ), userAuditHistory );
-auditRouter.post( '/metrics/client-metrics', isAllowedSessionHandler, validate( clientMetricsValid ), clientMetrics );
-auditRouter.post( '/metrics/store-metrics', isAllowedSessionHandler, validate( storeMetricsValid ), storeMetrics );
-auditRouter.post( '/metrics/user-metrics', isAllowedSessionHandler, validate( userMetricsValid ), userMetrics );
-auditRouter.post( '/metrics/pending-summary-table', isAllowedSessionHandler, validate( pendingSummaryTableValid ), pendingSummaryTable );
-auditRouter.post( '/metrics/overall-audit-summary', isAllowedSessionHandler, validate( overAllAuditSummaryValid ), overAllAuditSummary );
-auditRouter.post( '/metrics/re-trigger', isAllowedSessionHandler, validate( reTriggerValid ), isAuditDocumentExist, isAuditInputFolderExist, reTrigger );
-auditRouter.get( '/audit-images', isAllowedSessionHandler, validate( auditImageValid ), isAuditInputFolderExist, auditImages );
+auditRouter.post( '/metrics/user-audit-history', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( userAuditHistoryValid ), userAuditHistory );
+auditRouter.post( '/metrics/client-metrics', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( clientMetricsValid ), clientMetrics );
+auditRouter.post( '/metrics/store-metrics', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( storeMetricsValid ), storeMetrics );
+auditRouter.post( '/metrics/user-metrics', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( userMetricsValid ), userMetrics );
+auditRouter.post( '/metrics/pending-summary-table', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( pendingSummaryTableValid ), pendingSummaryTable );
+auditRouter.post( '/metrics/overall-audit-summary', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( overAllAuditSummaryValid ), overAllAuditSummary );
+auditRouter.post( '/metrics/re-trigger', isAllowedSessionHandler,
+    accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'TicketConfiguration', permissions: [ 'isEdit' ] } ] } ),
+    validate( reTriggerValid ), isAuditDocumentExist, isAuditInputFolderExist, reTrigger );
+auditRouter.get( '/audit-images', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( auditImageValid ), isAuditInputFolderExist, auditImages );
 // summary
-auditRouter.post( '/metrics/overview-card', isAllowedSessionHandler, validate( overViewCardValid ), overViewCard );
-auditRouter.post( '/metrics/summary-split-up', isAllowedSessionHandler, validate( summarySplitValid ), summarySplit );
-auditRouter.post( '/metrics/overview-table', isAllowedSessionHandler, validate( overviewTableValid ), overviewTable );
+auditRouter.post( '/metrics/overview-card', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( overViewCardValid ), overViewCard );
+auditRouter.post( '/metrics/summary-split-up', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( summarySplitValid ), summarySplit );
+auditRouter.post( '/metrics/overview-table', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( overviewTableValid ), overviewTable );
 // ticket
-auditRouter.get( '/total-not-assigned-count', isAllowedSessionHandler, totalNotAssignedCount );
+auditRouter.get( '/total-not-assigned-count', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), totalNotAssignedCount );
 // audit user wallet
 auditRouter.get( '/get-user-credit', isAllowedSessionHandler, isAuditUser, getUserCredit );
@@ -42,5 +44,5 @@ auditRouter.get( '/get-user-audit-count', isAllowedSessionHandler, getUserAuditC
 auditRouter.get( '/get-user-audit-count-mtd', isAllowedSessionHandler, getUserAuditCountMTD );
 // audit log
-auditRouter.get( '/audit-view-logs', isAllowedSessionHandler, validate( auditViewLogValid ), auditViewLogs );
+auditRouter.get( '/audit-view-logs', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( auditViewLogValid ), auditViewLogs );
 export default auditRouter;

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

@@ -1,5 +1,5 @@
 import { Router } from 'express';
-import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
+import { accessVerification, isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
 import { getDetectionFileValid, getFileValid, userAuditHistoryValid, workSpaceValid, saveValid, clientMetricsValid, storeMetricsValid, userMetricsValid, pendingSummaryTableValid, overAllAuditSummaryValid, summarySplitValid, overviewTableValid, getUpdatedFileValid, saveBinaryValid, getDraftedDataValid, saveDraftValid, reTriggerValidSchema } from '../dtos/traxAudit.dtos.js';
 import { isExistsQueue } from '../validation/audit.validation.js';
 import { clientMetrics, getAuditFile, getDetectionAuditFile, getUpdatedFile, overAllAuditSummary, overviewTable, pendingSummaryTable, saveBinary, storeMetrics, summarySplit, userAuditHistory, userMetrics, workSpace, saveDraft, getDraftedData, save, reTrigger } from '../controllers/traxAudit.controllers.js';
@@ -9,30 +9,32 @@ export const traxAuditRouter = Router();
 // Audit Mapping
-traxAuditRouter.get( '/get-file-detection', isAllowedSessionHandler, validate( getDetectionFileValid ), isExistsQueue, getDetectionAuditFile );
-traxAuditRouter.post( '/save', validate( saveValid ), isAllowedSessionHandler, validateUserEmpDetection, save );
-traxAuditRouter.post( '/save-draft', validate( saveDraftValid ), isAllowedSessionHandler, saveDraft );
-traxAuditRouter.get( '/get-drafted-data', validate( getDraftedDataValid ), isAllowedSessionHandler, getDraftedData );
+traxAuditRouter.get( '/get-file-detection', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( getDetectionFileValid ), isExistsQueue, getDetectionAuditFile );
+traxAuditRouter.post( '/save', validate( saveValid ), isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validateUserEmpDetection, save );
+traxAuditRouter.post( '/save-draft', validate( saveDraftValid ), isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), saveDraft );
+traxAuditRouter.get( '/get-drafted-data', validate( getDraftedDataValid ), isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), getDraftedData );
 // Y/n
-traxAuditRouter.get( '/get-file', isAllowedSessionHandler, validate( getFileValid ), isExistsQueue, getAuditFile );
-traxAuditRouter.post( '/get-updated-file', isAllowedSessionHandler, validate( getUpdatedFileValid ), isTraxAuditDocumentExist, getUpdatedFile );
+traxAuditRouter.get( '/get-file', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( getFileValid ), isExistsQueue, getAuditFile );
+traxAuditRouter.post( '/get-updated-file', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( getUpdatedFileValid ), isTraxAuditDocumentExist, getUpdatedFile );
 traxAuditRouter.post( '/save-binary-audit', isAllowedSessionHandler, validate( saveBinaryValid ), validateBinaryAudit, saveBinary );
 // metrcis
-traxAuditRouter.post( '/work-space', isAllowedSessionHandler, validate( workSpaceValid ), workSpace );
-traxAuditRouter.post( '/metrics/user-audit-history', isAllowedSessionHandler, validate( userAuditHistoryValid ), userAuditHistory );
-traxAuditRouter.post( '/metrics/client-metrics', isAllowedSessionHandler, validate( clientMetricsValid ), clientMetrics );
-traxAuditRouter.post( '/metrics/store-metrics', isAllowedSessionHandler, validate( storeMetricsValid ), storeMetrics );
-traxAuditRouter.post( '/metrics/user-metrics', isAllowedSessionHandler, validate( userMetricsValid ), userMetrics );
-traxAuditRouter.post( '/metrics/pending-summary-table', isAllowedSessionHandler, validate( pendingSummaryTableValid ), pendingSummaryTable );
-traxAuditRouter.post( '/metrics/overall-audit-summary', isAllowedSessionHandler, validate( overAllAuditSummaryValid ), overAllAuditSummary );
-traxAuditRouter.post( '/metrics/re-trigger', isAllowedSessionHandler, validate( reTriggerValidSchema ), isuserEmpDocumentExist, isMappingAuditInputFolderExist, reTrigger );
+traxAuditRouter.post( '/work-space', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( workSpaceValid ), workSpace );
+traxAuditRouter.post( '/metrics/user-audit-history', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( userAuditHistoryValid ), userAuditHistory );
+traxAuditRouter.post( '/metrics/client-metrics', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( clientMetricsValid ), clientMetrics );
+traxAuditRouter.post( '/metrics/store-metrics', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( storeMetricsValid ), storeMetrics );
+traxAuditRouter.post( '/metrics/user-metrics', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( userMetricsValid ), userMetrics );
+traxAuditRouter.post( '/metrics/pending-summary-table', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( pendingSummaryTableValid ), pendingSummaryTable );
+traxAuditRouter.post( '/metrics/overall-audit-summary', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( overAllAuditSummaryValid ), overAllAuditSummary );
+traxAuditRouter.post( '/metrics/re-trigger', isAllowedSessionHandler,
+    accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'TicketConfiguration', permissions: [ 'isEdit' ] } ] } ),
+    validate( reTriggerValidSchema ), isuserEmpDocumentExist, isMappingAuditInputFolderExist, reTrigger );
 // summary
-traxAuditRouter.post( '/metrics/summary-split-up', isAllowedSessionHandler, validate( summarySplitValid ), summarySplit );
-traxAuditRouter.post( '/metrics/overview-table', isAllowedSessionHandler, validate( overviewTableValid ), overviewTable );
+traxAuditRouter.post( '/metrics/summary-split-up', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( summarySplitValid ), summarySplit );
+traxAuditRouter.post( '/metrics/overview-table', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( overviewTableValid ), overviewTable );
 export default traxAuditRouter;

package/src/service/auditUsers.service.js CHANGED Viewed

@@ -7,3 +7,11 @@ export function aggregateAuditUsers( query ) {
 export function findOneAuditUsers( query, fields ) {
   return auditUsersModel.findOne( query, fields );
 };
+export function updateOneAuditUsers( query, fields ) {
+  return auditUsersModel.updateOne( query, fields );
+};
+export function updateManyAuditUsers( query, fields ) {
+  return auditUsersModel.updateMany( query, fields );
+};