tango-app-api-audit 3.6.28 → 3.6.30

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.6.28",
+    "version": "3.6.30",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",

package/src/controllers/eyeTestAudit.controllers.js

@@ -853,6 +853,37 @@ export async function save( req, res ) {
       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',
@@ -878,7 +909,7 @@ export async function save( req, res ) {
         case '>': if ( humanScore > value ) {
           const record1 = {
             RMEmail: inputData.RMEmail,
-            RMName: inputData.RMEmail,
+            RMName: rmName.toString(),
             cluster: inputData.cluster,
             optumId: inputUpdatedData?._source?.optumId,
             optomEmailId: inputUpdatedData?._source?.salesmanEmailId,
@@ -909,7 +940,7 @@ export async function save( req, res ) {
         case '<': if ( humanScore < value ) {
           const record2 = {
             RMEmail: inputData.RMEmail,
-            RMName: inputData.RMEmail,
+            RMName: rmName.toString(),
             cluster: inputData.cluster,
             optumId: inputUpdatedData?._source?.optumId,
             optomEmailId: inputUpdatedData?._source?.salesmanEmailId,
@@ -940,7 +971,7 @@ export async function save( req, res ) {
         case '>=': if ( humanScore >= value ) {
           const record3 = {
             RMEmail: inputData.RMEmail,
-            RMName: inputData.RMEmail,
+            RMName: rmName.toString(),
             cluster: inputData.cluster,
             optumId: inputUpdatedData?._source?.optumId,
             optomEmailId: inputUpdatedData?._source?.salesmanEmailId,
@@ -971,7 +1002,7 @@ export async function save( req, res ) {
         case '<=': if ( humanScore <= value ) {
           const record4 = {
             RMEmail: inputData.RMEmail,
-            RMName: inputData.RMEmail,
+            RMName: rmName.toString(),
             cluster: inputData.cluster,
             optumId: inputUpdatedData?._source?.optumId,
             optomEmailId: inputUpdatedData?._source?.salesmanEmailId,
@@ -1003,7 +1034,7 @@ export async function save( req, res ) {
         case '==': if ( humanScore == value ) {
           const record5 = {
             RMEmail: inputData.RMEmail,
-            RMName: inputData.RMEmail,
+            RMName: rmName.toString(),
             cluster: inputData.cluster,
             optumId: inputUpdatedData?._source?.optumId,
             optomEmailId: inputUpdatedData?._source?.salesmanEmailId,
@@ -1034,7 +1065,7 @@ export async function save( req, res ) {
         case '===': if ( humanScore === value ) {
           const record6 = {
             RMEmail: inputData.RMEmail,
-            RMName: inputData.RMEmail,
+            RMName: rmName.toString(),
             cluster: inputData.cluster,
             optumId: inputUpdatedData?._source?.optumId,
             optomEmailId: inputUpdatedData?._source?.salesmanEmailId,
@@ -2543,7 +2574,7 @@ export async function emailAlertLog( req, res ) {
         'range': {
           'createdAt': {
             'gte': dayjs( inputData.fromDate ),
-            'lte': dayjs( `${inputData.toDate} ${dayjs().format( 'HH:mm:ss' )}` ),
+            'lte': dayjs( inputData.toDate ),
           },
         },
       },
@@ -2551,23 +2582,11 @@ export async function emailAlertLog( req, res ) {
     let sort =[
       { [sortBy]: { order: inputData.sortOrder === 1 ? 'asc' : 'desc' } },
     ];
-    if ( inputData.RmList && inputData.RmList?.lenght > 0 ) {
-      filter.push( {
-        'terms': {
-          'RMEmail.keyword': inputData?.RmList,
-        },
-      } );
-    }
 
-    if ( inputData.cluster && inputData.cluster?.lenght > 0 ) {
-      filter.push( {
-        'terms': {
-          'cluster.keyword': inputData?.cluster,
-        },
-      } );
-    }
     let search = {
-      must: filter,
+      'must': filter,
+      'should': [],
+      'minimum_should_match': 1,
     };
     if ( inputData.searchValue && inputData.searchValue !== '' ) {
       search ={
@@ -2630,9 +2649,28 @@ export async function emailAlertLog( req, res ) {
             },
           },
         ],
-        'minimum_should_match': 1,
+
+
       };
     }
+
+    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?.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,
@@ -2659,9 +2697,9 @@ export async function emailAlertLog( req, res ) {
         optumId: item?._source?.optumId,
         optomEmailId: item?._source?.optomEmailId,
         storeName: item?._source?.storeName,
-        complianceScore: Math.round( item?._source?.complianceScore || 0 ),
-        humanScore: Math.round( item?._source?.humanScore || 0 ),
-        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 || '--',
@@ -2682,10 +2720,9 @@ export async function emailAlertLog( req, res ) {
             'Optom Email': element.optomEmailId || '--',
             'Store Name': element.storeName,
             'Audited By': element.auditedBy || '--',
-            'Tango Score': Math.round( element.complianceScore || 0 ),
-
-            'Trust Score': element.trustScore || '--',
-            'Human Audited Score': Math.round( element.humanScore || 0 ),
+            'Tango Score': Math.round( element.complianceScore || 0 )+' %',
+            'Trust Score': element.trustScore+' %' || '--',
+            'Human Audited Score': Math.round( element.humanScore || 0 ) + ' %',
 
 
           } );
@@ -2695,7 +2732,7 @@ export async function emailAlertLog( req, res ) {
       } );
       const mappedArrays = await Promise.all( promises );
       const result = mappedArrays.flat();
-      logger.info( { result: result } );
+
       await download( result, res );
       return;
     }
@@ -2704,7 +2741,6 @@ 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: count } );
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';

package/src/validation/eyeTest.validation.js

@@ -164,9 +164,9 @@ export async function sendComplianceEmail( {
 
       <p class="subtitle">
         Dear ${userName},<br><br>
-        Please ensure that all conducted eye tests meet the required compliance standards.<br>
-        Your prompt attention to this matter will help us maintain the highest standards.<br>
-        Please take a look at the below findings.
+        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">