Merge pull request #28 from GenomicDataInfrastructure/retrieve-multip…

…le-datasets-from-beacon fix: retrieve multiple datasets from Beacon
GenomicDataInfrastructure · Jun 12, 2024 · 783d997 · 783d997
2 parents 564a78d + f25d06d
commit 783d997
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/...n/java/io/github/genomicdatainfrastructure/discovery/services/CkanFacetsQueryBuilder.java b/...n/java/io/github/genomicdatainfrastructure/discovery/services/CkanFacetsQueryBuilder.java
@@ -22,10 +22,11 @@ public class CkanFacetsQueryBuilder {
     private final String CKAN_FACET_GROUP = "ckan";
     private final String QUOTED_VALUE = "\"%s\"";
     private final String FACET_PATTERN = "%s:(%s)";
+    private final String AND = " AND ";
 
     public String buildFacetQuery(DatasetSearchQuery query) {
         var facets = query.getFacets();
-        var operator = query.getOperator();
+        var operator = CkanQueryOperatorMapper.getOperator(query.getOperator());
 
         var nonNullFacets = ofNullable(facets)
                 .orElseGet(List::of)
@@ -35,7 +36,7 @@ public String buildFacetQuery(DatasetSearchQuery query) {
 
         return nonNullFacets.entrySet().stream()
                 .map(entry -> getFacetQuery(entry.getKey(), entry.getValue(), operator))
-                .collect(joining(CkanQueryOperatorMapper.getOperator(operator)));
+                .collect(joining(AND));
     }
 
     private Boolean isCkanGroupAndFacetIsNotBlank(DatasetSearchQueryFacet facet) {
@@ -46,11 +47,12 @@ private Boolean isCkanGroupAndFacetIsNotBlank(DatasetSearchQueryFacet facet) {
                 !facet.getValue().isBlank();
     }
 
-    private String getFacetQuery(String key, List<DatasetSearchQueryFacet> facets,
-            DatasetSearchQuery.OperatorEnum operator) {
+    private String getFacetQuery(
+            String key, List<DatasetSearchQueryFacet> facets, String operator
+    ) {
         var values = facets.stream()
                 .map(facet -> QUOTED_VALUE.formatted(facet.getValue()))
-                .collect(joining(CkanQueryOperatorMapper.getOperator(operator)));
+                .collect(joining(operator));
 
         return FACET_PATTERN.formatted(key, values);
     }

diff --git a/.../java/io/github/genomicdatainfrastructure/discovery/services/CkanQueryOperatorMapper.java b/.../java/io/github/genomicdatainfrastructure/discovery/services/CkanQueryOperatorMapper.java
@@ -14,6 +14,6 @@ public class CkanQueryOperatorMapper {
     private final String OR = " OR ";
 
     public String getOperator(DatasetSearchQuery.OperatorEnum operator) {
-        return operator.equals(DatasetSearchQuery.OperatorEnum.OR) ? OR : AND;
+        return DatasetSearchQuery.OperatorEnum.AND.equals(operator) ? AND : OR;
     }
 }
diff --git a/src/main/openapi/discovery.yaml b/src/main/openapi/discovery.yaml
@@ -118,7 +118,7 @@ components:
           enum:
             - AND
             - OR
-          default: AND
+          default: OR
     DatasetSearchQueryFacet:
       type: object
       properties:

diff --git a/...va/io/github/genomicdatainfrastructure/discovery/services/CkanFacetsQueryBuilderTest.java b/...va/io/github/genomicdatainfrastructure/discovery/services/CkanFacetsQueryBuilderTest.java
@@ -79,7 +79,7 @@ void can_parse_with_or_operator(String value) {
         query.setFacets(facets);
         query.setOperator(DatasetSearchQuery.OperatorEnum.OR);
 
-        var expected = "field1:(\"value1\" OR \"value2\") OR field2:(\"value3\")";
+        var expected = "field1:(\"value1\" OR \"value2\") AND field2:(\"value3\")";
         var actual = CkanFacetsQueryBuilder.buildFacetQuery(query);
         assertEquals(expected, actual);
     }