Fixed smart aggs not applying to _or

Author: ankane

CHANGELOG.md

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

lib/searchkick/query.rb

@@ -908,10 +908,9 @@ def smart_agg_filters(where, field, agg_where)
       agg_where_keys = agg_where.except(:_and, :_or, :_not, :_script).to_h { |k, v| [k.to_s, true] }
       where.each do |f, v|
         case f
-        when :_and
+        when :_and, :_or
           smart_where[f] = v.map { |v2| smart_agg_filters(v2, field, agg_where) }
-        when :_or, :_script
-          # TODO figure out how to handle
+        when :_script
           smart_where[f] = v
         when :_not
           # TODO figure out agg_where overrides

test/aggs_test.rb

@@ -171,10 +171,15 @@ def test_smart_aggs
     assert_aggs ({"store_id" => {1 => 1, 2 => 2}}), where: {_and: [{store_id: 2}]}, aggs: [:store_id]
     assert_aggs ({"store_id" => {1 => 1, 2 => 2}}), where: {_and: [{store_id: 2}]}, aggs: [:store_id], smart_aggs: false
 
-    # TODO fix
-    assert_aggs ({"store_id" => {2 => 2}}), where: {_or: [{store_id: 2}]}, aggs: [:store_id]
+    assert_aggs ({"store_id" => {1 => 1}}), where: {_and: [{store_id: 2}, {in_stock: true}]}, aggs: [:store_id]
+    assert_aggs ({"store_id" => {1 => 1, 2 => 2}}), where: {_and: [{store_id: 2}, {in_stock: true}]}, aggs: [:store_id], smart_aggs: false
+
+    assert_aggs ({"store_id" => {1 => 1, 2 => 2}}), where: {_or: [{store_id: 2}]}, aggs: [:store_id]
     assert_aggs ({"store_id" => {1 => 1, 2 => 2}}), where: {_or: [{store_id: 2}]}, aggs: [:store_id], smart_aggs: false
 
+    assert_aggs ({"store_id" => {1 => 1, 2 => 2}}), where: {_or: [{store_id: 2}, {in_stock: true}]}, aggs: [:store_id]
+    assert_aggs ({"store_id" => {1 => 1, 2 => 2}}), where: {_or: [{store_id: 2}, {in_stock: true}]}, aggs: [:store_id], smart_aggs: false
+
     assert_aggs ({"store_id" => {1 => 1, 2 => 1}}), where: {store_id: 2, price: {gt: 5}}, aggs: [:store_id]
     assert_aggs ({"store_id" => {1 => 1, 2 => 2}}), where: {store_id: 2, price: {gt: 5}}, aggs: [:store_id], smart_aggs: false