tango-app-api-audit 3.5.20 → 3.5.22

package/package.json

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

package/src/controllers/eyeTestAudit.controllers.js

@@ -7,6 +7,7 @@ import timezone from 'dayjs/plugin/timezone.js';
 import 'dayjs/locale/en.js';
 import { findOneEyeTestConfig, updateOneEyeTestConfig } from '../service/eyeTestConfiguration.service.js';
 import { ObjectId } from 'mongodb';
+import { aggregateClusters } from '../service/clusters.service.js';
 
 dayjs.extend( utc );
 dayjs.extend( timezone );
@@ -1598,9 +1599,12 @@ export async function getUserConfig( req, res ) {
       configureType: 'user',
 
     };
-    const getOne = await findOneEyeTestConfig( query, { userList: 1 } );
+    const getOne = await findOneEyeTestConfig( query, { userList: 1, _id: 1 } );
+    if ( !getOne ) {
+      return res.sendError( ' No data found', 204 );
+    }
     logger.info( { getOne: getOne, message: 'getUserConfig' } );
-    return res.sendSuccess( { result: getOne?.userList || [] } );
+    return res.sendSuccess( { result: getOne || [] } );
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
     logger.error( { message: error, data: req.body, function: 'eyetestAudit-controller-getUserConfig' } );
@@ -1666,6 +1670,50 @@ export async function updateUserConfig( req, res ) {
   }
 }
 
