Merge pull request #1384 from algolia/feature/MAGE-681-NS-POV

MAGE-681 - Check error code when index doesn't exist already

Author: mohitalgolia

Helper/AlgoliaHelper.php

@@ -193,7 +193,13 @@ public function generateSearchSecuredApiKey($key, $params = [])
 
     public function getSettings($indexName)
     {
-        return $this->getIndex($indexName)->getSettings();
+        try {
+            return $this->getIndex($indexName)->getSettings();
+        }catch (\Exception $e) {
+            if ($e->getCode() !== 404) {
+                throw $e;
+            }
+        }
     }
 
     public function mergeSettings($indexName, $settings, $mergeSettingsFrom = '')

Helper/Entity/ProductHelper.php

@@ -473,7 +473,7 @@ public function setSettings($indexName, $indexNameTmp, $storeId, $saveToTmpIndic
                 $replicas = array_values(array_unique(array_merge($replicas, $currentSettings['replicas'])));
             }
         } catch (AlgoliaException $e) {
-            if ($e->getMessage() !== 'Index does not exist') {
+            if ($e->getCode() !== 404) {
                 throw $e;
             }
         }
@@ -518,7 +518,7 @@ public function setSettings($indexName, $indexNameTmp, $storeId, $saveToTmpIndic
                     Copying synonyms from production index to TMP one to not erase them with the index move.
                 ');
             } catch (AlgoliaException $e) {
-                $this->logger->error('Error encountered while copying synonyms: ' . $e->getMessage());
+                $this->logger->log('Error encountered while copying synonyms: ' . $e->getMessage());
             }
 
             try {
@@ -527,9 +527,7 @@ public function setSettings($indexName, $indexNameTmp, $storeId, $saveToTmpIndic
                     Copying query rules to "' . $indexNameTmp . '" to not to erase them with the index move.
                 ');
             } catch (AlgoliaException $e) {
-                // Fail silently if query rules are disabled on the app
-                // If QRs are disabled, nothing will happen and the extension will work as expected
-                if ($e->getMessage() !== 'Query Rules are not enabled on this application') {
+                if ($e->getCode() !== 404) {
                     throw $e;
                 }
             }
@@ -1462,9 +1460,7 @@ protected function clearFacetsQueryRules(SearchIndex $index)
                 $page++;
             } while (($page * $hitsPerPage) < $fetchedQueryRules['nbHits']);
         } catch (AlgoliaException $e) {
-            // Fail silently if query rules are disabled on the app
-            // If QRs are disabled, nothing will happen and the extension will work as expected
-            if ($e->getMessage() !== 'Query Rules are not enabled on this application') {
+            if ($e->getCode() !== 404) {
                 throw $e;
             }
         }

Helper/MerchandisingHelper.php

@@ -160,9 +160,7 @@ public function copyQueryRules($storeId, $entityIdFrom, $entityIdTo, $entityType
                 ]);
             }
         } catch (AlgoliaException $e) {
-            // Fail silently if query rules are disabled on the app
-            // If QRs are disabled, nothing will happen and the extension will work as expected
-            if ($e->getMessage() !== 'Query Rules are not enabled on this application') {
+            if ($e->getCode() !== 404) {
                 throw $e;
             }
         }

Model/Observer/SaveSettings.php

@@ -25,7 +25,7 @@ class SaveSettings implements ObserverInterface
     protected $algoliaHelper;
 
     /**
-     * @var AlgoliaHelper
+     * @var Data
      */
     protected $helper;
 
@@ -79,7 +79,7 @@ public function execute(Observer $observer)
                 }
             }
         } catch (\Exception $e) {
-            if ($e->getMessage() !== 'Index does not exist') {
+            if ($e->getCode() !== 404) {
                 throw $e;
             }
         }

README.md

@@ -1,7 +1,7 @@
 Algolia Search for Magento 2
 ============================
 
-![Latest version](https://img.shields.io/badge/latest-3.10.4-green)
+![Latest version](https://img.shields.io/badge/latest-3.10.5-green)
 ![Magento 2](https://img.shields.io/badge/Magento-2.4.x-orange)
 
 ![PHP](https://img.shields.io/badge/PHP-8.2%2C8.1%2C7.4-blue)

view/adminhtml/layout/algolia_algoliasearch_landingpage_index.xml

@@ -19,6 +19,6 @@
                     <argument name="view_model" xsi:type="object">Algolia\AlgoliaSearch\ViewModel\Adminhtml\Common</argument>
                 </arguments>
             </block>
-        </referenceBlock>
+        </referenceContainer>
     </body>
 </page>