tango-app-api-audit 3.4.48 → 3.4.50

package/package.json

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

package/src/controllers/traxAudit.controllers.js

@@ -1,5 +1,5 @@
 import { checkFileExist, chunkArray, download, getDate, getDateWithCustomizeTime, getObject, getOpenSearchData, getUTC, insertOpenSearchData, listFileByPath, logger, signedUrl, sqsReceive, updateOpenSearchData } from 'tango-app-api-middleware';
-import { aggregateBinaryAudit, createBinaryAudit, updateOneBinaryAuditModel } from '../service/binaryAudit.service.js';
+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';
 import { aggregateUserEmpDetection, countDocumentsUserEmpDetection, createUserEmpDetection, updateOneUserEmpDetection } from '../service/userEmpDetection.service.js';
@@ -543,14 +543,6 @@ export async function getAuditFile( req, res ) {
               moduleType: userDetails[0].moduleType,
             };
             break;
-          case 'uniform-detection':
-            query ={
-              storeId: userDetails[0].storeId,
-              fileDate: userDetails[0].fileDate,
-              // tempId: userDetails[0].tempId,
-              moduleType: userDetails[0].moduleType,
-            };
-            break;
           case 'camera-angle-change':
             query ={
               storeId: userDetails[0].storeId,
@@ -569,12 +561,6 @@ export async function getAuditFile( req, res ) {
             };
             break;
           case 'cleaning':
-            query ={
-              storeId: userDetails[0].storeId,
-              fileDate: userDetails[0].fileDate,
-              moduleType: userDetails[0].moduleType,
-            };
-            break;
           case 'scrum':
             query ={
               storeId: userDetails[0].storeId,
@@ -630,33 +616,6 @@ export async function getAuditFile( req, res ) {
               file_path: msg.changed } ) : '',
           },
         ];
-        break;
-      case 'uniform-detection':
-        const files = [];
-
-        const params ={
-          Bucket: msg.inputBucketName,
-          Key: msg?.filePath,
-        };
-
-        const isExists = await checkFileExist( params );
-
-        if ( isExists ) {
-          const signedParams ={
-            Bucket: msg.inputBucketName,
-            file_path: msg?.filePath,
-          };
-          const data = await signedUrl( signedParams );
-
-          files.push(
-              data,
-          );
-        }
-        result.push( {
-          type: 'image',
-          file: files,
-        } );
-
         break;
       case 'unattended-customer':
       case 'left-in-middle':
