tango-app-api-audit 3.6.13 → 3.6.14

package/package.json

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

package/src/controllers/eyeTestAudit.controllers.js

@@ -526,7 +526,7 @@ export async function viewFile( req, res ) {
           }
           return step;
         } );
-        if ( searchData.lenght ==0 ) {
+        if ( searchData.length ==0 ) {
           return res.sendError( 'No saved records found', 400 );
         }
         if ( searchData.userId !== req.user._id ) {
@@ -574,7 +574,7 @@ export async function viewFile( req, res ) {
         } );
         isEnable=true;
     }
-    response.steps.sort(
+    response?.steps?.sort(
         ( a, b ) => order.indexOf( a.processName ) - order.indexOf( b.processName ),
     );
     return res.sendSuccess( { result: response, isEnable: isEnable } );
@@ -1244,17 +1244,7 @@ export async function summaryList( req, res ) {
 
       } );
     }
-    if ( inputData.complianceScore && inputData.complianceScore?.length > null ) {
-      const values = Array.isArray( inputData.complianceScore ) ?
-    inputData.complianceScore.map( Number ) :
-    [ Number( inputData.complianceScore ) ];
-      filter.push( {
-        'terms': {
-          'ComplianceScore': values,
-        },
 
-      } );
-    }
     if ( inputData.storeId && inputData.storeId.length > 0 ) {
       filter.push( {
 
@@ -1267,6 +1257,41 @@ export async function summaryList( req, res ) {
       return res.sendError( 'No data found', 204 );
     }
 
+    let mustQuery = [
+      ...filter,
+    ];
+
+    if ( inputData.complianceScore && inputData.complianceScore?.length > null ) {
+      if ( inputData.keyType !== 'store' ) {
+        const rangeShould = inputData?.complianceScore?.map( ( r ) => {
+          const [ gte, lt ] = r.split( '-' ).map( Number );
+          return {
+            range: {
+              ComplianceScore: { gte, lt },
+            },
+          };
+        } );
+
+        mustQuery.push(
+            {
+              bool: {
+                should: rangeShould, // any one of the ranges should match
+              },
+            },
+        );
+      } else {
+        const values = Array.isArray( inputData.complianceScore ) ?
+    inputData.complianceScore.map( Number ) :
+    [ Number( inputData.complianceScore ) ];
+        filter.push( {
+          'terms': {
+            'ComplianceScore': values,
+          },
+
+        } );
+      }
+    }
+
     if ( inputData?.category ) {
       switch ( inputData?.category ) {
         case 'fake':
@@ -1490,6 +1515,7 @@ export async function summaryList( req, res ) {
         return res.sendError( 'No data', 204 );
       }
       const temp =[];
+
       for ( const [ i, cluster ] of getCluster.entries() ) {
         temp.push( cluster );
         const getClusterQuery= {
@@ -1497,7 +1523,7 @@ export async function summaryList( req, res ) {
           'query': {
             'bool': {
               'must': [
-                ...filter,
+                ...mustQuery,
                 {
                   'terms': { 'storeId.keyword': cluster?.store },
                 },
@@ -1866,6 +1892,7 @@ export async function summaryList( req, res ) {
                 'Queue ID': element?._source?.queueId,
                 'Tango Score': `${element?._source?.totalSteps>0 ? Math.round( ( element?._source?.coveredStepsAI/ element?._source?.totalSteps )*100 ): 0} %`,
                 'Steps Covered By AI': element?._source?.coveredStepsAI || 0,
+                'Human Score': [ 'Re-Audited', 'Audited' ].includes( element?._source?.auditStatus )?`${element?._source?.totalSteps>0 ? Math.round( ( element?._source?.auditedSteps/ element?._source?.totalSteps )*100 ): 0} %`:'NA',
                 'Steps Covered By Human': [ 'Re-Audited', 'Audited' ].includes( element?._source?.auditStatus )?element?._source?.auditedSteps :'NA',
                 'Trust Score': element?._source?.trustScore == null || element?._source?.trustScore ==undefined ? 'NA' : `${element?._source?.trustScore} %`,
                 'Visitor Type': element?._source?.visitorsType,
@@ -1888,6 +1915,7 @@ export async function summaryList( req, res ) {
                 'Store Name': element?._source?.storeName ||'Un Assigned',
                 'Engagement ID': element?._source?.engagementId,
                 'Tango Score': `${element?._source?.totalSteps>0 ? Math.round( ( element?._source?.coveredStepsAI/ element?._source?.totalSteps )*100 ): 0} %`,
+                'Human Score': [ 'Re-Audited', 'Audited' ].includes( element?._source?.auditStatus )?`${element?._source?.totalSteps>0 ? Math.round( ( element?._source?.auditedSteps/ element?._source?.totalSteps )*100 ): 0} %`:'NA',
                 'Steps Covered By AI': element?._source?.coveredStepsAI || 0,
                 'Steps Covered By Human': [ 'Re-Audited', 'Audited' ].includes( element?._source?.auditStatus )?element?._source?.auditedSteps :'NA',
                 'Trust Score': element?._source?.trustScore == null || element?._source?.trustScore ==undefined ? 'NA' : `${element?._source?.trustScore} %`,
@@ -2027,6 +2055,7 @@ export async function summaryList( req, res ) {
           const minutes = Math.floor( testDuration / 60 );
           const seconds = testDuration % 60;
           temp[i].complianceScore = `${item?._source?.totalSteps>0 ? Math.round( ( item?._source?.coveredStepsAI/ item?._source?.totalSteps )*100 ): 0} %`;
+          temp[i].humanComplianceScore = [ 'Re-Audited', 'Audited' ].includes( item?._source?.auditStatus )?`${item?._source?.totalSteps>0 ? Math.round( ( item?._source?.auditedSteps/ item?._source?.totalSteps )*100 ): 0} %`:'NA';
           temp[i].min = minutes;
           temp[i].sec = seconds;
           temp[i].auditedBy = userName?.userName || '';
@@ -2082,18 +2111,42 @@ export async function summaryCard( req, res ) {
         },
       } );
     }
-
-    if ( inputData?.complianceScore && inputData?.complianceScore?.length > 0 ) {
-      filter.push(
-          {
-            'terms': {
-              'ComplianceScore': inputData.complianceScore,
+    let mustQuery = [
+      ...filter,
+    ];
+    if ( inputData.complianceScore && inputData.complianceScore?.length > null ) {
+      if ( inputData.keyType !== 'store' ) {
+        const rangeShould = inputData?.complianceScore?.map( ( r ) => {
+          const [ gte, lt ] = r.split( '-' ).map( Number );
+          return {
+            range: {
+              ComplianceScore: { gte, lt },
             },
+          };
+        } );
+        logger.info( { rangeShould: rangeShould } );
+        mustQuery.push(
+            {
+              bool: {
+                should: rangeShould, // any one of the ranges should match
+              },
+            },
+        );
+      } else {
+        const values = Array.isArray( inputData.complianceScore ) ?
+    inputData.complianceScore.map( Number ) :
+    [ Number( inputData.complianceScore ) ];
+        filter.push( {
+          'terms': {
+            'ComplianceScore': values,
           },
-      );
+
+        } );
+      }
     }
+
     let bool = {
-      'must': filter,
+      'must': mustQuery,
     };
     if ( inputData?.category ) {
       switch ( inputData?.category ) {

package/src/dtos/eyeTestAudit.dtos.js

@@ -155,7 +155,7 @@ export const summaryListSchema = joi.object( {
       joi.string().optional(),
   ).optional(),
   storeId: joi.array().items( joi.string().required() ).required(),
-  complianceScore: joi.array().items( joi.number().required() ).optional(),
+  complianceScore: joi.array().items( joi.string().required() ).optional(),
   nearAddition: joi.string().optional().allow( '' ),
   isExport: joi.boolean().optional(),
   searchValue: joi.string().optional().allow( '' ),
@@ -222,11 +222,18 @@ export const summaryCardSchema = joi.object( {
     otherwise: joi.optional(),
   } ),
   demographics: joi.array().optional(),
+  keyType: joi.string()
+      .valid( 'rm', 'cluster', 'store' )
+      .required()
+      .messages( {
+        'any.only': 'Please give a valid key type',
+        'any.required': 'keyType is required',
+      } ),
   RMList: joi.array().items(
       joi.string().optional(),
   ).optional(),
   storeId: joi.array().items( joi.string().required() ).required(),
-  complianceScore: joi.array().items( joi.number().required() ).optional(),
+  complianceScore: joi.array().items( joi.string().required() ).optional(),
   nearAddition: joi.string().optional().allow( '' ),
   category: joi.string().optional() .valid( 'fake', 'genuine' ),
 } );