Merge branch 'develop' into release-3.10.1-prep

Author: mohitalgolia

Helper/Entity/CategoryHelper.php

@@ -50,6 +50,7 @@ class CategoryHelper
     protected $categoryRepository;
 
     protected $isCategoryVisibleInMenuCache;
+    protected $coreCategories;
     protected $idColumn;
     protected $categoryAttributes;
     protected $rootCategoryId = -1;
@@ -548,7 +549,12 @@ public function isCategoryVisibleInMenu($categoryId, $storeId)
      */
     public function getCoreCategories($filterNotIncludedCategories = true, $storeId = null)
     {
-        $key = $filterNotIncludedCategories ? 'filtered' : 'non_filtered';
+        // Cache category look up by store scope
+        $key = ($filterNotIncludedCategories ? 'filtered' : 'non_filtered') . "-$storeId";
+
+        if (isset($this->coreCategories[$key])) {
+            return $this->coreCategories[$key];
+        }
 
         $collection = $this->categoryCollectionFactory->create()
             ->distinct(true)
@@ -562,14 +568,14 @@ public function getCoreCategories($filterNotIncludedCategories = true, $storeId
             $collection->addAttributeToFilter('include_in_menu', '1');
         }
 
-        $coreCategories[$key] = [];
+        $this->coreCategories[$key] = [];
 
         /** @var \Magento\Catalog\Model\Category $category */
         foreach ($collection as $category) {
-                $coreCategories[$key][$category->getId()] = $category;
+                $this->coreCategories[$key][$category->getId()] = $category;
         }
 
-        return $coreCategories[$key];
+        return $this->coreCategories[$key];
     }
 
     /**

Helper/Entity/ProductHelper.php

@@ -485,8 +485,8 @@ public function setSettings($indexName, $indexNameTmp, $storeId, $saveToTmpIndic
             } else {
                 foreach ($sortingIndices as $values) {
                     $replicaName = $values['name'];
-                    array_unshift($customRanking,$values['ranking'][0]); 
-                    $replicaSetting['customRanking'] = $customRanking;   
+                    array_unshift($customRanking,$values['ranking'][0]);
+                    $replicaSetting['customRanking'] = $customRanking;
                     $this->algoliaHelper->setSettings($replicaName, $replicaSetting, false, false);
                     $this->logger->log('Setting settings to "' . $replicaName . '" replica.');
                     $this->logger->log('Settings: ' . json_encode($replicaSetting));
@@ -502,6 +502,15 @@ public function setSettings($indexName, $indexNameTmp, $storeId, $saveToTmpIndic
         // $this->deleteUnusedReplicas($indexName, $replicas, $setReplicasTaskId);
 
         if ($saveToTmpIndicesToo === true) {
+            try {
+                $this->algoliaHelper->copySynonyms($indexName, $indexNameTmp);
+                $this->logger->log('
+                    Copying synonyms from production index to TMP one to not to erase them with the index move.
+                ');
+            } catch (AlgoliaException $e) {
+                $this->logger->error('Error encountered while copying synonyms: ' . $e->getMessage());
+            }
+
             try {
                 $this->algoliaHelper->copyQueryRules($indexName, $indexNameTmp);
                 $this->logger->log('