tango-app-api-audit 3.6.19 → 3.6.21

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -637,6 +637,9 @@ export async function getAuditFile( req, res ) {
           'minimum_should_match': 1,
         },
       },
+      sort: [
+        { timestamp: { order: 'desc' } },
+      ],
 
     }:
     {
@@ -664,6 +667,9 @@ export async function getAuditFile( req, res ) {
           ],
         },
       },
+      sort: [
+        { timestamp: { order: 'desc' } },
+      ],
 
     };
     logger.info( { fetchData: fetchData, msg: msg, inputData: inputData, type: 'debug-bucketNameIssue' } );
@@ -847,6 +853,7 @@ export async function getAuditFile( req, res ) {
       storeId: storeId,
       storeName: storeInfo?.storeName,
       address: storeInfo?.address,
+      folderPath: folderPath,
       file: {
         queueName: inputData.queueName,
         store_id: storeId,
@@ -4507,6 +4514,9 @@ export async function auditImages( req, res ) {
               },
             },
 
+            sort: [
+              { timestamp: { order: 'desc' } },
+            ],
           };
           const files = [];
           const list = await searchOpenSearchData( openSearch.trackerInput, getQuery );
@@ -4583,6 +4593,9 @@ export async function auditImages( req, res ) {
                 'minimum_should_match': 1,
               },
             },
+            sort: [
+              { timestamp: { order: 'desc' } },
+            ],
 
           };
           const filesAC = [];

package/src/controllers/eyeTestAudit.controllers.js

