Target non-default analyzer fields in exact search.

Smile-SA · Jul 4, 2023 · be83195 · be83195
1 parent 60ee892
commit be83195
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 1 deletion.
diff --git a/...dule-elasticsuite-core/Search/Request/Query/Fulltext/NonStandardSearchableFieldFilter.php b/...dule-elasticsuite-core/Search/Request/Query/Fulltext/NonStandardSearchableFieldFilter.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Smile ElasticSuite to newer
+ * versions in the future.
+ *
+ * @category  Smile
+ * @package   Smile\ElasticsuiteCore
+ * @author    Romain Ruaud <romain.ruaud@smile.fr>
+ * @copyright 2023 Smile
+ * @license   Open Software License ("OSL") v. 3.0
+ */
+
+namespace Smile\ElasticsuiteCore\Search\Request\Query\Fulltext;
+
+use Smile\ElasticsuiteCore\Api\Index\Mapping\FieldInterface;
+
+/**
+ * Indicates if a field is used in search with a non-default analyzer.
+ *
+ * @category Smile
+ * @package  Smile\ElasticsuiteCore
+ * @author   Romain Ruaud <romain.ruaud@smile.fr>
+ */
+class NonStandardSearchableFieldFilter extends SearchableFieldFilter
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function filterField(FieldInterface $field)
+    {
+        return parent::filterField($field) && ($field->getDefaultSearchAnalyzer() !== FieldInterface::ANALYZER_STANDARD);
+    }
+}
diff --git a/src/module-elasticsuite-core/Search/Request/Query/Fulltext/QueryBuilder.php b/src/module-elasticsuite-core/Search/Request/Query/Fulltext/QueryBuilder.php
@@ -117,8 +117,18 @@ private function getCutoffFrequencyQuery(ContainerConfigurationInterface $contai
     {
         $relevanceConfig = $containerConfig->getRelevanceConfig();
 
+        $nonStandardSearchableFieldFilter = $this->fieldFilters['nonStandardSearchableFieldFilter'];
+
+        $defaultFields = array_fill_keys([MappingInterface::DEFAULT_SEARCH_FIELD, 'sku'], 1);
+        $fields        = $defaultFields + $this->getWeightedFields(
+            $containerConfig,
+            null,
+            $nonStandardSearchableFieldFilter,
+            MappingInterface::DEFAULT_SEARCH_FIELD
+        );
+
         $queryParams = [
-            'fields'             => array_fill_keys([MappingInterface::DEFAULT_SEARCH_FIELD, 'sku'], 1),
+            'fields'             => array_fill_keys(array_keys($fields), 1),
             'queryText'          => $queryText,
             'cutoffFrequency'    => $relevanceConfig->getCutOffFrequency(),
             'minimumShouldMatch' => $relevanceConfig->getMinimumShouldMatch(),

diff --git a/src/module-elasticsuite-core/etc/di.xml b/src/module-elasticsuite-core/etc/di.xml
@@ -80,6 +80,7 @@
         <arguments>
             <argument name="fieldFilters" xsi:type="array">
                 <item name="searchableFieldFilter" xsi:type="object">Smile\ElasticsuiteCore\Search\Request\Query\Fulltext\SearchableFieldFilter</item>
+                <item name="nonStandardSearchableFieldFilter" xsi:type="object">Smile\ElasticsuiteCore\Search\Request\Query\Fulltext\NonStandardSearchableFieldFilter</item>
                 <item name="fuzzyFieldFilter"  xsi:type="object">Smile\ElasticsuiteCore\Search\Request\Query\Fulltext\FuzzyFieldFilter</item>
                 <item name="nonStandardFuzzyFieldFilter"  xsi:type="object">Smile\ElasticsuiteCore\Search\Request\Query\Fulltext\NonStandardFuzzyFieldFilter</item>
                 <item name="spannableFieldFilter"  xsi:type="object">Smile\ElasticsuiteCore\Search\Request\Query\Fulltext\SpannableFieldFilter</item>