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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.6.42-eyetest.2",
+    "version": "3.6.44",
     "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';
@@ -25,17 +25,32 @@ export async function getList( req, res ) {
 
     const sortBy = inputData?.sortBy ? [ 'coveredStepsAI', 'trustScore', 'date' ].includes( inputData.sortBy ) ? inputData.sortBy :`${inputData.sortBy}.keyword` : 'storeName.keyword';
     const order = inputData?.sortOrder || -1;
-    let filter= [
-      {
-        'range': {
-          'date': {
-            'gte': new Date( inputData.fromDate ),
-            'lte': new Date( inputData.toDate ),
+    let filter;
+    if ( dateType === 'auditedDate' ) {
+      filter= [
+        {
+          'range': {
+            'updatedAt': {
+              'gte': new Date( inputData.fromDate ),
+              'lte': new Date( inputData.toDate ),
+            },
           },
         },
-      },
 
-    ];
+      ];
+    } else {
+      filter= [
+        {
+          'range': {
+            'date': {
+              'gte': new Date( inputData.fromDate ),
+              'lte': new Date( inputData.toDate ),
+            },
+          },
+        },
+
+      ];
+    }
 
 
     if ( inputData.demographics && inputData.demographics.length > 0 ) {
@@ -298,49 +313,7 @@ export async function getList( req, res ) {
   }
 }
 
-// export async function fetchAllDocuments( index, data ) {
-//   try {
-//     const pageSize = 1000; // safer chunk size
-//     let allHits = [];
-//     let searchAfter = null;
-//     let hasMore = true;
-//     let i =0;
-
-//     while ( hasMore ) {
-//       const body={
-//         size: pageSize,
-//         query: {
-//           bool: data,
-//         },
-//         sort: [
-//           { 'storeName.keyword': 'desc' },
-//           { '_id': 'asc' }, // Required for stable search_after
-//         ],
-//       };
-
-//       if ( searchAfter ) {
-//         body.search_after = searchAfter;
-//       }
-
-//       const response = await getOpenSearchData( index, body );
-//       const hits = response.body.hits.hits;
-//       i = i+hits.length;
-//       logger.info( { index: i, length: hits.length, msg: '........index' } );
-//       allHits.push( ...hits );
-//       if ( allHits.length >= 50000 ) {
-//         hasMore = false;
-//       } else {
-//         searchAfter = hits[hits.length - 1].sort;
-//       }
-//     }
-
-//     logger.info( `Fetched ${allHits.length} documents` );
-//     return allHits;
-//   } catch ( error ) {
-//     const err = error.message || 'Internal Server Error';
-//     return res.sendError( err, 500 );
-//   };
-// };
+
 export async function fetchDeepPage( index, data, limit, offset, sortBy, order, searchAfter1 ) {
   try {
     logger.info( { index: index, data: data, limit: limit, offset: offset } );
@@ -365,27 +338,6 @@ export async function fetchDeepPage( index, data, limit, offset, sortBy, order,
     );
 
     const hits = response?.body?.hits?.hits;
-    // while ( currentCount < offset + limit ) {
-    //   const response = await getOpenSearchData(
-    //       index,
-    //       body,
-    //   );
-
-    //   const hits = response?.body?.hits?.hits;
-    //   logger.info( { response: response } );
-    //   if ( !hits.length || offset + limit <= i ) break;
-    //   i = i+hits.length;
-    //   logger.info( { hits: hits, function: '.........hits' } );
-    //   currentCount += hits.length;
-    //   searchAfter = hits[hits.length - 1].sort;
-    //   logger.info( { searchAfter: searchAfter } );
-    //   // Only keep the target range
-    //   const startIndex = Math.max( 0, hits.length - ( currentCount - offset ) );
-    //   const sliced = hits.slice( startIndex, startIndex + limit );
-    //   if ( currentCount >= offset ) {
-    //     finalResults.push( ...sliced );
-    //   }
-    // }
     return hits;
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
@@ -398,7 +350,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 +427,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 +448,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 +555,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 +611,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 +650,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 +703,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 +731,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 +800,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 +888,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 +938,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 +978,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 +1023,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 +1067,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 +1108,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 +1147,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,
           } );
         }
@@ -1417,21 +1412,36 @@ export async function summaryList( req, res ) {
     const limit = inputData.limit || 10;
     const offset = inputData.offset ? ( inputData.offset - 1 ) * limit : 0;
 
-    const sortBy = inputData?.sortBy ? [ 'coveredStepsAI', 'trustScore', 'date', 'ComplianceScore', 'auditedSteps' ].includes( inputData.sortBy ) ? inputData.sortBy :`${inputData.sortBy}.keyword` : 'storeName.keyword';
+    const sortBy = inputData?.sortBy ? inputData?.sortBy === 'auditedDate'? 'updatedAt': [ 'coveredStepsAI', 'trustScore', 'date', 'ComplianceScore', 'auditedSteps' ].includes( inputData.sortBy ) ? inputData.sortBy :`${inputData.sortBy}.keyword` : 'storeName.keyword';
     const order = inputData?.sortOrder || -1;
 
     // declare filter and assign range values from inputData
-    let filter= [
-      {
-        'range': {
-          'date': {
-            'gte': new Date( inputData.fromDate ),
-            'lte': new Date( inputData.toDate ),
+    let filter;
+    if ( inputData?.dateType === 'auditedDate' ) {
+      filter= [
+        {
+          'range': {
+            'updatedAt': {
+              'gte': new Date( inputData.fromDate ),
+              'lte': new Date( inputData.toDate ),
+            },
           },
         },
-      },
 
-    ];
+      ];
+    } else {
+      filter= [
+        {
+          'range': {
+            'date': {
+              'gte': new Date( inputData.fromDate ),
+              'lte': new Date( inputData.toDate ),
+            },
+          },
+        },
+
+      ];
+    }
 
     // filter by Audit Status if key has minimum one element
     if ( inputData?.auditStatus && inputData?.auditStatus?.length > 0 ) {
@@ -1544,7 +1554,9 @@ export async function summaryList( req, res ) {
       }
     }
 
-
+    mustQuery = [
+      ...filter,
+    ];
     if ( inputData.keyType === 'rm' || inputData.keyType === 'cluster' ) {
       let sort ={
         _id: -1,
@@ -1784,7 +1796,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 +2615,6 @@ export async function summaryCard( req, res ) {
 
 
     const getOutput = await getOpenSearchData( openSearch?.EyeTestInput, getQuery );
-    logger.info( { getOutput: getOutput } );
     const initialValue = {
       totalFiles: 0,
       completedFiles: 0,

package/src/dtos/eyeTestAudit.dtos.js

@@ -3,6 +3,7 @@ import dayjs from 'dayjs';
 
 export const getListSchema = joi.object(
     {
+      dateType: joi.string().optional().valid( 'fileDate', 'auditedDate' ),
       fromDate: joi.string().required().messages( {
         'any.required': 'From Date is required',
         'string.empty': 'From Date cannot be empty',
@@ -101,6 +102,7 @@ export const userAuditedDataValid = {
 };
 
 export const summaryListSchema = joi.object( {
+  dateType: joi.string().optional().valid( 'fileDate', 'auditedDate' ),
   keyType: joi.string()
       .valid( 'rm', 'cluster', 'store' )
       .required()