tango-app-api-audit 3.4.68-beta.21 → 3.4.68-beta.22

package/.eslintrc.cjs

@@ -36,7 +36,7 @@ module.exports = {
     'no-unused-vars': 'error',
     'new-cap': [ 'error', { 'newIsCap': true, 'capIsNew': false } ],
     'prefer-const': 'off',
-    // 'no-console': 'error',
+    'no-console': 'error',
   },
 };
 

package/package.json

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

package/src/controllers/eyeTestAudit.controllers.js

@@ -57,6 +57,8 @@ export async function getList( req, res ) {
         },
 
       } );
+    } else {
+      return res.sendError( 'No data found', 204 );
     }
     let search ={
       'must': filter,
@@ -213,7 +215,10 @@ 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( 'D MMM, YYYY' ),
@@ -254,7 +259,10 @@ 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;
@@ -752,7 +760,9 @@ export async function cancel( req, res ) {
     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 );
@@ -768,7 +778,7 @@ export async function cancel( req, res ) {
       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 } );