tango-app-api-audit 3.4.11-alpha.12 → 3.4.11-alpha.14

package/package.json

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

package/src/controllers/traxAudit.controllers.js

@@ -799,11 +799,11 @@ export async function workSpace( req, res ) {
       },
     ];
 
-    const auditUserCount = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( auditFiles ) : await aggregateBinaryAudit( auditFiles );
-    const userIncompleteFilesCount = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( userIncompleteFiles ) : await aggregateBinaryAudit( userIncompleteFiles );
+    const auditUserCount = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( auditFiles ) : await aggregateBinaryAudit( auditFiles );
+    const userIncompleteFilesCount = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( userIncompleteFiles ) : await aggregateBinaryAudit( userIncompleteFiles );
     logger.info( { moduleType: inputData.moduleType, userIncompleteFiles: userIncompleteFilesCount } );
     const userAsignAuditCount = await aggregateAssignAudit( userAsignAudit );
-    const completedStoresCount = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( completedStores ) : await aggregateBinaryAudit( binarCompletedStores );
+    const completedStoresCount = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( completedStores ) : await aggregateBinaryAudit( binarCompletedStores );
     const clientAssignedCount = await aggregateAssignAudit( clientAssign );
     const auditStoreData = await aggregateTraxAuditData(
         auditStoreDataQuery,
@@ -1384,10 +1384,10 @@ export async function saveBinary( req, res ) {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const sqs = JSON.parse( process.env.SQS );
     const inputData = req.body;
-    const isoDate = req.userAudit?.startTime;
-    const currentTime = dayjs();
-    const isoDateTime = dayjs( isoDate );
-    const timeDifferenceInMinutes = currentTime.diff( isoDateTime, 'seconds' );
+    // const isoDate = req.userAudit?.startTime;
+    // const currentTime = dayjs();
+    // const isoDateTime = dayjs( isoDate );
+    // const timeDifferenceInMinutes = currentTime.diff( isoDateTime, 'seconds' );
     const value = inputData.moduleType? inputData.moduleType.replace( /-/g, ' ' ) : '';
     switch ( inputData.moduleType ) {
       case 'unattended-customer':
@@ -1404,7 +1404,7 @@ export async function saveBinary( req, res ) {
           answer: inputData.answer,
           userComments: inputData.userComments || '',
           endTime: new Date(),
-          timeSpent: timeDifferenceInMinutes,
+          timeSpent: inputData.timeSpent,
         };
         let updatDataunattended= await updateOneBinaryAuditModel( unattendedquery, update );
         if ( updatDataunattended.modifiedCount==0 ) {
@@ -1430,7 +1430,7 @@ export async function saveBinary( req, res ) {
             question: req.userAudit?.question,
             result: req.userAudit?.answer,
             endTime: Date.now(),
-            timeSpent: timeDifferenceInMinutes,
+            timeSpent: inputData.timeSpent,
             auditId: new mongoose.Types.ObjectId( inputData.auditId ),
           },
           createdAt: Date.now(),
@@ -1454,7 +1454,7 @@ export async function saveBinary( req, res ) {
           answer: inputData.answer,
           userComments: inputData.userComments || '',
           endTime: new Date(),
-          timeSpent: timeDifferenceInMinutes,
+          timeSpent: inputData.timeSpent,
         };
         let updatDataUniform= await updateOneBinaryAuditModel( uniformDetectionQuery, updateUniform );
         if ( updatDataUniform.modifiedCount==0 ) {
@@ -1515,7 +1515,7 @@ export async function saveBinary( req, res ) {
             question: req.userAudit?.question,
             result: req.userAudit?.answer,
             endTime: Date.now(),
-            timeSpent: timeDifferenceInMinutes,
+            timeSpent: inputData.timeSpent,
             auditId: new mongoose.Types.ObjectId( inputData.auditId ),
           },
           createdAt: Date.now(),
@@ -1537,7 +1537,7 @@ export async function saveBinary( req, res ) {
           answer: inputData.answer,
           userComments: inputData.userComments || '',
           endTime: new Date(),
-          timeSpent: timeDifferenceInMinutes,
+          timeSpent: inputData.timeSpent,
         };
         let updatDataleft= await updateOneBinaryAuditModel( leftquery, leftupdate );
         if ( updatDataleft.modifiedCount==0 ) {
@@ -1563,7 +1563,7 @@ export async function saveBinary( req, res ) {
             question: req.userAudit?.question,
             result: req.userAudit?.answer,
             endTime: Date.now(),
-            timeSpent: timeDifferenceInMinutes,
+            timeSpent: inputData.timeSpent,
             auditId: new mongoose.Types.ObjectId( inputData.auditId ),
           },
           createdAt: Date.now(),
@@ -1586,7 +1586,7 @@ export async function saveBinary( req, res ) {
           answer: inputData.answer,
           userComments: inputData.userComments || '',
           endTime: new Date(),
-          timeSpent: timeDifferenceInMinutes,
+          timeSpent: inputData.timeSpent,
         };
         let updatDatacamera= await updateOneBinaryAuditModel( cameraquery, cameraupdate );
         if ( updatDatacamera.modifiedCount==0 ) {
@@ -1613,7 +1613,7 @@ export async function saveBinary( req, res ) {
             question: req.userAudit?.question,
             result: req.userAudit?.answer,
             endTime: Date.now(),
-            timeSpent: timeDifferenceInMinutes,
+            timeSpent: inputData.timeSpent,
             auditId: new mongoose.Types.ObjectId( inputData.auditId ),
           },
           createdAt: Date.now(),
@@ -1841,7 +1841,7 @@ export async function userAuditHistory( req, res ) {
       },
       );
     }
-    const count = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )? await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const count = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )? await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -1917,7 +1917,7 @@ export async function userAuditHistory( req, res ) {
     {
       $limit: limit,
     } );
-    const result = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )? await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )? await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
 
     return res.sendSuccess( { result: result, count: count.length } );
   } catch ( error ) {
@@ -2242,7 +2242,7 @@ export async function clientMetrics( req, res ) {
       );
     }
 
