Merge pull request #73 from algolia/feat/missing-query-parameters

Add missing query parameters `filters` and `numericFilters`

Author: Clément Le Provost

algoliasearch/src/main/java/com/algolia/search/saas/Query.java

@@ -419,7 +419,15 @@ public JSONArray getFacetFilters() {
         return null;
     }
 
-    // NOTE: `filters` left out because type too complex.
+    private static final String KEY_FILTERS = "filters";
+
+    public @NonNull Query setFilters(String filters) {
+        return set(KEY_FILTERS, filters);
+    }
+
+    public String getFilters() {
+        return get(KEY_FILTERS);
+    }
 
     private static final String KEY_GET_RANKING_INFO = "getRankingInfo";
 
@@ -688,7 +696,24 @@ public Integer getMinWordSizefor2Typos() {
         return parseInt(get(KEY_MIN_WORD_SIZE_FOR_2_TYPOS));
     }
 
-    // NOTE: `numericFilters` left out because type too complex.
+    private static final String KEY_NUMERIC_FILTERS = "numericFilters";
+
+    public @NonNull Query setNumericFilters(JSONArray filters) {
+        return set(KEY_NUMERIC_FILTERS, filters);
+    }
+
+    public JSONArray getNumericFilters() {
+        try {
+            String value = get(KEY_NUMERIC_FILTERS);
+            if (value != null) {
+                return new JSONArray(value);
+            }
+        }
+        catch (JSONException e) {
+            // Will return null
+        }
+        return null;
+    }
 
     private static final String KEY_OPTIONAL_WORDS = "optionalWords";
 

algoliasearch/src/test/java/com/algolia/search/saas/IndexTest.java

@@ -539,7 +539,7 @@ public void testDeleteByQueryAsync() throws Exception {
         final CountDownLatch signal = new CountDownLatch(2);
         addDummyObjects(3000);
         final Query query = new Query();
-        query.set("numericFilters", "dummy < 1500");
+        query.setNumericFilters(new JSONArray().put("dummy < 1500"));
         index.deleteByQueryAsync(query, new CompletionHandler() {
             @Override
             public void requestCompleted(JSONObject content, AlgoliaException error) {

algoliasearch/src/test/java/com/algolia/search/saas/QueryTest.java

@@ -598,4 +598,28 @@ public void test_minimumAroundRadius() {
         Query query2 = Query.parse(query1.build());
         assertEquals(query2.getMinimumAroundRadius(), query1.getMinimumAroundRadius());
     }
+
+    @Test
+    public void test_numericFilters() throws JSONException {
+        final JSONArray VALUE = new JSONArray("[\"code=1\", [\"price:0 to 10\", \"price:1000 to 2000\"]]");
+        Query query1 = new Query();
+        assertNull(query1.getNumericFilters());
+        query1.setNumericFilters(VALUE);
+        assertEquals(query1.getNumericFilters(), VALUE);
+        assertEquals(query1.get("numericFilters"), "[\"code=1\",[\"price:0 to 10\",\"price:1000 to 2000\"]]");
+        Query query2 = Query.parse(query1.build());
+        assertEquals(query2.getNumericFilters(), query1.getNumericFilters());
+    }
+
+    @Test
+    public void test_filters() {
+        final String VALUE = "available=1 AND (category:Book OR NOT category:Ebook) AND publication_date: 1441745506 TO 1441755506 AND inStock > 0 AND author:\"John Doe\"";
+        Query query1 = new Query();
+        assertNull(query1.getFilters());
+        query1.setFilters(VALUE);
+        assertEquals(query1.getFilters(), VALUE);
+        assertEquals(query1.get("filters"), VALUE);
+        Query query2 = Query.parse(query1.build());
+        assertEquals(query2.getFilters(), query1.getFilters());
+    }
 }