tango-app-api-audit 3.5.27 → 3.5.28

package/package.json

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

package/src/controllers/eyeTestAudit.controllers.js

@@ -1131,42 +1131,67 @@ export async function summaryList( req, res ) {
     }
 
 
-    if ( inputData.keyType === 'rm' ) {
-      return res.sendSuccess( { result: [
-        {
-          RMName: '',
-          clusterCount: '',
-          storeCount: '',
-          totalFiles: 0,
-          completedFiles: 0,
-          tangoScore: 0,
-          trustScore: 0,
+    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 } },
+        {
+          $group: {
+            _id: { clusterName: '$clusterName', RMName: '$Teamlead.email' },
+            clusterName: { $first: '$clusterName' },
+            RMName: { $first: '$Teamlead.email' },
+            store: { $addToSet: '$stores.storeId' },
 
-      ], count: 1 } );
-    } else if ( inputData.keyType === 'cluster' ) {
-      const clusterQuery =[
-        { $match: { 'Teamlead.email': { $in: inputData.RMList } } },
+          },
+        },
+        { $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 } },
         {
           $group: {
-            _id: '$clusterName',
+            _id: '$Teamlead.email',
             clusterName: { $first: '$clusterName' },
+            RMName: { $first: '$Teamlead.email' },
             store: { $addToSet: '$stores.storeId' },
 
           },
         },
         { $project: {
-          RMName: inputData?.RMList[0],
+          RMName: 1,
           clusterName: 1,
           storesCount: { $size: '$store' },
           store: 1,
         } },
       ];
-      const getCluster = await aggregateClusters( clusterQuery );
+      const getCluster = await aggregateClusters( inputData.keyType === 'rm'?RMQuery: clusterQuery );
       logger.info( { getCluster: getCluster } );
       if ( !getCluster || getCluster?.length == 0 ) {
-        return res.sendError( 'No data', 400 );
+        return res.sendError( 'No data', 204 );
       }
       const temp =[];
       for ( const [ i, cluster ] of getCluster.entries() ) {

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/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;