tango-app-api-audit 3.6.42-eyetest.2 → 3.6.43

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.6.42-eyetest.2",
+    "version": "3.6.43",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",
@@ -29,7 +29,7 @@
         "nodemon": "^3.1.3",
         "swagger-ui-express": "^5.0.1",
         "tango-api-schema": "^2.5.27",
-        "tango-app-api-middleware": "^3.6.8",
+        "tango-app-api-middleware": "^3.6.18",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/eyeTestAudit.controllers.js

@@ -1,4 +1,4 @@
-import { getOpenSearchData, getOpenSearchById, logger, insertOpenSearchData, updateOpenSearchData, download, chunkArray, getOpenSearchCount, insertWithId } from 'tango-app-api-middleware';
+import { getOpenSearchData, getOpenSearchById, logger, insertOpenSearchData, updateOpenSearchData, download, chunkArray, getOpenSearchCount, insertWithId, signedUrl } from 'tango-app-api-middleware';
 import { aggregateUser, findOneUser, findUser } from '../service/user.service.js';
 import mongoose from 'mongoose';
 import dayjs from 'dayjs';
@@ -398,7 +398,10 @@ export async function viewFile( req, res ) {
   try {
     const inputData = req.params;
     const openSearch = JSON.parse( process.env.OPENSEARCH );
-    const url = JSON.parse( process.env.URL );
+    const bucket = JSON.parse( process.env.BUCKET );
+    // const url = JSON.parse( process.env.URL );
+    const updatedDate = process.env.EYE_TEST_UPDATED_DATE;
+    const remoteUpdatedDate = process.env.REMOTE_UPDATED_DATE;
     let isEnable =true;
     const order = [
       'Distance-VA-Check',
@@ -472,7 +475,18 @@ export async function viewFile( req, res ) {
     const temp = searchRes?.body?.hits?.hits?.length > 0? searchRes?.body?.hits?.hits[0] : [];
 
     const getUserName = await findOneUser( { _id: new mongoose.Types.ObjectId( temp?._source?.userId ) }, { userName: 1 } );
-
+    const inputBucketName = getData?.type === 'remote'? bucket?.remoteInput : bucket?.physicalInput;
+    const inputOldBucketName = getData?.type === 'remote'? bucket?.remoteOldInput : bucket?.physicalOldInput;
+    const configDate = getData?.type === 'remote'? new Date( remoteUpdatedDate ): new Date( updatedDate );
+    const fileDate = new Date( getData?.fileDate );
+    const params = {
+      file_path: getData?.filePath,
+      Bucket: fileDate > configDate ? inputBucketName: inputOldBucketName,
+      key: fileDate > configDate ?'akamai' : 'aws',
+      type: getData?.type,
+    };
+    const getSignedUrl = await signedUrl( params );
+    logger.info( { mesagee: 'signedurl', getSignedUrl: getSignedUrl, params: params } );
     const searchData = temp?
     getData['lastAuditedDetails']= {
       'auditedBy': getUserName?.userName || '',
@@ -482,7 +496,7 @@ export async function viewFile( req, res ) {
     getData['complianceScore'] = getData.complianceScore || getData?.totalSteps>0 ? Math.round( ( getData?.coveredStepsAI/ getData?.totalSteps )*100 ): 0;
     getData['trustScore'] = getData?.trustScore || 0;
     getData['testDuration'] = Math.round( getData?.testDuration/60 ) || 0;
-    getData['filePath'] = `${url[getData?.type]}${getData?.filePath}`;
+    getData['filePath'] = getSignedUrl; // `${url[getData?.type]}${getData?.filePath}`;
     getData['auditType'] = getData.auditType || 'Audit';
     const response = getData;
 
@@ -589,9 +603,11 @@ export async function viewFile( req, res ) {
 export async function getFile( req, res ) {
   try {
     const inputData = req.params;
-    const url = JSON.parse( process.env.URL );
+    // const url = JSON.parse( process.env.URL );
     const openSearch = JSON.parse( process.env.OPENSEARCH );
-
+    const bucket = JSON.parse( process.env.BUCKET );
+    const updatedDate = process.env.EYE_TEST_UPDATED_DATE;
+    const remoteUpdatedDate = process.env.REMOTE_UPDATED_DATE;
     const getInput = await getOpenSearchById( openSearch.EyeTestInput, inputData.id );
     if ( !getInput || !getInput?.body ) {
       return res.sendError( 'No Data Found', 204 );
@@ -643,7 +659,18 @@ export async function getFile( req, res ) {
     };
     const searchRes= await getOpenSearchData( openSearch.EyeTestOutput, searchQuery );
     const searchData = searchRes?.body?.hits?.hits?.lenght > 0? searchRes?.body?.hits?.hits[0] : null;
-    logger.info( { searchData: searchData, getData: getData, messahe: '...........3' } );
+    const inputBucketName = getData?.type === 'remote'? bucket?.remoteInput : bucket?.physicalInput;
+    const inputOldBucketName = getData?.type === 'remote'? bucket?.remoteOldInput : bucket?.physicalOldInput;
+    const configDate = getData?.type === 'remote'? new Date( remoteUpdatedDate ): new Date( updatedDate );
+    const fileDate = new Date( getData?.fileDate );
+    const params = {
+      file_path: getData?.filePath,
+      Bucket: fileDate > configDate ? inputBucketName: inputOldBucketName,
+      key: fileDate > configDate ?'akamai' : 'aws',
+      type: getData?.type,
+    };
+    const getSignedUrl = await signedUrl( params );
+    logger.info( { mesagee: 'signedurl', getSignedUrl: getSignedUrl, params: params } );
     switch ( getData?.auditStatus ) {
       case 'Yet-to-Audit':
         const record= {
@@ -671,7 +698,7 @@ export async function getFile( req, res ) {
           'auditStatus': 'In-Progress',
           'totalSteps': getData?.totalSteps,
           'inputBucketName': getData?.inputBucketName,
-          'filePath': `${url[getData?.type]}${getData?.filePath}`,
+          'filePath': getSignedUrl, // `${url[getData?.type]}${getData?.filePath}`,
           'steps': getData?.steps,
           'startTime': dayjs().tz( 'Asia/Kolkata' ),
           'createdAt': dayjs().tz( 'Asia/Kolkata' ),
@@ -724,7 +751,7 @@ export async function getFile( req, res ) {
           'spokenLanguage': getData?.spokenLanguage || '',
           'auditStatus': 'In-Progress',
           'totalSteps': getData?.totalSteps,
-          'filePath': `${url[getData?.type]}${getData?.filePath}`,
+          'filePath': getSignedUrl, // `${url[getData?.type]}${getData?.filePath}`,
           'steps': getData?.steps,
           'auditType': 'Re-Audit',
           'startTime': dayjs().tz( 'Asia/Kolkata' ),
@@ -752,7 +779,10 @@ export async function save( req, res ) {
     const inputData = req.body;
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const ses = JSON.parse( process.env.SES );
-    const url = JSON.parse( process.env.URL );
+    const bucket = JSON.parse( process.env.BUCKET );
+    // const url = JSON.parse( process.env.URL );
+    const updatedDate = process.env.EYE_TEST_UPDATED_DATE;
+    const remoteUpdatedDate = process.env.REMOTE_UPDATED_DATE;
 
     let searchFilter =[
       {
@@ -818,6 +848,7 @@ export async function save( req, res ) {
     if ( !output ) {
       return res.sendError( 'This file is currently being audited by another user. Any actions you perform will not be saved.', 400 );
     }
+
     const record ={
       'steps': inputData?.steps,
       'auditStatus': inputData?.auditStatus,
@@ -905,6 +936,18 @@ export async function save( req, res ) {
       steps.sort(
           ( a, b ) => order.indexOf( a.processName ) - order.indexOf( b.processName ),
       );
+      const inputBucketName = inputUpdatedData?._source?.type === 'remote'? bucket?.remoteInput : bucket?.physicalInput;
+      const inputOldBucketName = inputUpdatedData?._source?.type === 'remote'? bucket?.remoteOldInput : bucket?.physicalOldInput;
+      const configDate = inputUpdatedData?._source?.type === 'remote'? new Date( remoteUpdatedDate ): new Date( updatedDate );
+      const fileDate = new Date( inputUpdatedData?._source?.fileDate );
+      const params = {
+        file_path: inputUpdatedData?._source?.filePath,
+        Bucket: fileDate > configDate ? inputBucketName: inputOldBucketName,
+        key: fileDate > configDate ?'akamai' : 'aws',
+        type: inputUpdatedData?._source?.type,
+      };
+      const getSignedUrl = await signedUrl( params );
+      logger.info( { mesagee: 'signedurl', getSignedUrl: getSignedUrl, params: params } );
       switch ( condition ) {
         case '>': if ( humanScore > value ) {
           const record1 = {
@@ -943,7 +986,7 @@ export async function save( req, res ) {
             startTime: `${inputUpdatedData?._source?.fileDate}T${inputUpdatedData?._source?.testEndTime}`,
             compliancePercentage: humanScore,
             steps: steps,
-            videoUrl: `${inputUpdatedData?._source?.type === 'physical'?url.physical:url.remote}${inputUpdatedData?._source?.filePath}`,
+            videoUrl: getSignedUrl, // `${inputUpdatedData?._source?.type === 'physical'?url.physical:url.remote}${inputUpdatedData?._source?.filePath}`,
             ref: reference1,
           } );
         }
@@ -983,7 +1026,7 @@ export async function save( req, res ) {
             startTime: `${inputUpdatedData?._source?.fileDate}T${inputUpdatedData?._source.testEndTime}`,
             compliancePercentage: humanScore,
             steps: steps,
-            videoUrl: `${inputUpdatedData?._source?.type === 'physical'?url.physical:url.remote}${inputUpdatedData?._source?.filePath}`,
+            videoUrl: getSignedUrl, // `${inputUpdatedData?._source?.type === 'physical'?url.physical:url.remote}${inputUpdatedData?._source?.filePath}`,
             ref: reference2,
           } );
         };
@@ -1028,7 +1071,7 @@ export async function save( req, res ) {
             startTime: `${inputUpdatedData?._source?.fileDate}T${inputUpdatedData?._source.testEndTime}`,
             compliancePercentage: humanScore,
             steps: steps,
-            videoUrl: `${inputUpdatedData?._source?.type === 'physical'?url.physical:url.remote}${inputUpdatedData?._source?.filePath}`,
+            videoUrl: getSignedUrl, // `${inputUpdatedData?._source?.type === 'physical'?url.physical:url.remote}${inputUpdatedData?._source?.filePath}`,
 
             ref: reference3,
           } );
@@ -1072,7 +1115,7 @@ export async function save( req, res ) {
             startTime: `${inputUpdatedData?._source?.fileDate}T${inputUpdatedData?._source.testEndTime}`,
             compliancePercentage: humanScore,
             steps: steps,
-            videoUrl: `${inputUpdatedData?._source?.type === 'physical'?url.physical:url.remote}${inputUpdatedData?._source?.filePath}`,
+            videoUrl: getSignedUrl, // `${inputUpdatedData?._source?.type === 'physical'?url.physical:url.remote}${inputUpdatedData?._source?.filePath}`,
             ref: reference4,
           } );
         }
@@ -1113,7 +1156,7 @@ export async function save( req, res ) {
             startTime: `${inputUpdatedData?._source?.fileDate}T${inputUpdatedData?._source.testEndTime}`,
             compliancePercentage: humanScore,
             steps: steps,
-            videoUrl: `${inputUpdatedData?._source?.type === 'physical'?url.physical:url.remote}${inputUpdatedData?._source?.filePath}`,
+            videoUrl: getSignedUrl, // `${inputUpdatedData?._source?.type === 'physical'?url.physical:url.remote}${inputUpdatedData?._source?.filePath}`,
             ref: reference5,
           } );
         }
@@ -1152,7 +1195,7 @@ export async function save( req, res ) {
             startTime: `${inputUpdatedData?._source?.fileDate}T${inputUpdatedData?._source.testEndTime}`,
             compliancePercentage: humanScore,
             steps: steps,
-            videoUrl: `${inputUpdatedData?._source?.type === 'physical'?url.physical:url.remote}${inputUpdatedData?._source?.filePath}`,
+            videoUrl: getSignedUrl, // `${inputUpdatedData?._source?.type === 'physical'?url.physical:url.remote}${inputUpdatedData?._source?.filePath}`,
             ref: reference6,
           } );
         }
@@ -1544,7 +1587,9 @@ export async function summaryList( req, res ) {
       }
     }
 
-
+    mustQuery = [
+      ...filter,
+    ];
     if ( inputData.keyType === 'rm' || inputData.keyType === 'cluster' ) {
       let sort ={
         _id: -1,
@@ -1784,7 +1829,6 @@ export async function summaryList( req, res ) {
 
         };
         const getResponse = await getOpenSearchData( openSearch.EyeTestInput, getClusterQuery );
-        logger.info( { getResponse: getResponse } );
         if ( getResponse?.body?.aggregations && getResponse?.body?.aggregations?.total_count?.value > 0 ) {
           delete temp[i].store;
           delete temp[i]._id;
@@ -2604,7 +2648,6 @@ export async function summaryCard( req, res ) {
 
 
     const getOutput = await getOpenSearchData( openSearch?.EyeTestInput, getQuery );
-    logger.info( { getOutput: getOutput } );
     const initialValue = {
       totalFiles: 0,
       completedFiles: 0,