tango-app-api-audit 3.4.0-alpha.5 → 3.4.0-alpha.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.4.0-alpha.5",
+    "version": "3.4.0-alpha.7",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",

package/src/controllers/audit.controllers.js

@@ -1450,6 +1450,9 @@ export async function userAuditHistory( req, res ) {
     const dateRangeCreatedAt = await getDateWithCustomizeTime( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
     let filter = [
       { userId: { $eq: userId } },
+      {
+        moduleType: { $eq: inputData.moduleType },
+      },
     ];
 
     if ( inputData.dateType == 'fileDate' ) {
@@ -1464,12 +1467,6 @@ export async function userAuditHistory( req, res ) {
       );
     }
 
-    if ( inputData.filterByModuleType?.length > 0 ) {
-      filter.push( {
-        moduleType: { $in: inputData.filterByModuleType },
-      } );
-    }
-
     if ( inputData.filterByAuditType?.length > 0 ) {
       filter.push( {
         auditType: { $in: inputData.filterByAuditType },
@@ -1705,23 +1702,18 @@ export async function clientMetrics( req, res ) {
     let filter = [
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
+      { moduleType: { $eq: inputData.moduleType } },
     ];
 
     let storeAuditFilter = [
       { $eq: [ '$clientId', '$$clientId' ] },
       { $eq: [ '$fileDate', '$$fileDate' ] },
+      {
+        $eq: [ '$moduleType', inputData.moduleType ],
+      },
 
     ];
 
-    if ( inputData?.filterByModuleType?.length> 0 ) {
-      filter.push(
-          { moduleType: { $in: inputData.filterByModuleType } },
-      );
-      storeAuditFilter.push( {
-        $in: [ '$moduleType', inputData.filterByModuleType ],
-      } );
-    }
-
     if ( inputData?.filterByClient?.length> 0 ) {
       filter.push(
           { clientId: { $in: inputData.filterByClient } },
@@ -1930,6 +1922,7 @@ export async function storeMetrics( req, res ) {
     let filter = [
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
+      { moduleType: { $eq: inputData.moduleType } },
 
     ];
     if ( inputData.filterByClientId && inputData.filterByClientId?.length > 0 ) {
@@ -1948,11 +1941,6 @@ export async function storeMetrics( req, res ) {
       filter.push( { auditType: { $in: inputData.filterByAuditType } } );
     }
 
-    if ( inputData.filterByModuleType && inputData.filterByModuleType?.length > 0 ) {
-      filter.push( { moduleType: { $in: inputData.filterByModuleType } } );
-    }
-
-
     const query = [
       {
         $match: {
@@ -2175,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,
@@ -2189,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,
@@ -2219,20 +2211,17 @@ export async function userMetrics( req, res ) {
       filter.push(
           { updatedAt: { $gte: dateRangeUpdatedAt.start } },
           { updatedAt: { $lte: dateRangeUpdatedAt.end } },
+          { moduleType: { $eq: inputData.moduleType } },
 
       );
     } else {
       filter.push(
           { fileDateISO: { $gte: dateRange.start } },
           { fileDateISO: { $lte: dateRange.end } },
+          { moduleType: { $eq: inputData.moduleType } },
 
       );
     }
-    if ( inputData?.filterByModuleType?.length> 0 ) {
-      filter.push(
-          { moduleType: { $in: inputData.filterByModuleType } },
-      );
-    }
     if ( inputData?.filterByStatus?.length> 0 ) {
       filter.push(
           { auditStatus: { $in: inputData.filterByStatus } },
@@ -2489,6 +2478,7 @@ export async function pendingSummaryTable( req, res ) {
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
       { auditStatus: { $ne: 'completed' } },
+      { moduleType: { $eq: inputData.moduleType } },
 
     ];
 
@@ -2496,10 +2486,6 @@ export async function pendingSummaryTable( req, res ) {
       filters.push( { clientId: { $in: inputData.clientId } } );
     }
 
-    if ( inputData.filterByModuleType.length > 0 ) {
-      filters.push( { moduleType: { $in: inputData.filterByModuleType } } );
-    }
-
     if ( inputData.filterByAuditType.length > 0 ) {
       filters.push( { auditType: { $in: inputData.filterByAuditType } } );
     }
@@ -2680,7 +2666,7 @@ export async function overAllAuditSummary( req, res ) {
     let filters =[
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
-      { moduleType: { $in: inputData.moduleType },
+      { moduleType: { $eq: inputData.moduleType },
       },
     ];
     if ( inputData.clientId.length > 0 ) {
@@ -3030,13 +3016,11 @@ export async function summarySplit( req, res ) {
     let filters =[
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
+      { moduleType: { $eq: inputData.moduleType } },
     ];
     if ( inputData.clientId.length > 0 ) {
       filters.push( { clientId: { $in: inputData.clientId } } );
     }
-    if ( inputData?.moduleType?.length > 0 ) {
-      filters.push( { moduleType: { $in: inputData.moduleType } } );
-    }
     const query =[
       {
         $match: {
@@ -3146,6 +3130,7 @@ export async function overviewTable( req, res ) {
     let filters =[
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
+      { moduleType: { $eq: inputData.moduleType } },
 
     ];
 
@@ -3153,10 +3138,6 @@ export async function overviewTable( req, res ) {
       filters.push( { clientId: { $in: inputData.clientId } } );
     }
 
-    if ( inputData.filterByModuleType.length > 0 ) {
-      filters.push( { moduleType: { $in: inputData.filterByModuleType } } );
-    }
-
     if ( inputData.filterByAuditType.length > 0 ) {
       filters.push( { auditType: { $in: inputData.filterByAuditType } } );
     }

package/src/controllers/traxAudit.controllers.js

@@ -10,6 +10,7 @@ import { aggregateAssignAudit } from '../service/assignAudit.service.js';
 import { aggregateStoreEmpDetection } from '../service/storeEmpDetection.service.js';
 import { listQueue } from 'tango-app-api-middleware/src/utils/aws/sqs.js';
 import _ from 'lodash';
+import mongoose from 'mongoose';
 
 
 export async function getDetectionAuditFile( req, res ) {
@@ -1071,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(),
@@ -1145,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 ={
@@ -1159,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 ) {
@@ -1181,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 ) {
@@ -1203,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 ) {
@@ -1336,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: [
@@ -1410,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' } },
           ],
 
         },
@@ -1439,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;
       } );
@@ -1610,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',
@@ -1672,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',
@@ -1768,6 +1812,7 @@ export async function storeMetrics( req, res ) {
       },
       {
         $project: {
+          auditId: '$_id',
           _id: 0,
           fileDate: 1,
           storeId: 1,
@@ -1775,13 +1820,18 @@ 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
           // },
+          userId: 1,
           auditType: 1,
           beforeCount: 1,
           afterCount: { $ifNull: [ '$afterCount', null ] },
@@ -1793,6 +1843,7 @@ export async function storeMetrics( req, res ) {
           }, null ] },
           timeSpent: 1,
           status: 1,
+          auditStatus: 1,
         },
       },
       {
@@ -1852,7 +1903,7 @@ export async function storeMetrics( req, res ) {
       },
       {
         $project: {
-          _id: 0,
+          auditId: 1,
           fileDate: 1,
           storeId: 1,
           storeName: 1,
@@ -1863,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 ] },
@@ -1900,6 +1953,7 @@ export async function storeMetrics( req, res ) {
 
           },
           status: 1,
+          auditStatus: 1,
         },
       },
 
@@ -1916,10 +1970,11 @@ 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' } },
+            { auditStatus: { $regex: inputData.searchValue, $options: 'i' } },
           ],
         },
       } );
@@ -1952,41 +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,
-          } );
-        } 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,
-          } );
+        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;
@@ -2046,15 +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 ] },
-        },
+
+          value: {
+            $replaceAll: { input: '$moduleType', find: '-', replacement: ' ' },
+          } },
       },
       {
         $group: {
@@ -2066,11 +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' },
-
+          moduleType: { $last: '$moduleType' },
+          value: { $last: '$value' },
         },
       },
       {
@@ -2079,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,
@@ -2106,11 +2165,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: { $floor: { $divide: [ '$differenceInSeconds', 3600 ] } },
           minutes: { $floor: { $divide: [ { $mod: [ '$differenceInSeconds', 3600 ] }, 60 ] } },
           seconds: { $mod: [ '$differenceInSeconds', 60 ] },
@@ -2126,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 ] },
@@ -2152,7 +2207,6 @@ export async function userMetrics( req, res ) {
               else: { $toString: { $round: [ '$seconds', 0 ] } },
             },
           },
-
         },
       },
       {
@@ -2164,13 +2218,12 @@ 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' ],
           },
@@ -2211,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',
@@ -2264,24 +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',
-            },
+            $project: detection,
+          },
+      ) :
+      query.push(
+          {
+            $project: YesNo,
           },
       );
     }
