Fixed smart aggs not applying when multiple where calls - fixes #1737

Author: ankane

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 - Added `per` method
 - Fixed error with `aggs` method and non-hash arguments
+- Fixed smart aggs not applying when multiple `where` calls
 
 ## 6.0.3 (2026-01-06)
 

lib/searchkick/relation.rb

@@ -573,10 +573,17 @@ def where(value = NO_DEFAULT_VALUE)
 
     def where!(value)
       check_loaded
+      value = ensure_permitted(value)
       if @options[:where]
-        @options[:where] = {_and: [@options[:where], ensure_permitted(value)]}
+        # keep simple when possible for smart aggs
+        if !@options[:where].keys.intersect?(value.keys)
+          merge_option(:where, value)
+        else
+          # TODO flatten
+          @options[:where] = {_and: [@options[:where], value]}
+        end
       else
-        @options[:where] = ensure_permitted(value)
+        @options[:where] = value
       end
       self
     end

test/aggs_test.rb

@@ -172,6 +172,11 @@ def test_relation_multiple_arguments
     assert_aggs expected, Product.search("Product").aggs(:color, store_id: {where: {in_stock: true}})
   end
 
+  def test_relation_smart_aggs
+    assert_aggs ({"store_id" => {1 => 1, 2 => 1}}), Product.search("Product").where(store_id: 2, price: {gt: 5}).aggs(:store_id)
+    assert_aggs ({"store_id" => {1 => 1, 2 => 1}}), Product.search("Product").where(store_id: 2).where(price: {gt: 5}).aggs(:store_id)
+  end
+
   def test_relation_smart_aggs_false
     assert_aggs ({"store_id" => {2 => 2}}), Product.search("Product").where(color: "red").aggs(store_id: {where: {in_stock: false}}).smart_aggs(false)
   end

test/where_test.rb

@@ -89,6 +89,7 @@ def test_where_relation
     # multiple where
     assert_search_relation ["Product A"], Product.search("product").where(in_stock: true).where(backordered: true)
     assert_search_relation [], Product.search("product").where(in_stock: true).where(in_stock: false)
+    assert_search_relation [], Product.search("product").where(in_stock: true).where("in_stock" => false)
 
     # rewhere
     assert_search_relation ["Product A", "Product C"], Product.search("product").where(in_stock: true).rewhere(backordered: true)