-    const count = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )? await aggregateTraxAuditData( MappingQuery ) : await aggregateTraxAuditData( query );
+    const count = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )? await aggregateTraxAuditData( MappingQuery ) : await aggregateTraxAuditData( query );
     logger.info( { count: count } );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
@@ -2309,7 +2309,7 @@ export async function clientMetrics( req, res ) {
       );
     }
 
-    const result = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )? await aggregateTraxAuditData( MappingQuery ) : await aggregateTraxAuditData( query );
+    const result = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )? await aggregateTraxAuditData( MappingQuery ) : await aggregateTraxAuditData( query );
     if ( result.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -2344,7 +2344,7 @@ export async function storeMetrics( req, res ) {
     }
 
     if ( inputData.filterByStatus && inputData.filterByStatus?.length > 0 ) {
-      [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )? filter.push( { status: { $in: inputData.filterByStatus } } ) : filter.push( { auditStatus: { $in: inputData.filterByStatus } } );
+      [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )? filter.push( { status: { $in: inputData.filterByStatus } } ) : filter.push( { auditStatus: { $in: inputData.filterByStatus } } );
     }
 
     if ( inputData.filterByAuditType && inputData.filterByAuditType?.length > 0 ) {
@@ -2777,7 +2777,7 @@ export async function storeMetrics( req, res ) {
       },
       );
     }
-    const count = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryQuery );
+    const count = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryQuery );
 
 
     if ( count.length == 0 ) {
@@ -2801,7 +2801,7 @@ export async function storeMetrics( req, res ) {
         $limit: limit,
       } );
     }
