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

@@ -193,7 +193,8 @@ protected function getStemmerConfig()
      *
      * @throws LocalizedException
      */
-    private function getSynonymFilter(): array {
+    private function getSynonymFilter(): array
+    {
         $connection = $this->synonymReader->getConnection();
         $select = $connection->select()->from($this->synonymReader->getMainTable(), 'synonyms');
         $synonyms = $connection->fetchCol($select);

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

@@ -23,27 +23,34 @@ class SynonymReaderPlugin
     /**
      * @param IndexerRegistry $indexerRegistry
      */
-    public function __construct(IndexerRegistry $indexerRegistry) {
+    public function __construct(IndexerRegistry $indexerRegistry)
+    {
         $this->indexerRegistry = $indexerRegistry;
     }
 
     /**
+     * Invalidate fulltext index after synonyms create/ update
+     *
      * @param SynonymGroup $subject
      * @param AbstractDb $synonymGroup
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterSave(SynonymGroup $subject, AbstractDb $synonymGroup) {
+    public function afterSave(SynonymGroup $subject, AbstractDb $synonymGroup)
+    {
         $this->invalidateIndexer();
     }
 
     /**
+     * Invalidate fulltext index after synonyms delete
+     *
      * @param SynonymGroup $subject
      * @param AbstractDb $synonymGroup
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterDelete(SynonymGroup $subject, AbstractDb $synonymGroup) {
+    public function afterDelete(SynonymGroup $subject, AbstractDb $synonymGroup)
+    {
         $this->invalidateIndexer();
     }
 
@@ -52,7 +59,8 @@ public function afterDelete(SynonymGroup $subject, AbstractDb $synonymGroup) {
      *
      * @return void
      */
-    private function invalidateIndexer() {
+    private function invalidateIndexer()
+    {
         $fulltextIndexer = $this->indexerRegistry->get(Fulltext::INDEXER_ID);
         if (!$fulltextIndexer->isScheduled()) {
             $fulltextIndexer->invalidate();

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

@@ -9,8 +9,11 @@
 
 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;
 
@@ -31,6 +34,21 @@ class BuilderTest extends TestCase
      */
     protected $esConfig;
 
+    /**
+     * @var SynonymReader|MockObject
+     */
+    private $synonymReaderMock;
+
+    /**
+     * @var AdapterInterface|MockObject
+     */
+    private $connectionMock;
+
+    /**
+     * @var Select|MockObject
+     */
+    private $selectMock;
+
     /**
      * Setup method
      * @return void
@@ -44,18 +62,38 @@ protected function setUp(): void
                 'getLocale'
             ])
             ->getMock();
+
         $this->esConfig = $this->getMockBuilder(
             EsConfigInterface::class
         )
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->synonymReaderMock = $this->getMockBuilder(
+            SynonymReader::class
+        )
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->connectionMock = $this->getMockBuilder(
+            AdapterInterface::class
+        )
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->selectMock = $this->getMockBuilder(
+            Select::class
+        )
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $objectManager = new ObjectManagerHelper($this);
         $this->model = $objectManager->getObject(
             Builder::class,
             [
                 'localeResolver' => $this->localeResolver,
-                'esConfig' => $this->esConfig
+                'esConfig' => $this->esConfig,
+                'synonymReader' => $this->synonymReaderMock
             ]
         );
     }
@@ -68,6 +106,11 @@ protected function setUp(): void
      */
     public function testBuild($locale)
     {
+        $synonymsArray = [
+            'mp3,player,sound,audio',
+            'tv,video,television,screen'
+        ];
+
         $this->localeResolver->expects($this->once())
             ->method('getLocale')
             ->willReturn($locale);
@@ -80,6 +123,22 @@ public function testBuild($locale)
                 'en_US' => 'english',
             ]);
 
+        $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->connectionMock->expects($this->once())
+            ->method('fetchCol')
+            ->willReturn($synonymsArray);
+
         $result = $this->model->build();
         $this->assertNotNull($result);
     }

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

@@ -308,7 +308,6 @@
         <arguments>
             <argument name="preprocessorContainer" xsi:type="array">
                 <item name="stopwordsPreprocessor" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Query\Preprocessor\Stopwords</item>
-                <item name="synonymsPreprocessor" xsi:type="object">Magento\Search\Adapter\Query\Preprocessor\Synonyms</item>
             </argument>
         </arguments>
     </type>