tango-app-api-audit 3.4.3-alpha.17 → 3.4.3-alpha.19

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -356,6 +356,7 @@ export async function getAuditFile( req, res ) {
               auditId: userDetails[0]._id,
               moduleType: userDetails[0].moduleType,
               zoneName: userDetails[0].zoneName,
+              beforeCount: userDetails[0].beforeCount,
             },
             createdAt: new Date(),
           };
@@ -458,6 +459,7 @@ export async function getAuditFile( req, res ) {
             auditId: reauditInsert._id,
             zoneName: msg.zone_id,
             moduleType: inputData.moduleType,
+            beforeCount: msg.total_count,
           },
           createdAt: new Date(),
         };
@@ -610,6 +612,7 @@ export async function getAuditFile( req, res ) {
           auditId: insertData._id,
           zoneName: msg.zone_id,
           moduleType: inputData.moduleType,
+          beforeCount: msg.total_count,
         },
         createdAt: new Date(),
       };
@@ -1239,8 +1242,10 @@ export async function getDraftedData( req, res ) {
 
 export async function save( req, res ) {
   try {
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
     const bucket = JSON.parse( process.env.BUCKET );
     const sqs = JSON.parse( process.env.SQS );
+    const auditConfig = JSON.parse( process.env.AUDIT_CONFIG );
     const inputData = req.body;
     let storeAuditData = await findOneStoreAudit( {
       storeId: inputData.storeId,
@@ -1331,12 +1336,29 @@ export async function save( req, res ) {
         },
     );
 
-    /** *
-     *
-     * logs need to be added
-     *
-     *
-     */
+    const logData = {
+      userId: req.user._id,
+      userName: req.user.userName,
+      logType: 'audit',
+      logSubType: 'auditDone',
+      logData: {
+        fileDate: req.userAudit?.fileDate,
+        auditType: req.userAudit?.auditType,
+        storeId: req.userAudit?.storeId,
+        zoneName: req.userAudit?.zoneName,
+        moduleType: req.userAudit?.moduleType,
+        queueName: req.userAudit?.queueName,
+        clientId: req.userAudit?.clientId,
+        beforeCount: req.userAudit?.beforeCount,
+        afterCount: inputData.customerCount,
+        startTime: req.userAudit?.startTime,
+        endTime: Date.now(),
+        timeSpent: timeDifferenceInMinutes,
+        auditId: new mongoose.Types.ObjectId( inputData.auditId ),
+      },
+      createdAt: Date.now(),
+    };
+    await insertOpenSearchData( openSearch.auditLog, logData );
 
     let storeConfig = await findOneStore(
         {
@@ -1401,6 +1423,31 @@ export async function save( req, res ) {
             timeSpent: timeDifferenceInMinutes,
           },
       );
+
+      const logData = {
+        userId: req.user._id,
+        userName: req.user.userName,
+        logType: 'audit',
+        logSubType: 'reAuditPush',
+        logData: {
+          fileDate: req.userAudit?.fileDate,
+          auditType: req.userAudit?.auditType,
+          storeId: req.userAudit?.storeId,
+          moduleType: req.userAudit?.moduleType,
+          zoneName: req.userAudit?.zoneName,
+          queueName: req.userAudit?.queueName,
+          clientId: req.userAudit?.clientId,
+          beforeCount: req.userAudit?.beforeCount,
+          afterCount: inputData.customerCount,
+          startTime: req.userAudit?.startTime,
+          endTime: Date.now(),
+          timeSpent: timeDifferenceInMinutes,
+          auditId: new mongoose.Types.ObjectId( inputData.auditId ),
+        },
+        createdAt: Date.now(),
+      };
+
+      await insertOpenSearchData( openSearch.auditLog, logData );
     } else {
       logger.info( 'Hit in Features', {
         data: _.omit( inputData, [ 'junk', 'employee', 'customer' ] ),
@@ -1419,10 +1466,8 @@ export async function save( req, res ) {
             timeSpent: timeDifferenceInMinutes,
           },
       );
-
       const sqsProduceQueue = {
-        QueueUrl: `${sqs.url}${sqs.feature}`,
-
+        QueueUrl: ( auditConfig?.isCheckMinAfterCount ==1 && auditConfig?.minAfterCount ) >1500? `${sqs.url}${sqs.feature_new}`: `${sqs.url}${sqs.feature}`,
         MessageBody: JSON.stringify( {
           store_id: inputData.storeId,
           store_date: inputData.fileDate,
@@ -1892,16 +1937,16 @@ export async function clientMetrics( req, res ) {
             $project: {
               '_id': 0,
               'File Date': '$fileDate',
-              'Client Name': '$clientName',
-              'Client Id': '$clientId',
+              'Brand Name': '$clientName',
+              'Brand Id': '$clientId',
               'Product Type': '$moduleType',
-              'Completed Percentage': '$completionPercentage',
+              // 'Completed Percentage': '$completionPercentage',
               'Installed Stores': '$installedStore',
               'Audit Stores': '$totalFilesCount',
               'Inprogress Stores': '$inprogressStoresCount',
-              'Not Assigned': '$notAssignedCount',
+              'Not Assigned stores': '$notAssignedCount',
               // 'Not Assigned Stores': '$notAssignedStores',
-              'Completed': '$completedStores',
+              'Completed Stores': '$completedStores',
               'Status': '$clientStatus',
             },
           },
@@ -2172,34 +2217,36 @@ export async function storeMetrics( req, res ) {
         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,
+            'Store ID': element.storeId,
+            // 'Client Id': element.clientId,
+            // 'Client Name': element.clientName,
+            'Product Type': element.moduleType,
             '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,
+            'Audit Type': element.auditType,
             '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,
+            'Store ID': element.storeId,
+            // 'Client Id': element.clientId,
+            // 'Client Name': element.clientName,
+            'Product Type': element.moduleType,
             '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,
+            'Audit Type': element.auditType,
             'Status': element.status,
           } );
         }
@@ -2266,6 +2313,7 @@ export async function userMetrics( req, res ) {
           totalCompletedFiles: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, 1, 0 ] },
           beforeCount: 1,
           afterCount: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, '$afterCount', 0 ] },
+          createdAt: 1,
         },
       },
       {
@@ -2278,6 +2326,7 @@ export async function userMetrics( req, res ) {
           afterCount: { $sum: '$afterCount' },
           checkIntime: { $first: '$startTime' },
           checkOutTime: { $last: '$endTime' },
+          createdAt: { $first: '$createdAt' },
 
         },
       },
@@ -2303,6 +2352,7 @@ export async function userMetrics( req, res ) {
           differenceInSeconds: {
             $divide: [ { $subtract: [ '$checkOutTime', '$checkIntime' ] }, 1000 ],
           },
+          createdAt: 1,
         },
       },
       {
@@ -2318,6 +2368,7 @@ export async function userMetrics( req, res ) {
           hours: { $floor: { $divide: [ '$differenceInSeconds', 3600 ] } },
           minutes: { $floor: { $divide: [ { $mod: [ '$differenceInSeconds', 3600 ] }, 60 ] } },
           seconds: { $mod: [ '$differenceInSeconds', 60 ] },
+          createdAt: 1,
         },
       },
       {
@@ -2352,7 +2403,7 @@ export async function userMetrics( req, res ) {
               else: { $toString: { $round: [ '$seconds', 0 ] } },
             },
           },
-
+          createdAt: 1,
         },
       },
       {
@@ -2370,6 +2421,7 @@ export async function userMetrics( req, res ) {
           workingHours: {
             $concat: [ '$hours', ':', '$minutes', ':', '$seconds' ],
           },
+          createdAt: 1,
         },
       },
       {
@@ -2423,6 +2475,7 @@ export async function userMetrics( req, res ) {
             },
           },
           workingHours: 1,
