Fixed simple filter applies to facet filter

Added a test when using a simple filter and a faceted filter at the same time
anti-social · May 31, 2023 · 4ee47ce · 4ee47ce
1 parent 97b5009
commit 4ee47ce
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 4 deletions.
diff --git a/elasticmagic-query-filters/src/commonMain/kotlin/dev/evo/elasticmagic/qf/SimpleFilter.kt b/elasticmagic-query-filters/src/commonMain/kotlin/dev/evo/elasticmagic/qf/SimpleFilter.kt
@@ -34,11 +34,11 @@ open class BaseFilterResult(
 class PreparedSimpleFilter(
     name: String,
     paramName: String,
-    filterExpr: QueryExpression?,
-) : PreparedFilter<BaseFilterResult>(name, paramName, filterExpr) {
+    private val filterExpression: QueryExpression?,
+) : PreparedFilter<BaseFilterResult>(name, paramName, null) {
     override fun apply(searchQuery: SearchQuery<*>, otherFacetFilterExpressions: List<QueryExpression>) {
-        if (facetFilterExpr != null) {
-            searchQuery.filter(facetFilterExpr)
+        if (filterExpression != null) {
+            searchQuery.filter(filterExpression)
         }
     }
 

diff --git a/...ticmagic-query-filters/src/commonTest/kotlin/dev/evo/elasticmagic/qf/SimpleFilterTests.kt b/...ticmagic-query-filters/src/commonTest/kotlin/dev/evo/elasticmagic/qf/SimpleFilterTests.kt
@@ -10,6 +10,7 @@ class SimpleFilterTests : BaseCompilerTest<SearchQueryCompiler>(::SearchQueryCom
 
 
     object BikeQueryFilters : QueryFilters() {
+        val manufacturer by FacetFilter(BikeDocument.manufacturer)
         val price by SimpleFilter(BikeDocument.price, mode = FilterMode.INTERSECT)
         val priceUnion by SimpleFilter(BikeDocument.price, mode = FilterMode.UNION)
     }
@@ -51,6 +52,46 @@ class SimpleFilterTests : BaseCompilerTest<SearchQueryCompiler>(::SearchQueryCom
         )
     }
 
+    @Test
+    fun simpleFilterWithFacetFilter() = testWithCompiler {
+
+        val sq = SearchQuery()
+        BikeQueryFilters.apply(
+            sq,
+            mapOf(
+                listOf("price") to listOf("1.0", "3.0"),
+                listOf("manufacturer") to listOf("BMC", "Cube")
+            )
+        )
+
+        compile(sq).body shouldContainExactly mapOf(
+            "post_filter" to mapOf(
+                "terms" to mapOf(
+                    "manufacturer" to listOf(
+                        "BMC",
+                        "Cube"
+                    )
+                )
+            ),
+            "query" to mapOf(
+                "bool" to mapOf(
+                    "filter" to listOf(
+                        mapOf(
+                            "bool" to mapOf(
+                                "filter" to listOf(
+                                    mapOf(
+                                        "term" to mapOf("price" to 1.0F)
+                                    ), mapOf("term" to mapOf("price" to 3.0F))
+                                )
+                            )
+                        )
+                    )
+                )
+            ),
+            "aggs" to mapOf("qf:manufacturer" to mapOf("terms" to mapOf("field" to "manufacturer")))
+        )
+    }
+
     @Test
     fun unionFilter() = testWithCompiler {