tango-app-api-audit 3.5.26 → 3.5.28

package/package.json

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

package/src/controllers/eyeTestAudit.controllers.js

@@ -1131,32 +1131,125 @@ export async function summaryList( req, res ) {
     }
 
 
-    if ( inputData.keyType === 'rm' ) {
-      return res.sendSuccess( { result: [
+    if ( inputData.keyType === 'rm' || inputData.keyType === 'cluster' ) {
+      const clusterQuery =[
+        { $match: {
+          $and: [
+            { 'Teamlead.email': { $in: inputData.RMList } },
+            { clientId: { $eq: inputData?.clientId } },
+          ],
+        },
+        },
+        { $unwind: { path: '$Teamlead', preserveNullAndEmptyArrays: true } },
+        { $unwind: { path: '$stores', preserveNullAndEmptyArrays: true } },
         {
-          RMName: '',
-          clusterCount: '',
-          storeCount: '',
-          totalFiles: 0,
-          completedFiles: 0,
-          tangoScore: 0,
-          trustScore: 0,
-        },
-
-      ], count: 1 } );
-    } else if ( inputData.keyType === 'cluster' ) {
-      return res.sendSuccess( { result: [
+          $group: {
+            _id: { clusterName: '$clusterName', RMName: '$Teamlead.email' },
+            clusterName: { $first: '$clusterName' },
+            RMName: { $first: '$Teamlead.email' },
+            store: { $addToSet: '$stores.storeId' },
+
+          },
+        },
+        { $project: {
+          RMName: 1,
+          clusterName: 1,
+          storesCount: { $size: '$store' },
+          store: 1,
+        } },
+      ];
+      const RMQuery =[
+        { $match: {
+          $and: [
+            {
+              'Teamlead.email': { $in: inputData.RMList },
+            },
+            {
+              'clientId': { $eq: inputData?.clientId },
+            },
+          ],
+        },
+        },
+        { $unwind: { path: '$Teamlead', preserveNullAndEmptyArrays: true } },
+        { $unwind: { path: '$stores', preserveNullAndEmptyArrays: true } },
         {
-          RMName: '',
-          clusterName: '',
-          storeName: '',
-          totalFiles: 0,
-          completedFiles: 0,
-          tangoScore: 0,
-          trustScore: 0,
+          $group: {
+            _id: '$Teamlead.email',
+            clusterName: { $first: '$clusterName' },
+            RMName: { $first: '$Teamlead.email' },
+            store: { $addToSet: '$stores.storeId' },
+
+          },
         },
+        { $project: {
+          RMName: 1,
+          clusterName: 1,
+          storesCount: { $size: '$store' },
+          store: 1,
+        } },
+      ];
+      const getCluster = await aggregateClusters( inputData.keyType === 'rm'?RMQuery: clusterQuery );
+      logger.info( { getCluster: getCluster } );
+      if ( !getCluster || getCluster?.length == 0 ) {
+        return res.sendError( 'No data', 204 );
+      }
+      const temp =[];
+      for ( const [ i, cluster ] of getCluster.entries() ) {
+        logger.info( { cluster: cluster } );
+        temp.push( cluster );
+        const getClusterQuery= {
+          'size': 0,
+          'query': {
+            'bool': {
+              'must': [
+                { 'terms': { 'storeId.keyword': cluster?.store } },
+                { 'term': { 'type.keyword': inputData?.type } },
+                {
+                  'range': {
+                    'date': {
+                      'gte': inputData?.fromDate,
+                      'lte': inputData?.toDate,
+                    },
+                  },
+                },
+
+              ],
+            },
+          },
+          'aggs': {
+            'total_count': {
+              'value_count': { 'field': '_id' },
+            },
+            'avg_complianceScore': {
+              'avg': { 'field': 'ComplianceScore' },
+            },
+            'audited_trustScore': {
+              'filter': { 'terms': { 'auditStatus.keyword': [ 'Audited', 'reAudited' ] } },
+              'aggs': {
+                'avg_trustScore': {
+                  'avg': { 'field': 'trustScore' },
+                },
+                'totalCount': {
+                  'value_count': { 'field': '_id' },
+                },
+              },
+            },
+          },
+        };
+        const getResponse = await getOpenSearchData( openSearch.EyeTestInput, getClusterQuery );
+        logger.info( { getResponse: getResponse } );
+        if ( getResponse?.body?.aggregations ) {
+          delete temp[i].store;
+          delete temp[i]._id;
+          temp[i].totalFiles = getResponse?.body?.aggregations?.total_count?.value || 0,
+          temp[i].completedFiles=getResponse?.body?.aggregations?.audited_trustScore?.totalCount?.value || 0;
+          temp[i].complianceScore = getResponse?.body?.aggregations?.avg_complianceScore?.value || 0;
+          temp[i].trustScore =getResponse?.body?.aggregations?.audited_trustScore?.totalCount?.value || 'NA';
+          logger.info( { getResponse: getResponse, ms: '........1' } );
+        }
+      }
 
-      ], count: 1 } );
+      return res.sendSuccess( { result: temp, count: getCluster?.length || 0 } );
     } else {
       let search ={
         'must': filter,
@@ -1326,9 +1419,19 @@ export async function summaryList( req, res ) {
             if ( element?._source?.userId&&element?._source?.userId!='' ) {
               userName = await findOneUser( { _id: element?._source?.userId }, { _id: 0, userName: 1 } );
             }
+
+            let RMName = '';
+            let clusterName='';
+            if ( element?._source?.storeId&&element?._source?.storeId!='' ) {
+              const getCluster = await findOneClusters( { 'stores.storeId': element?._source?.storeId }, { Teamlead: 1, clusterName: 1 } );
+              RMName =( getCluster && getCluster.Teamlead?.length > 0 )? getCluster?.Teamlead?.[0]?.email : '';
+              clusterName = getCluster?.clusterName;
+            }
             if ( element?._source?.type == 'physical' ) {
               exportData.push( {
                 'Date': dayjs( element?._source?.date ).format( 'D MMM, YYYY' ),
+                'RM Name': RMName,
+                'Cluster Name': clusterName,
                 'Store Name': element?._source?.storeName,
                 'Store ID': element?._source?.storeId || 'Un Assigned',
                 'Store Name': element?._source?.storeName ||'Un Assigned',
@@ -1346,6 +1449,8 @@ export async function summaryList( req, res ) {
             } else {
               exportData.push( {
                 'Date': dayjs( element?._source?.date ).format( 'D MMM, YYYY' ),
+                'Cluster Name': clusterName,
+                'Store Name': element?._source?.storeName,
                 'Store Name': element?._source?.storeName,
                 'Store ID': element?._source?.storeId || 'Un Assigned',
                 'Store Name': element?._source?.storeName ||'Un Assigned',

package/src/dtos/eyeTestAudit.dtos.js

@@ -146,14 +146,7 @@ export const summaryListSchema = joi.object( {
     'any.required': 'Type is required',
     'string.empty': 'Type cannot be empty',
   } ),
-  clientId: joi.string().when( '$userType', {
-    is: 'tango',
-    then: joi.required().messages( {
-      'any.required': 'clientId is required',
-      'string.base': 'clientId must be a string',
-    } ),
-    otherwise: joi.optional(),
-  } ),
+  clientId: joi.string().required(),
   demographics: joi.array().optional(),
   RMList: joi.array().items(
       joi.string().required(),

package/src/service/clusters.service.js

@@ -5,7 +5,7 @@ export function aggregateClusters( query ) {
   return clusterModel.aggregate( query, { collation: { locale: 'en', strength: 2 } } );
 }
 
-export function findClusters( query ) {
+export function findClusters( query, field ) {
   return clusterModel.find( query, field );
 }
 

package/src/validation/eyeTest.validation.js

@@ -3,12 +3,14 @@ import { logger } from 'tango-app-api-middleware';
 export async function roleValidation( req, res, next ) {
   try {
     const userRole = req?.user?.role;
+    req.body.clientId = req?.user?.userType == 'tango'? req?.body?.clientId : req?.user?.clientId;
     switch ( userRole ) {
       case 'user':
-        delete req?.body?.RMList;
+        req.body.RMList = [ req?.user?.email ];
         break;
       case 'admin':
-        delete req?.body?.RMList;
+        req.body.RMList = [ req?.user?.email ];
+        // delete req?.body?.RMList;
         break;
       case 'superadmin':
         break;