tango-app-api-audit 3.6.15 → 3.6.16

package/package.json

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

package/src/controllers/eyeTestAudit.controllers.js

@@ -1264,10 +1264,10 @@ export async function summaryList( req, res ) {
     if ( inputData.complianceScore && inputData.complianceScore?.length > null ) {
       if ( inputData.keyType !== 'store' ) {
         const rangeShould = inputData?.complianceScore?.map( ( r ) => {
-          const [ gte, lt ] = r.split( '-' ).map( Number );
+          const [ gte, lte ] = r.split( '-' ).map( Number );
           return {
             range: {
-              ComplianceScore: { gte, lt },
+              ComplianceScore: { gte, lte },
             },
           };
         } );
@@ -1276,6 +1276,7 @@ export async function summaryList( req, res ) {
             {
               bool: {
                 should: rangeShould, // any one of the ranges should match
+                minimum_should_match: 1,
               },
             },
         );
@@ -1550,6 +1551,7 @@ export async function summaryList( req, res ) {
             },
           },
         };
+        logger.info( { getClusterQuery: getClusterQuery } );
         const getResponse = await getOpenSearchData( openSearch.EyeTestInput, getClusterQuery );
         if ( getResponse?.body?.aggregations ) {
           delete temp[i].store;
@@ -2117,10 +2119,10 @@ export async function summaryCard( req, res ) {
     if ( inputData.complianceScore && inputData.complianceScore?.length > null ) {
       if ( inputData.keyType !== 'store' ) {
         const rangeShould = inputData?.complianceScore?.map( ( r ) => {
-          const [ gte, lt ] = r.split( '-' ).map( Number );
+          const [ gte, lte ] = r.split( '-' ).map( Number );
           return {
             range: {
-              ComplianceScore: { gte, lt },
+              ComplianceScore: { gte, lte },
             },
           };
         } );
@@ -2128,6 +2130,7 @@ export async function summaryCard( req, res ) {
             {
               bool: {
                 should: rangeShould, // any one of the ranges should match
+                minimum_should_match: 1,
               },
             },
         );
@@ -2259,6 +2262,34 @@ export async function summaryCard( req, res ) {
                   },
                 },
 
+
+                'humanScore': {
+                  filter: {
+                    terms: {
+                      'auditStatus.keyword': [ 'Audited', 'ReAudited' ],
+                    },
+                  },
+                  aggs: {
+                    scoreValue: {
+                      avg: {
+                        script: {
+                          source: `
+                if (doc['totalSteps'].size() > 0 
+                  && doc['auditedSteps'].size() > 0 
+                  && doc['totalSteps'].value > 0) {
+                  return (1.0 * doc['auditedSteps'].value / doc['totalSteps'].value) * 100.0;
+                } else {
+                  return null;
+                }
+              `,
+                          lang: 'painless',
+                        },
+                      },
+                    },
+                  },
+                },
+
+
                 'trustScore': {
                   filter: {
                     terms: { 'auditStatus.keyword': [ 'Audited', 'Re-Audited' ] },
@@ -2312,6 +2343,7 @@ export async function summaryCard( req, res ) {
       completedFiles: 0,
       completedRatio: 0,
       tangoScore: 0,
+      humanScore: 0,
       tangoScoreTrend: 0,
       trustScore: 0,
       trend: false,
@@ -2322,6 +2354,7 @@ export async function summaryCard( req, res ) {
       initialValue.completedFiles =temp?.completedFiles?.doc_count;
       initialValue.completedRatio =Math.round( temp?.completedRatio?.value || 0 );
       initialValue.tangoScore =Math.round( temp?.tangoScore?.value || 0 )+ ' %';
+      initialValue.humanScore =Math.round( temp?.humanScore?.value || 0 )+ ' %';
       initialValue.tangoScoreTrend =temp?.tangoScoreTrend?.value || 0;
       initialValue.trustScore =temp?.trustScore?.avg_val?.value == null || temp?.trustScore?.avg_val?.value === undefined ? 'NA':Math.round( temp?.trustScore?.avg_val?.value );
       initialValue.trend = initialValue.tangoScoreTrend < 0? false : true;