tango-app-api-audit 3.4.68-beta.9 → 3.4.69-beta.0

package/src/controllers/eyeTestAudit.controllers.js

@@ -12,11 +12,14 @@ dayjs.extend( timezone );
 export async function getList( req, res ) {
   try {
     const inputData = req.body;
+    if ( inputData.clientId !== '11' ) {
+      return res.sendError( 'No data found', 204 );
+    }
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const limit = inputData.limit || 10;
     const offset = inputData.offset ? ( inputData.offset - 1 ) * limit : 0;
 
-    const sortBy = inputData?.sortBy ? `${inputData.sortBy}.keyword` : 'storeName.keyword';
+    const sortBy = inputData?.sortBy ? inputData.sortBy === 'coveredStepsAI'||inputData.sortBy==='updatedAt' ? inputData.sortBy :`${inputData.sortBy}.keyword` : 'storeName.keyword';
     const order = inputData?.sortOrder || -1;
     let filter= [
       {
@@ -31,13 +34,13 @@ export async function getList( req, res ) {
     ];
 
 
-    // if ( inputData.demographics && inputData.demographics.length > 0 ) {
-    //   filter.push( {
-    //     'terms': {
-    //       'visitorsType.keyword': inputData.demographics,
-    //     },
-    //   } );
-    // }
+    if ( inputData.demographics && inputData.demographics.length > 0 ) {
+      filter.push( {
+        'terms': {
+          'visitorsType.keyword': inputData.demographics,
+        },
+      } );
+    }
     if ( inputData.type && inputData.type!='' ) {
       filter.push( {
         'term': {
@@ -54,67 +57,108 @@ export async function getList( req, res ) {
         },
 
       } );
+    } else {
+      return res.sendError( 'No data found', 204 );
     }
     let search ={
       'must': filter,
     };
 
     if ( inputData.searchValue && inputData.searchValue !== '' ) {
-      search ={
-        'must': filter,
-        'should': [
-          {
-            'wildcard': {
-              'storeName.keyword': {
-                'value': `*${inputData.searchValue}*`,
+      if ( inputData.type&&inputData.type==='remote' ) {
+        search ={
+          'must': filter,
+          'should': [
+            {
+              'wildcard': {
+                'storeName.keyword': {
+                  'value': `*${inputData.searchValue}*`,
+                },
               },
             },
-          },
-          {
-            'wildcard': {
-              'storeId.keyword': {
-                'value': `*${inputData.searchValue}*`,
+            {
+              'wildcard': {
+                'storeId.keyword': {
+                  'value': `*${inputData.searchValue}*`,
+                },
               },
             },
-          },
-          {
-            'wildcard': {
-              'engagementId.keyword': {
-                'value': `*${inputData.searchValue}*`,
+            {
+              'wildcard': {
+                'engagementId.keyword': {
+                  'value': `*${inputData.searchValue}*`,
+                },
               },
             },
-          },
-          {
-            'wildcard': {
-              'queueId.keyword': {
-                'value': `*${inputData.searchValue}*`,
+
+            {
+              'wildcard': {
+                'auditStatus.keyword': {
+                  'value': `*${inputData.searchValue}*`,
+                },
               },
             },
-          },
-          {
-            'wildcard': {
-              'optumId.keyword': {
-                'value': `*${inputData.engagementId}*`,
+          ],
+          'minimum_should_match': 1,
+        };
+      } else {
+        search ={
+          'must': filter,
+          'should': [
+            {
+              'wildcard': {
+                'storeName.keyword': {
+                  'value': `*${inputData.searchValue}*`,
+                },
               },
             },
-          },
-          {
-            'wildcard': {
-              'visitorsType.keyword': {
-                'value': `*${inputData.searchValue}*`,
+            {
+              'wildcard': {
+                'storeId.keyword': {
+                  'value': `*${inputData.searchValue}*`,
+                },
               },
             },
-          },
-          {
-            'wildcard': {
-              'auditStatus.keyword': {
-                'value': `*${inputData.searchValue}*`,
+            {
+              'wildcard': {
+                'engagementId.keyword': {
+                  'value': `*${inputData.searchValue}*`,
+                },
               },
             },
-          },
-        ],
-        'minimum_should_match': 1,
-      };
+            {
+              'wildcard': {
+                'queueId.keyword': {
+                  'value': `*${inputData.searchValue}*`,
+                },
+              },
+            },
+            {
+              'wildcard': {
+                'optumId.keyword': {
+                  'value': `*${inputData.searchValue}*`,
+                },
+              },
+            },
+            {
+              'wildcard': {
+                'visitorsType.keyword': {
+                  'value': `*${inputData.searchValue}*`,
+                },
+              },
+            },
+
+            {
+              'wildcard': {
+                'auditStatus.keyword': {
+                  'value': `*${inputData.searchValue}*`,
+                },
+              },
+            },
+          ],
+          'minimum_should_match': 1,
+        };
+      }
     }
     let searchQuery={
       'from': offset,
@@ -171,16 +215,19 @@ export async function getList( req, res ) {
           const minutes1 =minutes> 1? `${minutes} mins` : `${minutes} min`;
           const seconds1 = seconds > 1? `${minutes} secs`: seconds == 1? `${minutes} sec` : '';
           const duration =`${minutes1} ${seconds1}`;
-          const userName = await findOneUser( { _id: element?._source?.userId }, { _id: 0, userName: 1 } );
+          let userName = '';
+          if ( element?._source?.userId&&element?._source?.userId!='' ) {
+            userName = await findOneUser( { _id: element?._source?.userId }, { _id: 0, userName: 1 } );
+          }
           if ( element?._source?.type == 'physical' ) {
             exportData.push( {
-              'Date': dayjs( element?._source?.date ).format( 'YYYY,MMM D' ),
+              'Date': dayjs( element?._source?.date ).format( 'D MMM, YYYY' ),
               'Store Name': element?._source?.storeName,
               'Store ID': element?._source?.storeId || 'Un Assigned',
               'Store Name': element?._source?.storeName ||'Un Assigned',
               'Optum ID': element?._source?.optumId,
               'Queue ID': element?._source?.queueId,
-              'Compliance Score': element?._source?.complianceScore || 0,
+              'Compliance Score': element?._source?.totalSteps>0 ? Math.round( ( element?._source?.coveredStepsAI/ element?._source?.totalSteps )*100 ): 0,
               'Steps Covered By AI': element?._source?.coveredStepsAI || 0,
               'Visitor Type': element?._source?.visitorsType,
               'Test Duration': duration || '',
@@ -190,14 +237,13 @@ export async function getList( req, res ) {
             } );
           } else {
             exportData.push( {
-              'Date': dayjs( element?._source?.date ).format( 'YYYY,MMM D' ),
+              'Date': dayjs( element?._source?.date ).format( 'D MMM, YYYY' ),
               'Store Name': element?._source?.storeName,
               'Store ID': element?._source?.storeId || 'Un Assigned',
               'Store Name': element?._source?.storeName ||'Un Assigned',
               'Engagement ID': element?._source?.engagementId,
               'Compliance Score': element?._source?.complianceScore || 0,
               'Steps Covered By AI': element?._source?.coveredStepsAI || 0,
-              'Visitor Type': element?._source?.visitorsType,
               'Test Duration': duration || '',
               'Audit Status': element?._source?.auditStatus || '',
               'Audited By': userName?.userName || '',
@@ -213,14 +259,18 @@ export async function getList( req, res ) {
       return;
     } else {
       for ( const [ i, item ] of searchValue.entries() ) {
-        const userName = await findOneUser( { _id: item?._source?.userId }, { _id: 0, userName: 1 } );
+        let userName='';
+        if ( item?._source?.userId&&item?._source?.userId!='' ) {
+          userName = await findOneUser( { _id: item?._source?.userId }, { _id: 0, userName: 1 } );
+        }
         const testDuration = searchValue[i]?._source?.testDuration;
         const minutes = Math.floor( testDuration / 60 );
         const seconds = testDuration % 60;
-
+        searchValue[i]._source.complianceScore = searchValue[i]?._source?.totalSteps>0 ? Math.round( ( searchValue[i]?._source?.coveredStepsAI/ searchValue[i]?._source?.totalSteps )*100 ): 0;
         searchValue[i]._source.min = minutes;
         searchValue[i]._source.sec = seconds;
         searchValue[i]._source.auditedBy = userName?.userName || '';
+        searchValue[i]._source.date = dayjs( searchValue[i]?._source?.date ).format( 'D MMM, YYYY' );
       }
     }
 
@@ -257,7 +307,11 @@ export async function viewFile( req, res ) {
         'term': {
           'type.keyword': getData?.type,
         },
-
+      },
+      {
+        'terms': {
+          'auditStatus.keyword': [ 'Audited', 'Re-Audited' ],
+        },
       },
     ];
     if ( getData?.type == 'remote' ) {
@@ -272,7 +326,11 @@ export async function viewFile( req, res ) {
           'term': {
             'type.keyword': getData?.type,
           },
-
+        },
+        {
+          'terms': {
+            'auditStatus.keyword': [ 'Audited', 'Re-Audited' ],
+          },
         },
       ];
     }
@@ -290,6 +348,7 @@ export async function viewFile( req, res ) {
     };
 
     const searchRes= await getOpenSearchData( openSearch.EyeTestOutput, searchQuery );
+
     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 } );
@@ -321,7 +380,9 @@ export async function viewFile( req, res ) {
         break;
       case 'Audited':
         response['steps']= temp._source?.steps;
+        isEnable=true;
       case 'Re-Audited':
+        response['steps']= temp._source?.steps;
         isEnable=true;
     }
 
@@ -432,7 +493,7 @@ export async function getFile( req, res ) {
         if ( !searchData ) {
           const data1 = await insertOpenSearchData( openSearch.EyeTestOutput, record );
           logger.info( { data1: data1 } );
-          await updateOpenSearchData( openSearch.EyeTestInput, inputData.id, { doc: { auditStatus: 'In-Progress', auditType: 'Audit', userId: req?.user?._id } } );
+          await updateOpenSearchData( openSearch.EyeTestInput, inputData.id, { doc: { 'auditStatus': 'In-Progress', 'auditType': 'Audit', 'userId': req?.user?._id, 'updatedAt': dayjs().tz( 'Asia/Kolkata' ) } } );
         }
 
         break;
@@ -480,7 +541,7 @@ export async function getFile( req, res ) {
 
         };
         await insertOpenSearchData( openSearch.EyeTestOutput, newRecord );
-        await updateOpenSearchData( openSearch.EyeTestInput, inputData.id, { doc: { auditStatus: 'In-Progress', auditType: 'Re-Audit' } } );
+        await updateOpenSearchData( openSearch.EyeTestInput, inputData.id, { doc: { auditStatus: 'In-Progress', auditType: 'Re-Audit', userId: req?.user?._id } } );
 
         break;
       default:
@@ -512,7 +573,11 @@ export async function save( req, res ) {
         },
 
       },
-
+      {
+        'term': {
+          'userId.keyword': req?.user?._id,
+        },
+      },
       {
         'term': {
           'auditStatus.keyword': 'In-Progress',
@@ -558,26 +623,27 @@ export async function save( req, res ) {
     logger.info( { getOutput: getOutput } );
     const output = getOutput?.body?.hits?.hits?.length > 0 ? getOutput?.body?.hits?.hits[0] : null;
     if ( !output ) {
-      return res.sendError( 'No saved records found', 400 );
+      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,
-      auditedSteps: inputData?.auditedSteps,
-      overRides: inputData?.overRides,
-      trustScore: Math.round( 100-( ( inputData?.overRides / inputData?.steps?.length ) * 100 ) ),
-      spokenLanguage: inputData?.spokenLanguage,
-      endTime: dayjs().tz( 'Asia/Kolkata' ),
-
+      'steps': inputData?.steps,
+      'auditStatus': inputData?.auditStatus,
+      'auditedSteps': inputData?.auditedSteps,
+      'overRides': inputData?.overRides,
+      'trustScore': Math.round( 100-( ( inputData?.overRides / inputData?.steps?.length ) * 100 ) ),
+      'spokenLanguage': inputData?.spokenLanguage,
+      'endTime': dayjs().tz( 'Asia/Kolkata' ),
+      'updatedAt': dayjs().tz( 'Asia/Kolkata' ),
     };
     const inputrecord ={
 
-      auditStatus: inputData?.auditStatus,
-      auditedSteps: inputData?.auditedSteps,
-      overRides: inputData?.overRides,
-      trustScore: Math.round( 100-( ( inputData?.overRides / inputData?.steps?.length ) * 100 ) ),
-      spokenLanguage: inputData?.spokenLanguage,
-      endTime: dayjs().tz( 'Asia/Kolkata' ),
+      'auditStatus': inputData?.auditStatus,
+      'auditedSteps': inputData?.auditedSteps,
+      'overRides': inputData?.overRides,
+      'trustScore': Math.round( 100-( ( inputData?.overRides / inputData?.steps?.length ) * 100 ) ),
+      'spokenLanguage': inputData?.spokenLanguage,
+      'endTime': dayjs().tz( 'Asia/Kolkata' ),
+      'updatedAt': dayjs().tz( 'Asia/Kolkata' ),
 
     };
     await updateOpenSearchData( openSearch.EyeTestOutput, output?._id, { doc: record } );
@@ -594,7 +660,20 @@ export async function cancel( req, res ) {
   try {
     const inputData = req.body;
     const openSearch = JSON.parse( process.env.OPENSEARCH );
+    let searchFilterhistory=[
+      {
+        'term': {
+          'queueId.keyword': inputData?.fileId,
+        },
+
+      },
+      {
+        'term': {
+          'type.keyword': inputData?.type,
+        },
 
+      },
+    ];
     let searchFilter =[
       {
         'term': {
@@ -608,7 +687,11 @@ export async function cancel( req, res ) {
         },
 
       },
-
+      {
+        'term': {
+          'userId.keyword': req?.user?._id,
+        },
+      },
       {
         'term': {
           'auditStatus.keyword': 'In-Progress',
@@ -640,6 +723,20 @@ export async function cancel( req, res ) {
           },
         },
       ];
+      searchFilterhistory=[
+        {
+          'term': {
+            'engagementId.keyword': inputData?.fileId,
+          },
+
+        },
+        {
+          'term': {
+            'type.keyword': inputData?.type,
+          },
+
+        },
+      ];
     }
 
     let searchQuery={
@@ -650,23 +747,38 @@ export async function cancel( req, res ) {
         },
       },
     };
+    let searchQueryHistory={
+      'size': 100,
+      'query': {
+        'bool': {
+          'must': searchFilterhistory,
+        },
+      },
+    };
     const getOutput = await getOpenSearchData( openSearch.EyeTestOutput, searchQuery );
+    const getOutputHistory = await getOpenSearchData( openSearch.EyeTestOutput, searchQueryHistory );
     logger.info( { getOutput: getOutput } );
     const output = getOutput?.body?.hits?.hits?.length > 0 ? getOutput?.body?.hits?.hits[0] : null;
+    let checkReaudited = getOutput?.body?.hits?.hits?.length > 0 ? getOutputHistory?.body?.hits?.hits.filter( ( data ) => data._source.auditType==='Re-Audit'&&data._source.auditStatus==='Re-Audited' ).length:0;
+    let checkReauditedData = getOutput?.body?.hits?.hits?.length > 0 ? getOutputHistory?.body?.hits?.hits.filter( ( data ) => data._source.auditType==='Re-Audit'&&data._source.auditStatus==='Re-Audited' ):[];
+    let checkaudited = getOutput?.body?.hits?.hits?.length > 0 ? getOutputHistory?.body?.hits?.hits.filter( ( data ) => data._source.auditType==='Audit'&&data._source.auditStatus==='Audited' ).length:0;
+    let checkauditedData = getOutput?.body?.hits?.hits?.length > 0 ? getOutputHistory?.body?.hits?.hits.filter( ( data ) => data._source.auditType==='Audit'&&data._source.auditStatus==='Audited' ):[];
+
     if ( !output ) {
       return res.sendError( 'No saved records found', 400 );
     }
     const record1 ={
 
       auditStatus: 'Skipped',
+      auditType: checkReaudited>0?'Re-Audit':'Audit',
       endTime: dayjs().tz( 'Asia/Kolkata' ),
 
     };
     const record2 ={
-
-      auditStatus: 'Yet-to-Audit',
+      auditStatus: checkReaudited>0?'Re-Audited':checkaudited>0?'Audited':'Yet-to-Audit',
+      auditType: checkReaudited>0?'Re-Audit':'Audit',
       endTime: dayjs().tz( 'Asia/Kolkata' ),
-
+      userId: checkaudited>0?checkauditedData[0]?._source?.userId:checkReaudited>0?checkReauditedData[0]?._source?.userId:'',
     };
     await updateOpenSearchData( openSearch.EyeTestOutput, output?._id, { doc: record1 } );
     await updateOpenSearchData( openSearch.EyeTestInput, inputData.id, { doc: record2 } );
@@ -702,6 +814,9 @@ export async function getFileHistory( req, res ) {
             ],
           },
         },
+        'sort': [
+          { updatedAt: { order: 'desc' } },
+        ],
       };
     } else {
       Query = {
@@ -722,6 +837,9 @@ export async function getFileHistory( req, res ) {
             ],
           },
         },
+        'sort': [
+          { updatedAt: { order: 'desc' } },
+        ],
       };
     };
 
@@ -730,7 +848,6 @@ export async function getFileHistory( req, res ) {
       let sourcesArray = resposnse.body.hits.hits.map( ( hit ) => hit );
       let outputData=[];
       for ( let data of sourcesArray ) {
-        // console.log( data._source.endTime );
         let findUser= await findOneUser( { _id: new mongoose.Types.ObjectId( data._source.userId ) } );
         outputData.push( {
           _id: data._id,

package/src/dtos/eyeTestAudit.dtos.js

@@ -2,10 +2,23 @@ import joi from 'joi';
 
 export const getListSchema = joi.object(
     {
-      fromDate: joi.string().required(),
-      toDate: joi.string().required(),
-      type: joi.string().required(),
+      fromDate: joi.string().required().messages( {
+        'any.required': 'From Date is required',
+        'string.empty': 'From Date cannot be empty',
+      } ),
+      toDate: joi.string().required().messages( {
+        'any.required': 'To Date is required',
+        'string.empty': 'To Date cannot be empty',
+      } ),
+      type: joi.string().required().messages( {
+        'any.required': 'Type is required',
+        'string.empty': 'Type cannot be empty',
+      } ),
       demographics: joi.array().optional(),
+      clientId: joi.string().required().messages( {
+        'any.required': 'Client ID is required',
+        'string.empty': 'Client ID cannot be empty',
+      } ),
       storeId: joi.array().optional(),
       limit: joi.number().optional(),
       offset: joi.number().optional(),