tango-app-api-audit 3.4.43 → 3.4.45

package/package.json

@@ -1,42 +1,42 @@
-{
-    "name": "tango-app-api-audit",
-    "version": "3.4.43",
-    "description": "audit & audit metrics apis",
-    "main": "index.js",
-    "type": "module",
-    "scripts": {
-        "start": "nodemon --exec \"eslint --fix . && node index.js\""
-    },
-    "engines": {
-        "node": ">=18.10.0"
-    },
-    "author": "praveenraj",
-    "license": "ISC",
-    "dependencies": {
-        "adm-zip": "^0.5.15",
-        "aws-sdk": "^2.1643.0",
-        "axios": "^1.7.9",
-        "dayjs": "^1.11.11",
-        "dotenv": "^16.4.5",
-        "express": "^4.19.2",
-        "form-data": "^4.0.1",
-        "handlebars": "^4.7.8",
-        "joi-to-swagger": "^6.2.0",
-        "lodash": "^4.17.21",
-        "mongodb": "^6.7.0",
-        "nodemon": "^3.1.3",
-        "swagger-ui-express": "^5.0.1",
-        "tango-api-schema": "^2.2.45",
-        "tango-app-api-middleware": "^3.1.48",
-        "winston": "^3.13.0",
-        "winston-daily-rotate-file": "^5.0.0"
-    },
-    "devDependencies": {
-        "eslint": "^8.57.0",
-        "eslint-config-google": "^0.14.0",
-        "eslint-config-semistandard": "^17.0.0",
-        "eslint-config-standard": "^17.1.0",
-        "eslint-plugin-import": "^2.29.1",
-        "eslint-plugin-promise": "^6.2.0"
-    }
-}
+{
+    "name": "tango-app-api-audit",
+    "version": "3.4.45",
+    "description": "audit & audit metrics apis",
+    "main": "index.js",
+    "type": "module",
+    "scripts": {
+        "start": "nodemon --exec \"eslint --fix . && node index.js\""
+    },
+    "engines": {
+        "node": ">=18.10.0"
+    },
+    "author": "praveenraj",
+    "license": "ISC",
+    "dependencies": {
+        "adm-zip": "^0.5.15",
+        "aws-sdk": "^2.1643.0",
+        "axios": "^1.7.9",
+        "dayjs": "^1.11.11",
+        "dotenv": "^16.4.5",
+        "express": "^4.19.2",
+        "form-data": "^4.0.1",
+        "handlebars": "^4.7.8",
+        "joi-to-swagger": "^6.2.0",
+        "lodash": "^4.17.21",
+        "mongodb": "^6.7.0",
+        "nodemon": "^3.1.3",
+        "swagger-ui-express": "^5.0.1",
+        "tango-api-schema": "^2.2.45",
+        "tango-app-api-middleware": "^3.1.48",
+        "winston": "^3.13.0",
+        "winston-daily-rotate-file": "^5.0.0"
+    },
+    "devDependencies": {
+        "eslint": "^8.57.0",
+        "eslint-config-google": "^0.14.0",
+        "eslint-config-semistandard": "^17.0.0",
+        "eslint-config-standard": "^17.1.0",
+        "eslint-plugin-import": "^2.29.1",
+        "eslint-plugin-promise": "^6.2.0"
+    }
+}

package/src/controllers/audit.controllers.js

@@ -4956,13 +4956,47 @@ export async function auditViewLogs( req, res ) {
             ],
           };
           break;
+        case 'scrum':
+        case 'cleaning':
+          logsQuery = {
+            'size': 100,
+            'query': {
+              'bool': {
+                'must': [
+                  {
+                    'term': {
+                      'logData.fileDate.keyword': inputData.fileDate,
+                    },
+                  },
+                  {
+                    'term': {
+                      'logData.storeId.keyword': inputData.storeId,
+                    },
+                  },
+                  {
+                    'term': {
+                      'logData.moduleType.keyword': inputData.moduleType,
+                    },
+                  },
+                  {
+                    'terms': {
+                      'logSubType.keyword': [ 'auditDone', 'reTrigger' ],
+                    },
+                  },
+                ],
+              },
+            },
+            'sort': [
+              { createdAt: { order: 'desc' } },
+            ],
+          };
+          break;
         default:
           return res.sendError( 'Please give valid modueType', 400 );
       }
     }
     logger.info( { query: logsQuery, message: 'unattended' } );
     const logs = await getOpenSearchData( parsedOpenSearch.auditLog, logsQuery );