@@ -2339,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',
@@ -2389,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,
@@ -2414,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' } },
           ],
 
         },
@@ -2447,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;
@@ -2616,90 +2690,6 @@ export async function overAllAuditSummary( req, res ) {
   }
 }
 
-export async function overViewCard( req, res ) {
-  try {
-    const inputData = req.body;
-    const temp = {
-      totalCount: 0,
-      auditFileCount: 0,
-      ReAuditFileCount: 0,
-      inprogressCount: 0,
-      completedCount: 0,
-      pendingCount: 0,
-    };
-
-    const dateRange = await getUTC( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
-    let filters =[
-      { fileDateISO: { $gte: dateRange.start } },
-      { fileDateISO: { $lte: dateRange.end } },
-    ];
-    if ( inputData.clientId.length > 0 ) {
-      filters.push( { clientId: { $in: inputData.clientId } } );
-    }
-    const query =[
-      {
-        $match: {
-          $and: filters,
-        },
-
-      },
-      {
-        $project: {
-          auditFileCount: {
-            $cond: [
-              { $eq: [ '$auditType', 'Audit' ] }, 1, 0,
-            ],
-          },
-          ReAuditFileCount: {
-            $cond: [
-              { $eq: [ '$auditType', 'ReAudit' ] }, 1, 0,
-            ],
-          },
-          inprogressCount: {
-            $cond: [
-              { $ne: [ '$status', 'completed' ] }, 1, 0,
-            ],
-          },
-          completedCount: {
-            $cond: [
-              { $eq: [ '$status', 'completed' ] }, 1, 0,
-            ],
-          },
-        },
-      },
-      {
-        $group: {
-          _id: { fileDate: '$fileDate', clientId: '$clientId' },
-          totalCount: { $sum: 1 },
-          auditFileCount: { $sum: '$auditFileCount' },
-          ReAuditFileCount: { $sum: '$ReAuditFileCount' },
-          inprogressCount: { $sum: '$inprogressCount' },
-          completedCount: { $sum: '$completedCount' },
-
-        },
-      },
-      {
-        $project: {
-          _id: 0,
-          totalCount: 1,
-          auditFileCount: 1,
-          ReAuditFileCount: 1,
-          inprogressCount: 1,
-          completedCount: 1,
-          notAssigned: { $subtract: [ '$totalCount', { $add: [ '$inprogressCount', '$completedCount' ] } ] },
-        },
-      },
-    ];
-    const result = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
-    logger.info( { result: result } );
-    return res.sendSuccess( { result: result.length> 0? result[0]: temp } );
-  } catch ( error ) {
-    const err = error.message || 'Internal Server Error';
-    logger.error( { error: error, message: req.body, function: 'overViewCard' } );
-    return res.sendError( err, 500 );
-  }
-}
-
 export async function summarySplit( req, res ) {
   try {
     const inputData = req.body;
@@ -2862,14 +2852,20 @@ 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,
           status: 1,
+          auditStatus: 1,
           // userId: 1,
         },
       },
@@ -2907,14 +2903,17 @@ 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,
           status: 1,
+          auditStatus: 1,
           // userName: '$user.userName',
           // userEmail: '$user.userEmail',
 
@@ -2930,12 +2929,13 @@ export async function overviewTable( req, res ) {
             { fileDate: { $regex: inputData.searchValue, $options: 'i' } },
             { auditType: { $regex: inputData.searchValue, $options: 'i' } },
             { status: { $regex: inputData.searchValue, $options: 'i' } },
-            { moduleType: { $regex: inputData.searchValue, $options: 'i' } },
+            { auditStatus: { $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' } },
           ],
@@ -2970,43 +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,
-          } );
-        } 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,
-          } );
+        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/docs/traxAudit.docs.js