-    const result = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryQuery );
+    const result = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryQuery );
     if ( inputData.isExport ) {
       const exportdata = [];
       result.forEach( ( element ) => {
@@ -3124,7 +3124,7 @@ export async function userMetrics( req, res ) {
       );
     }
 
-    const count = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const count = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -3160,7 +3160,7 @@ export async function userMetrics( req, res ) {
         'Audited Date': { $dateToString: { format: '%Y-%m-%d', date: '$createdAt' } },
         // 'Mapping Percentage': '$mappingPerc',
       };
-      [ 'mobile-detection' ,'uniform-detection'].includes( inputData.moduleType )?
+      [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )?
       query.push(
           {
             $project: detection,
@@ -3174,7 +3174,7 @@ export async function userMetrics( req, res ) {
     }
 
 
-    const result = [ 'mobile-detection' ,'uniform-detection'].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( inputData.isExport ) {
       await download( result, res );
       return;
@@ -3318,7 +3318,7 @@ export async function pendingSummaryTable( req, res ) {
       },
       );
     }
-    const count = [ 'mobile-detection' ,'uniform-detection'].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const count = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -3334,7 +3334,7 @@ export async function pendingSummaryTable( req, res ) {
       } );
     }
 
-    const result = [ 'mobile-detection' ,'uniform-detection'].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( inputData.isExport ) {
       const exportdata = [];
       result.forEach( ( element ) => {
@@ -3530,7 +3530,7 @@ export async function overAllAuditSummary( req, res ) {
       },
     ];
 
-    const storeAudit = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( storeAuditQuery ) : await aggregateBinaryAudit( binaryAuditQuery );
+    const storeAudit = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( storeAuditQuery ) : await aggregateBinaryAudit( binaryAuditQuery );
     if ( storeAudit.length > 0 ) {
       temp.inprogressStores= storeAudit[0].inprogressStores;
       temp.completedStores = storeAudit[0].completedStores;
@@ -3718,7 +3718,7 @@ export async function summarySplit( req, res ) {
         },
       },
     ];
-    const result = [ 'mobile-detection' ,'uniform-detection'].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryAuditQuery );
+    const result = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryAuditQuery );
     const totalCount = await aggregateTraxAuditData( totalQuery );
     result[0].totalCount = totalCount[0]?.total;
     return res.sendSuccess( { result: result.length> 0? result[0]: temp } );
@@ -3748,7 +3748,7 @@ export async function overviewTable( req, res ) {
     }
 
     if ( inputData.filterByStatus.length > 0 ) {
-      [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )? filters.push( { status: { $in: inputData.filterByStatus } } ):filters.push( { auditStatus: { $in: inputData.filterByStatus } } );
+      [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )? filters.push( { status: { $in: inputData.filterByStatus } } ):filters.push( { auditStatus: { $in: inputData.filterByStatus } } );
     }
 
     const query =[
@@ -3865,7 +3865,7 @@ export async function overviewTable( req, res ) {
       },
       );
     }
-    const count = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const count = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -3880,7 +3880,7 @@ export async function overviewTable( req, res ) {
         $limit: limit,
       } );
     }