-    logger.info( { logs: logs.body.hits, inputData: inputData, auditLog: parsedOpenSearch.auditLog } );
     if ( logs.body.hits.hits.length > 0 ) {
       const sourcesArray = logs.body.hits.hits.map( ( hit ) => hit._source );
       for ( const i of sourcesArray ) { // Loop through sourcesArray

package/src/controllers/traxAudit.controllers.js

@@ -60,7 +60,17 @@ export async function workSpace( req, res ) {
                           $cond: [
                             { $eq: [ inputData.moduleType, 'hygiene' ] }, '$auditConfigs.traxQueueName.hygiene', {
                               $cond: [
-                                { $eq: [ inputData.moduleType, 'camera-angle-change' ] }, '$auditConfigs.traxQueueName.cameraAngleChange', '$auditConfigs.traxQueueName.eyeTestCamera' ],
+                                { $eq: [ inputData.moduleType, 'camera-angle-change' ] }, '$auditConfigs.traxQueueName.cameraAngleChange',
+                                {
+                                  $cond: [
+                                    { $eq: [ inputData.moduleType, 'eye-test-camera' ] }, '$auditConfigs.traxQueueName.eyeTestCamera',
+                                    {
+                                      $cond: [
+                                        { $eq: [ inputData.moduleType, 'cleaning' ] }, '$auditConfigs.traxQueueName.cleaning', '$auditConfigs.traxQueueName.scrum' ],
+                                    },
+                                  ],
+                                },
+                              ],
                             },
 
                           ],
@@ -466,6 +476,7 @@ export async function getAuditFile( req, res ) {
   try {
     const inputData = req.query;
     const openSearch = JSON.parse( process.env.OPENSEARCH );
+    const url = JSON.parse( process.env.URL );
     const previousDate = new Date( new Date() - 1 );
     const data = await getDate( previousDate, new Date() );
     const start = data.start;
@@ -557,10 +568,23 @@ export async function getAuditFile( req, res ) {
               moduleType: userDetails[0].moduleType,
             };
             break;
+          case 'cleaning':
+            query ={
+              storeId: userDetails[0].storeId,
+              fileDate: userDetails[0].fileDate,
+              moduleType: userDetails[0].moduleType,
+            };
+            break;
+          case 'scrum':
+            query ={
+              storeId: userDetails[0].storeId,
+              fileDate: userDetails[0].fileDate,
+              moduleType: userDetails[0].moduleType,
+            };
+            break;
           default:
             return res.sendError( 'Please give valid moduleType', 400 );
         }
-        logger.info( { query: query } );
         const traxInfo = await findOneTraxAuditData( query );
         if ( !traxInfo ) {
           return res.sendError( 'The source record not found', 400 );
@@ -636,6 +660,8 @@ export async function getAuditFile( req, res ) {
         break;
       case 'unattended-customer':
       case 'left-in-middle':
+      case 'cleaning':
+      case 'scrum':
         for ( let i =0; i< msg.fileDetails.length; i++ ) {
           const files = [];
           const params ={
@@ -645,18 +671,14 @@ export async function getAuditFile( req, res ) {
           };
           const list = await listFileByPath( params );
           const folderPath = list.data;
-          logger.info( { folderPath: list, params: params, list: list } );
           if ( folderPath?.length ) {
             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 signedParams ={
-                Bucket: msg.inputBucketName,
-                file_path: folderPath[i].Key,
-              };
-              const data = await signedUrl( signedParams );
-
+              // const signedParams ={
+              //   Bucket: msg.inputBucketName,
+              //   file_path: folderPath[i].Key,
+              // };
+              const BucketCDN = url.traxAuditInput;
+              const data = `${BucketCDN}${ folderPath[i].Key}`;
               files.push(
                   data,
               );
@@ -790,7 +812,7 @@ export async function getAuditFile( req, res ) {
       address: storeInfo?.address,
       customerId: msg.tempId,
       moduleType: inputData.moduleType,
-      value: inputData.moduleType == 'left-in-middle'? 'Employee Left in Middle ' : ( inputData.moduleType ).split( '-' ).join( ' ' ),
+      value: inputData.moduleType == 'left-in-middle'? 'Employee Left in Middle' : inputData.moduleType == 'cleaning'? 'Store Cleaning Audit ': inputData.moduleType == 'scrum'? 'Scrum Identification':( inputData.moduleType ).split( '-' ).join( ' ' ),
       fileDate: msg.fileDate,
       question: msg.question,
       questionType: msg.questionType,
@@ -864,6 +886,8 @@ export async function getUpdatedFile( req, res ) {
         break;
       case 'unattended-customer':
       case 'left-in-middle':
+      case 'cleaning':
+      case 'scrum':
         for ( let i =0; i< msg.fileDetails.length; i++ ) {
           const files = [];
           const params ={
@@ -876,9 +900,6 @@ export async function getUpdatedFile( req, res ) {
           logger.info( { folderPath: list, params: params, list: list } );
           if ( folderPath?.length ) {
             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 signedParams ={
                 Bucket: msg.inputBucketName,
                 file_path: folderPath[i].Key,
@@ -1000,6 +1021,8 @@ export async function saveBinary( req, res ) {
     const value = inputData.moduleType? inputData.moduleType.replace( /-/g, ' ' ) : '';
     switch ( inputData.moduleType ) {
       case 'unattended-customer':
+      case 'cleaning':
+      case 'scrum':
         let unattendedquery ={
           _id: inputData.auditId,
           storeId: inputData.storeId,
@@ -1019,6 +1042,65 @@ export async function saveBinary( req, res ) {
         if ( updatDataunattended.modifiedCount==0 ) {
           return res.sendError( 'Update failed, it may be invalid request', 400 );
         }
+        if ( [ 'cleaning', 'scrum' ].includes( inputData.moduleType ) ) {
+          let filter= [
+            {
+              'term': {
+                'storeId.keyword': inputData.storeId,
+              },
+            },
+            {
+              'term': {
+                'fileDate.keyword': inputData.fileDate,
+              },
+            },
+            {
+              'term': {
+                'moduleType.keyword': inputData.moduleType,
+              },
+            },
+          ];
+          let searchQuery={
+            'size': 1,
+            'query': {
+              'bool': {
+                'must': filter,
+              },
+            },
+          };
+          const [ getStore, getClient ] = await Promise.all( [ findOneStore( { storeId: inputData.storeId }, { storeName: 1, storeProfile: 1, spocDetails: 1 } ), findOneClient( { clientId: req.userAudit?.clientId }, { clientName: 1 } ) ] );
+          const getFilePath = await findOneTraxAuditData(
+              {
+                fileDate: inputData.fileDate,
+                storeId: inputData.storeId,
+                moduleType: inputData.moduleType,
+              },
+          );
+          const output = {
+            clientId: req.userAudit?.clientId,
+            clientName: getClient?.clientName,
+            storeId: inputData.storeId,
+            storeName: getStore?.storeName,
+            question: getFilePath?.sqs?.Body?.question,
+            spocName: getStore?.spocDetails? getStore?.spocDetails[0]?.name : '',
+            spocEmail: getStore?.spocDetails? getStore?.spocDetails[0]?.email:'',
+            spocContact: getStore?.spocDetails? getStore?.spocDetails[0].contact:'',
+            address: getStore?.storeProfile?.address,
+            fileDate: inputData.fileDate,
+            moduleType: inputData.moduleType,
+            Answer: inputData.answer,
+            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(),
+          };
+          const searchData= await getOpenSearchData( openSearch.traxDetectionOutput, searchQuery );
+          logger.info( { length: searchData?.body?.hits?.hits?.length, _id: searchData?.body?.hits?.hits[0]?._id, output: output } );
+          if ( searchData?.body?.hits?.hits?.length >0 ) {
+            await updateOpenSearchData( openSearch.traxDetectionOutput, searchData?.body?.hits?.hits[0]?._id, { doc: output } );
+          } else {
+            await insertOpenSearchData( openSearch.traxDetectionOutput, output );
+          }
+        }
         const logData2 = {
           userId: req.user._id,
           userName: req.user.userName,
@@ -1258,7 +1340,7 @@ export async function saveBinary( req, res ) {
           formData.append( 'storeName', stores?.storeName );
           formData.append( 'taskName', 'EyeTest QR Verification' );
           formData.append( 'answerType', 'image' );
-          formData.append( 'question', 'Please Upload QR image of the clinic' );
+          formData.append( 'question', 'Please upload the QR image pasted in this clinic' );
           formData.append( 'scheduleDate', formattedDate );
           formData.append( 'scheduleEndTime', '11:00 PM' );
 
@@ -1612,6 +1694,8 @@ export async function userAuditHistory( req, res ) {
               temp['User Comments'] = element.userComments;
               break;
             case 'left-in-middle':
+            case 'cleaning':
+            case 'scrum':
               temp['Question'] = element.question;
               temp['Result'] = element.answer;
               temp['User Comments'] = element.userComments;
@@ -2549,6 +2633,8 @@ export async function storeMetrics( req, res ) {
             temp['Result'] = element.answer;
             break;
           case 'left-in-middle':
+          case 'cleaning':
+          case 'scrum':
             temp['Question'] = element.question;
             temp['User Comments'] = element.userComments;
             temp['Status'] = toCamelCase( element.auditStatus );
@@ -3119,6 +3205,8 @@ export async function pendingSummaryTable( req, res ) {
             temp['Question'] = element.question;
             break;
           case 'left-in-middle':
+          case 'cleaning':
+          case 'scrum':
             temp['Question'] = element.question;
             break;
           case 'mobile-detection':
@@ -3681,6 +3769,8 @@ export async function overviewTable( req, res ) {
             temp['Status'] = toCamelCase( element.auditStatus );
             break;
           case 'left-in-middle':
+          case 'cleaning':
+          case 'scrum':
             temp['Question'] = element.question;
             temp['User Comments'] = element.userComments;
             temp['Audit Type'] = element.auditType;
@@ -4316,7 +4406,7 @@ export async function save( req, res ) {
         },
       };
 
-      const searchData= await getOpenSearchData( openSearch.nob, searchQuery );
+      const searchData= await getOpenSearchData( openSearch.traxDetectionOutput, searchQuery );
       logger.info( { length: searchData?.body?.hits?.hits?.length, _id: searchData?.body?.hits?.hits[0]?._id, output: output } );
       if ( searchData?.body?.hits?.hits?.length >0 ) {
         await updateOpenSearchData( openSearch.traxDetectionOutput, searchData?.body?.hits?.hits[0]?._id, { doc: output } );