Merge branch 'main' into feat/ranking_score_threshold

meilisearch · Jul 6, 2024 · add3200 · add3200
2 parents e7ef719 + 5d4e3ed
commit add3200
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 12 deletions.
diff --git a/.code-samples.meilisearch.yaml b/.code-samples.meilisearch.yaml
@@ -657,3 +657,17 @@ search_parameter_reference_ranking_score_threshold_1: |-
   client.index('INDEX_NAME').search('badman', {
     rankingScoreThreshold: 0.2
   })
+search_parameter_reference_distinct_1: |-
+  client.index('INDEX_NAME').search('QUERY TERMS', {
+    distinct: 'ATTRIBUTE_A'
+  })
+distinct_attribute_guide_filterable_1: |-
+  client.index('products').update_filterable_attributes([
+    'product_id',
+    'sku',
+    'url'
+  ])
+distinct_attribute_guide_distinct_parameter_1: |-
+  client.index('products').search('white shirt', {
+    distinct: 'sku'
+  })
diff --git a/spec/meilisearch/index/search/attributes_to_highlight_spec.rb b/spec/meilisearch/index/search/attributes_to_highlight_spec.rb
@@ -7,7 +7,7 @@
     response = index.search('the', attributes_to_highlight: ['title'])
     expect(response).to be_a(Hash)
     expect(response.keys).to contain_exactly(*DEFAULT_SEARCH_RESPONSE_KEYS)
-    expect(response['hits'].count).to eq(3)
+    expect(response['hits'].count).to eq(4)
     expect(response['hits'].first).to have_key('_formatted')
     expect(response['hits'].first['_formatted']['title']).to eq('<em>The</em> Hobbit')
   end
@@ -16,7 +16,7 @@
     response = index.search('', attributes_to_highlight: ['*'])
     expect(response).to be_a(Hash)
     expect(response.keys).to contain_exactly(*DEFAULT_SEARCH_RESPONSE_KEYS)
-    expect(response['hits'].count).to eq(7)
+    expect(response['hits'].count).to eq(8)
     expect(response['hits'].first).to have_key('_formatted')
   end
 

diff --git a/spec/meilisearch/index/search/attributes_to_retrieve_spec.rb b/spec/meilisearch/index/search/attributes_to_retrieve_spec.rb
@@ -7,7 +7,7 @@
     response = index.search('the', attributes_to_retrieve: ['title'])
     expect(response).to be_a(Hash)
     expect(response.keys).to contain_exactly(*DEFAULT_SEARCH_RESPONSE_KEYS)
-    expect(response['hits'].count).to eq(3)
+    expect(response['hits'].count).to eq(4)
     expect(response['hits'].first).to have_key('title')
     expect(response['hits'].first).not_to have_key('objectId')
     expect(response['hits'].first).not_to have_key('genre')
@@ -17,7 +17,7 @@
     response = index.search('the', attributes_to_retrieve: ['title', 'genre'])
     expect(response).to be_a(Hash)
     expect(response.keys).to contain_exactly(*DEFAULT_SEARCH_RESPONSE_KEYS)
-    expect(response['hits'].count).to eq(3)
+    expect(response['hits'].count).to eq(4)
     expect(response['hits'].first).to have_key('title')
     expect(response['hits'].first).not_to have_key('objectId')
     expect(response['hits'].first).to have_key('genre')
@@ -27,7 +27,7 @@
     response = index.search('the', attributes_to_retrieve: ['*'])
     expect(response).to be_a(Hash)
     expect(response.keys).to contain_exactly(*DEFAULT_SEARCH_RESPONSE_KEYS)
-    expect(response['hits'].count).to eq(3)
+    expect(response['hits'].count).to eq(4)
     expect(response['hits'].first).to have_key('objectId')
     expect(response['hits'].first).to have_key('title')
     expect(response['hits'].first).to have_key('genre')

diff --git a/spec/meilisearch/index/search/distinct_spec.rb b/spec/meilisearch/index/search/distinct_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+RSpec.describe 'MeiliSearch::Index - Distinct search' do
+  include_context 'search books with genre'
+
+  before do
+    index.update_filterable_attributes(['genre']).await
+  end
+
+  it 'does a search without distinct' do
+    response = index.search('harry potter')
+    expect(response['hits'].count).to eq(2)
+  end
+
+  it 'does a custom search with distinct' do
+    response = index.search('harry potter', { distinct: 'genre' })
+    expect(response['hits'].count).to eq(1)
+  end
+end
diff --git a/spec/meilisearch/index/search/q_spec.rb b/spec/meilisearch/index/search/q_spec.rb
@@ -64,7 +64,7 @@
     response = index.search('coco "harry"')
     expect(response).to be_a(Hash)
     expect(response.keys).to contain_exactly(*DEFAULT_SEARCH_RESPONSE_KEYS)
-    expect(response['hits'].count).to eq(1)
+    expect(response['hits'].count).to eq(2)
     expect(response['hits'].first['objectId']).to eq(4)
     expect(response['hits'].first).not_to have_key('_formatted')
   end

diff --git a/spec/support/books_contexts.rb b/spec/support/books_contexts.rb
@@ -4,12 +4,13 @@
   let(:index) { client.index('books') }
   let(:documents) do
     [
-      { objectId: 123,  title: 'Pride and Prejudice',                    genre: 'romance' },
-      { objectId: 456,  title: 'Le Petit Prince',                        genre: 'adventure' },
-      { objectId: 1,    title: 'Alice In Wonderland',                    genre: 'adventure' },
-      { objectId: 2,    title: 'Le Rouge et le Noir',                    genre: 'romance' },
-      { objectId: 1344, title: 'The Hobbit',                             genre: 'adventure' },
-      { objectId: 4,    title: 'Harry Potter and the Half-Blood Prince', genre: 'fantasy' },
+      { objectId: 123,  title: 'Pride and Prejudice',                     genre: 'romance' },
+      { objectId: 456,  title: 'Le Petit Prince',                         genre: 'adventure' },
+      { objectId: 1,    title: 'Alice In Wonderland',                     genre: 'adventure' },
+      { objectId: 2,    title: 'Le Rouge et le Noir',                     genre: 'romance' },
+      { objectId: 1344, title: 'The Hobbit',                              genre: 'adventure' },
+      { objectId: 4,    title: 'Harry Potter and the Half-Blood Prince',  genre: 'fantasy' },
+      { objectId: 7,    title: 'Harry Potter and the Chamber of Secrets', genre: 'fantasy' },
       { objectId: 42,   title: 'The Hitchhiker\'s Guide to the Galaxy' }
     ]
   end