tango-app-api-audit 3.4.55 → 3.4.56

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.4.55",
+    "version": "3.4.56",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",
@@ -26,7 +26,7 @@
         "mongodb": "^6.7.0",
         "nodemon": "^3.1.3",
         "swagger-ui-express": "^5.0.1",
-        "tango-api-schema": "^2.2.69",
+        "tango-api-schema": "^2.2.93",
         "tango-app-api-middleware": "^3.1.48",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/traxAudit.controllers.js

@@ -1,4 +1,4 @@
-import { checkFileExist, chunkArray, download, getDate, getDateWithCustomizeTime, getObject, getOpenSearchData, getUTC, insertOpenSearchData, listFileByPath, logger, signedUrl, sqsReceive, updateOpenSearchData } from 'tango-app-api-middleware';
+import { checkFileExist, chunkArray, download, getDate, getDateWithCustomizeTime, getJsonFileData, getObject, getOpenSearchData, getUTC, insertOpenSearchData, listFileByPath, logger, signedUrl, sqsReceive, updateOpenSearchData } from 'tango-app-api-middleware';
 import { aggregateBinaryAudit, findOneBinaryAudit, updateOneBinaryAuditModel, updateOneUpsertBinaryAudit } from '../service/binaryAudit.service.js';
 import { countDocumentsStore, findOneStore } from '../service/store.service.js';
 import { findOneUser } from '../service/user.service.js';
@@ -72,7 +72,7 @@ export async function workSpace( req, res ) {
                                             { $eq: [ inputData.moduleType, 'scrum' ] }, '$auditConfigs.traxQueueName.scrum',
                                             {
                                               $cond: [
-                                                { $and: [ { $eq: [ inputData.moduleType, 'open-time' ] }, { $eq: [ inputData.moduleType, 'close-time' ] } ] }, '$auditConfigs.traxQueueName.openClose', '$auditConfigs.traxQueueName.anomaly',
+                                                { $eq: [ inputData.moduleType, 'open-time' ] }, '$auditConfigs.traxQueueName.openClose', '$auditConfigs.traxQueueName.anomaly',
 
                                               ],
                                             },
@@ -369,10 +369,10 @@ export async function workSpace( req, res ) {
       },
     ];
 
