tango-app-api-audit 3.6.6 → 3.6.7

package/package.json

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

package/src/controllers/eyeTestAudit.controllers.js

@@ -1207,7 +1207,7 @@ export async function summaryList( req, res ) {
     const limit = inputData.limit || 10;
     const offset = inputData.offset ? ( inputData.offset - 1 ) * limit : 0;
 
-    const sortBy = inputData?.sortBy ? [ 'coveredStepsAI', 'trustScore', 'date', 'ComplianceScore' ].includes( inputData.sortBy ) ? inputData.sortBy :`${inputData.sortBy}.keyword` : 'storeName.keyword';
+    const sortBy = inputData?.sortBy ? [ 'coveredStepsAI', 'trustScore', 'date', 'ComplianceScore', 'auditedSteps' ].includes( inputData.sortBy ) ? inputData.sortBy :`${inputData.sortBy}.keyword` : 'storeName.keyword';
     const order = inputData?.sortOrder || -1;
 
     let filter= [
@@ -1221,7 +1221,15 @@ export async function summaryList( req, res ) {
       },
 
     ];
-    if ( inputData.demographics && inputData.demographics.length > 0 ) {
+
+    if ( inputData?.auditStatus && inputData?.auditStatus?.length > 0 ) {
+      filter.push( {
+        'terms': {
+          'auditStatus.keyword': inputData.auditStatus,
+        },
+      } );
+    }
+    if ( inputData?.demographics && inputData?.demographics?.length > 0 ) {
       filter.push( {
         'terms': {
           'visitorsType.keyword': inputData.demographics,
@@ -1848,6 +1856,7 @@ export async function summaryList( req, res ) {
             if ( element?._source?.type == 'physical' ) {
               exportData.push( {
                 'Date': dayjs( element?._source?.date ).format( 'D MMM, YYYY' ),
+                'Audited Date': [ 'Re-Audited', 'Audited' ].includes( element?._source?.auditStatus )?dayjs( element?._source?.updatedAt ).format( 'D MMM, YYYY' ): 'NA',
                 ...( req?.user?.role === 'superadmin' && { 'RM Name': RMName } ),
                 ...( req?.user?.role !== 'user' && { 'Cluster Name': clusterName } ),
                 'Store Name': element?._source?.storeName,
@@ -1857,6 +1866,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,
+                'Steps Covered By User': [ '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,
                 'Test Duration': duration || '',
@@ -1869,6 +1879,7 @@ export async function summaryList( req, res ) {
             } else {
               exportData.push( {
                 'Date': dayjs( element?._source?.date ).format( 'D MMM, YYYY' ),
+                'Audited Date': [ 'Re-Audited', 'Audited' ].includes( element?._source?.auditStatus )?dayjs( element?._source?.updatedAt ).format( 'D MMM, YYYY' ): 'NA',
                 ...( req?.user?.role === 'superadmin' && { 'RM Name': RMName } ),
                 ...( req?.user?.role !== 'user' && { 'Cluster Name': clusterName } ),
                 'Store Name': element?._source?.storeName,
@@ -1878,6 +1889,7 @@ export async function summaryList( req, res ) {
                 'Engagement ID': element?._source?.engagementId,
                 'Tango Score': `${element?._source?.totalSteps>0 ? Math.round( ( element?._source?.coveredStepsAI/ element?._source?.totalSteps )*100 ): 0} %`,
                 'Steps Covered By AI': element?._source?.coveredStepsAI || 0,
+                'Steps Covered By User': [ '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} %`,
                 'Test Duration': duration || '',
                 'Audit Status': element?._source?.auditStatus || '',
@@ -2019,6 +2031,7 @@ export async function summaryList( req, res ) {
           temp[i].sec = seconds;
           temp[i].auditedBy = userName?.userName || '';
           temp[i].date = dayjs( item?._source?.date ).format( 'D MMM, YYYY' );
+          temp[i].auditedDate = [ 'Re-Audited', 'Audited' ].includes( element?._source?.auditStatus )?dayjs( element?._source?.updatedAt ).format( 'D MMM, YYYY' ): 'NA';
           temp[i].RMName = RMName;
           temp[i].clusterName =clusterName;
           temp[i].RMEmail =RMEmail;

package/src/dtos/eyeTestAudit.dtos.js

@@ -150,7 +150,7 @@ export const summaryListSchema = joi.object( {
   demographics: joi.array().optional(),
   RMList: joi.array().items(
       joi.string().required(),
-  ).optional(),
+  ).required(),
   cluster: joi.array().items(
       joi.string().optional(),
   ).optional(),
@@ -164,6 +164,7 @@ export const summaryListSchema = joi.object( {
   category: joi.string().optional() .valid( 'fake', 'genuine' ),
   offset: joi.number().optional(),
   limit: joi.number().optional(),
+  auditStatus: joi.array().items( joi.string().required().valid( 'Re-Audited', 'Audited', 'In-Progress', 'Yet-to-Audit' ) ).optional(),
 } );
 
 export const summaryListValid = {

package/src/validation/eyeTest.validation.js

@@ -2,20 +2,20 @@ import { logger } from 'tango-app-api-middleware';
 
 export async function roleValidation( req, res, next ) {
   try {
-    const userRole = req?.user?.role;
+    // const userRole = req?.user?.role;
     req.body.clientId = req?.user?.userType == 'tango'? req?.body?.clientId : req?.user?.clientId;
-    switch ( userRole ) {
-      case 'user':
-        req.body.RMList = [ req?.user?.email ];
-        break;
-      case 'admin':
-        req.body.RMList = [ req?.user?.email ];
-        // delete req?.body?.RMList;
-        break;
-      case 'superadmin':
-        break;
-      default: return res.sendError( 'forbidden to access: you must be User or Admin or Super Admin', 403 );
-    }
+    // switch ( userRole ) {
+    //   case 'user':
+    //     req.body.RMList = [ req?.user?.email ];
+    //     break;
+    //   case 'admin':
+    //     req.body.RMList = [ req?.user?.email ];
+    //     // delete req?.body?.RMList;
+    //     break;
+    //   case 'superadmin':
+    //     break;
+    //   default: return res.sendError( 'forbidden to access: you must be User or Admin or Super Admin', 403 );
+    // }
     next();
     return;
   } catch ( error ) {