tango-app-api-audit 3.6.27 → 3.6.30

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.6.27",
+    "version": "3.6.30",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",
@@ -13,6 +13,7 @@
     "author": "praveenraj",
     "license": "ISC",
     "dependencies": {
+        "@aws-sdk/client-ses": "^3.918.0",
         "adm-zip": "^0.5.15",
         "aws-sdk": "^2.1643.0",
         "axios": "^1.7.9",
@@ -24,6 +25,7 @@
         "joi-to-swagger": "^6.2.0",
         "lodash": "^4.17.21",
         "mongodb": "^6.7.0",
+        "nodemailer": "^7.0.10",
         "nodemon": "^3.1.3",
         "swagger-ui-express": "^5.0.1",
         "tango-api-schema": "^2.3.28",

package/src/controllers/audit.controllers.js

@@ -609,7 +609,7 @@ export async function getAuditFile( req, res ) {
     const getQuery = msg.audit_type =='ReAudit'?
     {
       size: inputData?.limit || 500,
-      _source: [ 'module', 'status', 'date', 'store_id', 'outputCluster', 'personPath', 'REIDCluster', 'isEmployee', 'isJunk', 'EmployeeStatusFinal', 'entry_time' ], // Only fetch necessary fields
+      _source: [ 'module', 'status', 'date', 'store_id', 'outputCluster', 'personPath', 'REIDCluster', 'isEmployee', 'isJunk', 'EmployeeStatusFinal' ], // Only fetch necessary fields
 
       query: {
         bool: {
@@ -638,13 +638,13 @@ export async function getAuditFile( req, res ) {
         },
       },
       sort: [
-        { entry_time: { order: 'desc' } },
+        { timestamp: { order: 'desc' } },
       ],
 
     }:
     {
       size: inputData?.limit || 500,
-      _source: [ 'module', 'status', 'date', 'store_id', 'personPath', 'REIDCluster', 'EmployeeStatusProposed', 'isJunk', 'EmployeeStatusFinal', 'entry_time' ], // Only fetch necessary fields
+      _source: [ 'module', 'status', 'date', 'store_id', 'personPath', 'REIDCluster', 'EmployeeStatusProposed', 'isJunk', 'EmployeeStatusFinal' ], // Only fetch necessary fields
 
       query: {
         bool: {
@@ -668,7 +668,7 @@ export async function getAuditFile( req, res ) {
         },
       },
       sort: [
-        { entry_time: { order: 'desc' } },
+        { timestamp: { order: 'desc' } },
       ],
 
     };
@@ -4490,7 +4490,7 @@ export async function auditImages( req, res ) {
         case 'BC':
           const getQuery = {
             size: 10000,
-            _source: [ 'module', 'status', 'date', 'store_id', 'personPath', 'REIDCluster', 'EmployeeStatusProposed', 'isJunk', 'EmployeeStatusFinal', 'entry_time' ], // Only fetch necessary fields
+            _source: [ 'module', 'status', 'date', 'store_id', 'personPath', 'REIDCluster', 'EmployeeStatusProposed', 'isJunk', 'EmployeeStatusFinal' ], // Only fetch necessary fields
 
             query: {
               bool: {
@@ -4515,7 +4515,7 @@ export async function auditImages( req, res ) {
             },
 
             sort: [
-              { entry_time: { order: 'desc' } },
+              { timestamp: { order: 'desc' } },
             ],
           };
           const files = [];
@@ -4565,7 +4565,7 @@ export async function auditImages( req, res ) {
 
           const getACQuery = {
             size: 10000,
-            _source: [ 'module', 'status', 'date', 'store_id', 'outputCluster', 'personPath', 'REIDCluster', 'isEmployee', 'isJunk', 'EmployeeStatusFinal', 'entry_time' ], // Only fetch necessary fields
+            _source: [ 'module', 'status', 'date', 'store_id', 'outputCluster', 'personPath', 'REIDCluster', 'isEmployee', 'isJunk', 'EmployeeStatusFinal' ], // Only fetch necessary fields
 
             query: {
               bool: {
@@ -4594,7 +4594,7 @@ export async function auditImages( req, res ) {
               },
             },
             sort: [
-              { entry_time: { order: 'desc' } },
+              { timestamp: { order: 'desc' } },
             ],
 
           };

package/src/controllers/eyeTestAudit.controllers.js

@@ -8,6 +8,7 @@ import 'dayjs/locale/en.js';
 import { aggregateEyeTestConfig, findOneEyeTestConfig, updateOneEyeTestConfig } from '../service/eyeTestConfiguration.service.js';
 import { ObjectId } from 'mongodb';
 import { aggregateClusters } from '../service/clusters.service.js';
+import { sendComplianceEmail } from '../validation/eyeTest.validation.js';
 
 dayjs.extend( utc );
 dayjs.extend( timezone );
@@ -750,6 +751,8 @@ export async function save( req, res ) {
   try {
     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 );
 
     let searchFilter =[
       {
@@ -811,7 +814,6 @@ export async function save( req, res ) {
       },
     };
     const getOutput = await getOpenSearchData( openSearch.EyeTestOutput, searchQuery );
-    logger.info( { getOutput: getOutput } );
     const output = getOutput?.body?.hits?.hits?.length > 0 ? getOutput?.body?.hits?.hits[0] : null;
     if ( !output ) {
       return res.sendError( 'This file is currently being audited by another user. Any actions you perform will not be saved.', 400 );
@@ -845,19 +847,76 @@ export async function save( req, res ) {
 
     const getEyetestConfig = await findOneEyeTestConfig( { clientId: req?.user.userType == 'tango'? inputData?.clientId : req.user.clientId, configureType: 'email' }, { complianceThreshold: 1 } );
 
-    if ( getEyetestConfig && inputData.auditStatus == 'Audited' && inputUpdatedData ) {
-      const trustScore = Math.round( 100-( ( inputData?.overRides / inputData?.steps?.length ) * 100 ) );
+    if ( getEyetestConfig &&( inputData.auditStatus == 'Audited' ||inputData.auditStatus == 'Re-Audited' ) && inputUpdatedData && inputData.type === 'physical' && inputData?.isReSend !== false ) {
       const value = Number( getEyetestConfig?.complianceThreshold?.value?.split( '%' )[0] );
       const condition = getEyetestConfig?.complianceThreshold?.condition;
-      const id= `${inputData?.RMEmail}_${inputData?.cluster}_${inputUpdatedData?._source?.optumId}_${inputData?.fileId}`;
+      const id= inputData?.isReSend === true ?`${inputData.id}_${inputUpdatedData?._source?.optumId}_${inputData?.fileId}_${Date.now()}` : `${inputData.id}_${inputUpdatedData?._source?.optumId}_${inputData?.fileId}`;
+      const humanScore = Math.round( ( inputUpdatedData?._source?.auditedSteps /inputUpdatedData?._source?.totalSteps ) * 100 );
+      const userName = await findOneUser( { _id: new mongoose.Types.ObjectId( inputUpdatedData?._source?.userId ) }, { userName: 1 } );
+      const emailList = inputData?.RMEmail?.split( ',' );
+      let rmName;
+
+      if ( emailList?.length > 0 ) {
+        const userQuery = [
+          {
+            $match: {
+              $and: [
+                {
+                  email: { $in: emailList },
+                },
+              ],
+            },
+          },
+          {
+            $group: {
+              _id: null,
+              userList: { $addToSet: '$userName' },
+            },
+          },
+          {
+            $project: {
+              userList: 1,
+              _id: 0,
+            },
+          },
+        ];
+        const getRMName = await aggregateUser( userQuery );
+        rmName = getRMName?.[0]?.userList || '';
+      }
+
+      const order = [
+        'Distance-VA-Check',
+        'Torchlight Check',
+        'JCC Check',
+        'Duochrome Check',
+        'Near Addition Check',
+        'Prescription Verification Check',
+      ];
+      const steps = inputData?.steps
+          .filter( ( step ) =>
+    step.hasOwnProperty( 'auditedStatus' ) ?
+      step.auditedStatus === false :
+      step.AIStatus === false,
+          )
+          .map( ( step ) => ( {
+            stepName: step.processName,
+            comment: step?.reason === 'others'? step.otherReason:step?.reason,
+          } ) );
+      steps.sort(
+          ( a, b ) => order.indexOf( a.processName ) - order.indexOf( b.processName ),
+      );
       switch ( condition ) {
-        case '>': if ( trustScore > value ) {
+        case '>': if ( humanScore > value ) {
           const record1 = {
             RMEmail: inputData.RMEmail,
+            RMName: rmName.toString(),
             cluster: inputData.cluster,
             optumId: inputUpdatedData?._source?.optumId,
+            optomEmailId: inputUpdatedData?._source?.salesmanEmailId,
             storeName: inputUpdatedData?._source?.storeName,
             complianceScore: inputUpdatedData?._source?.ComplianceScore,
+            humanScore: humanScore,
+            auditedBy: userName?.userName || '',
             trustScore: inputUpdatedData?._source?.trustScore,
             auditedId: inputUpdatedData?._id,
             queueId: inputUpdatedData?._source?.queueId,
@@ -866,15 +925,29 @@ export async function save( req, res ) {
 
           };
           await insertWithId( openSearch.eyeTestEmailAlert, id, record1 );
+          sendComplianceEmail( {
+            toEmail: inputUpdatedData?._source?.salesmanEmailId,
+            fromEmail: ses.eyeTestAlertEmail,
+            userName: 'User',
+            storeName: inputUpdatedData?._source?.storeName,
+            startTime: `${inputUpdatedData?._source?.fileDate}T${inputUpdatedData?._source.testEndTime}`,
+            compliancePercentage: humanScore,
+            steps: steps,
+            videoUrl: `${url.physical}${inputUpdatedData?._source?.filePath}`,
+          } );
         }
           break;
-        case '<': if ( trustScore < value ) {
+        case '<': if ( humanScore < value ) {
           const record2 = {
             RMEmail: inputData.RMEmail,
+            RMName: rmName.toString(),
             cluster: inputData.cluster,
             optumId: inputUpdatedData?._source?.optumId,
+            optomEmailId: inputUpdatedData?._source?.salesmanEmailId,
             storeName: inputUpdatedData?._source?.storeName,
             complianceScore: inputUpdatedData?._source?.ComplianceScore,
+            humanScore: humanScore,
+            auditedBy: userName?.userName || '',
             trustScore: inputUpdatedData?._source?.trustScore,
             auditedId: inputUpdatedData?._id,
             queueId: inputUpdatedData?._source?.queueId,
@@ -883,15 +956,29 @@ export async function save( req, res ) {
 
           };
           await insertWithId( openSearch.eyeTestEmailAlert, id, record2 );
+          sendComplianceEmail( {
+            toEmail: inputUpdatedData?._source?.salesmanEmailId,
+            fromEmail: ses.eyeTestAlertEmail,
+            userName: 'User',
+            storeName: inputUpdatedData?._source?.storeName,
+            startTime: `${inputUpdatedData?._source?.fileDate}T${inputUpdatedData?._source.testEndTime}`,
+            compliancePercentage: humanScore,
+            steps: steps,
+            videoUrl: `${url.physical}${inputUpdatedData?._source?.filePath}`,
+          } );
         };
           break;
-        case '>=': if ( trustScore >= value ) {
+        case '>=': if ( humanScore >= value ) {
           const record3 = {
             RMEmail: inputData.RMEmail,
+            RMName: rmName.toString(),
             cluster: inputData.cluster,
             optumId: inputUpdatedData?._source?.optumId,
+            optomEmailId: inputUpdatedData?._source?.salesmanEmailId,
             storeName: inputUpdatedData?._source?.storeName,
             complianceScore: inputUpdatedData?._source?.ComplianceScore,
+            humanScore: humanScore,
+            auditedBy: userName?.userName || '',
             trustScore: inputUpdatedData?._source?.trustScore,
             auditedId: inputUpdatedData?._id,
             queueId: inputUpdatedData?._source?.queueId,
@@ -900,15 +987,29 @@ export async function save( req, res ) {
 
           };
           await insertWithId( openSearch.eyeTestEmailAlert, id, record3 );
+          sendComplianceEmail( {
+            toEmail: inputUpdatedData?._source?.salesmanEmailId,
+            fromEmail: ses.eyeTestAlertEmail,
+            userName: 'User',
+            storeName: inputUpdatedData?._source?.storeName,
+            startTime: `${inputUpdatedData?._source?.fileDate}T${inputUpdatedData?._source.testEndTime}`,
+            compliancePercentage: humanScore,
+            steps: steps,
+            videoUrl: `${url.physical}${inputUpdatedData?._source?.filePath}`,
+          } );
         }
           break;
-        case '<=': if ( trustScore <= value ) {
+        case '<=': if ( humanScore <= value ) {
           const record4 = {
             RMEmail: inputData.RMEmail,
+            RMName: rmName.toString(),
             cluster: inputData.cluster,
             optumId: inputUpdatedData?._source?.optumId,
+            optomEmailId: inputUpdatedData?._source?.salesmanEmailId,
             storeName: inputUpdatedData?._source?.storeName,
             complianceScore: inputUpdatedData?._source?.ComplianceScore,
+            humanScore: humanScore,
+            auditedBy: userName?.userName || '',
             trustScore: inputUpdatedData?._source?.trustScore,
             auditedId: inputUpdatedData?._id,
             queueId: inputUpdatedData?._source?.queueId,
@@ -917,16 +1018,30 @@ export async function save( req, res ) {
 
           };
           await insertWithId( openSearch.eyeTestEmailAlert, id, record4 );
+          sendComplianceEmail( {
+            toEmail: inputUpdatedData?._source?.salesmanEmailId,
+            fromEmail: ses.eyeTestAlertEmail,
+            userName: 'User',
+            storeName: inputUpdatedData?._source?.storeName,
+            startTime: `${inputUpdatedData?._source?.fileDate}T${inputUpdatedData?._source.testEndTime}`,
+            compliancePercentage: humanScore,
+            steps: steps,
+            videoUrl: `${url.physical}${inputUpdatedData?._source?.filePath}`,
+          } );
         }
           break;
         case '=':
-        case '==': if ( trustScore == value ) {
+        case '==': if ( humanScore == value ) {
           const record5 = {
             RMEmail: inputData.RMEmail,
+            RMName: rmName.toString(),
             cluster: inputData.cluster,
             optumId: inputUpdatedData?._source?.optumId,
+            optomEmailId: inputUpdatedData?._source?.salesmanEmailId,
             storeName: inputUpdatedData?._source?.storeName,
             complianceScore: inputUpdatedData?._source?.ComplianceScore,
+            humanScore: humanScore,
+            auditedBy: userName?.userName || '',
             trustScore: inputUpdatedData?._source?.trustScore,
             auditedId: inputUpdatedData?._id,
             queueId: inputUpdatedData?._source?.queueId,
@@ -935,15 +1050,29 @@ export async function save( req, res ) {
 
           };
           await insertWithId( openSearch.eyeTestEmailAlert, id, record5 );
+          sendComplianceEmail( {
+            toEmail: inputUpdatedData?._source?.salesmanEmailId,
+            fromEmail: ses.eyeTestAlertEmail,
+            userName: 'User',
+            storeName: inputUpdatedData?._source?.storeName,
+            startTime: `${inputUpdatedData?._source?.fileDate}T${inputUpdatedData?._source.testEndTime}`,
+            compliancePercentage: humanScore,
+            steps: steps,
+            videoUrl: `${url.physical}${inputUpdatedData?._source?.filePath}`,
+          } );
         }
           break;
-        case '===': if ( trustScore === value ) {
+        case '===': if ( humanScore === value ) {
           const record6 = {
             RMEmail: inputData.RMEmail,
+            RMName: rmName.toString(),
             cluster: inputData.cluster,
             optumId: inputUpdatedData?._source?.optumId,
+            optomEmailId: inputUpdatedData?._source?.salesmanEmailId,
             storeName: inputUpdatedData?._source?.storeName,
             complianceScore: inputUpdatedData?._source?.ComplianceScore,
+            humanScore: humanScore,
+            auditedBy: userName?.userName || '',
             trustScore: inputUpdatedData?._source?.trustScore,
             auditedId: inputUpdatedData?._id,
             queueId: inputUpdatedData?._source?.queueId,
@@ -951,12 +1080,22 @@ export async function save( req, res ) {
             updatedAt: new Date(),
           };
           await insertWithId( openSearch.eyeTestEmailAlert, id, record6 );
+          sendComplianceEmail( {
+            toEmail: inputUpdatedData?._source?.salesmanEmailId,
+            fromEmail: ses.eyeTestAlertEmail,
+            userName: 'User',
+            storeName: inputUpdatedData?._source?.storeName,
+            startTime: `${inputUpdatedData?._source?.fileDate}T${inputUpdatedData?._source.testEndTime}`,
+            compliancePercentage: humanScore,
+            steps: steps,
+            videoUrl: `${url.physical}${inputUpdatedData?._source?.filePath}`,
+          } );
         }
           break;
         default: throw new Error( `Unknown condition: ${condition}` );
       }
     }
-    return res.sendSuccess( 'The file has been submited successfully' );
+    return res.sendSuccess( 'The file has been submitted successfully' );
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
     logger.error( { message: error, data: req.params, function: 'eyetestAudit-controller-save' } );
@@ -1198,18 +1337,25 @@ export async function userAuditedData( req, res ) {
 
 export async function summaryList( req, res ) {
   try {
+    // declare inputData and get request body
     const inputData = req.body;
+
+    // throw 204 if client id is not 11
     if ( inputData.clientId !== '11' ) {
       return res.sendError( 'No data found', 204 );
     }
 
+    // declare openSearch and get data form the .env/secret manager
     const openSearch = JSON.parse( process.env.OPENSEARCH );
+
+    // set limit, offset, sortBy, sortOrder value if not set default value
     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 order = inputData?.sortOrder || -1;
 
+    // declare filter and assign range values from inputData
     let filter= [
       {
         'range': {
@@ -1222,6 +1368,7 @@ export async function summaryList( req, res ) {
 
     ];
 
+    // filter by Audit Status if key has minimum one element
     if ( inputData?.auditStatus && inputData?.auditStatus?.length > 0 ) {
       filter.push( {
         'terms': {
@@ -1229,6 +1376,8 @@ export async function summaryList( req, res ) {
         },
       } );
     }
+
+    // filter by Visitors Type if key has minimum one element
     if ( inputData?.demographics && inputData?.demographics?.length > 0 ) {
       filter.push( {
         'terms': {
@@ -1236,6 +1385,8 @@ export async function summaryList( req, res ) {
         },
       } );
     }
+
+    // filter by Eye test Type if key has string value one element
     if ( inputData.type && inputData.type!='' ) {
       filter.push( {
         'term': {
@@ -1245,6 +1396,17 @@ export async function summaryList( req, res ) {
       } );
     }
 
+    // filter by near addition if value != "" and eye test must be a physical
+    if ( inputData.nearAddition && inputData.nearAddition!='' && inputData.type ==='physical' ) {
+      filter.push( {
+        'term': {
+          'nearAddition.keyword': inputData.nearAddition,
+        },
+
+      } );
+    }
+
+    // filter by stores if key has minimum one element  else throw an error
     if ( inputData.storeId && inputData.storeId.length > 0 ) {
       filter.push( {
 
@@ -1257,11 +1419,14 @@ export async function summaryList( req, res ) {
       return res.sendError( 'No data found', 204 );
     }
 
+    // Declare mustQuery as an array and include all elements from the filter array
     let mustQuery = [
       ...filter,
     ];
 
-    if ( inputData.complianceScore && inputData.complianceScore?.length > null ) {
+    // filter by complianceScore/tango score if key has minimum one element
+    if ( inputData.complianceScore && inputData.complianceScore?.length > 0 ) {
+      // If the key type is not 'store', split the compliance score ranges
       if ( inputData.keyType !== 'store' ) {
         const rangeShould = inputData?.complianceScore?.map( ( r ) => {
           const [ gte, lte ] = r.split( '-' ).map( Number );
@@ -1271,7 +1436,7 @@ export async function summaryList( req, res ) {
             },
           };
         } );
-
+        // Add the range conditions to mustQuery (any one of the ranges should match)
         mustQuery.push(
             {
               bool: {
@@ -1280,7 +1445,7 @@ export async function summaryList( req, res ) {
               },
             },
         );
-      } else {
+      } else { // If-else condition: use 'terms' filter to match records by Compliance Score / Tango Score
         const values = Array.isArray( inputData.complianceScore ) ?
     inputData.complianceScore.map( Number ) :
     [ Number( inputData.complianceScore ) ];
@@ -1293,6 +1458,7 @@ export async function summaryList( req, res ) {
       }
     }
 
+    // filter by category if key exist allow "fake, genuine" else throw valid category
     if ( inputData?.category ) {
       switch ( inputData?.category ) {
         case 'fake':
@@ -1898,7 +2064,9 @@ export async function summaryList( req, res ) {
               'Store ID': element?._source?.storeId || 'Un Assigned',
               'Store Name': element?._source?.storeName ||'Un Assigned',
               'Optom ID': element?._source?.optumId,
+              'Optom Email ID': element?._source?.salesmanEmailId,
               'Queue ID': element?._source?.queueId,
+              'Power Types': element?._source?.nearAddition === 'true' ? 'With Near Addition' : element?._source?.nearAddition === 'false' ? 'Without Near Addition':'',
               'Tango Score': `${element?._source?.totalSteps>0 ? Math.round( ( element?._source?.coveredStepsAI/ element?._source?.totalSteps )*100 ): 0} %`,
               'Steps Covered By AI': element?._source?.coveredStepsAI || 0,
               'Human Audited Score': [ 'Re-Audited', 'Audited' ].includes( element?._source?.auditStatus )?`${element?._source?.totalSteps>0 ? Math.round( ( element?._source?.auditedSteps/ element?._source?.totalSteps )*100 ): 0} %`:'NA',
@@ -1923,12 +2091,16 @@ export async function summaryList( req, res ) {
               'Store ID': element?._source?.storeId || 'Un Assigned',
               'Store Name': element?._source?.storeName ||'Un Assigned',
               'Engagement ID': element?._source?.engagementId,
+              'Optom ID': element?._source?.optm_userId,
+              'Optom Email ID': element?._source?.userEmail,
+              'Optom Name': element?._source?.displayName,
               'Tango Score': `${element?._source?.totalSteps>0 ? Math.round( ( element?._source?.coveredStepsAI/ element?._source?.totalSteps )*100 ): 0} %`,
-              'Human Audited Score': [ 'Re-Audited', 'Audited' ].includes( element?._source?.auditStatus )?`${element?._source?.totalSteps>0 ? Math.round( ( element?._source?.auditedSteps/ element?._source?.totalSteps )*100 ): 0} %`:'NA',
               'Steps Covered By AI': element?._source?.coveredStepsAI || 0,
-              'Steps Covered By Human': [ 'Re-Audited', 'Audited' ].includes( element?._source?.auditStatus )?element?._source?.auditedSteps :'NA',
               'Trust Score': element?._source?.trustScore == null || element?._source?.trustScore ==undefined ? 'NA' : `${element?._source?.trustScore} %`,
+              'Steps Covered By Human': [ 'Re-Audited', 'Audited' ].includes( element?._source?.auditStatus )?element?._source?.auditedSteps :'NA',
+              'Human Audited Score': [ 'Re-Audited', 'Audited' ].includes( element?._source?.auditStatus )?`${element?._source?.totalSteps>0 ? Math.round( ( element?._source?.auditedSteps/ element?._source?.totalSteps )*100 ): 0} %`:'NA',
               'Test Duration': duration || '',
+              'Comments ': element._source?.subComment || '',
               'Audit Status': element?._source?.auditStatus || '',
               'Audited By': userName?.userName || '',
 
@@ -2118,6 +2290,15 @@ export async function summaryCard( req, res ) {
         },
       } );
     }
+
+    if ( inputData.nearAddition && inputData.nearAddition!='' && inputData.type ==='physical' ) {
+      filter.push( {
+        'term': {
+          'nearAddition.keyword': inputData.nearAddition,
+        },
+
+      } );
+    }
     let mustQuery = [
       ...filter,
     ];
@@ -2271,7 +2452,7 @@ export async function summaryCard( req, res ) {
                 'humanScore': {
                   filter: {
                     terms: {
-                      'auditStatus.keyword': [ 'Audited', 'ReAudited' ],
+                      'auditStatus.keyword': [ 'Audited', 'Re-Audited' ],
                     },
                   },
                   aggs: {
@@ -2386,49 +2567,123 @@ export async function emailAlertLog( req, res ) {
     inputData.clientId = req.user.userType == 'tango'? inputData?.clientId : req?.user?.clientId;
     // get openserach name form the env file
     const openSearch = JSON.parse( process.env.OPENSEARCH );
-
+    const sortBy = inputData?.sortBy ? [ 'complianceScore', 'humanScore', 'trustScore', 'updatedAt', 'createdAt' ].includes( inputData.sortBy ) ? inputData.sortBy :`${inputData.sortBy}.keyword` : 'RMName.keyword';
 
     let filter =[
       {
         'range': {
           'createdAt': {
             'gte': dayjs( inputData.fromDate ),
-            'lte': dayjs( `${inputData.toDate} ${dayjs().format( 'HH:mm:ss' )}` ),
+            'lte': dayjs( inputData.toDate ),
           },
         },
       },
     ];
     let sort =[
-      { [inputData?.sortBy]: { order: inputData.sortOrder === 1 ? 'asc' : 'desc' } },
+      { [sortBy]: { order: inputData.sortOrder === 1 ? 'asc' : 'desc' } },
     ];
-    if ( inputData.RmList && inputData.RmList?.lenght > 0 ) {
-      filter.push( {
-        'terms': {
-          'RMEmail.keyword': inputData?.RmList,
+
+    let search = {
+      'must': filter,
+      'should': [],
+      'minimum_should_match': 1,
+    };
+    if ( inputData.searchValue && inputData.searchValue !== '' ) {
+      search ={
+        'must': filter,
+        'should': [
+          {
+            'wildcard': {
+              'RMEmail.keyword': {
+                'value': `*${inputData.searchValue}*`,
+              },
+            },
+          },
+          {
+            'wildcard': {
+              'RMName.keyword': {
+                'value': `*${inputData.searchValue}*`,
+              },
+            },
+          },
+          {
+            'wildcard': {
+              'cluster.keyword': {
+                'value': `*${inputData.searchValue}*`,
+              },
+            },
+          },
+          {
+            'wildcard': {
+              'optumId.keyword': {
+                'value': `*${inputData.searchValue}*`,
+              },
+            },
+          },
+          {
+            'wildcard': {
+              'queueId.keyword': {
+                'value': `*${inputData.searchValue}*`,
+              },
+            },
+          },
+          {
+            'wildcard': {
+              'storeName.keyword': {
+                'value': `*${inputData.searchValue}*`,
+              },
+            },
+          },
+          {
+            'wildcard': {
+              'auditedBy.keyword': {
+                'value': `*${inputData.searchValue}*`,
+              },
+            },
+          },
+          {
+            'wildcard': {
+              'optomEmailId.keyword': {
+                'value': `*${inputData.searchValue}*`,
+              },
+            },
+          },
+        ],
+
+
+      };
+    }
+
+    if ( inputData.RMList && inputData.RMList?.length > 0 ) {
+      const shouldRMQuery =inputData.RMList.map( ( email ) => ( {
+        wildcard: {
+          'RMEmail.keyword': `*${email}*`,
         },
-      } );
+      } ) );
+      search['should'].push( ...shouldRMQuery );
     }
 
-    if ( inputData.cluster && inputData.cluster?.lenght > 0 ) {
-      filter.push( {
-        'terms': {
-          'cluster.keyword': inputData?.cluster,
+    if ( inputData.cluster && inputData.cluster?.length > 0 ) {
+      const shouldClusterQuery =inputData?.cluster?.map( ( cluster ) => ( {
+        wildcard: {
+          'RMEmail.keyword': `*${cluster}*`,
         },
-      } );
+      } ) );
+      search['should'].push( ...shouldClusterQuery );
     }
     const getQuery = {
       'size': inputData.isExport == true? 50000 : inputData?.limit || 10,
       'from': offset || 0,
       'query': {
-        'bool': {
-          'must': filter,
-        },
+        'bool': search,
       },
       'sort': sort,
     };
 
+
     // get query result from the open saerch
     const getData= await getOpenSearchData( openSearch.eyeTestEmailAlert, getQuery );
+    const count = getData?.body?.hits?.total?.value;
     // throw error if got null or empty array
     if ( !getData || getData?.body?.hits?.hits?.length == 0 ) {
       return res.sendError( 'No records found', 204 );
@@ -2436,30 +2691,39 @@ export async function emailAlertLog( req, res ) {
     let response =[];
     for ( let item of getData?.body?.hits?.hits ) {
       response.push( {
-        RMEmail: item?._source?.RMEmail,
+        RMEmail: item?._source?.RMEmail || '',
+        RMName: item?._source?.RMName || '',
         cluster: item?._source?.cluster,
         optumId: item?._source?.optumId,
+        optomEmailId: item?._source?.optomEmailId,
         storeName: item?._source?.storeName,
-        complianceScore: item?._source?.complianceScore,
-        trustScore: item?._source?.trustScore,
+        complianceScore: Math.round( item?._source?.complianceScore || 0 ) + ' %',
+        humanScore: Math.round( item?._source?.humanScore || 0 )+ ' %',
+        trustScore: item?._source?.trustScore+ ' %' || '--',
         auditedId: item?._source?.auditedId,
         queueId: item?._source?.queueId,
+        auditedBy: item?._source?.auditedBy || '--',
 
       } );
     }
 
     if ( inputData.isExport == true ) {
+      logger.info( { response: response } );
       const chunkedMappingData = await chunkArray( response, 10 );
       const promises = chunkedMappingData.map( async ( chunk ) => {
         const exportData = [];
         for ( const element of chunk ) {
           exportData.push( {
-            'RM Email': element.RMEmail,
+            'RM Name': element.RMEmail,
             'Cluster Name': element.cluster,
-            'Optom Id': element.optumId,
+            'Optom ID': element.optumId,
+            'Optom Email': element.optomEmailId || '--',
             'Store Name': element.storeName,
-            'Tango Score': element.complianceScore || 0,
-            'Trust Score': element.trustScore || 0,
+            'Audited By': element.auditedBy || '--',
+            'Tango Score': Math.round( element.complianceScore || 0 )+' %',
+            'Trust Score': element.trustScore+' %' || '--',
+            'Human Audited Score': Math.round( element.humanScore || 0 ) + ' %',
+
 
           } );
         }
@@ -2468,6 +2732,7 @@ export async function emailAlertLog( req, res ) {
       } );
       const mappedArrays = await Promise.all( promises );
       const result = mappedArrays.flat();
+
       await download( result, res );
       return;
     }
@@ -2476,8 +2741,7 @@ export async function emailAlertLog( req, res ) {
     // throw error if null or undefined  or empty array
 
 
-    logger.info( { inputData: inputData, getData: response } );
-    return res.sendSuccess( { result: response, count: response.length } );
+    return res.sendSuccess( { result: response, count: count } );
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
     logger.error( { message: error, data: req.body, function: 'eyetestAudit-controller-emailAlertLog' } );
@@ -2637,10 +2901,6 @@ export async function getEmailConfig( req, res ) {
       configureType: 'email',
     };
     const getOne = await findOneEyeTestConfig( query, { complianceThreshold: 1, _id: 1 } );
-    logger.info( { getOne: getOne, message: 'getEmailConfig' } );
-    // if ( !getOne?.complianceThreshold ) {
-    //   return res.sendError( 'No data found', 204 );
-    // }
     if ( !getOne ) {
       return res.sendError( ' No data found', 204 );
     }

package/src/controllers/traxAudit.controllers.js

@@ -1,4 +1,4 @@
-import { checkFileExist, chunkArray, download, getDate, getDateWithCustomizeTime, getJsonFileData, getObject, getOpenSearchData, getUTC, insertOpenSearchData, listFileByPath, logger, signedUrl, sqsReceive, updateOpenSearchData, sendMessageToQueue, listQueue, copyImage, upsertOpenSearchData } from 'tango-app-api-middleware';
+import { checkFileExist, chunkArray, download, getDate, getDateWithCustomizeTime, getJsonFileData, getObject, getOpenSearchData, getUTC, insertOpenSearchData, listFileByPath, logger, signedUrl, sqsReceive, updateOpenSearchData, sendMessageToQueue, listQueue, copyImage } from 'tango-app-api-middleware';
 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';
@@ -1149,8 +1149,7 @@ export async function saveBinary( req, res ) {
           fileDetails: getTraxInsertData?.sqs?.Body?.fileDetails,
           createdAt: new Date(),
         };
-        const customerId = `${inputData.storeId}_${inputData.fileDate}_${inputData.moduleType}_${inputData.tempId}`;
-        await upsertOpenSearchData( openSearch.traxDetectionOutput, customerId, { doc: OpenSearchOutput } );
+        await insertOpenSearchData( openSearch.traxDetectionOutput, OpenSearchOutput );
         const logData2 = {
           userId: req.user._id,
           userName: req.user.userName,

package/src/dtos/eyeTestAudit.dtos.js

@@ -64,6 +64,7 @@ export const saveSchema = joi.object( {
   spokenLanguage: joi.string().optional(),
   cluster: joi.string().required().allow( '' ),
   RMEmail: joi.string().required().allow( '' ),
+  isReSend: joi.boolean().optional(),
 } );
 
 export const saveValid = {
@@ -156,7 +157,7 @@ export const summaryListSchema = joi.object( {
   ).optional(),
   storeId: joi.array().items( joi.string().required() ).required(),
   complianceScore: joi.array().items( joi.string().required() ).optional(),
-  nearAddition: joi.string().optional().allow( '' ),
+  nearAddition: joi.string().optional().allow( '', 'true', 'false' ),
   isExport: joi.boolean().optional(),
   searchValue: joi.string().optional().allow( '' ),
   sortBy: joi.string().optional(),
@@ -234,7 +235,7 @@ export const summaryCardSchema = joi.object( {
   ).optional(),
   storeId: joi.array().items( joi.string().required() ).required(),
   complianceScore: joi.array().items( joi.string().required() ).optional(),
-  nearAddition: joi.string().optional().allow( '' ),
+  nearAddition: joi.string().optional().allow( '', 'true', 'false' ),
   category: joi.string().optional() .valid( 'fake', 'genuine' ),
 } );
 
@@ -279,12 +280,8 @@ export const emailAlertLogSchema = joi.object( {
 
         return value;
       } ),
-  type: joi.string().required().messages( {
-    'any.required': 'Type is required',
-    'string.empty': 'Type cannot be empty',
-  } ),
   RMList: joi.array().items(
-      joi.string().optional(),
+      joi.string().required(),
   ).optional(),
   clientId: joi.string().when( '$userType', {
     is: 'tango',
@@ -294,7 +291,7 @@ export const emailAlertLogSchema = joi.object( {
     } ),
     otherwise: joi.optional(),
   } ),
-  cluster: joi.array().items( joi.string().required() ).required(),
+  cluster: joi.array().items( joi.string().required() ).optional(),
   isExport: joi.boolean().optional(),
   searchValue: joi.string().optional().allow( '' ),
   sortBy: joi.string().optional(),
@@ -413,6 +410,7 @@ export const getEmailConfigSchema = joi.object( {
     } ),
     otherwise: joi.optional(),
   } ),
+
 } );
 
 export const getEmailConfigValid = {

package/src/routes/eyeTestAudit.routes.js

@@ -3,14 +3,14 @@ import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
 import { accessVerification } from 'tango-app-api-middleware';
 import { cancelValid, clusterListValid, emailAlertLogValid, getEmailConfigValid, getFileHistoryValid, getFileValid, getListValid, getUserConfigValid, rmListValid, saveValid, summaryCardValid, summaryListValid, updateEmailConfigValid, updateUserConfigValid, userAuditedDataValid, viewFileValid } from '../dtos/eyeTestAudit.dtos.js';
 import { addUserConfig, cancel, clusterList, emailAlertLog, getEmailConfig, getFile, getFileHistory, getList, getUserConfig, rmList, save, summaryCard, summaryList, updateEmailConfig, updateEmailConfig1, updateUserConfig, userAuditedData, viewFile } from '../controllers/eyeTestAudit.controllers.js';
-import { isSuperAdmin, roleValidation } from '../validation/eyeTest.validation.js';
+import { isSuperAdmin, roleValidation, sendAlert } from '../validation/eyeTest.validation.js';
 
 export const eyeTestAuditRouter = Router();
 
 eyeTestAuditRouter.post( '/get-list', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), validate( getListValid ), getList );
 eyeTestAuditRouter.get( '/view-file/:id', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), validate( viewFileValid ), viewFile );
 eyeTestAuditRouter.get( '/get-file/:id', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), validate( getFileValid ), getFile );
-eyeTestAuditRouter.post( '/save', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), validate( saveValid ), save );
+eyeTestAuditRouter.post( '/save', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), validate( saveValid ), sendAlert, save );
 eyeTestAuditRouter.post( '/cancel', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), validate( cancelValid ), cancel );
 eyeTestAuditRouter.get( '/get-file-history/:id/:type', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), validate( getFileHistoryValid ), getFileHistory );
 eyeTestAuditRouter.get( '/user-audited-data/:id', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), validate( userAuditedDataValid ), userAuditedData );

package/src/validation/eyeTest.validation.js

@@ -1,4 +1,5 @@
-import { logger } from 'tango-app-api-middleware';
+import { getOpenSearchById, logger } from 'tango-app-api-middleware';
+import { SESClient, SendEmailCommand } from '@aws-sdk/client-ses';
 
 export async function roleValidation( req, res, next ) {
   try {
@@ -39,3 +40,205 @@ export async function isSuperAdmin( req, res, next ) {
   }
 }
 
+export async function sendAlert( req, res, next ) {
+  try {
+    const inputData = req.body;
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
+    if ( inputData.auditStatus == 'Re-Audited' && inputData.type == 'physical' && inputData?.isReSend == undefined ) {
+      const getOne = await getOpenSearchById( openSearch.EyeTestInput, inputData.id );
+      const id = `${inputData.id}_${getOne?.body?._source?.optumId}_${inputData.fileId}`;
+      const getId = await getOpenSearchById( openSearch.eyeTestEmailAlert, id );
+      logger.info( { getId: getId, id: id } );
+      const inputUpdatedData = getId?.body;
+      if ( inputUpdatedData ) {
+        return res.sendSuccess( 'Do you want resend mail?', 202 );
+      } else {
+        return next();
+      }
+    } else {
+      return next();
+    }
+  } catch ( error ) {
+    const err = error.message;
+    return res.sendError( err, 500 );
+  }
+}
+
+export async function sendComplianceEmail( {
+  toEmail,
+  fromEmail,
+  userName,
+  storeName,
+  startTime,
+  compliancePercentage,
+  steps,
+  videoUrl, //  S3 cdn video URL
+} ) {
+  // Initialize AWS SES client
+  const sesClient = new SESClient( {
+    region: 'ap-south-1',
+    credentials: {
+      accessKeyId: process.env.AWS_ACCESS_KEY_ID_SIGNED_URL,
+      secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY__SIGNED_URL,
+    },
+  } );
+
+  // Fetch video as base64 to attach in SES
+  const videoResponse = await fetch( videoUrl );
+  const videoBuffer = await videoResponse.arrayBuffer();
+  const videoBase64 = Buffer.from( videoBuffer ).toString( 'base64' );
+
+  //  HTML Email Template
+  const htmlBody = ( userName, steps, compliancePercentage ) => {
+    const tableRows = steps
+        .map(
+            ( item ) => `
+        <tr>
+          <td>${item.stepName}</td>
+          <td>${item.comment ?? '--'}</td>
+        </tr>
+      `,
+        )
+        .join( '' );
+
+    return `
+  <!DOCTYPE html>
+  <html>
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Non Compliance Report</title>
+    <style>
+      body { font-family: 'Inter', sans-serif; margin: 0; padding: 0; background: #f9fafb; color: #121a26; }
+      .container { max-width: 700px; margin: 24px auto; background: #fff; padding: 24px; border-radius: 10px; box-shadow: 0 1px 3px rgba(0,0,0,0.1); }
+      .header { display: flex; align-items: center; gap: 10px; }
+      .logo { width: 36px; height: 36px; border-radius: 50%; }
+      .title { font-size: 20px; font-weight: 700; color: #121a26; }
+      .subtitle { font-size: 15px; color: #384860; margin-top: 8px; line-height: 1.6; }
+      .divider { height: 2px; background: #eaeef0; margin: 16px 0; }
+      .table { width: 100%; border-collapse: collapse; margin-top: 16px; }
+      .table th, .table td { text-align: left; padding: 12px 16px; border-bottom: 1px solid #eaeef0; color: #384860; font-size: 14px; }
+     .compliance-box {
+  background: #F1F5F9;         
+  color: #F04438;              
+  font-weight: 700;
+  font-size: 18px;
+  padding: 12px 16px;
+  border-radius: 8px;
+  text-align: left;               
+  margin-top: 24px;
+  border: 1px solid #e2e8f0;    /* subtle border for better definition */
+}
+  .video {
+        margin-top: 20px;
+        border-radius: 8px;
+         overflow: hidden;
+      }
+       .video video {
+         width: 100%;
+        border-radius: 8px;
+       }
+         a.button {
+         display: inline-block;
+         margin-top: 16px;
+         padding: 10px 16px;
+         background: #2563eb;
+         color: #fff;
+         text-decoration: none;
+         border-radius: 6px;
+         font-weight: 600;
+      }
+      .footer { margin-top: 24px; color: #555; font-size: 16px; text-align: left; }
+        .attachment { margin-top: 24px; color: #555; font-size: 18px; text-align: left; }
+      .copy-rights { margin-top: 24px; color: #555; font-size: 12px; text-align: left; }
+    </style>
+  </head>
+  <body>
+    <div class="container">
+      <div class="header">
+        <img src="https://dashboard-api.tangoeye.ai/logo.png" alt="Team Tango"  />
+       
+      </div>
+
+      <div class="divider"></div>
+
+      <p class="subtitle">
+        Dear ${userName},<br><br>
+        Please ensure that all conducted eye tests meet the required compliance standards.<br><br>
+        Your prompt attention to this matter will help us maintain the highest standards and avoid any<br> 
+        discrepancies. Please take a look at the below findings.
+      </p>
+
+      <table class="table">
+        <thead>
+          <tr>
+            <th>Step Name</th>
+            <th>Comments</th>
+          </tr>
+        </thead>
+        <tbody>
+          ${tableRows}
+        </tbody>
+      </table>
+
+      <div class="compliance-box">Compliance Percentage: ${compliancePercentage}%</div>
+
+<p class="attachment">One Attachment</p>
+       <!-- Video Embed (only if provided) -->
+      ${
+        videoUrl ?
+          `
+       <div class="video">
+  <a href="${videoUrl}" target="_blank" style="text-decoration:none; color:#00A3FF; font-weight:600;">
+    <img src="https://img.icons8.com/?size=100&id=63671&format=png&color=000000" 
+         alt="Play Video" width="80" height="80" 
+         style="vertical-align:middle; margin-right:10px;">
+    ${storeName}_${startTime}-video.mp4
+  </a>
+</div>
+      ` :
+          ''
+}
+
+      <p class="footer">Regards,<br>Team Tango</p>
+      </br></br>
+       <p class = "copy-rights">2024 © Tango Eye . All rights reserved.</p>
+    </div>
+   
+  </body>
+  </html>`;
+  };
+
+  const emailHTML = htmlBody( userName, steps, compliancePercentage );
+
+  //  Send email with video attachment
+  const params = {
+    Source: fromEmail,
+    Destination: {
+      ToAddresses: [ toEmail ],
+    },
+    Message: {
+      Subject: { Data: 'Non Compliance on Eye Test Procedures' },
+      Body: { Html: { Data: emailHTML } },
+    },
+    Attachments: [
+      {
+        Name: `${storeName}_${startTime}-video.mp4`,
+        Content: videoBase64,
+        ContentType: 'video/mp4',
+      },
+    ],
+  };
+
+  try {
+    const command = new SendEmailCommand( params );
+    const response = await sesClient.send( command );
+    logger.info( { response: response, command: command, params: params, code: response?.$metadata?.httpStatusCode } );
+    return response;
+  } catch ( error ) {
+    logger.error( 'Error sending compliance email', error );
+    throw error;
+  }
+}
+
+