[CSL 2935] Re-add filterBy to variationsMap

README.md

@@ -83,6 +83,7 @@ var variationsMap: VariationsMap = VariationsMap(
     "max_price" to mapOf("aggregation" to "max", "field" to "data.price"),
   ),
   dtype = "array",
+  filterBy = """{"and":[{"field":"data.brand","value":"Best Brand"}]}""",
 )
 
 // Using RxJava
@@ -154,6 +155,7 @@ var variationsMap: VariationsMap = VariationsMap(
     "max_price" to mapOf("aggregation" to "max", "field" to "data.price"),
   ),
   dtype = "array",
+  """{"and":[{"field":"data.brand","value":"Best Brand"}]}""",
 )
 var preFilterExpression = """{ "and": [ { "name": "Color", "value": "green" } ] }"""
 
@@ -223,6 +225,7 @@ var variationsMap: VariationsMap = VariationsMap(
     "max_price" to mapOf("aggregation" to "max", "field" to "data.price"),
   ),
   dtype = "array",
+  """{"and":[{"field":"data.brand","value":"Best Brand"}]}"""
 )
 var preFilterExpression = """{ "and": [ { "name": "Color", "value": "green" } ] }"""
 
@@ -325,6 +328,7 @@ var variationsMap: VariationsMap = VariationsMap(
     "max_price" to mapOf("aggregation" to "max", "field" to "data.price"),
   ),
   dtype = "array",
+  """{"and":[{"field":"data.brand","value":"Best Brand"}]}""",
 )
 
 // Using RxJava

library/src/main/java/io/constructor/core/ConstructorIo.kt

@@ -204,6 +204,7 @@ object ConstructorIo {
             }
 
             encodedParams.add(Constants.QueryConstants.VARIATIONS_MAP.urlEncode() to variationsMapJSONString.urlEncode())
+            variationsMap.filterBy = filterBy
         }
         numResultsPerSection?.forEach { section ->
             encodedParams.add(Pair(Constants.QueryConstants.NUM_RESULTS+section.key, section.value.toString()))

library/src/test/java/io/constructor/core/ConstructorioBrowseTest.kt

@@ -317,20 +317,23 @@ class ConstructorIoBrowseTest {
         val mockResponse = MockResponse().setResponseCode(200)
             .setBody(TestDataLoader.loadAsString("browse_response.json"))
         mockServer.enqueue(mockResponse)
+        val filterBy = """{"and":[{"field":"data.brand","value":"Best Brand"}]}"""
         val variationsMap = VariationsMap(
             dtype = "array",
             values = mapOf(
                 "Price" to mapOf("aggregation" to "min", "field" to "data.facets.price"),
                 "Country" to mapOf("aggregation" to "all", "field" to "data.facets.country")
             ),
             groupBy = listOf(mapOf("name" to "Country", "field" to "data.facets.Country")),
-            filterBy = """{"and":[{"field":"data.brand","value":"Best Brand"}]}"""
+            filterBy = filterBy
         )
         val browseRequest = BrowseRequest.Builder("group_id", "Beverages")
             .setVariationsMap(variationsMap)
             .build()
         val observer = constructorIo.getBrowseResults(browseRequest).test()
         val request = mockServer.takeRequest()
+
+        assertThat(variationsMap.filterBy).isEqualTo(filterBy)
         assertThat(request.requestUrl!!.encodedPath).isEqualTo("/browse/group_id/Beverages")
         with(request.requestUrl!!) {
             val queryParams = mapOf(

library/src/test/java/io/constructor/core/ConstructorioSearchTest.kt

@@ -319,21 +319,23 @@ class ConstructorIoSearchTest {
         val mockResponse = MockResponse().setResponseCode(200)
             .setBody(TestDataLoader.loadAsString("search_response.json"))
         mockServer.enqueue(mockResponse)
+        val filterBy = """{"and":[{"field":"data.brand","value":"Best Brand"}]}"""
         val variationsMap = VariationsMap(
             dtype = "array",
             values = mapOf(
                 "Price" to mapOf("aggregation" to "min", "field" to "data.facets.price"),
                 "Country" to mapOf("aggregation" to "all", "field" to "data.facets.country")
             ),
             groupBy = listOf(mapOf("name" to "Country", "field" to "data.facets.Country")),
-            filterBy = """{"and":[{"field":"data.brand","value":"Best Brand"}]}"""
+            filterBy = filterBy
         )
         val searchRequest = SearchRequest.Builder("bbq")
             .setVariationsMap(variationsMap)
             .build()
         val observer = constructorIo.getSearchResults(searchRequest).test()
         val request = mockServer.takeRequest()
 
+        assertThat(variationsMap.filterBy).isEqualTo(filterBy)
         assertThat(request.requestUrl!!.encodedPath).isEqualTo("/search/bbq")
         with(request.requestUrl!!) {
             val queryParams = mapOf(