tango-app-api-audit 3.6.32 → 3.6.34

package/package.json

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

package/src/controllers/eyeTestAudit.controllers.js

@@ -2225,9 +2225,6 @@ export async function summaryList( req, res ) {
                     {
                       isActive: true,
                     },
-                    {
-                      role: { $eq: 'admin' },
-                    },
                   ],
                 },
               },
@@ -2604,8 +2601,6 @@ export async function emailAlertLog( req, res ) {
 
     let search = {
       'must': filter,
-      'should': [],
-      'minimum_should_match': 1,
     };
     if ( inputData.searchValue && inputData.searchValue !== '' ) {
       search ={
@@ -2668,27 +2663,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,