Improved smart aggs behavior with _and

Author: ankane

lib/searchkick/relation.rb

@@ -575,11 +575,11 @@ def where!(value)
       check_loaded
       value = ensure_permitted(value)
       if @options[:where]
-        if @options[:where][:_and].is_a?(Array)
-          merge_option(:where, {_and: @options[:where][:_and] + [value]})
         # keep simple when possible for smart aggs
-        elsif !@options[:where].keys.intersect?(value.keys)
+        if !@options[:where].keys.intersect?(value.keys)
           merge_option(:where, value)
+        elsif @options[:where][:_and].is_a?(Array)
+          merge_option(:where, {_and: @options[:where][:_and] + [value]})
         else
           @options[:where] = {_and: [@options[:where], value]}
         end

test/aggs_test.rb

@@ -255,6 +255,7 @@ def test_smart_aggs_relation
 
     assert_aggs ({"store_id" => {1 => 1, 2 => 1}}), Product.search("Product").where(store_id: 2).where(price: {gt: 5}).aggs(:store_id)
     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(_and: [{price: {gt: 5}}]).where(store_id: 2).aggs(:store_id)
     assert_aggs ({"store_id" => {2 => 2}}), Product.search("Product").where(color: "red").aggs(store_id: {where: {in_stock: false}}).smart_aggs(false)
   end