tango-app-api-audit 3.4.3-alpha.13 → 3.4.3-alpha.15

package/package.json

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

package/src/controllers/traxAudit.controllers.js

@@ -2,7 +2,7 @@ import { checkFileExist, chunkArray, download, getDate, getDateWithCustomizeTime
 import { aggregateBinaryAudit, createBinaryAudit, updateOneBinaryAuditModel } from '../service/binaryAudit.service.js';
 import { countDocumentsStore, findOneStore } from '../service/store.service.js';
 import { findOneUser } from '../service/user.service.js';
-import { aggregateUserEmpDetection, createUserEmpDetection, updateOneUserEmpDetection } from '../service/userEmpDetection.service.js';
+import { aggregateUserEmpDetection, countDocumentsUserEmpDetection, createUserEmpDetection, updateOneUserEmpDetection } from '../service/userEmpDetection.service.js';
 import { aggregateTraxAuditData, findOneTraxAuditData } from '../service/traxAuditData.service.js';
 import { aggregateClient, findOneClient } from '../service/client.service.js';
 import dayjs from 'dayjs';
@@ -346,6 +346,7 @@ import { updateOneEmpDetectionOutput } from '../service/empDetectionOutput.servi
 //           img_id: img[3],
 //           selected: false,
 //           dropped: false,
+// singleDetection: false,
 //           count: 1,
 //           mappedid: [ mapimg ],
 //         } );
@@ -1722,7 +1723,7 @@ export async function userAuditHistory( req, res ) {
             'Start Time': element.startTime,
             'End Time': element.endTime || '',
             'Time Spent': element.timeSpent,
-            'Status': element.auditStatus,
+            'Status': toCamelCase( element.auditStatus ),
             'Audited Date': dayjs( element.createdAt ).format( 'YYYY,MMM D' ),
             'Result': element.answer,
 
@@ -2594,18 +2595,18 @@ export async function storeMetrics( req, res ) {
           case 'left-in-middle':
             temp['Question'] = element.question;
             temp['User Comments'] = element.userComments;
-            temp['Status'] = element.auditStatus;
+            temp['Status'] = toCamelCase( element.auditStatus );
             break;
           case 'mobile-detection':
             temp['Before Count'] = element.beforeCount;
             temp['After Count'] = element.afterCount;
-            temp['Status'] = element.status;
+            temp['Status'] = toCamelCase( 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['Status'] = toCamelCase( element.status );
             temp['Accuracy'] = element.accuracy;
             break;
         }
@@ -3088,7 +3089,7 @@ export async function pendingSummaryTable( req, res ) {
           'Start Time': element.startTime,
           'User Name': element.userName,
           'User Email': element.userEmail,
-          'Status': element.auditStatus,
+          'Status': toCamelCase( element.auditStatus ),
         };
         switch ( inputData.moduleType ) {
           case 'camera-angle-change':
@@ -3635,32 +3636,32 @@ export async function overviewTable( req, res ) {
             temp['stream Name'] = element.streamName;
             temp['User Comments'] = element.userComments;
             temp['Audit Type'] = element.auditType;
-            temp['Status'] = element.auditStatus;
+            temp['Status'] = toCamelCase( element.auditStatus );
             break;
           case 'unattended-customer':
             temp['Customer ID'] = element.tempId;
             temp['Question'] = element.question;
             temp['User Comments'] = element.userComments;
             temp['Audit Type'] = element.auditType;
-            temp['Status'] = element.auditStatus;
+            temp['Status'] = toCamelCase( element.auditStatus );
             break;
           case 'left-in-middle':
             temp['Question'] = element.question;
             temp['User Comments'] = element.userComments;
             temp['Audit Type'] = element.auditType;
-            temp['Status'] = element.auditStatus;
+            temp['Status'] = toCamelCase( element.auditStatus );
             break;
           case 'mobile-detection':
             temp['Before Count'] = element.beforeCount;
             temp['After Count'] = element.afterCount;
             temp['Audit Type'] = element.auditType;
-            temp['Status'] = element.status;
+            temp['Status'] = toCamelCase( element.status );
             break;
           case 'uniform-detection':
             temp['Before Count'] = element.beforeCount;
             temp['After Count'] = element.afterCount;
             temp['Audit Type'] = element.auditType;
-            temp['Status'] = element.status;
+            temp['Status'] = toCamelCase( element.status );
             break;
         }
         exportdata.push( temp );
@@ -4005,6 +4006,7 @@ export async function getDetectionAuditFile( req, res ) {
           img_id: img[3],
           selected: false,
           dropped: false,
+          singleDetection: false,
           count: 1,
           mappedid: [ mapimg ],
         } );
@@ -4231,13 +4233,29 @@ export async function getDraftedData( req, res ) {
 export async function save( 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' );
     const getUserAuditData = await findOneUserEmpDetection( { _id: inputData.auditId } );
     inputData.clientId = getUserAuditData.clientId;
     const query ={ storeId: inputData.storeId, moduleType: inputData.moduleType, fileDate: inputData.fileDate };
     const data = await updateOneEmpDetectionOutput( query, { $set: inputData }, { upsert: true } );
     if ( data ) {
-      await updateOneUserEmpDetection( { _id: inputData.auditId }, { auditStatus: 'completed', afterCount: inputData.employeeCount } );
-      await updateOneStoreEmpDetection( query, { status: 'completed', afterCount: inputData.employeeCount } );
+      const userUpdated ={
+        auditStatus: 'completed',
+        afterCount: inputData.employeeCount,
+        endTime: Date.now(),
+        isDraft: false,
+        timeSpent: timeDifferenceInMinutes,
+      };
+      const storeUpdated ={
+        status: 'completed',
+        afterCount: inputData.employeeCount,
+        timeSpent: timeDifferenceInMinutes,
+      };
+      await updateOneUserEmpDetection( { _id: inputData.auditId }, userUpdated );
+      await updateOneStoreEmpDetection( query, storeUpdated );
       return res.sendSuccess( { result: 'Updated Successfully' } );
     } else {
       return res.sendError( 'something went wrong', 403 );
@@ -4264,6 +4282,9 @@ export async function reTrigger( req, res ) {
     if ( !getQueueName || queueName == '' ) {
       return res.sendError( 'queueName does not create', 400 );
     }
+    const getRecord = await countDocumentsUserEmpDetection( { storeId: message.storeId,
+      fileDate: message.fileDate,
+      moduleType: message.moduleType, auditStatus: 'completed' } );
     const msg = {
       storeId: message.storeId,
       fileDate: message.fileDate,
@@ -4273,6 +4294,7 @@ export async function reTrigger( req, res ) {
       question: message.question,
       folderPath: message.folderPath,
       fileCount: message.fileCount,
+      auditType: getRecord > 0? 'ReAudit':'Audit',
     };
     const sqsProduceQueue = {
       QueueUrl: `${sqs.url}${queueName}`,
@@ -4338,3 +4360,15 @@ export async function reTrigger( req, res ) {
     return res.sendError( err, 500 );
   }
 }
+
+export function toCamelCase( str ) {
+  logger.info( { str: str } );
+  return str
+      .split( '-' ) // Split the string by spaces
+      .map( ( word, index ) =>
+      // index === 0 ?
+      // word.toLowerCase() : // Lowercase the first word
+        word.charAt( 0 ).toUpperCase() + word.slice( 1 ).toLowerCase(), // Capitalize the first letter of subsequent words
+      )
+      .join( '' ); // Join the words without spaces
+}

package/src/service/userEmpDetection.service.js

@@ -1,9 +1,7 @@
 import userEmpDetectionModel from 'tango-api-schema/schema/userEmpDetection.model.js';
-import { logger } from 'tango-app-api-middleware';
 
 
 export function aggregateUserEmpDetection( query ) {
-  logger.info( { seelevt: 'yryruteretwyyyyyyyyyyyyyyyyyyyyyyyyyyyyewe' } );
   return userEmpDetectionModel.aggregate( query, { collation: { locale: 'en', strength: 2 } } );
 }
 
@@ -15,6 +13,10 @@ export function findOneUserEmpDetection( query, fields ) {
   return userEmpDetectionModel.findOne( query, fields );
 }
 
+export function countDocumentsUserEmpDetection( query, fields ) {
+  return userEmpDetectionModel.countDocuments( query, fields );
+}
+
 export function updateOneUserEmpDetection( query, record ) {
   return userEmpDetectionModel.updateOne( query, { $set: record } );
 }