exclude relayed txs if isRelayed=false

multiversx · Jan 17, 2025 · e58959a · e58959a
1 parent 15d686b
commit e58959a
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/src/common/indexer/elastic/elastic.indexer.helper.ts b/src/common/indexer/elastic/elastic.indexer.helper.ts
@@ -340,11 +340,14 @@ export class ElasticIndexerHelper {
       elasticQuery = elasticQuery.withMustMatchCondition('relayerAddr', filter.relayer);
     }
 
-    if (filter.isRelayed) {
-      elasticQuery = elasticQuery.withMustCondition(QueryType.Should([
-        QueryType.Match('isRelayed', filter.isRelayed),
-        QueryType.Exists('relayer'),
-      ]));
+    const relayedConditions = QueryType.Should([
+      QueryType.Match('isRelayed', filter.isRelayed),
+      QueryType.Exists('relayer'),
+    ]);
+    if (filter.isRelayed === true) {
+      elasticQuery = elasticQuery.withMustCondition(relayedConditions);
+    } else if (filter.isRelayed === false){
+      elasticQuery = elasticQuery.withMustNotCondition(relayedConditions);
     }
 
     if (filter.type) {
@@ -558,11 +561,14 @@ export class ElasticIndexerHelper {
       elasticQuery = elasticQuery.withMustMatchCondition('tokens', filter.token, QueryOperator.AND);
     }
 
-    if (filter.isRelayed) {
-      elasticQuery = elasticQuery.withMustCondition(QueryType.Should([
-        QueryType.Match('isRelayed', filter.isRelayed),
-        QueryType.Exists('relayer'),
-      ]));
+    const relayedConditions = QueryType.Should([
+      QueryType.Match('isRelayed', filter.isRelayed),
+      QueryType.Exists('relayer'),
+    ]);
+    if (filter.isRelayed === true) {
+      elasticQuery = elasticQuery.withMustCondition(relayedConditions);
+    } else if (filter.isRelayed === false){
+      elasticQuery = elasticQuery.withMustNotCondition(relayedConditions);
     }
 
     if (filter.relayer) {