tango-app-api-audit 3.4.0-alpha.6 → 3.4.0-alpha.8

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -2163,6 +2163,8 @@ export async function storeMetrics( req, res ) {
             'Zone Name': element.zoneName,
             'User Name': element.userName,
             'User Email': element.userEmail,
+            'Before Count': element.beforeCount,
+            'After Count': element.afterCount,
             'Audit Type': element.auditType,
             'Accuracy': element.accuracy,
             'Time Spent': element.timeSpent,
@@ -2177,6 +2179,8 @@ export async function storeMetrics( req, res ) {
             'Client Name': element.clientName,
             'User Name': element.userName,
             'User Email': element.userEmail,
+            'Before Count': element.beforeCount,
+            'After Count': element.afterCount,
             'Audit Type': element.auditType,
             'Accuracy': element.accuracy,
             'Time Spent': element.timeSpent,

package/src/controllers/traxAudit.controllers.js

@@ -1072,6 +1072,7 @@ export async function getAuditFile( req, res ) {
         fileDate: msg.fileDate,
         queueName: inputData.queueName,
         auditStatus: 'inprogress',
+        AuditType: 'Audit',
         fileDateISO: start,
         timeSpent: 0,
         startTime: new Date(),
@@ -1146,7 +1147,10 @@ export async function getAuditFile( req, res ) {
 export async function saveBinary( req, res ) {
   try {
     const inputData = req.body;
-
+    const isoDate = req.userAudit?.startTime;
+    const currentTime = dayjs();
+    const isoDateTime = dayjs( isoDate );
+    const timeDifferenceInMinutes = currentTime.diff( isoDateTime, 'seconds' );
     switch ( inputData.moduleType ) {
       case 'unattended-customer':
         let unattendedquery ={
@@ -1160,7 +1164,9 @@ export async function saveBinary( req, res ) {
         let update={
           auditStatus: 'completed',
           answer: inputData.answer,
-          userCommands: inputData.userComments || '',
+          userComments: inputData.userComments || '',
+          endTime: new Date(),
+          timeSpent: timeDifferenceInMinutes,
         };
         let updatDataunattended= await updateOneBinaryAuditModel( unattendedquery, update );
         if ( updatDataunattended.modifiedCount==0 ) {
@@ -1182,7 +1188,9 @@ export async function saveBinary( req, res ) {
         let leftupdate={
           auditStatus: 'completed',
           answer: inputData.answer,
-          userCommands: inputData.userComments || '',
+          userComments: inputData.userComments || '',
+          endTime: new Date(),
+          timeSpent: timeDifferenceInMinutes,
         };
         let updatDataleft= await updateOneBinaryAuditModel( leftquery, leftupdate );
         if ( updatDataleft.modifiedCount==0 ) {
@@ -1204,7 +1212,9 @@ export async function saveBinary( req, res ) {
         let cameraupdate={
           auditStatus: 'completed',
           answer: inputData.answer,
-          userCommands: inputData.userComments || '',
+          userComments: inputData.userComments || '',
+          endTime: new Date(),
+          timeSpent: timeDifferenceInMinutes,
         };
         let updatDatacamera= await updateOneBinaryAuditModel( cameraquery, cameraupdate );
         if ( updatDatacamera.modifiedCount==0 ) {
@@ -1337,14 +1347,18 @@ export async function userAuditHistory( req, res ) {
           tempId: 1,
           streamName: 1,
           question: 1,
+          questionType: 1,
           answer: 1,
+          userComments: 1,
           storeName: '$store.storeName',
           clientId: 1,
           clientName: '$client.clientName',
           fileDate: 1,
           auditType: 1,
-          zoneName: 1,
           moduleType: 1,
+          value: {
+            $replaceAll: { input: '$moduleType', find: '-', replacement: ' ' },
+          },
           beforeCount: 1,
           afterCount: 1,
           accuracy: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, { $round: [
@@ -1411,11 +1425,12 @@ export async function userAuditHistory( req, res ) {
             { storeId: { $regex: inputData.searchValue, $options: 'i' } },
             { storeName: { $regex: inputData.searchValue, $options: 'i' } },
             { streamName: { $regex: inputData.searchValue, $options: 'i' } },
-            { moduleType: { $regex: inputData.searchValue, $options: 'i' } },
+            { value: { $regex: inputData.searchValue, $options: 'i' } },
             { auditType: { $regex: inputData.searchValue, $options: 'i' } },
             { auditStatus: { $regex: inputData.searchValue, $options: 'i' } },
             { tempId: { $regex: inputData.searchValue, $options: 'i' } },
             { question: { $regex: inputData.searchValue, $options: 'i' } },
+            { userComments: { $regex: inputData.searchValue, $options: 'i' } },
           ],
 
         },
@@ -1440,25 +1455,50 @@ export async function userAuditHistory( req, res ) {
       const promises = chunkedMappingData.map( async ( chunk ) => {
         const exportData = [];
         chunk.forEach( ( element ) => {
-          exportData.push( {
+          const temp ={
+
             'File Date': element.fileDate,
             'Brand ID': element.clientId,
             'Brand Name': element.clientName,
             'Store ID': element.storeId,
             'Store Name': element.storeName,
-            'Stream Name': element.moduleType == 'camera-angle-change'? element.zoneName : '',
             'Audit Type': element.auditType,
-            'Product Type': element.moduleType,
-            'Before Count': element.beforeCount,
-            'After Count': element.afterCount || '',
-            'Accuracy': element.accuracy || '',
+            'Product Type': element.value,
             'Start Time': element.startTime,
             'End Time': element.endTime || '',
             'Time Spent': element.timeSpent,
-            'Audit Status': element.auditStatus,
+            'Status': element.auditStatus,
             'Audited Date': dayjs( element.createdAt ).format( 'YYYY,MMM D' ),
+            'Result': element.answer,
 
-          } );
+
+          };
+          switch ( inputData.moduleType ) {
+            case 'camera-angle-change':
+              temp['stream Name'] = element.streamName;
+              temp['User Comments'] = element.userCommands;
+              break;
+            case 'unattended-customer':
+              temp['Customer ID'] = element.tempId;
+              temp['Question'] = element.question;
+              temp['User Comments'] = element.userCommands;
+              break;
+            case 'left-in-middle':
+              temp['Question'] = element.question;
+              temp['User Comments'] = element.userCommands;
+              break;
+            case 'uniform-detection':
+              temp['Before Count'] = element.beforeCount;
+              temp['After Count'] = element.afterCount;
+              temp['Accuracy'] = element.accuracy || '';
+              break;
+            case 'mobile-detection':
+              temp['Before Count'] = element.beforeCount;
+              temp['After Count'] = element.afterCount;
+              temp['Accuracy'] = element.accuracy || '';
+              break;
+          }
+          exportData.push( temp );
         } );
         return exportData;
       } );
@@ -1611,6 +1651,9 @@ export async function clientMetrics( req, res ) {
           clientName: 1,
           totalFilesCount: 1,
           moduleType: 1,
+          value: {
+            $replaceAll: { input: '$moduleType', find: '-', replacement: ' ' }, // Replacing "-" with " "
+          },
           installedStore: 1,
           // notAssignedStores: '$binaryAudit.notAssignedStores',
           inprogressStoresCount: '$binaryAudit.inprogressStores',
@@ -1673,7 +1716,7 @@ export async function clientMetrics( req, res ) {
               'File Date': '$fileDate',
               'Client Name': '$clientName',
               'Client Id': '$clientId',
-              'Product Type': '$moduleType',
+              'Product Type': '$value',
               'Completed Percentage': '$completionPercentage',
               'Installed Stores': '$installedStore',
               'Audit Stores': '$totalFilesCount',
@@ -1769,6 +1812,7 @@ export async function storeMetrics( req, res ) {
       },
       {
         $project: {
+          auditId: '$_id',
           _id: 0,
           fileDate: 1,
           storeId: 1,
@@ -1776,9 +1820,13 @@ export async function storeMetrics( req, res ) {
           clientName: '',
           clientId: 1,
           moduleType: 1,
+          value: {
+            $replaceAll: { input: '$moduleType', find: '-', replacement: ' ' },
+          },
           tempId: 1,
           streamName: 1,
           question: 1,
+          questionType: 1,
           answer: 1,
           // userId: {
           //   $arrayElemAt: [ '$userId', { $subtract: [ { $size: '$userId' }, 1 ] } ],    //need to check if no data
@@ -1855,7 +1903,7 @@ export async function storeMetrics( req, res ) {
       },
       {
         $project: {
-          _id: 0,
+          auditId: 1,
           fileDate: 1,
           storeId: 1,
           storeName: 1,
@@ -1866,8 +1914,10 @@ export async function storeMetrics( req, res ) {
           tempId: 1,
           streamName: 1,
           question: 1,
+          questionType: 1,
           answer: 1,
           moduleType: 1,
+          value: 1,
           auditType: 1,
           beforeCount: 1,
           afterCount: { $ifNull: [ '$afterCount', null ] },
@@ -1920,7 +1970,7 @@ export async function storeMetrics( req, res ) {
             { userName: { $regex: inputData.searchValue, $options: 'i' } },
             { status: { $regex: inputData.searchValue, $options: 'i' } },
             { auditType: { $regex: inputData.searchValue, $options: 'i' } },
-            { moduleType: { $regex: inputData.searchValue, $options: 'i' } },
+            { value: { $regex: inputData.searchValue, $options: 'i' } },
             { tempId: { $regex: inputData.searchValue, $options: 'i' } },
             { question: { $regex: inputData.searchValue, $options: 'i' } },
             { answer: { $regex: inputData.searchValue, $options: 'i' } },
@@ -1957,43 +2007,47 @@ export async function storeMetrics( req, res ) {
     if ( inputData.isExport ) {
       const exportdata = [];
       result.forEach( ( element ) => {
-        if ( element.moduleType == 'zone' ) {
-          exportdata.push( {
-            'File Date': element.fileDate,
-            'Store ID': element.storeId,
-            'Store Name': element.storeName,
-            'Client Id': element.clientId,
-            'Client Name': element.clientName,
-            'Customer Id': element.tempId,
-            'Question': element.question,
-            'Answer': element.answer,
-            'User Name': element.userName,
-            'User Email': element.userEmail,
-            'Audit Type': element.auditType,
-            'Accuracy': element.accuracy,
-            'Time Spent': element.timeSpent,
-            'Status': element.status,
-            'Audit Status': element.auditStatus,
-          } );
-        } else {
-          exportdata.push( {
-            'File Date': element.fileDate,
-            'Store ID': element.storeId,
-            'Store Name': element.storeName,
-            'Client Id': element.clientId,
-            'Client Name': element.clientName,
-            'User Name': element.userName,
-            'Customer Id': element.tempId,
-            'Question': element.question,
-            'Answer': element.answer,
-            'User Email': element.userEmail,
-            'Audit Type': element.auditType,
-            'Accuracy': element.accuracy,
-            'Time Spent': element.timeSpent,
-            'Status': element.status,
-            'Audit Status': element.auditStatus,
-          } );
+        const temp ={
+          'File Date': element.fileDate,
+          'Store ID': element.storeId,
+          'Store Name': element.storeName,
+          'Client Id': element.clientId,
+          'Client Name': element.clientName,
+          'User Name': element.userName,
+          'User Email': element.userEmail,
+          'Audit Type': element.auditType,
+          'Time Spent': element.timeSpent,
+          'Result': element.answer,
+        };
+        switch ( inputData.moduleType ) {
+          case 'camera-angle-change':
+            temp['stream Name'] = element.streamName;
+            temp['User Comments'] = element.auditStatus;
+            break;
+          case 'unattended-customer':
+            temp['Customer ID'] = element.tempId;
+            temp['Question'] = element.question;
+            temp['User Comments'] = element.auditStatus;
+            break;
+          case 'left-in-middle':
+            temp['Question'] = element.question;
+            temp['User Comments'] = element.userCommands;
+            temp['Status'] = element.auditStatus;
+            break;
+          case 'mobile-detection':
+            temp['Before Count'] = element.beforeCount;
+            temp['After Count'] = element.afterCount;
+            temp['Status'] = element.status;
+            temp['Accuracy'] = element.accuracy;
+            break;
+          case 'uniform-detection':
+            temp['Before Count'] = element.beforeCount;
+            temp['After Count'] = element.afterCount;
+            temp['Status'] = element.status;
+            temp['Accuracy'] = element.accuracy;
+            break;
         }
+        exportdata.push( temp );
       } );
       await download( exportdata, res );
       return;
@@ -2053,16 +2107,18 @@ export async function userMetrics( req, res ) {
           userId: 1,
           fileDate: 1,
           startTime: 1,
-          endTime: 1,
-          streamName: 1,
-          tempId: 1,
-          question: 1,
-          answer: 1,
+          beforeCount: 1,
+          moduleType: 1,
+          afterCount: 1,
+          checkIntime: 1,
+          checkOutTime: 1,
           totalCompletedFiles: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, 1, 0 ] },
           beforeCount: 1,
           afterCount: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, '$afterCount', 0 ] },
-          auditStatus: 1,
-        },
+
+          value: {
+            $replaceAll: { input: '$moduleType', find: '-', replacement: ' ' },
+          } },
       },
       {
         $group: {
@@ -2074,12 +2130,8 @@ export async function userMetrics( req, res ) {
           afterCount: { $sum: '$afterCount' },
           checkIntime: { $first: '$startTime' },
           checkOutTime: { $last: '$endTime' },
-          streamName: { $last: '$streamName' },
-          tempId: { $last: '$tempId' },
-          question: { $last: '$question' },
-          answer: { $last: '$answer' },
-          auditStatus: { $last: '$auditStatus' },
-
+          moduleType: { $last: '$moduleType' },
+          value: { $last: '$value' },
         },
       },
       {
@@ -2088,12 +2140,10 @@ export async function userMetrics( req, res ) {
           userId: 1,
           fileDate: 1,
           totalCompletedFiles: 1,
+          moduleType: 1,
+          value: 1,
           beforeCount: 1,
           afterCount: 1,
-          streamName: 1,
-          tempId: 1,
-          question: 1,
-          answer: 1,
           // mappingPerc: { $round: [
           //   { $multiply: [
           //     { $divide: [ '$afterCount', '$beforeCount' ] }, 100,
@@ -2104,7 +2154,6 @@ export async function userMetrics( req, res ) {
           differenceInSeconds: {
             $divide: [ { $subtract: [ '$checkOutTime', '$checkIntime' ] }, 1000 ],
           },
-          auditStatus: 1,
         },
       },
       {
@@ -2116,15 +2165,12 @@ export async function userMetrics( req, res ) {
           afterCount: 1,
           checkIntime: 1,
           checkOutTime: 1,
+          moduleType: 1,
+          value: 1,
           // mappingPerc: 1,
-          streamName: 1,
-          tempId: 1,
-          question: 1,
-          answer: 1,
           hours: { $floor: { $divide: [ '$differenceInSeconds', 3600 ] } },
           minutes: { $floor: { $divide: [ { $mod: [ '$differenceInSeconds', 3600 ] }, 60 ] } },
           seconds: { $mod: [ '$differenceInSeconds', 60 ] },
-          auditStatus: 1,
         },
       },
       {
@@ -2137,11 +2183,9 @@ export async function userMetrics( req, res ) {
           afterCount: 1,
           checkIntime: 1,
           checkOutTime: 1,
+          moduleType: 1,
+          value: 1,
           // mappingPerc: 1,
-          streamName: 1,
-          tempId: 1,
-          question: 1,
-          answer: 1,
           hours: {
             $cond: {
               if: { $lt: [ '$hours', 10 ] },
@@ -2163,7 +2207,6 @@ export async function userMetrics( req, res ) {
               else: { $toString: { $round: [ '$seconds', 0 ] } },
             },
           },
-          auditStatus: 1,
         },
       },
       {
@@ -2175,17 +2218,15 @@ export async function userMetrics( req, res ) {
           beforeCount: 1,
           afterCount: 1,
           checkIntime: 1,
-          zoneName: 1,
           checkOutTime: 1,
+          moduleType: 1,
+          value: {
+            $replaceAll: { input: '$moduleType', find: '-', replacement: ' ' },
+          },
           // mappingPerc: 1,
-          streamName: 1,
-          tempId: 1,
-          question: 1,
-          answer: 1,
           workingHours: {
             $concat: [ '$hours', ':', '$minutes', ':', '$seconds' ],
           },
-          auditStatus: 1,
         },
       },
       {
@@ -2223,11 +2264,11 @@ export async function userMetrics( req, res ) {
           totalCompletedFiles: 1,
           beforeCount: 1,
           afterCount: 1,
+          moduleType: 1,
+          value: {
+            $replaceAll: { input: '$moduleType', find: '-', replacement: ' ' },
+          },
           // mappingPerc: 1,
-          streamName: 1,
-          tempId: 1,
-          question: 1,
-          answer: 1,
           checkIntime: {
             $dateToString: {
               format: '%Y-%m-%d %H:%M:%S',
@@ -2243,7 +2284,6 @@ export async function userMetrics( req, res ) {
             },
           },
           workingHours: 1,
-          auditStatus: 1,
         },
       },
     ];
@@ -2277,25 +2317,39 @@ export async function userMetrics( req, res ) {
         { $limit: limit },
     );
     if ( inputData.isExport ) {
+      const detection = {
+        '_id': 0,
+        'File Date': '$fileDate',
+        'User Name': '$userName',
+        'Total Completed Files Count': '$totalCompletedFiles',
+        'Total Before Count': '$beforeCount',
+        'Total After Count': '$afterCount',
+        'check Intime': '$checkIntime',
+        'check OutTime': '$checkOutTime',
+        'working Hours': '$workingHours',
+        'Product Type': '$value',
+        // 'Mapping Percentage': '$mappingPerc',
+      };
+      const YesNo = {
+        '_id': 0,
+        'File Date': '$fileDate',
+        'User Name': '$userName',
+        'Total Completed Files Count': '$totalCompletedFiles',
+        'check Intime': '$checkIntime',
+        'check OutTime': '$checkOutTime',
+        'working Hours': '$workingHours',
+        'Product Type': '$value',
+        // 'Mapping Percentage': '$mappingPerc',
+      };
+      inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )?
       query.push(
           {
-            $project: {
-              '_id': 0,
-              'File Date': '$fileDate',
-              'User Name': '$userName',
-              'Total Completed Files Count': '$totalCompletedFiles',
-              'Total Before Count': '$beforeCount',
-              'Total After Count': '$afterCount',
-              'check Intime': '$checkIntime',
-              'check OutTime': '$checkOutTime',
-              'working Hours': '$workingHours',
-              'Mapping Percentage': '$mappingPerc',
-              'Customer ID': '$tempId',
-              'Stream Name': '$streamName',
-              'Question': '$question',
-              'Answer': '$answer',
-              'Audit Status': '$auditStatus',
-            },
+            $project: detection,
+          },
+      ) :
+      query.push(
+          {
+            $project: YesNo,
           },
       );
     }
@@ -2353,10 +2407,14 @@ export async function pendingSummaryTable( req, res ) {
           streamName: 1,
           tempId: 1,
           question: 1,
+          questionType: 1,
           answer: 1,
-          userCommands: 1,
+          userComments: 1,
           fileDate: 1,
           moduleType: 1,
+          value: {
+            $replaceAll: { input: '$moduleType', find: '-', replacement: ' ' },
+          },
           beforeCount: 1,
           startTime: { $dateToString: {
             format: '%Y-%m-%d %H:%M:%S',
@@ -2403,10 +2461,12 @@ export async function pendingSummaryTable( req, res ) {
           streamName: 1,
           tempId: 1,
           question: 1,
+          questionType: 1,
           answer: 1,
-          userCommands: 1,
+          userComments: 1,
           fileDate: 1,
           moduleType: 1,
+          value: 1,
           beforeCount: 1,
           startTime: 1,
           endTime: 1,
@@ -2428,6 +2488,7 @@ export async function pendingSummaryTable( req, res ) {
             { auditStatus: { $regex: inputData.searchValue, $options: 'i' } },
             { userName: { $regex: inputData.searchValue, $options: 'i' } },
             { userEmail: { $regex: inputData.searchValue, $options: 'i' } },
+            { value: { $regex: inputData.searchValue, $options: 'i' } },
           ],
 
         },
@@ -2461,41 +2522,40 @@ export async function pendingSummaryTable( req, res ) {
     if ( inputData.isExport ) {
       const exportdata = [];
       result.forEach( ( element ) => {
-        if ( element.moduleType == 'zone' ) {
-          exportdata.push( {
-            'Store ID': element.storeId,
-            'Stream Name': element.streamName,
-            'Customer ID': element.tempId,
-            'Question': question,
-            'Answer': element.answer,
-            'userComments': element.userCommands,
-            'File Date': element.fileDate,
-            'Product Type': element.moduleType,
-            'Audit Type': element.auditType,
-            'Before Count': element.beforeCount,
-            'Start Time': element.startTime,
-            'User Name': element.userName,
-            'User Email': element.userEmail,
-            'Status': element.auditStatus,
-          } );
-        } else {
-          exportdata.push( {
-            'Store ID': element.storeId,
-            'Stream Name': element.streamName,
-            'Customer ID': element.tempId,
-            'Question': question,
-            'Answer': element.answer,
-            'userComments': element.userCommands,
-            'File Date': element.fileDate,
-            'Product Type': element.moduleType,
-            'Audit Type': element.auditType,
-            'Before Count': element.beforeCount,
-            'Start Time': element.startTime,
-            'User Name': element.userName,
-            'User Email': element.userEmail,
-            'Status': element.auditStatus,
-          } );
+        const temp = {
+          'Store ID': element.storeId,
+          'Result': element.answer,
+          'userComments': element.userComments,
+          'File Date': element.fileDate,
+          'Product Type': element.value,
+          'Audit Type': element.auditType,
+          'Start Time': element.startTime,
+          'User Name': element.userName,
+          'User Email': element.userEmail,
+          'Status': element.auditStatus,
+        };
+        switch ( inputData.moduleType ) {
+          case 'camera-angle-change':
+            temp['stream Name'] = element.streamName;
+            temp['User Comments'] = element.userCommands;
+            break;
+          case 'unattended-customer':
+            temp['Customer ID'] = element.tempId;
+            temp['Question'] = element.question;
+            temp['User Comments'] = element.userCommands;
+            break;
+          case 'left-in-middle':
+            temp['Question'] = element.question;
+            temp['User Comments'] = element.userCommands;
+            break;
+          case 'mobile-detection':
+            temp['Before Count'] = element.beforeCount;
+            break;
+          case 'uniform-detection':
+            temp['Before Count'] = element.beforeCount;
+            break;
         }
+        exportdata.push( temp );
       } );
       await download( exportdata, res );
       return;
@@ -2792,10 +2852,15 @@ export async function overviewTable( req, res ) {
           streamName: 1,
           tempId: 1,
           question: 1,
+          questionType: 1,
           answer: 1,
-          userCommands: 1,
+          userComments: 1,
           fileDate: 1,
           moduleType: 1,
+
+          value: {
+            $replaceAll: { input: '$moduleType', find: '-', replacement: ' ' },
+          },
           beforeCount: 1,
           afterCount: 1,
           auditType: 1,
@@ -2838,10 +2903,12 @@ export async function overviewTable( req, res ) {
           streamName: 1,
           tempId: 1,
           question: 1,
+          questionType: 1,
           answer: 1,
-          userCommands: 1,
+          userComments: 1,
           fileDate: 1,
           moduleType: 1,
+          value: 1,
           beforeCount: 1,
           afterCount: 1,
           auditType: 1,
@@ -2863,12 +2930,12 @@ export async function overviewTable( req, res ) {
             { auditType: { $regex: inputData.searchValue, $options: 'i' } },
             { status: { $regex: inputData.searchValue, $options: 'i' } },
             { auditStatus: { $regex: inputData.searchValue, $options: 'i' } },
-            { moduleType: { $regex: inputData.searchValue, $options: 'i' } },
+            { value: { $regex: inputData.searchValue, $options: 'i' } },
             { streamName: { $regex: inputData.searchValue, $options: 'i' } },
             { tempId: { $regex: inputData.searchValue, $options: 'i' } },
             { question: { $regex: inputData.searchValue, $options: 'i' } },
             { answer: { $regex: inputData.searchValue, $options: 'i' } },
-            { userCommands: { $regex: inputData.searchValue, $options: 'i' } },
+            { userComments: { $regex: inputData.searchValue, $options: 'i' } },
             // { userName: { $regex: inputData.searchValue, $options: 'i' } },
             // { userEmail: { $regex: inputData.searchValue, $options: 'i' } },
           ],
@@ -2903,45 +2970,43 @@ export async function overviewTable( req, res ) {
     if ( inputData.isExport ) {
       const exportdata = [];
       result.forEach( ( element ) => {
-        if ( element.moduleType == 'zone' ) {
-          exportdata.push( {
-            'Store ID': element.storeId,
-            'Brand ID': element.clientId,
-            'Stream Name': element.streamName,
-            'Customer ID': element.tempId,
-            'Question': element.question,
-            'Answer': element.answer,
-            'User Comments': element.userCommands,
-            'File Date': element.fileDate,
-            'Product Type': element.moduleType,
-            'Audit Type': element.auditType,
-            'Before Count': element.beforeCount,
-            'After Count': element.afterCount,
-            // 'User Name': element.userName,
-            // 'User Email': element.userEmail,
-            'Status': element.status,
-            'Audit Status': element.status,
-          } );
-        } else {
-          exportdata.push( {
-            'Store ID': element.storeId,
-            'Brand ID': element.clientId,
-            'File Date': element.fileDate,
-            'Stream Name': element.streamName,
-            'Customer ID': element.tempId,
-            'Question': element.question,
-            'Answer': element.answer,
-            'User Comments': element.userCommands,
-            'Product Type': element.moduleType,
-            'Audit Type': element.auditType,
-            'Before Count': element.beforeCount,
-            'After Count': element.afterCount,
-            // 'User Name': element.userName,
-            // 'User Email': element.userEmail,
-            'Status': element.status,
-            'Audit Status': element.status,
-          } );
+        const temp ={
+          'Store ID': element.storeId,
+          'Brand ID': element.clientId,
+          'File Date': element.fileDate,
+          'Result': element.answer,
+          'Product Type': element.value,
+          'Audit Type': element.auditType,
+          // 'User Name': element.userName,
+          // 'User Email': element.userEmail,
+          'Status': element.status,
+          'Audit Status': element.status,
+        };
+
+        switch ( inputData.moduleType ) {
+          case 'camera-angle-change':
+            temp['stream Name'] = element.streamName;
+            temp['User Comments'] = element.userCommands;
+            break;
+          case 'unattended-customer':
+            temp['Customer ID'] = element.tempId;
+            temp['Question'] = element.question;
+            temp['User Comments'] = element.userCommands;
+            break;
+          case 'left-in-middle':
+            temp['Question'] = element.question;
+            temp['User Comments'] = element.userCommands;
+            break;
+          case 'mobile-detection':
+            temp['Before Count'] = element.beforeCount;
+            temp['After Count'] = element.afterCount;
+            break;
+          case 'uniform-detection':
+            temp['Before Count'] = element.beforeCount;
+            temp['After Count'] = element.afterCount;
+            break;
         }
+        exportdata.push( temp );
       } );
       await download( exportdata, res );
       return;

package/src/validation/traxAuditValidation.js

@@ -27,7 +27,7 @@ export async function validateBinaryAudit( req, res, next ) {
     if ( !userAuditDetails ) {
       return res.sendError( 'No Data Available' );
     } else if ( userAuditDetails && userAuditDetails.auditStatus == 'completed' ) {
-      return res.sendError( 'Forbidden to this action', 203 );
+      await updateOneBinaryAuditModel( { _id: inputData.auditId }, { auditType: 'ReAudit' } );
     }
     req.userAudit = userAuditDetails;
     next();