tango-app-api-audit 3.5.46 → 3.5.47

package/package.json

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

package/src/controllers/eyeTestAudit.controllers.js

@@ -1,11 +1,11 @@
 import { getOpenSearchData, getOpenSearchById, logger, insertOpenSearchData, updateOpenSearchData, download, chunkArray, getOpenSearchCount, insertWithId } from 'tango-app-api-middleware';
-import { findOneUser, findUser } from '../service/user.service.js';
+import { aggregateUser, findOneUser, findUser } from '../service/user.service.js';
 import mongoose from 'mongoose';
 import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc.js';
 import timezone from 'dayjs/plugin/timezone.js';
 import 'dayjs/locale/en.js';
-import { findOneEyeTestConfig, updateOneEyeTestConfig } from '../service/eyeTestConfiguration.service.js';
+import { aggregateEyeTestConfig, findOneEyeTestConfig, updateOneEyeTestConfig } from '../service/eyeTestConfiguration.service.js';
 import { ObjectId } from 'mongodb';
 import { aggregateClusters, findOneClusters } from '../service/clusters.service.js';
 
@@ -1424,7 +1424,7 @@ export async function summaryList( req, res ) {
               'avg': { 'field': 'ComplianceScore' },
             },
             'audited_trustScore': {
-              'filter': { 'terms': { 'auditStatus.keyword': [ 'Audited', 'reAudited' ] } },
+              'filter': { 'terms': { 'auditStatus.keyword': [ 'Audited', 'Re-Audited' ] } },
               'aggs': {
                 'avg_trustScore': {
                   'avg': { 'field': 'trustScore' },
@@ -1659,19 +1659,118 @@ export async function summaryList( req, res ) {
             let RMEmail = '';
             let clusterName='';
             if ( element?._source?.storeId&&element?._source?.storeId!='' ) {
-              const getCluster = await findOneClusters( { 'stores.storeId': element?._source?.storeId }, { Teamlead: 1, clusterName: 1 } );
-              RMEmail =( getCluster && getCluster.Teamlead?.length > 0 )? getCluster?.Teamlead?.[0]?.email : '';
-              clusterName = getCluster?.clusterName;
+              const rmListQuery =[
+                {
+                  $match: {
+                    $and: [
+                      {
+                        clientId: { $eq: inputData?.clientId },
+                      },
+                      {
+                        configureType: { $eq: 'user' },
+                      },
+                    ],
+                  },
+                },
+                {
+                  $unwind: {
+                    path: '$userList', preserveNullAndEmptyArrays: true,
+                  },
+                },
+                {
+                  $group: {
+                    _id: null,
+                    list: { $addToSet: '$userList.email' },
+                  },
+                },
+                {
+                  $project: {
+                    _id: 0,
+                    list: 1,
+                  },
+                },
+              ];
+              const getRMList = await aggregateEyeTestConfig( rmListQuery );
+              let getCluster = [];
+              if ( getRMList && getRMList?.length > 0 ) {
+                const getRMQuery = [
+                  {
+                    $unwind: {
+                      path: '$Teamlead', preserveNullAndEmptyArrays: true,
+                    },
+                  },
+                  {
+                    $match: {
+                      $and: [
+                        { 'stores.storeId': { $eq: element?._source?.storeId } },
+                        {
+                          'Teamlead.email': { $in: getRMList[0].list },
+                        },
+                      ],
+                    },
+                  },
+                  {
+                    $group: {
+                      _id: null,
+                      clusterName: { $addToSet: '$clusterName' },
+                      rmList: { $addToSet: '$Teamlead.email' },
+                    },
+                  },
+                  {
+                    $project: {
+                      _id: 0,
+                      clusterName: 1,
+                      rmList: 1,
+                    },
+                  },
+                ];
+                getCluster = await aggregateClusters( getRMQuery );
+              }
+
+              // const getCluster = await findOneClusters( { 'stores.storeId': element?._source?.storeId }, { Teamlead: 1, clusterName: 1 } );
+              RMEmail =( getCluster && getCluster?.rmList?.length > 0 )? getCluster?.rmList?.toString() : '';
+              clusterName = ( getCluster && getCluster?.clusterName?.length > 0 )? getCluster?.clusterName?.toString() : '';
             }
-            if ( RMEmail ) {
-              const temp = await findOneUser( { email: RMEmail }, { userName: 1 } );
-              RMName = temp?.userName;
+            if ( RMEmail && RMEmail !== '' ) {
+              const temp = await aggregateUser( [
+                {
+                  $match: {
+                    $and: [
+                      {
+                        email: { $in: getCluster?.rmList },
+                      },
+                      {
+                        isActive: true,
+                      },
+                      {
+                        role: { $eq: 'admin' },
+                      },
+                    ],
+                  },
+                },
+                {
+                  $group: {
+                    _id: null,
+                    user: { $addToSet: '$userName' },
+                  },
+                },
+                {
+                  $project: {
+                    _id: 0,
+                    user: 1,
+                  },
+                },
+              ] );
+              if ( temp && temp?.user?.length >0 ) {
+                RMName = temp?.[0]?.user?.toString( '' );
+              }
+              logger.info( { RMEmail: RMEmail } );
             }
             if ( element?._source?.type == 'physical' ) {
               exportData.push( {
                 'Date': dayjs( element?._source?.date ).format( 'D MMM, YYYY' ),
-                'RM Name': RMName,
-                'Cluster Name': clusterName,
+                ...( req?.user?.userType === 'superadmin' && { 'RM Name': RMName } ),
+                ...( req?.user?.userType !== 'user' && { 'Cluster Name': clusterName } ),
                 'Store Name': element?._source?.storeName,
                 'Store ID': element?._source?.storeId || 'Un Assigned',
                 'Store Name': element?._source?.storeName ||'Un Assigned',
@@ -1689,7 +1788,8 @@ export async function summaryList( req, res ) {
             } else {
               exportData.push( {
                 'Date': dayjs( element?._source?.date ).format( 'D MMM, YYYY' ),
-                'Cluster Name': clusterName,
+                ...( req?.user?.userType === 'superadmin' && { 'RM Name': RMName } ),
+                ...( req?.user?.userType !== 'user' && { 'Cluster Name': clusterName } ),
                 'Store Name': element?._source?.storeName,
                 'Store Name': element?._source?.storeName,
                 'Store ID': element?._source?.storeId || 'Un Assigned',
@@ -1887,7 +1987,7 @@ export async function summaryCard( req, res ) {
 
                 'completedFiles': {
                   filter: {
-                    terms: { 'auditStatus.keyword': [ 'Audited', 'ReAudited' ] },
+                    terms: { 'auditStatus.keyword': [ 'Audited', 'Re-Audited' ] },
                   },
                 },
 
@@ -1918,7 +2018,7 @@ export async function summaryCard( req, res ) {
 
                 'trustScore': {
                   filter: {
-                    terms: { 'auditStatus.keyword': [ 'Audited', 'ReAudited' ] },
+                    terms: { 'auditStatus.keyword': [ 'Audited', 'Re-Audited' ] },
                   },
                   aggs: {
                     avg_val: { avg: { field: 'trustScore' } },

package/src/service/eyeTestConfiguration.service.js

@@ -11,3 +11,7 @@ export function findOneEyeTestConfig( query, field ) {
 export function findEyeTestConfig( query, field ) {
   return eyeTestConfigurationModel.find( query, field );
 }
+
+export function aggregateEyeTestConfig( query ) {
+  return eyeTestConfigurationModel.aggregate( query );
+}