@@ -749,9 +708,7 @@ export async function getAuditFile( req, res ) {
 
       const record = {
         userId: req.user._id,
-        storeId: msg.storeId,
         clientId: storeInfo?.clientId,
-        fileDate: msg.fileDate,
         queueName: inputData.queueName,
         auditStatus: 'inprogress',
         auditType: 'Audit',
@@ -760,7 +717,6 @@ export async function getAuditFile( req, res ) {
         startTime: new Date(),
         tempId: msg.tempId,
         fileDetails: msg.fileDetails,
-        moduleType: inputData.moduleType,
         inputBucketName: msg.inputBucketName,
         question: msg.question,
         questionType: msg.questionType,
@@ -775,7 +731,48 @@ export async function getAuditFile( req, res ) {
         'inspectHourCount': msg.inspectHourCount,
         'endHourCount': msg.inspectHourCount,
       } : {};
-      insertData = await createBinaryAudit( record );
+
+      let getQuery = {};
+      switch ( inputData.moduleType ) {
+        case 'unattended-customer':
+          getQuery ={
+            storeId: msg.storeId,
+            fileDate: msg.fileDate,
+            tempId: msg.tempId,
+            moduleType: inputData.moduleType,
+          };
+          break;
+        case 'left-in-middle':
+          getQuery ={
+            storeId: msg.storeId,
+            fileDate: msg.fileDate,
+            question: msg.question,
+            moduleType: inputData.moduleType,
+          };
+          break;
+        case 'camera-angle-change':
+        case 'eye-test-camera':
+          getQuery ={
+            storeId: msg.storeId,
+            fileDate: msg.fileDate,
+            streamName: msg.streamName,
+            moduleType: inputData.moduleType,
+          };
+          break;
+        case 'cleaning':
+        case 'scrum':
+          getQuery ={
+            storeId: msg.storeId,
+            fileDate: msg.fileDate,
+            moduleType: inputData.moduleType,
+          };
+          break;
+        default:
+          return res.sendError( 'Please give valid moduleType', 400 );
+      }
+
+      await updateOneUpsertBinaryAudit( getQuery, record );
+      insertData = await findOneBinaryAudit( getQuery );
     } else {
       insertData = userDetails[0];
     }
@@ -1090,6 +1087,7 @@ export async function saveBinary( req, res ) {
             fileDate: inputData.fileDate,
             moduleType: inputData.moduleType,
             Answer: inputData.answer,
+            configTime: getFilePath?.sqs?.Body?.configTime,
             inputBucketName: getFilePath?.sqs?.Body?.inputBucketName,
             folderPath: [ 'cleaning', 'scrum' ].includes( inputData.moduleType ) ? getFilePath?.sqs?.Body?.fileDetails[0]?.outputFilePath : folderPath.split( '/' ).slice( 0, -1 ).join( '/' ) + '/',
             createdAt: new Date(),
@@ -1452,6 +1450,124 @@ export async function userAuditHistory( req, res ) {
       } );
     }
 
+    let traxAuditDataQuery={};
+    let traxAuditDataFilter = [];
+    switch ( inputData.moduleType ) {
+      case 'unattended-customer':
+        traxAuditDataQuery= {
+          fileDate: '$fileDate', storeId: '$storeId', tempId: '$tempId', moduleType: '$moduleType',
+        };
+        traxAuditDataFilter=[ {
+          $eq: [ '$fileDate', '$$fileDate' ],
+        },
+        {
+          $eq: [ '$storeId', '$$storeId' ],
+        },
+        {
+          $eq: [ '$tempId', '$$tempId' ],
+        },
+        {
+          $eq: [ '$moduleType', '$$moduleType' ],
+        },
+        ];
+        break;
+      case 'left-in-middle':
+        traxAuditDataQuery= {
+          fileDate: '$fileDate', storeId: '$storeId', tempId: '$tempId', moduleType: '$moduleType',
+        };
+        traxAuditDataFilter=[ {
+          $eq: [ '$fileDate', '$$fileDate' ],
+        },
+        {
+          $eq: [ '$storeId', '$$storeId' ],
+        },
+        {
+          $eq: [ '$question', '$$question' ],
+        },
+        {
+          $eq: [ '$moduleType', '$$moduleType' ],
+        },
+        ];
+        break;
+      case 'uniform-detection':
+      case 'mobile-detection':
+      case 'scrum':
+      case 'cleaning':
+        traxAuditDataQuery= {
+          fileDate: '$fileDate', storeId: '$storeId', moduleType: '$moduleType',
+        };
+        traxAuditDataFilter=[ {
+          $eq: [ '$fileDate', '$$fileDate' ],
+        },
+        {
+          $eq: [ '$storeId', '$$storeId' ],
+        },
+        {
+          $eq: [ '$moduleType', '$$moduleType' ],
+        },
+        ];
+        break;
+      case 'camera-angle-change':
+        traxAuditDataQuery= {
+          fileDate: '$fileDate', storeId: '$storeId', moduleType: '$moduleType', streamName: '$streamName',
+        };
+        traxAuditDataFilter=[ {
+          $eq: [ '$fileDate', '$$fileDate' ],
+        },
+        {
+          $eq: [ '$storeId', '$$storeId' ],
+        },
+        {
+          $eq: [ '$streamName', '$$streamName' ],
+        },
+        {
+          $eq: [ '$moduleType', '$$moduleType' ],
+        },
+        ];
+        break;
+      case 'hygiene':
+        traxAuditDataQuery= {
+          fileDate: '$fileDate', storeId: '$storeId', moduleType: '$moduleType', zoneName: '$zoneName',
+        };
+        traxAuditDataFilter=[ {
+          $eq: [ '$fileDate', '$$fileDate' ],
+        },
+        {
+          $eq: [ '$storeId', '$$storeId' ],
+        },
+        {
+          $eq: [ '$zoneName', '$$zoneName' ],
+        },
+        {
+          $eq: [ '$moduleType', '$$moduleType' ],
+        },
+        ];
+        break;
+      case 'eye-test-camera':
+        traxAuditDataQuery= {
+          fileDate: '$fileDate', storeId: '$storeId', moduleType: '$moduleType', question: '$question', streamName: '$streamName',
+        };
+        traxAuditDataFilter=[ {
+          $eq: [ '$fileDate', '$$fileDate' ],
+        },
+        {
+          $eq: [ '$storeId', '$$storeId' ],
+        },
+        {
+          $eq: [ '$question', '$$question' ],
+        },
+        {
+          $eq: [ '$streamName', '$$streamName' ],
+        },
+        {
+          $eq: [ '$moduleType', '$$moduleType' ],
+        },
+        ];
+        break;
+      default:
+        return res.sendError( 'Please give valid modueType', 400 );
+    }
+
     const query = [
       {
         $match: {
@@ -1512,24 +1628,12 @@ export async function userAuditHistory( req, res ) {
       {
         $lookup: {
           from: 'traxAuditData',
-          let: {
-            fileDate: '$fileDate', storeId: '$storeId', zoneName: '$zoneName',
-          },
+          let: traxAuditDataQuery,
           pipeline: [
             {
               $match: {
                 $expr: {
-                  $and: [
-                    {
-                      $eq: [ '$fileDate', '$$fileDate' ],
-                    },
-                    {
-                      $eq: [ '$storeId', '$$storeId' ],
-                    },
-                    {
-                      $eq: [ '$zoneName', '$$zoneName' ],
-                    },
-                  ],
+                  $and: traxAuditDataFilter,
                 },
               },
             },
@@ -4207,7 +4311,7 @@ export async function getDetectionAuditFile( req, res ) {
     } else {
       logger.error( {
         error: { folderPath: folderPath, nextQuery: nextQuery },
-        function: `getAuditFile - ${inputData.moduleType }`,
+        function: `geDetectiontAuditFile - ${inputData.moduleType }`,
         message: 'Bucket image data not availale',
       } );
       return res.sendError( 'Bucket is Empty', 204 );

package/src/service/binaryAudit.service.js

@@ -16,3 +16,7 @@ export function findOneBinaryAudit( query ) {
 export function updateOneBinaryAuditModel( query, record ) {
   return binaryAuditModel.updateOne( query, { $set: record } );
 }
+
+export function updateOneUpsertBinaryAudit( query, record ) {
+  return binaryAuditModel.updateOne( query, { $set: record }, { upsert: true } );
+}