Merge pull request #759 from afoucret/fix-sku-relevance

Fix sku releavance (#628).
Smile-SA · Feb 16, 2018 · b321cc2 · b321cc2
2 parents dc4c57d + df374e7
commit b321cc2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/module-elasticsuite-catalog/etc/elasticsuite_indices.xml b/src/module-elasticsuite-catalog/etc/elasticsuite_indices.xml
@@ -39,6 +39,7 @@
                 <field name="type_id" type="string" />
                 <field name="sku" type="string">
                     <isSearchable>1</isSearchable>
+                    <isUsedForSortBy>1</isUsedForSortBy>
                     <isUsedInSpellcheck>1</isUsedInSpellcheck>
                     <defaultSearchAnalyzer>whitespace</defaultSearchAnalyzer>
                 </field>

diff --git a/src/module-elasticsuite-core/Search/Request/Query/Fulltext/QueryBuilder.php b/src/module-elasticsuite-core/Search/Request/Query/Fulltext/QueryBuilder.php
@@ -130,15 +130,17 @@ private function getWeightedSearchQuery(ContainerConfigurationInterface $contain
         $phraseMatchBoost      = $relevanceConfig->getPhraseMatchBoost();
         $defaultSearchField    = MappingInterface::DEFAULT_SEARCH_FIELD;
         $searchableFieldFilter = $this->fieldFilters['searchableFieldFilter'];
+        $sortableAnalyzer      = FieldInterface::ANALYZER_SORTABLE;
+        $phraseAnalyzer        = FieldInterface::ANALYZER_WHITESPACE;
 
-        $phraseAnalyzer   = FieldInterface::ANALYZER_WHITESPACE;
         if (is_string($queryText) && str_word_count($queryText) > 1) {
             $phraseAnalyzer = FieldInterface::ANALYZER_SHINGLE;
         }
 
         $searchFields = array_merge(
             $this->getWeightedFields($containerConfig, null, $searchableFieldFilter, $defaultSearchField),
-            $this->getWeightedFields($containerConfig, $phraseAnalyzer, $searchableFieldFilter, $defaultSearchField, $phraseMatchBoost)
+            $this->getWeightedFields($containerConfig, $phraseAnalyzer, $searchableFieldFilter, $defaultSearchField, $phraseMatchBoost),
+            $this->getWeightedFields($containerConfig, $sortableAnalyzer, $searchableFieldFilter, null, 2 * $phraseMatchBoost)
         );
 
         $queryParams = [