tango-app-api-audit 3.6.32 → 3.6.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/controllers/eyeTestAudit.controllers.js +25 -15
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "tango-app-api-audit",
3
- "version": "3.6.32",
3
+ "version": "3.6.33",
4
4
  "description": "audit & audit metrics apis",
5
5
  "main": "index.js",
6
6
  "type": "module",
package/src/controllers/eyeTestAudit.controllers.js CHANGED
@@ -2604,8 +2604,6 @@ export async function emailAlertLog( req, res ) {
2604
2604
 
2605
2605
  let search = {
2606
2606
  'must': filter,
2607
- 'should': [],
2608
- 'minimum_should_match': 1,
2609
2607
  };
2610
2608
  if ( inputData.searchValue && inputData.searchValue !== '' ) {
2611
2609
  search ={
@@ -2668,27 +2666,39 @@ export async function emailAlertLog( req, res ) {
2668
2666
  },
2669
2667
  },
2670
2668
  ],
2671
-
2669
+ 'minimum_should_match': 1,
2672
2670
 
2673
2671
  };
2674
2672
  }
2675
2673
 
2676
2674
  if ( inputData.RMList && inputData.RMList?.length > 0 ) {
2677
- const shouldRMQuery =inputData.RMList.map( ( email ) => ( {
2678
- wildcard: {
2679
- 'RMEmail.keyword': `*${email}*`,
2680
- },
2681
- } ) );
2682
- search['should'].push( ...shouldRMQuery );
2675
+ filter.push(
2676
+ {
2677
+ bool: {
2678
+ should: inputData.RMList.map( ( email ) => ( {
2679
+ wildcard: {
2680
+ 'RMEmail.keyword': `*${email}*`,
2681
+ },
2682
+ } ) ),
2683
+ minimum_should_match: 1, // at least one should match
2684
+ },
2685
+ },
2686
+ );
2683
2687
  }
2684
2688
 
2685
2689
  if ( inputData.cluster && inputData.cluster?.length > 0 ) {
2686
- const shouldClusterQuery =inputData?.cluster?.map( ( cluster ) => ( {
2687
- wildcard: {
2688
- 'RMEmail.keyword': `*${cluster}*`,
2689
- },
2690
- } ) );
2691
- search['should'].push( ...shouldClusterQuery );
2690
+ filter.push(
2691
+ {
2692
+ bool: {
2693
+ should: inputData.cluster.map( ( cluster ) => ( {
2694
+ wildcard: {
2695
+ 'cluster.keyword': `*${cluster}*`,
2696
+ },
2697
+ } ) ),
2698
+ minimum_should_match: 1, // at least one should match
2699
+ },
2700
+ },
2701
+ );
2692
2702
  }
2693
2703
  const getQuery = {
2694
2704
  'size': inputData.isExport == true? 50000 : inputData?.limit || 10,