tango-app-api-audit 3.4.68-beta.12 → 3.4.68-beta.13

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/README.md

@@ -1,29 +1,29 @@
-# README #
-
-This README would normally document whatever steps are necessary to get your application up and running.
-
-### What is this repository for? ###
-
-* Quick summary
-* Version
-* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)
-
-### How do I get set up? ###
-
-* Summary of set up
-* Configuration
-* Dependencies
-* Database configuration
-* How to run tests
-* Deployment instructions
-
-### Contribution guidelines ###
-
-* Writing tests
-* Code review
-* Other guidelines
-
-### Who do I talk to? ###
-
-* Repo owner or admin
+# README #
+
+This README would normally document whatever steps are necessary to get your application up and running.
+
+### What is this repository for? ###
+
+* Quick summary
+* Version
+* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)
+
+### How do I get set up? ###
+
+* Summary of set up
+* Configuration
+* Dependencies
+* Database configuration
+* How to run tests
+* Deployment instructions
+
+### Contribution guidelines ###
+
+* Writing tests
+* Code review
+* Other guidelines
+
+### Who do I talk to? ###
+
+* Repo owner or admin
 * Other community or team contact

package/package.json

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

package/src/controllers/eyeTestAudit.controllers.js

@@ -597,7 +597,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': {
@@ -643,6 +656,20 @@ export async function cancel( req, res ) {
           },
         },
       ];
+      searchFilterhistory=[
+        {
+          'term': {
+            'engagementId.keyword': inputData?.fileId,
+          },
+
+        },
+        {
+          'term': {
+            'type.keyword': inputData?.type,
+          },
+
+        },
+      ];
     }
 
     let searchQuery={
@@ -653,21 +680,34 @@ 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 checkaudited = getOutput?.body?.hits?.hits?.length > 0 ? getOutputHistory?.body?.hits?.hits.filter( ( data ) => data._source.auditType==='Audit'&&data._source.auditStatus==='Audited' ).length:0;
+
     if ( !output ) {
       return res.sendError( 'No saved records found', 400 );
     }
     const record1 ={
 
-      auditStatus: 'Skipped',
+      auditStatus: checkReaudited>0?'Re-Audited':checkaudited>0?'Audited':'Yet-to-Audit',
+      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' ),
 
     };