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

Author: thiaramus

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

@@ -9,6 +9,7 @@
 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
@@ -18,38 +19,46 @@ class Builder implements BuilderInterface
     /**
      * @var LocaleResolver
      */
-    protected $localeResolver;
+    private $localeResolver;
 
     /**
      * @var EsConfigInterface
      */
-    protected $esConfig;
+    private $esConfig;
 
     /**
      * Current store ID.
      *
      * @var int
      */
-    protected $storeId;
+    private $storeId;
 
     /**
      * @var SynonymReader
      */
     private $synonymReader;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param LocaleResolver $localeResolver
      * @param EsConfigInterface $esConfig
      * @param SynonymReader $synonymReader
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         LocaleResolver $localeResolver,
         EsConfigInterface $esConfig,
-        SynonymReader $synonymReader
+        SynonymReader $synonymReader,
+        StoreManagerInterface $storeManager
     ) {
         $this->localeResolver = $localeResolver;
         $this->esConfig = $esConfig;
         $this->synonymReader = $synonymReader;
+        $this->storeManager = $storeManager;
     }
 
     /**
@@ -195,6 +204,8 @@ protected function getStemmerConfig()
      */
     private function getSynonymFilter(): array
     {
+        $this->storeManager->setCurrentStore($this->storeId);
+
         $synonyms = $this->synonymReader->getAllSynonyms();
         $synonymFilter = [];
 

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

@@ -6,9 +6,11 @@
 
 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\StoreManagerInterface;
 
 /**
@@ -55,12 +57,12 @@ public function loadByPhrase(\Magento\Search\Model\SynonymReader $object, $phras
         $rows = $this->queryByPhrase(strtolower($phrase));
         $synsPerScope = $this->getSynRowsPerScope($rows);
 
-        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]);
+        if (!empty($synsPerScope[ScopeInterface::SCOPE_STORES])) {
+            $object->setData($synsPerScope[ScopeInterface::SCOPE_STORES]);
+        } elseif (!empty($synsPerScope[ScopeInterface::SCOPE_WEBSITES])) {
+            $object->setData($synsPerScope[ScopeInterface::SCOPE_WEBSITES]);
         } else {
-            $object->setData($synsPerScope[\Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT]);
+            $object->setData($synsPerScope[ScopeConfigInterface::SCOPE_TYPE_DEFAULT]);
         }
         $this->_afterLoad($object);
         return $this;
@@ -74,9 +76,15 @@ public function loadByPhrase(\Magento\Search\Model\SynonymReader $object, $phras
     public function getAllSynonyms(): array
     {
         $connection = $this->getConnection();
-        $select = $connection->select()->from($this->getMainTable(), 'synonyms');
-
-        return $connection->fetchCol($select);
+        $query = $connection->select()->from($this->getMainTable());
+        $rows = $connection->fetchAll($query);
+        $synonymsPerScope = $this->getSynRowsPerScope($rows);
+
+        return array_merge(
+            array_column($synonymsPerScope[ScopeInterface::SCOPE_STORES], 'synonyms'),
+            array_column($synonymsPerScope[ScopeInterface::SCOPE_WEBSITES], 'synonyms'),
+            array_column($synonymsPerScope[ScopeConfigInterface::SCOPE_TYPE_DEFAULT], 'synonyms')
+        );
     }
 
     /**
@@ -151,9 +159,9 @@ private function getSynRowsPerScope($rows)
                 $synRowsForDefault[] = $row;
             }
         }
-        $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;
+        $synsPerScope[ScopeInterface::SCOPE_STORES] = $synRowsForStoreView;
+        $synsPerScope[ScopeInterface::SCOPE_WEBSITES] = $synRowsForWebsite;
+        $synsPerScope[ScopeConfigInterface::SCOPE_TYPE_DEFAULT] = $synRowsForDefault;
         return $synsPerScope;
     }