ACP2E-752: [Magento Cloud][Premier Support] Incorrect search results with Thai language

Author: thiaramus

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

@@ -9,7 +9,6 @@
 use Magento\Framework\Locale\Resolver as LocaleResolver;
 use Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface;
 use Magento\Search\Model\ResourceModel\SynonymReader;
-use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Index Builder

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

@@ -12,6 +12,7 @@
 use Magento\Framework\Locale\Resolver as LocaleResolver;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Search\Model\ResourceModel\SynonymReader;
+use Magento\Store\Model\Store;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -99,9 +100,10 @@ public function testBuildWithoutSynonymsProvided(string $locale)
             ->method('getLocale')
             ->willReturn($locale);
         $this->synonymReaderMock->expects($this->once())
-            ->method('getAllSynonyms')
+            ->method('getAllSynonymsForStoreViewId')
             ->willReturn([]);
 
+        $this->model->setStoreId(Store::DEFAULT_STORE_ID);
         $result = $this->model->build();
 
         $analysisFilters = $result["analysis"]["filter"];
@@ -153,9 +155,10 @@ public function testBuildWithProvidedSynonyms(string $locale)
             ->willReturn($locale);
 
         $this->synonymReaderMock->expects($this->once())
-            ->method('getAllSynonyms')
+            ->method('getAllSynonymsForStoreViewId')
             ->willReturn($synonyms);
 
+        $this->model->setStoreId(Store::DEFAULT_STORE_ID);
         $result = $this->model->build();
 
         $analysisFilters = $result["analysis"]["filter"];

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

@@ -6,11 +6,9 @@
 
 namespace Magento\Search\Model\ResourceModel;
 
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\DB\Helper\Mysql\Fulltext;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
-use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 
@@ -58,12 +56,12 @@ public function loadByPhrase(\Magento\Search\Model\SynonymReader $object, $phras
         $rows = $this->queryByPhrase(strtolower($phrase));
         $synsPerScope = $this->getSynRowsPerScope($rows);
 
-        if (!empty($synsPerScope[ScopeInterface::SCOPE_STORES])) {
-            $object->setData($synsPerScope[ScopeInterface::SCOPE_STORES]);
-        } elseif (!empty($synsPerScope[ScopeInterface::SCOPE_WEBSITES])) {
-            $object->setData($synsPerScope[ScopeInterface::SCOPE_WEBSITES]);
+        if (!empty($synsPerScope[\Magento\Store\Model\ScopeInterface::SCOPE_STORES])) {
+            $object->setData($synsPerScope[\Magento\Store\Model\ScopeInterface::SCOPE_STORES]);
+        } elseif (!empty($synsPerScope[\Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES])) {
+            $object->setData($synsPerScope[\Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES]);
         } else {
-            $object->setData($synsPerScope[ScopeConfigInterface::SCOPE_TYPE_DEFAULT]);
+            $object->setData($synsPerScope[\Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT]);
         }
         $this->_afterLoad($object);
         return $this;
@@ -163,9 +161,9 @@ private function getSynRowsPerScope($rows)
                 $synRowsForDefault[] = $row;
             }
         }
-        $synsPerScope[ScopeInterface::SCOPE_STORES] = $synRowsForStoreView;
-        $synsPerScope[ScopeInterface::SCOPE_WEBSITES] = $synRowsForWebsite;
-        $synsPerScope[ScopeConfigInterface::SCOPE_TYPE_DEFAULT] = $synRowsForDefault;
+        $synsPerScope[\Magento\Store\Model\ScopeInterface::SCOPE_STORES] = $synRowsForStoreView;
+        $synsPerScope[\Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES] = $synRowsForWebsite;
+        $synsPerScope[\Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT] = $synRowsForDefault;
         return $synsPerScope;
     }