Merge pull request #3463 from projectblacklight/3462-empty-query-afte…

…r-advanced-search-sends-null-params-to-solr Check for present query when appending boolean params
projectblacklight · Dec 10, 2024 · 5e8327c · 5e8327c
2 parents a753cd9 + 511c1f2
commit 5e8327c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/blacklight/solr/request.rb b/lib/blacklight/solr/request.rb
@@ -36,7 +36,7 @@ def append_boolean_query(bool_operator, query)
     self[:json][:query] ||= { bool: { bool_operator => [] } }
     self[:json][:query][:bool][bool_operator] ||= []
 
-    if self['q']
+    if self['q'].present?
       self[:json][:query][:bool][:must] ||= []
       self[:json][:query][:bool][:must] << self['q']
       delete 'q'

diff --git a/spec/models/blacklight/solr/request_spec.rb b/spec/models/blacklight/solr/request_spec.rb
@@ -64,5 +64,12 @@
 
       expect(subject.dig('json', 'query', 'bool', 'must')).to contain_exactly('some query', 'also required')
     end
+
+    it 'filters out empty query' do
+      subject['q'] = ""
+      subject.append_boolean_query :must, 'present query'
+
+      expect(subject.dig('json', 'query', 'bool', 'must')).to contain_exactly('present query')
+    end
   end
 end