tango-app-api-audit 3.4.40 → 3.4.42

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.4.40",
+    "version": "3.4.42",
     "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.2.19",
+        "tango-api-schema": "^2.2.45",
         "tango-app-api-middleware": "^3.1.48",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/traxAudit.controllers.js

@@ -56,7 +56,11 @@ export async function workSpace( req, res ) {
                         { $eq: [ inputData.moduleType, 'mobile-detection' ] }, '$auditConfigs.traxQueueName.mobileDetection',
                         {
                           $cond: [
-                            { $eq: [ inputData.moduleType, 'hygiene' ] }, '$auditConfigs.traxQueueName.hygiene', '$auditConfigs.traxQueueName.cameraAngleChange',
+                            { $eq: [ inputData.moduleType, 'hygiene' ] }, '$auditConfigs.traxQueueName.hygiene', {
+                              $cond: [
+                                { $eq: [ inputData.moduleType, 'camera-angle-change' ] }, '$auditConfigs.traxQueueName.cameraAngleChange', '$auditConfigs.traxQueueName.eyeTestCamera' ],
+                            },
+
                           ],
                         },
                       ],
@@ -542,8 +546,17 @@ export async function getAuditFile( req, res ) {
               moduleType: userDetails[0].moduleType,
             };
             break;
+          case 'eye-test-camera':
+            query ={
+              storeId: userDetails[0].storeId,
+              fileDate: userDetails[0].fileDate,
+              // question: userDetails[0].question,
+              streamName: userDetails[0].streamName,
+              moduleType: userDetails[0].moduleType,
+            };
+            break;
           default:
-            return res.sendError( 'Please give valid modueType', 400 );
+            return res.sendError( 'Please give valid moduleType', 400 );
         }
         logger.info( { query: query } );
         const traxInfo = await findOneTraxAuditData( query );
@@ -660,6 +673,32 @@ export async function getAuditFile( req, res ) {
           } );
         }
         break;
+      case 'eye-test-camera':
+        const eyeTestfiles = [];
+
+        const eyeTestparams ={
+          Bucket: msg.inputBucketName,
+          Key: msg?.filePath,
+        };
+
+        const isCameraExists = await checkFileExist( eyeTestparams );
+
+        if ( isCameraExists ) {
+          const url = JSON.parse( process.env.URL );
+          logger.info( { url: url, cameraBaseImage: url.cameraBaseImage } );
+          const data = `${url.cameraBaseImage}${msg?.filePath}`;
+
+          eyeTestfiles.push(
+              data,
+          );
+        } else {
+          return res.sendSuccess( 'No Data found', 204 );
+        }
+        result.push( {
+          type: 'image',
+          file: eyeTestfiles,
+        } );
+        break;
       default:
         return res.sendError( 'Please given valid moduleType', 400 );
     }
@@ -703,7 +742,7 @@ export async function getAuditFile( req, res ) {
         questionType: msg.questionType,
         streamName: msg.streamName,
       };
-      record.streamName = inputData.moduleType == 'camera-angle-change'? msg.streamName : '';
+      record.streamName = inputData.moduleType == 'camera-angle-change' || inputData.moduleType == 'eye-test-camera'? msg.streamName : '';
       record.videoDetails = inputData.moduleType == 'left-in-middle'? {
         'startHour': msg.startHour,
         'inspectHour': msg.inspectHour,
@@ -862,6 +901,31 @@ export async function getUpdatedFile( req, res ) {
           } );
         }
         break;
+      case 'eye-test-camera':
+        const eyeTestfiles = [];
+
+        const eyeTestparams ={
+          Bucket: msg.inputBucketName,
+          Key: msg?.filePath,
+        };
+
+        const isCameraExists = await checkFileExist( eyeTestparams );
+
+        if ( isCameraExists ) {
+          const url = JSON.parse( process.env.URL );
+          const data = `${url.cameraBaseImage}${msg?.filePath}`;
+
+          eyeTestfiles.push(
+              data,
+          );
+        } else {
+          return res.sendSuccess( 'No Data found', 204 );
+        }
+        result.push( {
+          type: 'image',
+          file: eyeTestfiles,
+        } );
+        break;
       default:
         return res.sendError( 'Please given valid moduleType', 400 );
     }
@@ -1164,9 +1228,29 @@ export async function saveBinary( req, res ) {
         return res.sendSuccess( `Successfully updated in ${value}` );
 
         break;
+      case 'eye-test-camera':
+        let eyeTestQuery ={
+          _id: inputData.auditId,
+          storeId: inputData.storeId,
+          fileDate: inputData.fileDate,
+          streamName: inputData.streamName,
+          moduleType: inputData.moduleType,
+        };
+        let eyeTestUpdate={
+          auditStatus: 'completed',
+          answer: inputData.answer,
+          userComments: inputData.userComments || '',
+          endTime: new Date(),
+          timeSpent: timeDifferenceInMinutes,
+        };
+        let updatDataEyeTest= await updateOneBinaryAuditModel( eyeTestQuery, eyeTestUpdate );
+        if ( updatDataEyeTest.modifiedCount==0 ) {
+          return res.sendError( 'Update failed, it may be invalid request', 400 );
+        }
+        return res.sendSuccess( `Successfully updated in ${value}` );
 
       default:
-        res.sendError( 'no data', 204 );
+        res.sendError( 'No Data', 204 );
         break;
     }
   } catch ( error ) {

package/src/service/storeEmpDetection.service.js

@@ -2,7 +2,7 @@ import storeEmpDetectionModel from 'tango-api-schema/schema/storeEmpDetection.mo
 
 
 export function aggregateStoreEmpDetection( query ) {
-  return storeEmpDetectionModel.aggregate( query, { collation: { locale: 'en', strength: 2 } } );
+  return storeEmpDetectionModel.aggregate( query );
 }
 
 export function findOneStoreEmpDetection( query ) {

package/src/validation/traxAuditValidation.js

@@ -102,6 +102,15 @@ export async function isTraxAuditDocumentExist( req, res, next ) {
           moduleType: inputData.moduleType,
         };
         break;
+      case 'eye-test-camera':
+        query ={
+          storeId: inputData.storeId,
+          fileDate: inputData.fileDate,
+          // question: inputData.question,
+          streamName: inputData.streamName,
+          moduleType: inputData.moduleType,
+        };
+        break;
       default:
         return res.sendError( 'Please give valid modueType', 400 );
     }