-    const result = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'mobile-detection', 'uniform-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( inputData.isExport ) {
       const exportdata = [];
       result.forEach( ( element ) => {
@@ -4420,14 +4420,14 @@ export async function saveDraft( req, res ) {
     };
 
     if ( getUserAuditData?.startTime ) {
-      const isoDate = getUserAuditData.startTime;
-      const currentTime = dayjs();
-      const isoDateTime = dayjs( isoDate );
-      const timeDifferenceInMinutes = currentTime.diff( isoDateTime, 'seconds' );
+      // const isoDate = getUserAuditData.startTime;
+      // const currentTime = dayjs();
+      // const isoDateTime = dayjs( isoDate );
+      // const timeDifferenceInMinutes = currentTime.diff( isoDateTime, 'seconds' );
 
-      userRecord.timeSpent = timeDifferenceInMinutes;
+      userRecord.timeSpent = inputData.timeSpent;
 
-      storeRecord.timeSpent = timeDifferenceInMinutes;
+      storeRecord.timeSpent = inputData.timeSpent;
     }
 
     if ( inputData.userCommands ) {
@@ -4500,10 +4500,10 @@ export async function save( req, res ) {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const sqs = JSON.parse( process.env.SQS );
     const inputData = req.body;
-    const isoDate = req.userAudit?.startTime;
-    const currentTime = dayjs();
-    const isoDateTime = dayjs( isoDate );
-    const timeDifferenceInMinutes = currentTime.diff( isoDateTime, 'seconds' );
+    // const isoDate = req.userAudit?.startTime;
+    // const currentTime = dayjs();
+    // const isoDateTime = dayjs( isoDate );
+    // const timeDifferenceInMinutes = currentTime.diff( isoDateTime, 'seconds' );
     const getUserAuditData = await findOneUserEmpDetection( { _id: inputData.auditId } );
     inputData.clientId = getUserAuditData.clientId;
     const query ={ storeId: inputData.storeId, moduleType: inputData.moduleType, fileDate: inputData.fileDate };
@@ -4514,16 +4514,17 @@ export async function save( req, res ) {
         afterCount: inputData.employeeCount,
         endTime: Date.now(),
         isDraft: false,
-        timeSpent: timeDifferenceInMinutes,
+        timeSpent: inputData.timeSpent,
       };
       const storeUpdated ={
         status: 'completed',
         afterCount: inputData.employeeCount,
-        timeSpent: timeDifferenceInMinutes,
+        timeSpent: inputData.timeSpent,
       };
-      await updateOneUserEmpDetection( { _id: inputData.auditId }, userUpdated );
-      await updateOneStoreEmpDetection( query, storeUpdated );
+      logger.info( { query: query, function: 'saveQuery' } );
+      const [ userUpdate, storeUpdate ] = await Promise.all( [ updateOneUserEmpDetection( { _id: inputData.auditId }, userUpdated ), updateOneStoreEmpDetection( query, storeUpdated ) ] );
 
+      logger.info( { userUpdate: userUpdate, storeUpdate: storeUpdate, function: 'saveUpdate' } );
       const getFilePath = await findOneTraxAuditData(
           {
             fileDate: inputData.fileDate,
@@ -4540,10 +4541,12 @@ export async function save( req, res ) {
           tempId.push( inputData?.employee[i].img_id );
         }
       }
+      const getStore = await findOneStore( { storeId: inputData.storeId }, { storeName: 1 } );
       const sqsProduceQueue = {
         QueueUrl: `${sqs.url}${sqs.uniformOutput}`,
         MessageBody: JSON.stringify( {
           storeId: inputData.storeId,
+          storeName: getStore?.storeName,
           fileDate: inputData.fileDate,
           moduleType: inputData.moduleType,
           inputBucketName: getFilePath?.sqs?.Body?.inputBucketName,
@@ -4581,7 +4584,7 @@ export async function save( req, res ) {
           afterCount: inputData.employeeCount,
           startTime: req.userAudit?.startTime,
           endTime: Date.now(),
-          timeSpent: timeDifferenceInMinutes,
+          timeSpent: inputData.timeSpent,
           auditId: new mongoose.Types.ObjectId( inputData.auditId ),
         },
         createdAt: Date.now(),

package/src/dtos/traxAudit.dtos.js

@@ -47,6 +47,7 @@ export const saveDraftSchema = joi.object(
       moduleType: joi.string().required(),
       auditType: joi.string().required(),
       fileDate: joi.string().required(),
+      timeSpent: joi.number().required(),
       queueName: joi.string().required(),
       totalCount: joi.number().required(),
       junkCount: joi.number().optional(),
@@ -272,6 +273,7 @@ export const saveSchema = joi.object( {
   fileDate: joi.string().required(),
   auditType: joi.string().required(),
   moduleType: joi.string().required(),
+  timeSpent: joi.number().required(),
   beforeCount: joi.number().required(),
   employeeCount: joi.number().required(),
   employee: joi.array().required(),