Boost exact matches for partial matching

Andrew Kane
1 parent 222c700a
Showing 3 changed files with 27 additions and 2 deletions Show diff stats
CHANGELOG.md
lib/searchkick/query.rb
test/autocomplete_test.rb
-## 1.3.7 [unreleased]
+## 1.4.0 [unreleased]
  
+- Boost exact matches for partial matching
 - Added `searchkick_debug` method
 - Added `geo_polygon` filter
  
@@ -271,7 +271,21 @@ module Searchkick
                 qs.concat qs.map { |q| q.except(:cutoff_frequency).merge(fuzziness: edit_distance, prefix_length: prefix_length, max_expansions: max_expansions, boost: factor).merge(transpositions) }
               end
  
-              queries.concat(qs.map { |q| {match_type => {field => q}} })
+              # boost exact matches more
+              if field =~ /\.word_(start|middle|end)\z/ && searchkick_options[:word] != false
+                queries << {
+                  bool: {
+                    must: {
+                      bool: {
+                        should: qs.map { |q| {match_type => {field => q}} }
+                      }
+                    },
+                    should: {match_type => {field.sub(/\.word_(start|middle|end)\z/, ".analyzed") => qs.first}}
+                  }
+                }
+              else
+                queries.concat(qs.map { |q| {match_type => {field => q}} })
+              end
             end
  
             payload = {
@@ -56,6 +56,16 @@ class AutocompleteTest &lt; Minitest::Test
     assert_search "dark grey", ["Dark Grey"], fields: [{name: :word_start}]
   end
  
+  def test_word_start_exact
+    store_names ["Back Scratcher", "Backpack"]
+    assert_order "back", ["Back Scratcher", "Backpack"], fields: [{name: :word_start}]
+  end
+
+  def test_word_start_exact_martin
+    store_names ["Martina", "Martin"]
+    assert_order "martin", ["Martin", "Martina"], fields: [{name: :word_start}]
+  end
+
   # TODO find a better place
  
   def test_exact
1		-## 1.3.7 [unreleased]
	1	+## 1.4.0 [unreleased]
2	2
	3	+- Boost exact matches for partial matching
3	4	- Added `searchkick_debug` method
4	5	- Added `geo_polygon` filter
5	6
...	...
...	...	@@ -271,7 +271,21 @@ module Searchkick
271	271	qs.concat qs.map { \|q\| q.except(:cutoff_frequency).merge(fuzziness: edit_distance, prefix_length: prefix_length, max_expansions: max_expansions, boost: factor).merge(transpositions) }
272	272	end
273	273
274		- queries.concat(qs.map { \|q\| {match_type => {field => q}} })
	274	+ # boost exact matches more
	275	+ if field =~ /\.word_(start\|middle\|end)\z/ && searchkick_options[:word] != false
	276	+ queries << {
	277	+ bool: {
	278	+ must: {
	279	+ bool: {
	280	+ should: qs.map { \|q\| {match_type => {field => q}} }
	281	+ }
	282	+ },
	283	+ should: {match_type => {field.sub(/\.word_(start\|middle\|end)\z/, ".analyzed") => qs.first}}
	284	+ }
	285	+ }
	286	+ else
	287	+ queries.concat(qs.map { \|q\| {match_type => {field => q}} })
	288	+ end
275	289	end
276	290
277	291	payload = {
...	...
...	...	@@ -56,6 +56,16 @@ class AutocompleteTest < Minitest::Test
56	56	assert_search "dark grey", ["Dark Grey"], fields: [{name: :word_start}]
57	57	end
58	58
	59	+ def test_word_start_exact
	60	+ store_names ["Back Scratcher", "Backpack"]
	61	+ assert_order "back", ["Back Scratcher", "Backpack"], fields: [{name: :word_start}]
	62	+ end
	63	+
	64	+ def test_word_start_exact_martin
	65	+ store_names ["Martina", "Martin"]
	66	+ assert_order "martin", ["Martin", "Martina"], fields: [{name: :word_start}]
	67	+ end
	68	+
59	69	# TODO find a better place
60	70
61	71	def test_exact
...	...