@@ -811,6 +811,7 @@ 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 );
@@ -844,27 +845,19 @@ 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 == 'ReAudited' ) && inputUpdatedData && inputData.type === 'physical' && inputData?.isReSend !== false ) {
+    if ( getEyetestConfig && inputData.auditStatus == 'Audited' && inputUpdatedData ) {
       const trustScore = Math.round( 100-( ( inputData?.overRides / inputData?.steps?.length ) * 100 ) );
       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 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 id= `${inputData?.RMEmail}_${inputData?.cluster}_${inputUpdatedData?._source?.optumId}_${inputData?.fileId}`;
       switch ( condition ) {
         case '>': if ( trustScore > value ) {
           const record1 = {
             RMEmail: inputData.RMEmail,
-            RMName: inputData.RMEmail,
             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,
@@ -878,14 +871,10 @@ export async function save( req, res ) {
         case '<': if ( trustScore < value ) {
           const record2 = {
             RMEmail: inputData.RMEmail,
-            RMName: inputData.RMEmail,
             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,
@@ -899,14 +888,10 @@ export async function save( req, res ) {
         case '>=': if ( trustScore >= value ) {
           const record3 = {
             RMEmail: inputData.RMEmail,
-            RMName: inputData.RMEmail,
             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,
@@ -920,14 +905,10 @@ export async function save( req, res ) {
         case '<=': if ( trustScore <= value ) {
           const record4 = {
             RMEmail: inputData.RMEmail,
-            RMName: inputData.RMEmail,
             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,
@@ -942,14 +923,10 @@ export async function save( req, res ) {
         case '==': if ( trustScore == value ) {
           const record5 = {
             RMEmail: inputData.RMEmail,
-            RMName: inputData.RMEmail,
             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,
@@ -963,14 +940,10 @@ export async function save( req, res ) {
         case '===': if ( trustScore === value ) {
           const record6 = {
             RMEmail: inputData.RMEmail,
-            RMName: inputData.RMEmail,
             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,
@@ -983,7 +956,7 @@ export async function save( req, res ) {
         default: throw new Error( `Unknown condition: ${condition}` );
       }
     }
-    return res.sendSuccess( 'The file has been submitted successfully' );
+    return res.sendSuccess( 'The file has been submited successfully' );
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
     logger.error( { message: error, data: req.params, function: 'eyetestAudit-controller-save' } );
@@ -1225,25 +1198,18 @@ 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': {
@@ -1256,7 +1222,6 @@ 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': {
@@ -1264,8 +1229,6 @@ 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': {
@@ -1273,8 +1236,6 @@ 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': {
@@ -1284,17 +1245,6 @@ 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( {
 
@@ -1303,20 +1253,15 @@ export async function summaryList( req, res ) {
         },
 
       } );
-    } 
-  else {                                                
+    } else {
       return res.sendError( 'No data found', 204 );
     }
 
-    // Declare mustQuery as an array and include all elements from the filter array
     let mustQuery = [
       ...filter,
     ];
 
-    // 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.complianceScore && inputData.complianceScore?.length > null ) {
       if ( inputData.keyType !== 'store' ) {
         const rangeShould = inputData?.complianceScore?.map( ( r ) => {
           const [ gte, lte ] = r.split( '-' ).map( Number );
@@ -1326,7 +1271,7 @@ export async function summaryList( req, res ) {
             },
           };
         } );
-  // Add the range conditions to mustQuery (any one of the ranges should match)
+
         mustQuery.push(
             {
               bool: {
@@ -1335,9 +1280,7 @@ export async function summaryList( req, res ) {
               },
             },
         );
-      }
-     // If-else condition: use 'terms' filter to match records by Compliance Score / Tango Score
-      else {
+      } else {
         const values = Array.isArray( inputData.complianceScore ) ?
     inputData.complianceScore.map( Number ) :
     [ Number( inputData.complianceScore ) ];
@@ -1350,7 +1293,6 @@ 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':
@@ -2176,15 +2118,6 @@ export async function summaryCard( req, res ) {
         },
       } );
     }
-
-    if ( inputData.nearAddition && inputData.nearAddition!='' && inputData.type ==='physical' ) {
-      filter.push( {
-        'term': {
-          'nearAddition.keyword': inputData.nearAddition,
-        },
-
-      } );
-    }
     let mustQuery = [
       ...filter,
     ];
@@ -2453,7 +2386,7 @@ 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 =[
       {
@@ -2466,7 +2399,7 @@ export async function emailAlertLog( req, res ) {
       },
     ];
     let sort =[
-      { [sortBy]: { order: inputData.sortOrder === 1 ? 'asc' : 'desc' } },
+      { [inputData?.sortBy]: { order: inputData.sortOrder === 1 ? 'asc' : 'desc' } },
     ];
     if ( inputData.RmList && inputData.RmList?.lenght > 0 ) {
       filter.push( {
@@ -2483,86 +2416,19 @@ export async function emailAlertLog( req, res ) {
         },
       } );
     }
-    let search = {
-      must: filter,
-    };
-    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}*`,
-              },
-            },
-          },
-        ],
-        'minimum_should_match': 1,
-      };
-    }
     const getQuery = {
       'size': inputData.isExport == true? 50000 : inputData?.limit || 10,
       'from': offset || 0,
       'query': {
-        'bool': search,
+        'bool': {
+          'must': filter,
+        },
       },
       '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 );
@@ -2611,7 +2477,7 @@ export async function emailAlertLog( req, res ) {
 
 
     logger.info( { inputData: inputData, getData: response } );
-    return res.sendSuccess( { result: response, count: count } );
+    return res.sendSuccess( { result: response, count: response.length } );
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
     logger.error( { message: error, data: req.body, function: 'eyetestAudit-controller-emailAlertLog' } );
@@ -2771,6 +2637,10 @@ 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/dtos/eyeTestAudit.dtos.js

@@ -64,7 +64,6 @@ 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 = {
@@ -157,7 +156,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( '', 'true', 'false' ),
+  nearAddition: joi.string().optional().allow( '' ),
   isExport: joi.boolean().optional(),
   searchValue: joi.string().optional().allow( '' ),
   sortBy: joi.string().optional(),
@@ -235,7 +234,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( '', 'true', 'false' ),
+  nearAddition: joi.string().optional().allow( '' ),
   category: joi.string().optional() .valid( 'fake', 'genuine' ),
 } );
 
@@ -280,8 +279,12 @@ 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().required(),
+      joi.string().optional(),
   ).optional(),
   clientId: joi.string().when( '$userType', {
     is: 'tango',
@@ -291,7 +294,7 @@ export const emailAlertLogSchema = joi.object( {
     } ),
     otherwise: joi.optional(),
   } ),
-  cluster: joi.array().items( joi.string().required() ).optional(),
+  cluster: joi.array().items( joi.string().required() ).required(),
   isExport: joi.boolean().optional(),
   searchValue: joi.string().optional().allow( '' ),
   sortBy: joi.string().optional(),
@@ -410,7 +413,6 @@ 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, sendAlert } from '../validation/eyeTest.validation.js';
+import { isSuperAdmin, roleValidation } 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 ), sendAlert, save );
+eyeTestAuditRouter.post( '/save', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), validate( saveValid ), 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,4 @@
-import { getOpenSearchById, logger } from 'tango-app-api-middleware';
+import { logger } from 'tango-app-api-middleware';
 
 export async function roleValidation( req, res, next ) {
   try {
@@ -39,26 +39,3 @@ 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 == 'ReAudited' && 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 );
-      const inputUpdatedData = getId?.body;
-      if ( inputUpdatedData ) {
-        return res.sendError( 'Do you want resend mail?', 202 );
-      } else {
-        return next();
-      }
-    } else {
-      return next();
-    }
-  } catch ( error ) {
-    const err = error.message;
-    return res.sendError( err, 500 );
-  }
-}
-