ACP2E-99: "Search Synonyms" no longer works when value is added in "Minimum Terms to Match"

Author: thiaramus

app/code/Magento/Elasticsearch/Model/Adapter/Index/Builder.php

@@ -5,7 +5,6 @@
  */
 namespace Magento\Elasticsearch\Model\Adapter\Index;
 
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Locale\Resolver as LocaleResolver;
 use Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface;
 use Magento\Search\Model\ResourceModel\SynonymReader;
@@ -60,7 +59,7 @@ public function build()
         $tokenizer = $this->getTokenizer();
         $filter = $this->getFilter();
         $charFilter = $this->getCharFilter();
-        $synonymFilter = $this->getSynonymFilter();
+        $synonymFilter = $this->synonymReader->getSynonymFilter();
 
         $settings = [
             'analysis' => [
@@ -187,29 +186,4 @@ protected function getStemmerConfig()
             'language' => $stemmerInfo['default'],
         ];
     }
-
-    /**
-     * Get filter based on defined synonyms
-     *
-     * @throws LocalizedException
-     */
-    private function getSynonymFilter(): array
-    {
-        $connection = $this->synonymReader->getConnection();
-        $select = $connection->select()->from($this->synonymReader->getMainTable(), 'synonyms');
-        $synonyms = $connection->fetchCol($select);
-
-        $synonymFilter = [];
-
-        if ($synonyms) {
-            $synonymFilter = [
-                'synonyms' => [
-                    'type' => 'synonym_graph',
-                    'synonyms' => $synonyms
-                ]
-            ];
-        }
-
-        return $synonymFilter;
-    }
 }

app/code/Magento/Elasticsearch/Model/Indexer/Fulltext/Plugin/Search/Model/SynonymReaderPlugin.php

@@ -62,8 +62,6 @@ public function afterDelete(SynonymGroup $subject, AbstractDb $synonymGroup)
     private function invalidateIndexer()
     {
         $fulltextIndexer = $this->indexerRegistry->get(Fulltext::INDEXER_ID);
-        if (!$fulltextIndexer->isScheduled()) {
-            $fulltextIndexer->invalidate();
-        }
+        $fulltextIndexer->invalidate();
     }
 }

app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/Index/BuilderTest.php

@@ -9,11 +9,9 @@
 
 use Magento\Elasticsearch\Model\Adapter\Index\Builder;
 use Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface;
-use Magento\Framework\DB\Select;
 use Magento\Framework\Locale\Resolver as LocaleResolver;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Search\Model\ResourceModel\SynonymReader;
-use Magento\Framework\DB\Adapter\AdapterInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -39,16 +37,6 @@ class BuilderTest extends TestCase
      */
     private $synonymReaderMock;
 