+          createdAt: 1,
         },
       },
     ];
@@ -2460,15 +2513,17 @@ export async function userMetrics( req, res ) {
           {
             $project: {
               '_id': 0,
-              'File Date': '$fileDate',
               'User Name': '$userName',
-              'Total Completed Files Count': '$totalCompletedFiles',
+              'File Date': '$fileDate',
+              'Completed Files': '$totalCompletedFiles',
+              'Product Type': '$moduleType',
               'Total Before Count': '$beforeCount',
               'Total After Count': '$afterCount',
-              'check Intime': '$checkIntime',
-              'check OutTime': '$checkOutTime',
-              'working Hours': '$workingHours',
               'Mapping Percentage': '$mappingPerc',
+              'Check Intime': '$checkIntime',
+              'Check OutTime': '$checkOutTime',
+              'Working Hours': '$workingHours',
+              'Audited Date': { $dateToString: { format: '%Y,%b %d', date: '$createdAt' } },
             },
           },
       );
@@ -3812,11 +3867,11 @@ export async function auditImages( req, res ) {
 export async function getUserAuditCount( req, res ) {
   try {
     const userWallet = JSON.parse( process.env.USER_WALLET );
-    const previousDate = dayjs( new Date() ).subtract( 16, 'days' );
+    const previousDate = dayjs( new Date() ).subtract( 19, 'days' );
     const fileDate = dayjs( previousDate ).format( 'DD-MM-YYYY' );
     const configTimeSpentSec = userWallet.minTimeSpentSec; // 18000;
-    const beforeCountX = userWallet.beforeCountCreditPerc; // 0.0335;
-    const afterCountY = userWallet.afterCountCreditPerc; // 0.0035;
+    // const beforeCountX = userWallet.beforeCountCreditPerc; // 0.0335;
+    // const afterCountY = userWallet.afterCountCreditPerc; // 0.0035;
     const reduce = userWallet.reductionPerc; // 0.05;
     const auditUserQuery=[
       {
@@ -3925,6 +3980,11 @@ export async function getUserAuditCount( req, res ) {
     }
     const zoneMinimumTarget =userCount[0]?.zoneUserCount?.length !== 0 && userCount[0]?.zoneFilesCount !==0 ? Math.floor( userCount[0].zoneFilesCount/userCount[0].zoneUserCount.length ) : 0;
     const trafficMinimumTarget =userCount[0]?.trafficUserCount?.length !== 0 && userCount[0]?.trafficFilesCount !==0 ? Math.floor( userCount[0].trafficFilesCount/userCount[0].trafficUserCount.length ) : 0;
+
+    const beforeCountTraffic = 544/trafficMinimumTarget;
+    const beforeCountZone = 544/zoneMinimumTarget; // 0.0035;
+    const afterCountCredit = 136;
+
     const query = [
       {
         $match: {
@@ -3938,7 +3998,8 @@ export async function getUserAuditCount( req, res ) {
         },
       },
       {
-        $set: { minimumTarget: { $cond: [ { $eq: [ '$moduleType', 'traffic' ] }, trafficMinimumTarget, zoneMinimumTarget ] } },
+        $set: { minimumTarget: { $cond: [ { $eq: [ '$moduleType', 'traffic' ] }, trafficMinimumTarget, zoneMinimumTarget ] },
+          afterCountCredit: afterCountCredit },
       },
       {
         $project: {
@@ -3950,7 +4011,9 @@ export async function getUserAuditCount( req, res ) {
           fileDate: 1,
           fileDateISO: 1,
           minimumTarget: 1,
+          afterCountCredit: 1,
           totalEarn: { $ifNull: [ 0, 0 ] },
+          singleImageAmount: { $ifNull: [ 0, 0 ] },
           totalReducedAmount: { $ifNull: [ 0, 0 ] },
           totalCredit: { $ifNull: [ 0, 0 ] },
           deductionBytimeSpent: { $ifNull: [ 0, 0 ] },
@@ -3969,11 +4032,13 @@ export async function getUserAuditCount( req, res ) {
           fileDateISO: { $first: '$fileDateISO' },
           userId: { $first: '$userId' },
           minimumTarget: { $first: '$minimumTarget' },
+          afterCountCredit: { $first: '$afterCountCredit' },
           totalEarn: { $first: '$totalEarn' },
           totalReducedAmount: { $first: '$totalReducedAmount' },
           totalCredit: { $first: '$totalCredit' },
           deductionByMinimumTarget: { $first: '$deductionByMinimumTarget' },
           deductionBytimeSpent: { $first: '$deductionBytimeSpent' },
+          singleImageAmount: { $first: '$singleImageAmount' },
         },
       },
       {
@@ -3987,12 +4052,35 @@ export async function getUserAuditCount( req, res ) {
           fileDate: 1,
           fileDateISO: 1,
           minimumTarget: 1,
-          totalEarn: { $add: [ { $multiply: [ '$totalBeforeCount', beforeCountX ] }, { $multiply: [ '$totalAfterCount', afterCountY ] } ] },
-          totalReducedAmount: 1,
-          totalCredit: 1,
+          singleImageAmount: { $cond: [ { $eq: [ '$moduleType', 'traffic' ] }, beforeCountTraffic, beforeCountZone ] },
+          beforeCountCredit: { $multiply: [ '$totalBeforeCount', { $cond: [ { $eq: [ '$moduleType', 'traffic' ] }, beforeCountTraffic, beforeCountZone ] } ] },
+          // afterCountCredit: { $cond: [ { $and: [
+          //   { $gte: [ { $divide: [ '$totalAfterCount', '$totalBeforeCount' ] }, 0.4 ] }, { $lte: [ { $divide: [ '$totalAfterCount', '$totalBeforeCount' ] }, 0.7 ] },
+          // ] }, 136,
+          // {
+          //   $cond: [ { $gt: [ { $divide: [ '$totalAfterCount', '$totalBeforeCount' ] }, 0.7 ] },
+          //     { $subtract: [ 136, { $multiply: [ { $subtract: [ { $divide: [ '$totalAfterCount', '$totalBeforeCount' ] }, 0.7 ] }, 136 ] } ] },
+          //     { $subtract: [ 136, { $multiply: [ { $subtract: [ 0.4, { $divide: [ '$totalAfterCount', '$totalBeforeCount' ] } ] }, 136 ] } ] },
+          //   ],
+          // },
+          // ] },
+          afterCountCredit: afterCountCredit,
+          totalEarn: { $add: [ { $multiply: [ '$totalBeforeCount', { $cond: [ { $eq: [ '$moduleType', 'traffic' ] }, beforeCountTraffic, beforeCountZone ] } ] }, 136 ] },
           deductionBytimeSpent: 1,
           deductionByMinimumTarget: 1,
-
+          mappingperc: { $multiply: [ { $divide: [ '$totalAfterCount', '$totalBeforeCount' ] }, 100 ] },
+          deductionByMapping: { $cond: [ { $and: [
+            { $gte: [ { $divide: [ '$totalAfterCount', '$totalBeforeCount' ] }, 0.4 ] }, { $lte: [ { $divide: [ '$totalAfterCount', '$totalBeforeCount' ] }, 0.7 ] },
+          ] }, 0,
+          {
+            $cond: [ { $gt: [ { $divide: [ '$totalAfterCount', '$totalBeforeCount' ] }, 0.7 ] },
+              { $multiply: [ { $subtract: [ { $divide: [ '$totalAfterCount', '$totalBeforeCount' ] }, 0.7 ] }, 136 ] },
+              { $multiply: [ { $subtract: [ 0.4, { $divide: [ '$totalAfterCount', '$totalBeforeCount' ] } ] }, 136 ] },
+            ],
+          },
+          ] },
+          totalReducedAmount: 1,
+          totalCredit: 1,
 
         },
       },
@@ -4015,6 +4103,9 @@ export async function getUserAuditCount( req, res ) {
           fileDate: 1,
           fileDateISO: 1,
           minimumTarget: 1,
+          singleImageAmount: { $cond: [ { $eq: [ '$moduleType', 'traffic' ] }, beforeCountTraffic, beforeCountZone ] },
+          beforeCountCredit: 1,
+          afterCountCredit: 1,
           totalEarn: 1,
           deductionBytimeSpent: { $cond: [
             { $lt: [ '$totalTimeSpent', configTimeSpentSec ] },
@@ -4026,8 +4117,11 @@ export async function getUserAuditCount( req, res ) {
             { $lt: [ '$totalBeforeCount', '$minimumTarget' ] },
             { $multiply: [ reduce, '$totalEarn' ] }, '$deductionByMinimumTarget',
           ] },
+          mappingperc: 1,
+          deductionByMapping: 1,
           totalCredit: { $subtract: [ '$totalEarn', '$totalReducedAmount' ] },
 
+
         },
       },
 
@@ -4060,11 +4154,17 @@ export async function getUserAuditCount( req, res ) {
           fileDate: 1,
           fileDateISO: 1,
           minimumTarget: 1,
-          totalEarn: { $add: [ { $multiply: [ '$totalBeforeCount', beforeCountX ] }, { $multiply: [ '$totalAfterCount', afterCountY ] } ] },
+          beforeCountCredit: 1,
+          afterCountCredit: 1,
+          totalEarn: 1,
           deductionByMinimumTarget: 1,
+          singleImageAmount: 1,
           deductionBytimeSpent: 1,
+          mappingperc: 1,
+          deductionByMapping: 1,
           totalCredit: { $subtract: [ '$totalEarn', '$totalReducedAmount' ] },
-          totalReducedAmount: { $round: [ { $add: [ '$deductionBytimeSpent', '$deductionByMinimumTarget' ] }, 2 ] },
+          totalReducedAmount: { $round: [ { $add: [ '$deductionBytimeSpent', '$deductionByMinimumTarget', '$deductionByMapping' ] }, 2 ] },
+
         },
       },
       {
@@ -4099,14 +4199,20 @@ export async function getUserAuditCount( req, res ) {
           timeSpent: '$totalTimeSpent',
           fileDate: 1,
           fileDateISO: 1,
+          beforeCountCredit: 1,
+          afterCountCredit: 1,
+          totalEarn: { $round: [ '$totalEarn', 2 ] },
+          minimumTarget: 1,
+          singleImageAmount: 1,
           deductionByMinimumTarget: { $round: [ '$deductionByMinimumTarget', 2 ] },
           deductionBytimeSpent: { $round: [ '$deductionBytimeSpent', 2 ] },
+          mappingperc: 1,
+          deductionByMapping: 1,
           totalReducedAmount: 1,
           totalCredit: { $round: [ { $subtract: [ '$totalEarn', '$totalReducedAmount' ] }, 2 ] },
-          totalEarn: { $round: [ '$totalEarn', 2 ] },
-          minimumTarget: 1,
           userEmail: '$users.email', // Access first element from array
-          userName: '$users.userName', // Access first element from array
+          userName: '$users.userName', // Access first element from array,
+
         },
       },
     ];
@@ -4452,8 +4558,12 @@ export async function auditViewLogs( req, res ) {
                 'logData.moduleType.keyword': inputData.moduleType,
               },
             },
+            {
+              'terms': {
+                'logSubType.keyword': [ 'auditDone', 'reAuditPush', 'reTrigger' ],
+              },
+            },
           ],
-
         },
       },
     };
@@ -4462,7 +4572,7 @@ export async function auditViewLogs( req, res ) {
       logData.push( logs.body.hits.hits[0]._source );
       return res.sendSuccess( logData );
     } else {
-      return res.sendError( 'No Record Inserted', 500 );
+      return res.sendError( 'No Record Inserted', 204 );
     }
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';

package/src/controllers/traxAudit.controllers.js

@@ -1403,6 +1403,7 @@ export async function getUpdatedFile( req, res ) {
 
 export async function saveBinary( req, res ) {
   try {
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.body;
     const isoDate = req.userAudit?.startTime;
     const currentTime = dayjs();
@@ -1476,6 +1477,31 @@ export async function saveBinary( req, res ) {
         };
         let updatDatacamera= await updateOneBinaryAuditModel( cameraquery, cameraupdate );
         if ( updatDatacamera.modifiedCount==0 ) {
+          const logData = {
+            userId: req.user._id,
+            userName: req.user.userName,
+            logType: 'traxAudit',
+            logSubType: 'auditDone',
+            logData: {
+              fileDate: req.userAudit?.fileDate,
+              auditType: req.userAudit?.auditType,
+              storeId: req.userAudit?.storeId,
+              moduleType: req.userAudit?.moduleType,
+              queueName: req.userAudit?.queueName,
+              clientId: req.userAudit?.clientId,
+              beforeCount: req.userAudit?.beforeCount,
+              afterCount: inputData.employeeCount,
+              startTime: req.userAudit?.startTime,
+              streamName: req.userAudit?.streamName,
+              tempId: req.userAudit?.tempId,
+              question: req.userAudit?.question,
+              endTime: Date.now(),
+              timeSpent: timeDifferenceInMinutes,
+              auditId: new mongoose.Types.ObjectId( inputData.auditId ),
+            },
+            createdAt: Date.now(),
+          };
+          await insertOpenSearchData( openSearch.auditLog, logData );
           return res.sendError( 'Update failed, it may be invalid request', 400 );
         }
         logger.info( 'update in binary data', { query: cameraquery, update: cameraupdate } );
@@ -1731,15 +1757,18 @@ export async function userAuditHistory( req, res ) {
           switch ( inputData.moduleType ) {
             case 'camera-angle-change':
               temp['stream Name'] = element.streamName;
+              temp['Result'] = element.answer;
               temp['User Comments'] = element.userComments;
               break;
             case 'unattended-customer':
               temp['Customer ID'] = element.tempId;
               temp['Question'] = element.question;
+              temp['Result'] = element.answer;
               temp['User Comments'] = element.userComments;
               break;
             case 'left-in-middle':
               temp['Question'] = element.question;
+              temp['Result'] = element.answer;
               temp['User Comments'] = element.userComments;
               break;
             case 'uniform-detection':
@@ -2088,16 +2117,16 @@ export async function clientMetrics( req, res ) {
             $project: {
               '_id': 0,
               'File Date': '$fileDate',
-              'Client Name': '$clientName',
-              'Client Id': '$clientId',
+              'Brand Name': '$clientName',
+              'Brand Id': '$clientId',
               'Product Type': '$value',
-              'Completed Percentage': '$completionPercentage',
+              // 'Completed Percentage': '$completionPercentage',
               'Installed Stores': '$installedStore',
               'Audit Stores': '$totalFilesCount',
               'Inprogress Stores': '$inprogressStoresCount',
-              'Not Assigned': '$notAssignedCount',
+              'Not Assigned Stores': '$notAssignedCount',
               // 'Not Assigned Stores': '$notAssignedStores',
-              'Completed': '$completedStores',
+              'Completed Stores': '$completedStores',
               'Status': '$clientStatus',
             },
           },
@@ -2201,10 +2230,10 @@ export async function storeMetrics( req, res ) {
           question: 1,
           questionType: 1,
           answer: 1,
-          // userId: {
-          //   $arrayElemAt: [ '$userId', { $subtract: [ { $size: '$userId' }, 1 ] } ],    //need to check if no data
-          // },
-          userId: 1,
+          userId: {
+            $arrayElemAt: [ '$userId', { $subtract: [ { $size: '$userId' }, 1 ] } ], // need to check if no data
+          },
+          // userId: 1,
           auditType: 1,
           beforeCount: 1,
           afterCount: { $ifNull: [ '$afterCount', null ] },
@@ -2579,7 +2608,6 @@ export async function storeMetrics( req, res ) {
           'User Email': element.userEmail,
           'Audit Type': element.auditType,
           'Time Spent': element.timeSpent,
-          'Result': element.answer,
         };
         switch ( inputData.moduleType ) {
           case 'camera-angle-change':
@@ -2676,7 +2704,7 @@ export async function userMetrics( req, res ) {
           totalCompletedFiles: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, 1, 0 ] },
           beforeCount: 1,
           afterCount: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, '$afterCount', 0 ] },
-
+          createdAt: 1,
           value: {
             $replaceAll: { input: '$moduleType', find: '-', replacement: ' ' },
           } },
@@ -2693,6 +2721,7 @@ export async function userMetrics( req, res ) {
           checkOutTime: { $last: '$endTime' },
           moduleType: { $last: '$moduleType' },
           value: { $last: '$value' },
+          createdAt: { $first: '$createdAt' },
         },
       },
       {
@@ -2705,6 +2734,7 @@ export async function userMetrics( req, res ) {
           value: 1,
           beforeCount: 1,
           afterCount: 1,
+          createdAt: 1,
           // mappingPerc: { $round: [
           //   { $multiply: [
           //     { $divide: [ '$afterCount', '$beforeCount' ] }, 100,
@@ -2732,6 +2762,7 @@ export async function userMetrics( req, res ) {
           hours: { $floor: { $divide: [ '$differenceInSeconds', 3600 ] } },
           minutes: { $floor: { $divide: [ { $mod: [ '$differenceInSeconds', 3600 ] }, 60 ] } },
           seconds: { $mod: [ '$differenceInSeconds', 60 ] },
+          createdAt: 1,
         },
       },
       {
@@ -2746,6 +2777,7 @@ export async function userMetrics( req, res ) {
           checkOutTime: 1,
           moduleType: 1,
           value: 1,
+          createdAt: 1,
           // mappingPerc: 1,
           hours: {
             $cond: {
@@ -2781,6 +2813,7 @@ export async function userMetrics( req, res ) {
           checkIntime: 1,
           checkOutTime: 1,
           moduleType: 1,
+          createdAt: 1,
           value: {
             $replaceAll: { input: '$moduleType', find: '-', replacement: ' ' },
           },
@@ -2844,6 +2877,7 @@ export async function userMetrics( req, res ) {
               timezone: 'Asia/Kolkata',
             },
           },
+          createdAt: 1,
           workingHours: 1,
         },
       },
@@ -2880,26 +2914,28 @@ export async function userMetrics( req, res ) {
     if ( inputData.isExport ) {
       const detection = {
         '_id': 0,
-        'File Date': '$fileDate',
         'User Name': '$userName',
-        'Total Completed Files Count': '$totalCompletedFiles',
+        'File Date': '$fileDate',
+        'Completed Files': '$totalCompletedFiles',
+        'Product Type': '$value',
         'Total Before Count': '$beforeCount',
         'Total After Count': '$afterCount',
-        'check Intime': '$checkIntime',
-        'check OutTime': '$checkOutTime',
-        'working Hours': '$workingHours',
-        'Product Type': '$value',
+        'Check Intime': '$checkIntime',
+        'Check OutTime': '$checkOutTime',
+        'Working Hours': '$workingHours',
+        'Audited Date': { $dateToString: { format: '%Y,%b %d', date: '$createdAt' } },
         // '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',
+        'File Date': '$fileDate',
+        'Completed Files': '$totalCompletedFiles',
         'Product Type': '$value',
+        'Check Intime': '$checkIntime',
+        'Check OutTime': '$checkOutTime',
+        'Working Hours': '$workingHours',
+        'Audited Date': { $dateToString: { format: '%Y,%b %d', date: '$createdAt' } },
         // 'Mapping Percentage': '$mappingPerc',
       };
       [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?
@@ -4232,6 +4268,7 @@ export async function getDraftedData( req, res ) {
 
 export async function save( req, res ) {
   try {
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.body;
     const isoDate = req.userAudit?.startTime;
     const currentTime = dayjs();
@@ -4256,6 +4293,28 @@ export async function save( req, res ) {
       };
       await updateOneUserEmpDetection( { _id: inputData.auditId }, userUpdated );
       await updateOneStoreEmpDetection( query, storeUpdated );
+      const logData = {
+        userId: req.user._id,
+        userName: req.user.userName,
+        logType: 'traxAudit',
+        logSubType: 'auditDone',
+        logData: {
+          fileDate: getUserAuditData?.fileDate,
+          auditType: getUserAuditData?.auditType,
+          storeId: getUserAuditData?.storeId,
+          moduleType: getUserAuditData?.moduleType,
+          queueName: req.userAudit?.queueName,
+          clientId: req.userAudit?.clientId,
+          beforeCount: req.userAudit?.beforeCount,
+          afterCount: inputData.employeeCount,
+          startTime: req.userAudit?.startTime,
+          endTime: Date.now(),
+          timeSpent: timeDifferenceInMinutes,
+          auditId: new mongoose.Types.ObjectId( inputData.auditId ),
+        },
+        createdAt: Date.now(),
+      };
+      await insertOpenSearchData( openSearch.auditLog, logData );
       return res.sendSuccess( { result: 'Updated Successfully' } );
     } else {
       return res.sendError( 'something went wrong', 403 );

package/src/routes/traxAudit.routes.js

@@ -3,14 +3,14 @@ import { 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';
-import { isMappingAuditInputFolderExist, isTraxAuditDocumentExist, isuserEmpDocumentExist, validateBinaryAudit } from '../validation/traxAuditValidation.js';
+import { isMappingAuditInputFolderExist, isTraxAuditDocumentExist, isuserEmpDocumentExist, validateBinaryAudit, validateUserEmpDetection } from '../validation/traxAuditValidation.js';
 
 export const traxAuditRouter = Router();
 
 // Audit Mapping
 
 traxAuditRouter.get( '/get-file-detection', isAllowedSessionHandler, validate( getDetectionFileValid ), isExistsQueue, getDetectionAuditFile );
-traxAuditRouter.post( '/save', validate( saveValid ), isAllowedSessionHandler, save );
+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 );