support parenthesis as group expression

algolia · Feb 1, 2022 · 4240bf2 · 4240bf2
1 parent 6015b3e
commit 4240bf2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/...search-core/src/main/java/com/algolia/search/models/indexing/FiltersJsonDeserializer.java b/...search-core/src/main/java/com/algolia/search/models/indexing/FiltersJsonDeserializer.java
@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
+
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
@@ -64,13 +65,18 @@ private List<List<String>> buildFilters(List list) {
 
   /** Build filters from (legacy) string */
   private List<List<String>> buildFilters(String string) {
-    if (string.startsWith("(") && string.endsWith(")")) {
-      String input = string.substring(1, string.length() - 1);
-      return Collections.singletonList(Arrays.asList(input.split(",")));
-    } else {
-      return Arrays.stream(string.split(","))
-          .map(Collections::singletonList)
-          .collect(Collectors.toList());
-    }
+    // Extract groups: "(A:1,B:2),C:3" -> ["(A:1,B:2)","C:3"]
+    List<String> groups = Arrays.asList(string.split(",(?![^()]*\\))"));
+    return groups.stream()
+        .map(
+            group -> {
+              if (group.startsWith("(") && group.endsWith(")")) {
+                String input = group.substring(1, group.length() - 1);
+                return Arrays.asList(input.split(","));
+              } else {
+                return Collections.singletonList(group);
+              }
+            })
+        .collect(Collectors.toList());
   }
 }
diff --git a/algoliasearch-core/src/test/java/com/algolia/search/JacksonParserTest.java b/algoliasearch-core/src/test/java/com/algolia/search/JacksonParserTest.java
@@ -193,16 +193,16 @@ void testLegacyFiltersFormat(String input) throws IOException {
             input));
 
     // Testing "one string with parenthesis" legacy filters => should be converted to "ORED" filters
-    // [["color:green", "color:yellow"]]
+    // [["color:green", "color:yellow"], ["color:blue"]]
     String stringParenthesisFilters =
-        String.format("{\"%s\":\"(color:green,color:yellow)\"}", input);
-    assertOREDResult(
+        String.format("{\"%s\":\"(color:green,color:yellow),color:blue\"}", input);
+    assertOREDLatestResult(
         extractFilters(
             Defaults.getObjectMapper().readValue(stringParenthesisFilters, ConsequenceParams.class),
             input));
 
     // Testing mixed case with array and string
-    // [["color:green","color:yellow"],"color:blue"]
+    // [["color:green","color:yellow"], ["color:blue"]]
     String stringAndArrayFilters =
         String.format("{\"%s\":[[\"color:green\",\"color:yellow\"],\"color:blue\"]}", input);
     List<List<String>> mixedDeserialized =