-    /**
-     * @var AdapterInterface|MockObject
-     */
-    private $connectionMock;
-
-    /**
-     * @var Select|MockObject
-     */
-    private $selectMock;
-
     /**
      * Setup method
      * @return void
@@ -75,30 +63,6 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->connectionMock = $this->getMockBuilder(
-            AdapterInterface::class
-        )
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->selectMock = $this->getMockBuilder(
-            Select::class
-        )
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->synonymReaderMock->expects($this->once())
-            ->method('getConnection')
-            ->willReturn($this->connectionMock);
-
-        $this->connectionMock->expects($this->once())
-            ->method('select')
-            ->willReturn($this->selectMock);
-
-        $this->selectMock->expects($this->once())
-            ->method('from')
-            ->willReturn($this->selectMock);
-
         $this->esConfig->expects($this->once())
             ->method('getStemmerInfo')
             ->willReturn([
@@ -134,9 +98,8 @@ public function testBuildWithoutSynonymsProvided(string $locale)
         $this->localeResolver->expects($this->once())
             ->method('getLocale')
             ->willReturn($locale);
-
-        $this->connectionMock->expects($this->once())
-            ->method('fetchCol')
+        $this->synonymReaderMock->expects($this->once())
+            ->method('getSynonymFilter')
             ->willReturn([]);
 
         $result = $this->model->build();
@@ -162,65 +125,6 @@ public function testBuildWithoutSynonymsProvided(string $locale)
         );
     }
 
-    /**
-     * Test build() method with synonyms provided.
-     *
-     * In this case synonyms filter should be created, populated with the list of available synonyms
-     * and referenced in the prefix_search and sku_prefix_search analyzers.
-     *
-     * @param string $locale
-     * @dataProvider buildDataProvider
-     */
-    public function testBuildWithProvidedSynonyms(string $locale)
-    {
-        $synonymsFilterName = 'synonyms';
-
-        $synonyms = [
-            'mp3,player,sound,audio',
-            'tv,video,television,screen'
-        ];
-
-        $expectedFilter = [
-            'type' => 'synonym_graph',
-            'synonyms' => $synonyms
-        ];
-
-        $this->localeResolver->expects($this->once())
-            ->method('getLocale')
-            ->willReturn($locale);
-
-        $this->connectionMock->expects($this->once())
-            ->method('fetchCol')
-            ->willReturn($synonyms);
-
-        $result = $this->model->build();
-
-        $analysisFilters = $result["analysis"]["filter"];
-        $prefixSearchAnalyzerFilters = $result["analysis"]["analyzer"]["prefix_search"]["filter"];
-        $skuPrefixSearchAnalyzerFilters = $result["analysis"]["analyzer"]["sku_prefix_search"]["filter"];
-
-        $this->assertArrayHasKey(
-            $synonymsFilterName,
-            $analysisFilters,
-            'Analysis filters must contain synonyms when defined'
-        );
-        $this->assertContains(
-            $expectedFilter,
-            $analysisFilters,
-            'Analysis synonyms filter must match the expected result'
-        );
-        $this->assertContains(
-            $synonymsFilterName,
-            $prefixSearchAnalyzerFilters,
-            'The prefix_search analyzer must include synonyms filter'
-        );
-        $this->assertContains(
-            $synonymsFilterName,
-            $skuPrefixSearchAnalyzerFilters,
-            'The sku_prefix_search analyzer must include synonyms filter'
-        );
-    }
-
     /**
      * @return array
      */

app/code/Magento/Elasticsearch/etc/di.xml

@@ -304,13 +304,6 @@
     <type name="Magento\Framework\Indexer\Config\DependencyInfoProvider">
         <plugin name="indexerDependencyUpdaterPlugin" type="Magento\Elasticsearch\Model\Indexer\Plugin\DependencyUpdaterPlugin"/>
     </type>
-    <type name="Magento\Elasticsearch\SearchAdapter\Query\Builder\MatchQuery">
-        <arguments>
-            <argument name="preprocessorContainer" xsi:type="array">
-                <item name="stopwordsPreprocessor" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\Stopwords</item>
-            </argument>
-        </arguments>
-    </type>
     <type name="Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\Stopwords">
         <arguments>
             <argument name="stopwordsModule" xsi:type="string">Magento_Elasticsearch</argument>

app/code/Magento/Search/Model/ResourceModel/SynonymReader.php

@@ -7,6 +7,7 @@
 namespace Magento\Search\Model\ResourceModel;
 
 use Magento\Framework\DB\Helper\Mysql\Fulltext;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 use Magento\Store\Model\StoreManagerInterface;
 
@@ -67,6 +68,31 @@ public function loadByPhrase(\Magento\Search\Model\SynonymReader $object, $phras
         return $this;
     }
 
+    /**
+     * Get all synonyms as array
+     *
+     * @throws LocalizedException
+     */
+    public function getSynonymFilter(): array
+    {
+        $connection = $this->getConnection();
+        $select = $connection->select()->from($this->getMainTable(), 'synonyms');
+        $synonyms = $connection->fetchCol($select);
+
+        $synonymFilter = [];
+
+        if ($synonyms) {
+            $synonymFilter = [
+                'synonyms' => [
+                    'type' => 'synonym_graph',
+                    'synonyms' => $synonyms
+                ]
+            ];
+        }
+
+        return $synonymFilter;
+    }
+
     /**
      * Init resource data
      *