tango-app-api-audit 3.6.41 → 3.6.42-eyetest-dynamicization.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.6.41",
+    "version": "3.6.42-eyetest-dynamicization.1",
     "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.15",
         "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,9 @@ 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;
     let isEnable =true;
     const order = [
       'Distance-VA-Check',
@@ -472,7 +474,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 = 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 +495,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 +602,10 @@ 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 getInput = await getOpenSearchById( openSearch.EyeTestInput, inputData.id );
     if ( !getInput || !getInput?.body ) {
       return res.sendError( 'No Data Found', 204 );
@@ -643,7 +657,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 = 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 +696,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 +749,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 +777,7 @@ 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 url = JSON.parse( process.env.URL );
 
     let searchFilter =[
       {
@@ -818,6 +843,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,
@@ -847,10 +873,10 @@ 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' ||inputData.auditStatus == 'Re-Audited' ) && inputUpdatedData && inputData.type === 'physical' && inputData?.isReSend !== false ) {
+    if ( getEyetestConfig &&( inputData.auditStatus == 'Audited' ||inputData.auditStatus == 'Re-Audited' ) && inputUpdatedData && inputData?.isReSend !== false ) {
       const value = Number( getEyetestConfig?.complianceThreshold?.value?.split( '%' )[0] );
       const condition = getEyetestConfig?.complianceThreshold?.condition;
-      const id= inputData?.isReSend === true ?`${inputData.id}_${inputUpdatedData?._source?.optumId}_${inputData?.fileId}_${Date.now()}` : `${inputData.id}_${inputUpdatedData?._source?.optumId}_${inputData?.fileId}`;
+      const id= inputData?.isReSend === true ?`${inputData.id}_${inputUpdatedData?._source?.type === 'physical'?inputUpdatedData?._source?.optumId:inputUpdatedData?._source?.optm_userId}_${inputData?.fileId}_${Date.now()}` : `${inputData.id}_${inputUpdatedData?._source?.type === 'physical'?inputUpdatedData?._source?.optumId:inputUpdatedData?._source?.optm_userId}_${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( ',' );
@@ -905,14 +931,26 @@ 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 = 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: getData?.type
+      };
+      const getSignedUrl = await signedUrl( params );
+      logger.info( { mesagee: 'signedurl', getSignedUrl: getSignedUrl, params: params } );
       switch ( condition ) {
         case '>': if ( humanScore > value ) {
           const record1 = {
             RMEmail: inputData.RMEmail,
             RMName: rmName.toString(),
             cluster: inputData.cluster,
-            optumId: inputUpdatedData?._source?.optumId,
-            optomEmailId: inputUpdatedData?._source?.salesmanEmailId,
+            optumId: inputUpdatedData?._source?.type === 'physical'?inputUpdatedData?._source?.optumId:inputUpdatedData?._source?.optm_userId,
+            optomEmailId: inputUpdatedData?._source?.type === 'physical'? inputUpdatedData?._source?.salesmanEmailId:inputUpdatedData?._source?.userEmail,
             storeName: inputUpdatedData?._source?.storeName,
             complianceScore: inputUpdatedData?._source?.ComplianceScore,
             humanScore: humanScore,
@@ -920,27 +958,30 @@ export async function save( req, res ) {
             trustScore: inputUpdatedData?._source?.trustScore,
             auditedId: inputUpdatedData?._id,
             queueId: inputUpdatedData?._source?.queueId,
+            engagementId: inputUpdatedData?._source?.type === 'physical'? '' : inputUpdatedData?._source?.engagementId,
+            eyetestType: inputUpdatedData?._source?.type,
             createdAt: new Date(),
             updatedAt: new Date(),
 
+
           };
           const reference1 ={
             storeCode: inputUpdatedData?._source?.storeName,
-            OptomId: inputUpdatedData?._source?.optumId,
+            OptomId: inputUpdatedData?._source?.type === 'physical'?inputUpdatedData?._source?.optumId:inputUpdatedData?._source?.optm_userId,
             feedBackIssuedBy: req?.user?.email,
-            RMName: inputData.RMEmail,
-            clusterName: inputData.cluster,
+            RMName: inputData?.RMEmail,
+            clusterName: inputData?.cluster,
           };
           await insertWithId( openSearch.eyeTestEmailAlert, id, record1 );
           sendComplianceEmail( {
-            toEmail: inputUpdatedData?._source?.salesmanEmailId,
+            toEmail: inputUpdatedData?._source?.type === 'physical'? inputUpdatedData?._source?.salesmanEmailId:inputUpdatedData?._source?.userEmail,
             fromEmail: ses.eyeTestAlertEmail,
             userName: 'Optom',
             storeName: inputUpdatedData?._source?.storeName,
-            startTime: `${inputUpdatedData?._source?.fileDate}T${inputUpdatedData?._source.testEndTime}`,
+            startTime: `${inputUpdatedData?._source?.fileDate}T${inputUpdatedData?._source?.testEndTime}`,
             compliancePercentage: humanScore,
             steps: steps,
-            videoUrl: `${url.physical}${inputUpdatedData?._source?.filePath}`,
+            videoUrl: getSignedUrl, // `${inputUpdatedData?._source?.type === 'physical'?url.physical:url.remote}${inputUpdatedData?._source?.filePath}`,
             ref: reference1,
           } );
         }
@@ -950,8 +991,8 @@ export async function save( req, res ) {
             RMEmail: inputData.RMEmail,
             RMName: rmName.toString(),
             cluster: inputData.cluster,
-            optumId: inputUpdatedData?._source?.optumId,
-            optomEmailId: inputUpdatedData?._source?.salesmanEmailId,
+            optumId: inputUpdatedData?._source?.type === 'physical'?inputUpdatedData?._source?.optumId:inputUpdatedData?._source?.optm_userId,
+            optomEmailId: inputUpdatedData?._source?.type === 'physical'? inputUpdatedData?._source?.salesmanEmailId:inputUpdatedData?._source?.userEmail,
             storeName: inputUpdatedData?._source?.storeName,
             complianceScore: inputUpdatedData?._source?.ComplianceScore,
             humanScore: humanScore,
@@ -959,27 +1000,28 @@ export async function save( req, res ) {
             trustScore: inputUpdatedData?._source?.trustScore,
             auditedId: inputUpdatedData?._id,
             queueId: inputUpdatedData?._source?.queueId,
+            engagementId: inputUpdatedData?._source?.type === 'physical'? '' : inputUpdatedData?._source?.engagementId,
             createdAt: new Date(),
             updatedAt: new Date(),
 
           };
           const reference2 ={
             storeCode: inputUpdatedData?._source?.storeName,
-            OptomId: inputUpdatedData?._source?.optumId,
+            OptomId: inputUpdatedData?._source?.type === 'physical'?inputUpdatedData?._source?.optumId:inputUpdatedData?._source?.optm_userId,
             feedBackIssuedBy: req?.user?.email,
             RMName: inputData.RMEmail,
             clusterName: inputData.cluster,
           };
           await insertWithId( openSearch.eyeTestEmailAlert, id, record2 );
           sendComplianceEmail( {
-            toEmail: inputUpdatedData?._source?.salesmanEmailId,
+            toEmail: inputUpdatedData?._source?.type === 'physical'? inputUpdatedData?._source?.salesmanEmailId:inputUpdatedData?._source?.userEmail,
             fromEmail: ses.eyeTestAlertEmail,
             userName: 'Optom',
             storeName: inputUpdatedData?._source?.storeName,
             startTime: `${inputUpdatedData?._source?.fileDate}T${inputUpdatedData?._source.testEndTime}`,
             compliancePercentage: humanScore,
             steps: steps,
-            videoUrl: `${url.physical}${inputUpdatedData?._source?.filePath}`,
+            videoUrl: getSignedUrl, // `${inputUpdatedData?._source?.type === 'physical'?url.physical:url.remote}${inputUpdatedData?._source?.filePath}`,
             ref: reference2,
           } );
         };
@@ -989,8 +1031,10 @@ export async function save( req, res ) {
             RMEmail: inputData.RMEmail,
             RMName: rmName.toString(),
             cluster: inputData.cluster,
-            optumId: inputUpdatedData?._source?.optumId,
-            optomEmailId: inputUpdatedData?._source?.salesmanEmailId,
+            optumId: inputUpdatedData?._source?.type === 'physical'?inputUpdatedData?._source?.optumId:inputUpdatedData?._source?.optm_userId,
+
+            optomEmailId: inputUpdatedData?._source?.type === 'physical'? inputUpdatedData?._source?.salesmanEmailId:inputUpdatedData?._source?.userEmail,
+
             storeName: inputUpdatedData?._source?.storeName,
             complianceScore: inputUpdatedData?._source?.ComplianceScore,
             humanScore: humanScore,
@@ -998,27 +1042,32 @@ export async function save( req, res ) {
             trustScore: inputUpdatedData?._source?.trustScore,
             auditedId: inputUpdatedData?._id,
             queueId: inputUpdatedData?._source?.queueId,
+            engagementId: inputUpdatedData?._source?.type === 'physical'? '' : inputUpdatedData?._source?.engagementId,
+
             createdAt: new Date(),
             updatedAt: new Date(),
 
           };
           const reference3 ={
             storeCode: inputUpdatedData?._source?.storeName,
-            OptomId: inputUpdatedData?._source?.optumId,
+            OptomId: inputUpdatedData?._source?.type === 'physical'?inputUpdatedData?._source?.optumId:inputUpdatedData?._source?.optm_userId,
+
             feedBackIssuedBy: req?.user?.email,
             RMName: inputData.RMEmail,
             clusterName: inputData.cluster,
           };
           await insertWithId( openSearch.eyeTestEmailAlert, id, record3 );
           sendComplianceEmail( {
-            toEmail: inputUpdatedData?._source?.salesmanEmailId,
+            toEmail: inputUpdatedData?._source?.type === 'physical'? inputUpdatedData?._source?.salesmanEmailId:inputUpdatedData?._source?.userEmail,
+
             fromEmail: ses.eyeTestAlertEmail,
             userName: 'Optom',
             storeName: inputUpdatedData?._source?.storeName,
             startTime: `${inputUpdatedData?._source?.fileDate}T${inputUpdatedData?._source.testEndTime}`,
             compliancePercentage: humanScore,
             steps: steps,
-            videoUrl: `${url.physical}${inputUpdatedData?._source?.filePath}`,
+            videoUrl: getSignedUrl, // `${inputUpdatedData?._source?.type === 'physical'?url.physical:url.remote}${inputUpdatedData?._source?.filePath}`,
+
             ref: reference3,
           } );
         }
@@ -1028,8 +1077,10 @@ export async function save( req, res ) {
             RMEmail: inputData.RMEmail,
             RMName: rmName.toString(),
             cluster: inputData.cluster,
-            optumId: inputUpdatedData?._source?.optumId,
-            optomEmailId: inputUpdatedData?._source?.salesmanEmailId,
+            optumId: inputUpdatedData?._source?.type === 'physical'?inputUpdatedData?._source?.optumId:inputUpdatedData?._source?.optm_userId,
+            optomEmailId: inputUpdatedData?._source?.type === 'physical'? inputUpdatedData?._source?.salesmanEmailId:inputUpdatedData?._source?.userEmail,
+
+
             storeName: inputUpdatedData?._source?.storeName,
             complianceScore: inputUpdatedData?._source?.ComplianceScore,
             humanScore: humanScore,
@@ -1037,27 +1088,29 @@ export async function save( req, res ) {
             trustScore: inputUpdatedData?._source?.trustScore,
             auditedId: inputUpdatedData?._id,
             queueId: inputUpdatedData?._source?.queueId,
+            engagementId: inputUpdatedData?._source?.type === 'physical'? '' : inputUpdatedData?._source?.engagementId,
+
             createdAt: new Date(),
             updatedAt: new Date(),
 
           };
           const reference4 ={
             storeCode: inputUpdatedData?._source?.storeName,
-            OptomId: inputUpdatedData?._source?.optumId,
+            OptomId: inputUpdatedData?._source?.type === 'physical'?inputUpdatedData?._source?.optumId:inputUpdatedData?._source?.optm_userId,
             feedBackIssuedBy: req?.user?.email,
             RMName: inputData.RMEmail,
             clusterName: inputData.cluster,
           };
           await insertWithId( openSearch.eyeTestEmailAlert, id, record4 );
           sendComplianceEmail( {
-            toEmail: inputUpdatedData?._source?.salesmanEmailId,
+            toEmail: inputUpdatedData?._source?.type === 'physical'? inputUpdatedData?._source?.salesmanEmailId:inputUpdatedData?._source?.userEmail,
             fromEmail: ses.eyeTestAlertEmail,
             userName: 'Optom',
             storeName: inputUpdatedData?._source?.storeName,
             startTime: `${inputUpdatedData?._source?.fileDate}T${inputUpdatedData?._source.testEndTime}`,
             compliancePercentage: humanScore,
             steps: steps,
-            videoUrl: `${url.physical}${inputUpdatedData?._source?.filePath}`,
+            videoUrl: getSignedUrl, // `${inputUpdatedData?._source?.type === 'physical'?url.physical:url.remote}${inputUpdatedData?._source?.filePath}`,
             ref: reference4,
           } );
         }
@@ -1068,8 +1121,8 @@ export async function save( req, res ) {
             RMEmail: inputData.RMEmail,
             RMName: rmName.toString(),
             cluster: inputData.cluster,
-            optumId: inputUpdatedData?._source?.optumId,
-            optomEmailId: inputUpdatedData?._source?.salesmanEmailId,
+            optumId: inputUpdatedData?._source?.type === 'physical'?inputUpdatedData?._source?.optumId:inputUpdatedData?._source?.optm_userId,
+            optomEmailId: inputUpdatedData?._source?.type === 'physical'? inputUpdatedData?._source?.salesmanEmailId:inputUpdatedData?._source?.userEmail,
             storeName: inputUpdatedData?._source?.storeName,
             complianceScore: inputUpdatedData?._source?.ComplianceScore,
             humanScore: humanScore,
@@ -1077,27 +1130,28 @@ export async function save( req, res ) {
             trustScore: inputUpdatedData?._source?.trustScore,
             auditedId: inputUpdatedData?._id,
             queueId: inputUpdatedData?._source?.queueId,
+            engagementId: inputUpdatedData?._source?.type === 'physical'? '' : inputUpdatedData?._source?.engagementId,
             createdAt: new Date(),
             updatedAt: new Date(),
 
           };
           const reference5 ={
             storeCode: inputUpdatedData?._source?.storeName,
-            OptomId: inputUpdatedData?._source?.optumId,
+            OptomId: inputUpdatedData?._source?.type === 'physical'?inputUpdatedData?._source?.optumId:inputUpdatedData?._source?.optm_userId,
             feedBackIssuedBy: req?.user?.email,
             RMName: inputData.RMEmail,
             clusterName: inputData.cluster,
           };
           await insertWithId( openSearch.eyeTestEmailAlert, id, record5 );
           sendComplianceEmail( {
-            toEmail: inputUpdatedData?._source?.salesmanEmailId,
+            toEmail: inputUpdatedData?._source?.type === 'physical'? inputUpdatedData?._source?.salesmanEmailId:inputUpdatedData?._source?.userEmail,
             fromEmail: ses.eyeTestAlertEmail,
             userName: 'Optom',
             storeName: inputUpdatedData?._source?.storeName,
             startTime: `${inputUpdatedData?._source?.fileDate}T${inputUpdatedData?._source.testEndTime}`,
             compliancePercentage: humanScore,
             steps: steps,
-            videoUrl: `${url.physical}${inputUpdatedData?._source?.filePath}`,
+            videoUrl: getSignedUrl, // `${inputUpdatedData?._source?.type === 'physical'?url.physical:url.remote}${inputUpdatedData?._source?.filePath}`,
             ref: reference5,
           } );
         }
@@ -1107,8 +1161,8 @@ export async function save( req, res ) {
             RMEmail: inputData.RMEmail,
             RMName: rmName.toString(),
             cluster: inputData.cluster,
-            optumId: inputUpdatedData?._source?.optumId,
-            optomEmailId: inputUpdatedData?._source?.salesmanEmailId,
+            optumId: inputUpdatedData?._source?.type === 'physical'?inputUpdatedData?._source?.optumId:inputUpdatedData?._source?.optm_userId,
+            optomEmailId: inputUpdatedData?._source?.type === 'physical'? inputUpdatedData?._source?.salesmanEmailId:inputUpdatedData?._source?.userEmail,
             storeName: inputUpdatedData?._source?.storeName,
             complianceScore: inputUpdatedData?._source?.ComplianceScore,
             humanScore: humanScore,
@@ -1116,26 +1170,27 @@ export async function save( req, res ) {
             trustScore: inputUpdatedData?._source?.trustScore,
             auditedId: inputUpdatedData?._id,
             queueId: inputUpdatedData?._source?.queueId,
+            engagementId: inputUpdatedData?._source?.type === 'physical'? '' : inputUpdatedData?._source?.engagementId,
             createdAt: new Date(),
             updatedAt: new Date(),
           };
           const reference6 ={
             storeCode: inputUpdatedData?._source?.storeName,
-            OptomId: inputUpdatedData?._source?.optumId,
+            OptomId: inputUpdatedData?._source?.type === 'physical'?inputUpdatedData?._source?.optumId:inputUpdatedData?._source?.optm_userId,
             feedBackIssuedBy: req?.user?.email,
             RMName: inputData.RMEmail,
             clusterName: inputData.cluster,
           };
           await insertWithId( openSearch.eyeTestEmailAlert, id, record6 );
           sendComplianceEmail( {
-            toEmail: inputUpdatedData?._source?.salesmanEmailId,
+            toEmail: inputUpdatedData?._source?.type === 'physical'? inputUpdatedData?._source?.salesmanEmailId:inputUpdatedData?._source?.userEmail,
             fromEmail: ses.eyeTestAlertEmail,
             userName: 'Optom',
             storeName: inputUpdatedData?._source?.storeName,
             startTime: `${inputUpdatedData?._source?.fileDate}T${inputUpdatedData?._source.testEndTime}`,
             compliancePercentage: humanScore,
             steps: steps,
-            videoUrl: `${url.physical}${inputUpdatedData?._source?.filePath}`,
+            videoUrl: getSignedUrl, // `${inputUpdatedData?._source?.type === 'physical'?url.physical:url.remote}${inputUpdatedData?._source?.filePath}`,
             ref: reference6,
           } );
         }
@@ -2788,7 +2843,7 @@ export async function emailAlertLog( req, res ) {
         const exportData = [];
         for ( const element of chunk ) {
           exportData.push( {
-            'RM Name': element.RMEmail,
+            'RM Name': element.RMName,
             'Cluster Name': element.cluster,
             'Optom ID': element.optumId,
             'Optom Email': element.optomEmailId || '--',

package/src/dtos/eyeTestAudit.dtos.js

@@ -281,7 +281,7 @@ export const emailAlertLogSchema = joi.object( {
         return value;
       } ),
   RMList: joi.array().items(
-      joi.string().required(),
+      joi.string().optional(),
   ).optional(),
   clientId: joi.string().when( '$userType', {
     is: 'tango',
@@ -291,7 +291,7 @@ export const emailAlertLogSchema = joi.object( {
     } ),
     otherwise: joi.optional(),
   } ),
-  cluster: joi.array().items( joi.string().required() ).optional(),
+  cluster: joi.array().items( joi.string().optional() ).optional(),
   isExport: joi.boolean().optional(),
   searchValue: joi.string().optional().allow( '' ),
   sortBy: joi.string().optional(),

package/src/validation/eyeTest.validation.js

@@ -44,9 +44,9 @@ 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 ) {
+    if ( inputData.auditStatus == 'Re-Audited' && inputData?.isReSend == undefined ) {
       const getOne = await getOpenSearchById( openSearch.EyeTestInput, inputData.id );
-      const id = `${inputData.id}_${getOne?.body?._source?.optumId}_${inputData.fileId}`;
+      const id = `${inputData.id}_${getOne?.body?._source?.type === 'physical' ? getOne?.body?._source?.optumId : getOne?.body?._source?.optm_userId}_${inputData.fileId}`;
       const getId = await getOpenSearchById( openSearch.eyeTestEmailAlert, id );
       logger.info( { getId: getId, id: id } );
       const inputUpdatedData = getId?.body;