@@ -1,5 +1,5 @@
 import j2s from 'joi-to-swagger';
-import { getFileSchema, userAuditHistorySchema, workSpaceSchema, saveSchema, clientMetricsSchema, storeMetricsSchema, userMetricsSchema, pendingSummaryTableSchema, overAllAuditSummarySchema, overviewTableSchema, summarySplitSchema, overViewCardSchema } from '../dtos/traxAudit.dtos.js';
+import { getFileSchema, userAuditHistorySchema, workSpaceSchema, saveSchema, clientMetricsSchema, storeMetricsSchema, userMetricsSchema, pendingSummaryTableSchema, overAllAuditSummarySchema, overviewTableSchema, summarySplitSchema } from '../dtos/traxAudit.dtos.js';
 
 export const traxAuditDocs = {
 
@@ -222,28 +222,6 @@ export const traxAuditDocs = {
       },
     },
   },
-  '/v3/trax-audit/metrics/overview-card': {
-    post: {
-      tags: [ 'Trax Audit' ],
-      description: `Get overall high level audited files count`,
-      operationId: 'metrics/overview-card',
-      parameters: {},
-      requestBody: {
-        content: {
-          'application/json': {
-            schema: j2s( overViewCardSchema ).swagger,
-          },
-        },
-      },
-      responses: {
-        200: { description: 'Successful' },
-        401: { description: 'Unauthorized User' },
-        422: { description: 'Field Error' },
-        500: { description: 'Server Error' },
-        204: { description: 'Not Found' },
-      },
-    },
-  },
 
   '/v3/trax-audit/metrics/summary-split-up': {
     post: {

package/src/dtos/audit.dtos.js

@@ -148,7 +148,7 @@ export const userAuditHistorySchema = joi.object(
       dateType: joi.string().required(),
       clientId: joi.array().optional(),
       filterByStoreId: joi.array().required(),
-      filterByModuleType: joi.array().optional(),
+      moduleType: joi.string().required(),
       filterByAuditType: joi.array().optional(),
       filterByStatus: joi.array().optional(),
       searchValue: joi.string().optional().allow( '' ),
@@ -170,7 +170,7 @@ export const clientMetricsSchema = joi.object(
       fromDate: joi.string().required(),
       toDate: joi.string().required(),
       searchValue: joi.string().optional().allow( '' ),
-      filterByModuleType: joi.array().optional(),
+      moduleType: joi.string().required(),
       filterByClient: joi.array().required(),
       filterByStatus: joi.array().optional(),
       sortColumnName: joi.string().optional(),
@@ -195,7 +195,7 @@ export const storeMetricsSchema = joi.object(
       filterByStoreId: joi.array().optional(),
       filterByStatus: joi.array().optional(),
       filterByAuditType: joi.array().optional(),
-      filterByModuleType: joi.array().optional(),
+      moduleType: joi.string().required(),
       sortColumnName: joi.string().optional(),
       sortBy: joi.number().optional(),
       limit: joi.number().optional(),
@@ -215,7 +215,7 @@ export const userMetricsSchema = joi.object(
       dateType: joi.string().required(),
       searchValue: joi.string().optional().allow( '' ),
       filterByUser: joi.array().optional(),
-      filterByModuleType: joi.array().optional(),
+      moduleType: joi.string().required(),
       filterByStatus: joi.array().optional(),
       sortColumnName: joi.string().optional(),
       sortBy: joi.number().optional(),
@@ -238,7 +238,7 @@ export const pendingSummaryTableSchema = joi.object(
       offset: joi.number().optional(),
       searchValue: joi.string().optional().allow( '' ),
       filterByStatus: joi.array().required(),
-      filterByModuleType: joi.array().optional(),
+      moduleType: joi.string().required(),
       filterByAuditType: joi.array().optional(),
       sortColumnName: joi.string().optional(),
       sortBy: joi.number().optional(),
@@ -259,7 +259,7 @@ export const overviewTableSchema = joi.object(
       offset: joi.number().optional(),
       searchValue: joi.string().optional().allow( '' ),
       filterByStatus: joi.array().optional(),
-      filterByModuleType: joi.array().optional(),
+      moduleType: joi.string().required(),
       filterByAuditType: joi.array().optional(),
       sortColumnName: joi.string().optional(),
       sortBy: joi.number().optional(),
@@ -276,7 +276,7 @@ export const overAllAuditSummarySchema = joi.object(
       fromDate: joi.string().required(),
       toDate: joi.string().required(),
       clientId: joi.array().optional(),
-      moduleType: joi.array().required(),
+      moduleType: joi.string().required(),
     },
 );
 
@@ -319,7 +319,7 @@ export const summarySplitSchema = joi.object(
       fromDate: joi.string().required(),
       toDate: joi.string().required(),
       clientId: joi.array().optional(),
-      moduleType: joi.array().optional(),
+      moduleType: joi.string().required(),
     },
 );
 

package/src/dtos/traxAudit.dtos.js

@@ -219,20 +219,6 @@ export const overAllAuditSummaryValid = {
   body: overAllAuditSummarySchema,
 };
 
-
-export const overViewCardSchema = joi.object(
-    {
-      fromDate: joi.string().required(),
-      toDate: joi.string().required(),
-      clientId: joi.array().optional(),
-      moduleType: joi.string().required(),
-    },
-);
-
-export const overViewCardValid = {
-  body: overViewCardSchema,
-};
-
 export const summarySplitSchema = joi.object(
     {
       fromDate: joi.string().required(),

package/src/routes/traxAudit.routes.js

@@ -1,8 +1,8 @@
 import { Router } from 'express';
 import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
-import { getDetectionFileValid, getFileValid, userAuditHistoryValid, workSpaceValid, saveValid, clientMetricsValid, storeMetricsValid, userMetricsValid, pendingSummaryTableValid, overAllAuditSummaryValid, summarySplitValid, overviewTableValid, overViewCardValid } from '../dtos/traxAudit.dtos.js';
+import { getDetectionFileValid, getFileValid, userAuditHistoryValid, workSpaceValid, saveValid, clientMetricsValid, storeMetricsValid, userMetricsValid, pendingSummaryTableValid, overAllAuditSummaryValid, summarySplitValid, overviewTableValid } from '../dtos/traxAudit.dtos.js';
 import { isExistsQueue } from '../validation/audit.validation.js';
-import { clientMetrics, getAuditFile, getDetectionAuditFile, overAllAuditSummary, overViewCard, overviewTable, pendingSummaryTable, saveBinary, storeMetrics, summarySplit, userAuditHistory, userMetrics, workSpace } from '../controllers/traxAudit.controllers.js';
+import { clientMetrics, getAuditFile, getDetectionAuditFile, overAllAuditSummary, overviewTable, pendingSummaryTable, saveBinary, storeMetrics, summarySplit, userAuditHistory, userMetrics, workSpace } from '../controllers/traxAudit.controllers.js';
 import { validateBinaryAudit } from '../validation/traxAuditValidation.js';
 
 export const traxAuditRouter = Router();
@@ -30,7 +30,6 @@ traxAuditRouter.post( '/metrics/overall-audit-summary', isAllowedSessionHandler,
 
 // summary
 
-traxAuditRouter.post( '/metrics/overview-card', isAllowedSessionHandler, validate( overViewCardValid ), overViewCard );
 traxAuditRouter.post( '/metrics/summary-split-up', isAllowedSessionHandler, validate( summarySplitValid ), summarySplit );
 traxAuditRouter.post( '/metrics/overview-table', isAllowedSessionHandler, validate( overviewTableValid ), overviewTable );
 

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();