+export async function clusterList( req, res ) {
+  try {
+    const inputData = req.body;
+    inputData.clientId = req?.user?.userType == 'tango' ? inputData.clientId : req?.user?.clientId;
+    const query = [
+
+      {
+        $match: {
+          $and: [
+            {
+              clientId: { $eq: inputData?.clientId },
+            },
+            {
+              'Teamlead.email': { $in: inputData?.rmList },
+            },
+
+          ],
+        },
+      },
+      {
+        $group: {
+          _id: null,
+          clientId: { $first: '$clientId' },
+          clusterList: { $addToSet: '$clusterName' },
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          clientId: 1,
+          clusterList: 1,
+        },
+      },
+    ];
+    const getClusterList = await aggregateClusters( query );
+    logger.info( { getClusterList: getClusterList, query: query } );
+    return res.sendSuccess( { result: getClusterList || [] } );
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.error( { message: error, data: req.body, function: 'eyetestAudit-controller-clusterList' } );
+    return res.sendError( err, 500 );
+  }
+}
+
 export async function rmList( req, res ) {
   try {
     const inputData = req.query;
@@ -1674,7 +1722,6 @@ export async function rmList( req, res ) {
       configureType: 'user',
     };
     const getRMList = await findOneEyeTestConfig( query, { userList: 1 } );
-    logger.info( { getRMList: getRMList } );
     return res.sendSuccess( { result: getRMList?.userList || [] } );
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
@@ -1692,12 +1739,15 @@ export async function getEmailConfig( req, res ) {
       clientId: clientId,
       configureType: 'email',
     };
-    const getOne = await findOneEyeTestConfig( query, { complianceThreshold: 1 } );
+    const getOne = await findOneEyeTestConfig( query, { complianceThreshold: 1, _id: 1 } );
     logger.info( { getOne: getOne, message: 'getEmailConfig' } );
     // if ( !getOne?.complianceThreshold ) {
     //   return res.sendError( 'No data found', 204 );
     // }
-    return res.sendSuccess( { result: getOne?.complianceThreshold } );
+    if ( !getOne ) {
+      return res.sendError( ' No data found', 204 );
+    }
+    return res.sendSuccess( { result: getOne } );
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
     logger.error( { message: error, data: req.body, function: 'eyetestAudit-controller-getEmailConfig' } );

package/src/docs/eyeTestAudit.docs.js

@@ -1,5 +1,5 @@
 import j2s from 'joi-to-swagger';
-import { getListSchema, getFileSchema, getFileHistorySchema, userAuditedDataSchema, viewFileSchema, saveSchema, cancelSchema, summaryCardSchema, getUserConfigSchema, rmListSchema, updateUserConfigParamsSchema, updateUserConfigSchema, updateEmailConfigParamaSchema, updateEmailConfigSchema, getEmailConfigSchema, summaryListSchema, emailAlertLogSchema } from '../dtos/eyeTestAudit.dtos.js';
+import { getListSchema, getFileSchema, getFileHistorySchema, userAuditedDataSchema, viewFileSchema, saveSchema, cancelSchema, summaryCardSchema, getUserConfigSchema, rmListSchema, updateUserConfigParamsSchema, updateUserConfigSchema, updateEmailConfigParamaSchema, updateEmailConfigSchema, getEmailConfigSchema, summaryListSchema, emailAlertLogSchema, clusterSchema } from '../dtos/eyeTestAudit.dtos.js';
 
 export const eyeTestAuditDocs = {
 
@@ -270,6 +270,28 @@ export const eyeTestAuditDocs = {
     },
   },
 
+  '/v3/eye-test-audit/cluster-list': {
+    post: {
+      tags: [ 'Eye Test Audit' ],
+      description: 'get cluster likt filter by client an RM',
+      operationId: 'cluster-list',
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( clusterSchema ).swagger,
+          },
+        },
+      },
+      responses: {
+        200: { description: 'Successful' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
+
   '/v3/eye-test-audit/update-user-config': {
     put: {
       tags: [ 'Eye Test Audit' ],

package/src/dtos/eyeTestAudit.dtos.js

@@ -319,6 +319,22 @@ export const rmListValid = {
   query: rmListSchema,
 };
 
+export const clusterSchema = joi.object( {
+  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(),
+  } ),
+  rmList: joi.array().items( joi.string().optional() ).optional(),
+} );
+
+export const clusterListValid = {
+  body: clusterSchema,
+};
+
 export const updateUserConfigSchema = joi.object( {
   clientId: joi.string().when( '$userType', {
     is: 'tango',

package/src/routes/eyeTestAudit.routes.js

@@ -1,8 +1,8 @@
 import { Router } from 'express';
 import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
 import { accessVerification } from 'tango-app-api-middleware';
-import { cancelValid, emailAlertLogValid, getEmailConfigValid, getFileHistoryValid, getFileValid, getListValid, getUserConfigValid, rmListValid, saveValid, summaryCardValid, summaryListValid, updateEmailConfigValid, updateUserConfigValid, userAuditedDataValid, viewFileValid } from '../dtos/eyeTestAudit.dtos.js';
-import { addUserConfig, cancel, emailAlertLog, getEmailConfig, getFile, getFileHistory, getList, getUserConfig, rmList, save, summaryCard, summaryList, updateEmailConfig, updateEmailConfig1, updateUserConfig, userAuditedData, viewFile } from '../controllers/eyeTestAudit.controllers.js';
+import { cancelValid, clusterListValid, emailAlertLogValid, getEmailConfigValid, getFileHistoryValid, getFileValid, getListValid, getUserConfigValid, rmListValid, saveValid, summaryCardValid, summaryListValid, updateEmailConfigValid, updateUserConfigValid, userAuditedDataValid, viewFileValid } from '../dtos/eyeTestAudit.dtos.js';
+import { addUserConfig, cancel, clusterList, emailAlertLog, getEmailConfig, getFile, getFileHistory, getList, getUserConfig, rmList, save, summaryCard, summaryList, updateEmailConfig, updateEmailConfig1, updateUserConfig, userAuditedData, viewFile } from '../controllers/eyeTestAudit.controllers.js';
 import { isSuperAdmin, roleValidation } from '../validation/eyeTest.validation.js';
 
 export const eyeTestAuditRouter = Router();
@@ -21,11 +21,14 @@ eyeTestAuditRouter.post( '/summary-list', isAllowedSessionHandler, accessVerific
 eyeTestAuditRouter.post( '/summary-card', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), validate( summaryCardValid ), summaryCard );
 eyeTestAuditRouter.post( '/email-alert-log', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), isSuperAdmin, validate( emailAlertLogValid ), emailAlertLog );
 
+eyeTestAuditRouter.post( '/cluster-list', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), isSuperAdmin, validate( clusterListValid ), clusterList );
+eyeTestAuditRouter.get( '/rm-list', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), isSuperAdmin, validate( rmListValid ), rmList );
+
+
 // setting
 eyeTestAuditRouter.get( '/get-user-config', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), validate( getUserConfigValid ), getUserConfig );
 eyeTestAuditRouter.put( '/update-user-config', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), isSuperAdmin, validate( updateUserConfigValid ), addUserConfig, updateUserConfig );
 
-eyeTestAuditRouter.get( '/rm-list', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), isSuperAdmin, validate( rmListValid ), rmList );
 eyeTestAuditRouter.get( '/get-email-config', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), isSuperAdmin, validate( getEmailConfigValid ), getEmailConfig );
 eyeTestAuditRouter.put( '/update-email-config', isAllowedSessionHandler, accessVerification( { userType: [ 'tango', 'client' ] } ), validate( updateEmailConfigValid ), updateEmailConfig );
 

package/src/service/clusters.service.js

@@ -1,6 +1,10 @@
-import clusterModel from 'tango-api-schema/schema/cluster.model';
+import clusterModel from 'tango-api-schema/schema/cluster.model.js';
 
 
 export function aggregateClusters( query ) {
   return clusterModel.aggregate( query, { collation: { locale: 'en', strength: 2 } } );
 }
+
+export function findClusters( query ) {
+  return clusterModel.find( query, field );
+}