hacked fixed for taxon_depth in predicates

gbif/occurrence#342
gbif · Sep 27, 2024 · 18b97dd · 18b97dd
1 parent 476cc11
commit 18b97dd
Showing 1 changed file with 24 additions and 8 deletions.
diff --git a/es-predicates/src/main/java/org/gbif/predicate/query/EsQueryVisitor.java b/es-predicates/src/main/java/org/gbif/predicate/query/EsQueryVisitor.java
@@ -93,6 +93,10 @@ private String getChecklistExactMatchOrVerbatimField(EqualsPredicate<S> predicat
     return esFieldMapper.getChecklistField(predicate.getChecklistKey(), predicate.getKey());
   }
 
+  private String getChecklistExactMatchOrVerbatimField(InPredicate<S> predicate) {
+    return esFieldMapper.getChecklistField(predicate.getChecklistKey(), predicate.getKey());
+  }
+
   /**
    * Translates a valid {@link org.gbif.api.model.occurrence.Download} object and translates it into
    * a json query that can be used as the <em>body</em> for _search request of ES index.
@@ -436,14 +440,26 @@ public void visit(InPredicate<S> predicate, BoolQueryBuilder queryBuilder) {
               });
 
     } else {
-      queryBuilder
-          .filter()
-          .add(
-              QueryBuilders.termsQuery(
-                  getExactMatchOrVerbatimField(predicate),
-                  predicate.getValues().stream()
-                      .map(v -> parseParamValue(v, parameter))
-                      .collect(Collectors.toList())));
+
+      if (predicate.getChecklistKey() != null){
+        queryBuilder
+                .filter()
+                .add(
+                        QueryBuilders.termsQuery(
+                                getChecklistExactMatchOrVerbatimField(predicate),
+                                predicate.getValues().stream()
+                                        .map(v -> parseParamValue(v, parameter))
+                                        .collect(Collectors.toList())));
+      } else {
+        queryBuilder
+                .filter()
+                .add(
+                        QueryBuilders.termsQuery(
+                                getExactMatchOrVerbatimField(predicate),
+                                predicate.getValues().stream()
+                                        .map(v -> parseParamValue(v, parameter))
+                                        .collect(Collectors.toList())));
+      }
     }
   }