tango-app-api-audit 3.6.31 → 3.6.33

package/package.json

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

package/src/controllers/eyeTestAudit.controllers.js

@@ -2124,38 +2124,57 @@ export async function summaryList( req, res ) {
         let RMEmail = '';
         let clusterName='';
         if ( item?._source?.storeId&&item?._source?.storeId!='' ) {
-          const rmListQuery =[
+          // 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 );
+
+          const getRMList = [
             {
-              $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,
-              },
+              list: [ 'marellapudi.ajay@lenskart.com',
+                'anirban.ghosh@lenskart.com',
+                'avadhesh.kumar@lenskart.com',
+                'ayush.gupta1@lenskart.in',
+                'dhirendra.bisht@thelenskart.com',
+                'mueen.khan@thelenskart.com',
+                'reshma.shetty@lenskart.in',
+                'srinivas.reddy@thelenskart.com',
+                'suresh.r@thelenskart.com',
+                'krishna.thulasi@lenskart.in',
+                'vijeesh.vl@lenskart.in',
+                'kunal.sharma@lenskart.mobi',
+                '',
+              ],
             },
           ];
-          const getRMList = await aggregateEyeTestConfig( rmListQuery );
           let getCluster = [];
           if ( getRMList && getRMList?.length > 0 ) {
             const getRMQuery = [
@@ -2574,7 +2593,7 @@ export async function emailAlertLog( req, res ) {
         'range': {
           'createdAt': {
             'gte': dayjs( inputData.fromDate ),
-            'lte': dayjs( inputData.toDate ),
+            'lte': dayjs( `${inputData.toDate} ${dayjs().format( 'HH:mm:ss' )}` ),
           },
         },
       },
@@ -2585,8 +2604,6 @@ export async function emailAlertLog( req, res ) {
 
     let search = {
       'must': filter,
-      'should': [],
-      'minimum_should_match': 1,
     };
     if ( inputData.searchValue && inputData.searchValue !== '' ) {
       search ={
@@ -2649,27 +2666,39 @@ export async function emailAlertLog( req, res ) {
             },
           },
         ],
-
+        'minimum_should_match': 1,
 
       };
     }
 
     if ( inputData.RMList && inputData.RMList?.length > 0 ) {
-      const shouldRMQuery =inputData.RMList.map( ( email ) => ( {
-        wildcard: {
-          'RMEmail.keyword': `*${email}*`,
-        },
-      } ) );
-      search['should'].push( ...shouldRMQuery );
+      filter.push(
+          {
+            bool: {
+              should: inputData.RMList.map( ( email ) => ( {
+                wildcard: {
+                  'RMEmail.keyword': `*${email}*`,
+                },
+              } ) ),
+              minimum_should_match: 1, // at least one should match
+            },
+          },
+      );
     }
 
     if ( inputData.cluster && inputData.cluster?.length > 0 ) {
-      const shouldClusterQuery =inputData?.cluster?.map( ( cluster ) => ( {
-        wildcard: {
-          'RMEmail.keyword': `*${cluster}*`,
-        },
-      } ) );
-      search['should'].push( ...shouldClusterQuery );
+      filter.push(
+          {
+            bool: {
+              should: inputData.cluster.map( ( cluster ) => ( {
+                wildcard: {
+                  'cluster.keyword': `*${cluster}*`,
+                },
+              } ) ),
+              minimum_should_match: 1, // at least one should match
+            },
+          },
+      );
     }
     const getQuery = {
       'size': inputData.isExport == true? 50000 : inputData?.limit || 10,