-    const auditUserCount = [ 'mobile-detection', 'uniform-detection', 'hygiene' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( auditFiles ) : await aggregateBinaryAudit( auditFiles );
-    const userIncompleteFilesCount = [ 'mobile-detection', 'uniform-detection', 'hygiene' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( userIncompleteFiles ) : await aggregateBinaryAudit( userIncompleteFiles );
+    const auditUserCount = [ 'mobile-detection', 'uniform-detection', 'hygiene', 'open-time', 'close-time' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( auditFiles ) : await aggregateBinaryAudit( auditFiles );
+    const userIncompleteFilesCount = [ 'mobile-detection', 'uniform-detection', 'hygiene', 'open-time', 'close-time' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( userIncompleteFiles ) : await aggregateBinaryAudit( userIncompleteFiles );
     const userAsignAuditCount = await aggregateAssignAudit( userAsignAudit );
-    const completedStoresCount = [ 'mobile-detection', 'uniform-detection', 'hygiene' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( completedStores ) : await aggregateBinaryAudit( binarCompletedStores );
+    const completedStoresCount = [ 'mobile-detection', 'uniform-detection', 'hygiene', 'open-time', 'close-time' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( completedStores ) : await aggregateBinaryAudit( binarCompletedStores );
     const clientAssignedCount = await aggregateAssignAudit( clientAssign );
     const auditStoreData = await aggregateTraxAuditData(
         auditStoreDataQuery,
@@ -4262,6 +4262,43 @@ export async function getDetectionAuditFile( req, res ) {
     const fetchData = {};
     let msg = {};
     // get user's inprogress files
+    let filterQuery ={};
+    let filter=[];
+    switch ( inputData.moduleType ) {
+      case 'mobile-detction':
+      case 'uniform-detection':
+      case 'open-time':
+      case 'close-time':
+        filter =[
+          {
+            $eq: [ '$fileDate', '$$fileDate' ],
+          },
+          {
+            $eq: [ '$storeId', '$$storeId' ],
+          },
+        ];
+        filterQuery={
+          fileDate: '$fileDate', storeId: '$storeId',
+        };
+        break;
+      case 'hygiene':
+        filter =[
+          {
+            $eq: [ '$fileDate', '$$fileDate' ],
+          },
+          {
+            $eq: [ '$storeId', '$$storeId' ],
+          },
+          {
+            $eq: [ '$zoneName', '$$zoneName' ],
+          },
+        ];
+        filterQuery={
+          fileDate: '$fileDate', storeId: '$storeId', zoneName: '$zoneName',
+        };
+        break;
+    }
+
     const userQuery = [
       {
         $match: {
@@ -4271,7 +4308,7 @@ export async function getDetectionAuditFile( req, res ) {
             { auditStatus: { $nin: [ 'completed', 'skipped' ] } },
             { createdAt: { $gte: start } },
             { createdAt: { $lte: end } },
-            { moduleType: inputData.moduleType },
+            { moduleType: { $in: inputData.moduleType=='open-time'?[ 'open-time', 'close-time' ]: [ inputData.moduleType ] } },
           ],
         },
       },
@@ -4284,24 +4321,12 @@ export async function getDetectionAuditFile( req, res ) {
       {
         $lookup: {
           from: 'traxAuditData',
-          let: {
-            fileDate: '$fileDate', storeId: '$storeId', zoneName: '$zoneName',
-          },
+          let: { ...filterQuery, moduleType: '$moduleType' },
           pipeline: [
             {
               $match: {
                 $expr: {
-                  $and: [
-                    {
-                      $eq: [ '$fileDate', '$$fileDate' ],
-                    },
-                    {
-                      $eq: [ '$storeId', '$$storeId' ],
-                    },
-                    {
-                      $eq: [ '$zoneName', '$$zoneName' ],
-                    },
-                  ],
+                  $and: [ ...filter, { $eq: [ '$moduleType', '$$moduleType' ] } ],
                 },
               },
             },
@@ -4316,8 +4341,8 @@ export async function getDetectionAuditFile( req, res ) {
     ];
 
     const userDetails = await aggregateUserEmpDetection( userQuery );
-    logger.info( { userDetails: userDetails, function: 'userDetails' } );
     const auditStatus = userDetails && userDetails.length > 0 ? userDetails[0].auditStatus : null;
+    logger.info( { auditStatus: auditStatus, userDetails: userDetails } );
     switch ( auditStatus ) {
       case null:
         logger.info( 'Hit in new file', { inputData } );
@@ -4435,6 +4460,7 @@ export async function getDetectionAuditFile( req, res ) {
           inputBucketName: userDetails[0].inputBucketName,
           folderPath: userDetails[0].folderPath,
           question: userDetails[0]?.sqs[0]?.message?.question,
+          moduleType: userDetails[0]?.moduleType,
         };
         break;
     }
@@ -4451,39 +4477,77 @@ export async function getDetectionAuditFile( req, res ) {
     if ( inputData.nextId ) {
       fetchData.ContinuationToken = decodeURIComponent( inputData.nextId );
     }
+    const openParems ={
+      Bucket: msg.inputBucketName,
+      Key: msg.folderPath,
+    };
+    inputData.moduleType= inputData.moduleType == 'open-time'? msg.moduleType : inputData.moduleType;
     const list = inputData.moduleType == 'hygiene'? await checkFileExist( {
       Bucket: msg.inputBucketName,
       Key: msg.folderPath,
-    } ) :
-     await listFileByPath( fetchData );
+    } ) :[ 'open-time', 'close-time' ].includes( inputData.moduleType )? await getJsonFileData( openParems ) :
+    await listFileByPath( fetchData );
     const folderPath = inputData.moduleType == 'hygiene'? list? [ {
       Key: msg.folderPath,
-    } ] : [] : list.data;
+    } ] : [] : [ 'open-time', 'close-time' ].includes( inputData.moduleType )? list?.statusCode== 500? []:JSON.parse( list.toString( 'utf-8' ) ).data : list.data;
     const nextQuery = inputData.moduleType == 'hygiene'? null : list?.pageToken;
     const bucketCDN = url.traxAuditInput;
     if ( folderPath?.length > 0 ) {
-      for ( let i = 0; i < folderPath.length; i++ ) {
-        const img = folderPath[i].Key.split( '/' );
-        const image = img[3].split( '.' );
-        const indexes = image[0].split( '_' );
-        const Key = folderPath[i].Key;
-        const data = `${bucketCDN}${Key}`;
-        const mapimg = {
-          img_path: data,
-          img_name: inputData.moduleType=='mobile-detection'?`${indexes[0]}-${indexes[3]}`:image[0],
-          img_id: img[3],
-        };
-        files.push( {
-          img_path: data,
-          img_name: inputData.moduleType=='mobile-detection'?`${indexes[0]}-${indexes[3]}`:image[0],
-          img_id: img[3],
-          selected: false,
-          dropped: false,
-          singleDetection: false,
-          count: 1,
-          mappedid: [ mapimg ],
-        } );
+      switch ( inputData.moduleType ) {
+        case 'mobile-detction':
+        case 'uniform-detection':
+        case 'hygiene':
+          for ( let i = 0; i < folderPath.length; i++ ) {
+            const img = folderPath[i].Key.split( '/' );
+            const image = img[3].split( '.' );
+            const indexes = image[0].split( '_' );
+            const Key = folderPath[i].Key;
+            const data = `${bucketCDN}${Key}`;
+            const mapimg = {
+              img_path: data,
+              img_name: inputData.moduleType=='mobile-detection'?`${indexes[0]}-${indexes[3]}`:image[0],
+              img_id: img[3],
+            };
+            files.push( {
+              img_path: data,
+              img_name: inputData.moduleType=='mobile-detection'?`${indexes[0]}-${indexes[3]}`:image[0],
+              img_id: img[3],
+              selected: false,
+              dropped: false,
+              singleDetection: false,
+              count: 1,
+              mappedid: [ mapimg ],
+            } );
+          }
+          break;
+        case 'open-time':
+        case 'close-time':
+
+          for ( let i = 0; i < folderPath?.length; i++ ) {
+            const item = folderPath[i];
+            const img = item?.file_path?.split( '/' );
+            const time = item?.time;
+            const Key = item?.file_path;
+            const data = `${bucketCDN}${Key}`;
+            const mapimg = {
+              img_path: data,
+              img_name: time,
+              img_id: img[3],
+            };
+            files.push( {
+              img_path: data,
+              img_name: time,
+              img_id: img[3],
+              selected: false,
+              dropped: false,
+              singleDetection: false,
+              count: 1,
+              mappedid: [ mapimg ],
+            } );
+          }
+          break;
       }
+
       if ( userDetails.length === 0 ) {
         const [ day, month, year ] = msg.fileDate.split( '-' );
         const temp = `${year}-${month}-${day}`;