Fixed fallback (#70)

* Fixed fallback
EmicoEcommerce · Aug 23, 2023 · 5347a53 · 5347a53
1 parent 18049fd
commit 5347a53
Show file tree

Hide file tree

Showing 11 changed files with 65 additions and 17 deletions.
diff --git a/Block/LayeredNavigation/Navigation/State.php b/Block/LayeredNavigation/Navigation/State.php
@@ -2,6 +2,7 @@
 
 namespace Tweakwise\Magento2Tweakwise\Block\LayeredNavigation\Navigation;
 
+use Tweakwise\Magento2Tweakwise\Exception\ApiException;
 use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\Filter\Item;
 use Tweakwise\Magento2Tweakwise\Model\Client\Request\ProductSearchRequest;
 use Tweakwise\Magento2Tweakwise\Model\Client\Type\FacetType\SettingsType;
@@ -70,6 +71,18 @@ protected function updateTemplate(CurrentContext $currentContext)
         $isSearch = $currentContext->getRequest() instanceof ProductSearchRequest;
         $isNavigation = !$isSearch;
 
+        if ($this->config->getTweakwiseExceptionTrown()) {
+            //no api response
+            return;
+        }
+
+        try {
+            $currentContext->getResponse();
+        } catch (ApiException $e) {
+            //no api response
+            return;
+        }
+
         if ($isSearch && $searchEnabled) {
             $this->_template = 'Tweakwise_Magento2Tweakwise::layer/state.phtml';
         }

diff --git a/Model/Catalog/Layer/FilterList/Plugin.php b/Model/Catalog/Layer/FilterList/Plugin.php
@@ -61,6 +61,11 @@ public function aroundGetFilters(FilterList $subject, Closure $proceed, Layer $l
             }
         }
 
+        //no api responseA
+        if($this->config->getTweakwiseExceptionTrown()) {
+            return $proceed($layer);
+        }
+
         try {
             return $this->tweakwiseFilterList->getFilters($layer);
         } catch (TweakwiseException $e) {

diff --git a/Model/Catalog/Layer/ItemCollectionProvider.php b/Model/Catalog/Layer/ItemCollectionProvider.php
@@ -77,6 +77,11 @@ public function getCollection(Category $category)
             }
         }
 
+        //no api response
+        if($this->config->getTweakwiseExceptionTrown()) {
+            return $this->originalProvider->getCollection($category);
+        }
+
         try {
             $collection = $this->collectionFactory->create(['navigationContext' => $this->navigationContext]);
 

diff --git a/Model/Catalog/Layer/NavigationContext.php b/Model/Catalog/Layer/NavigationContext.php
@@ -8,6 +8,7 @@
 
 namespace Tweakwise\Magento2Tweakwise\Model\Catalog\Layer;
 
+use Tweakwise\Magento2Tweakwise\Exception\ApiException;
 use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\NavigationContext\CurrentContext;
 use Tweakwise\Magento2Tweakwise\Model\Client;
 use Tweakwise\Magento2Tweakwise\Model\Client\Request\ProductNavigationRequest;
@@ -146,14 +147,21 @@ public function getRequest(): ProductNavigationRequest
     /**
      * @return ProductNavigationResponse
      */
-    public function getResponse(): ProductNavigationResponse
+    public function getResponse(): ProductNavigationResponse|null
     {
         if (!$this->response) {
             $request = $this->getRequest();
 
             $this->initializeRequest($request);
 
-            $this->response = $this->client->request($request);
+            if (!$this->config->getTweakwiseExceptionTrown()) {
+                try{
+                    $this->response = $this->client->request($request);
+                }catch (ApiException $e) {
+                    //no api response
+                    throw $e;
+                }
+            }
         }
 
         return $this->response;

diff --git a/Model/Client.php b/Model/Client.php
@@ -285,6 +285,7 @@ public function request(Request $request, bool $async = false)
         try {
             return $this->doRequest($request, $async);
         } catch (ApiException $e) {
+            $this->config->setTweakwiseExceptionThrown(true);
             $this->log->throwException($e);
         } finally {
             Profiler::stop('tweakwise::request::' . $request->getPath());

diff --git a/Model/Client/EndpointManager.php b/Model/Client/EndpointManager.php
@@ -13,8 +13,8 @@ class EndpointManager
     public const DOWN_PERIOD = 300; // 5 minutes
     public const VARIABLE_NAME = '__tw_primary_down_timer';
 
-    public const SERVER_URL = 'https://gateway.tweakwisenavigator.net';
-    public const FALLBACK_SERVER_URL = 'https://gateway.tweakwisenavigator.com';
+    public const SERVER_URL = 'http://gateway.tweakwisenavigator.net';
+    public const FALLBACK_SERVER_URL = 'http://gateway.tweakwisenavigator.com';
 
     /**
      * @var VariableFactory

diff --git a/Model/Config.php b/Model/Config.php
@@ -136,6 +136,11 @@ public function setTweakwiseExceptionThrown($thrown = true)
         return $this;
     }
 
+    public function getTweakwiseExceptionTrown()
+    {
+        return $this->tweakwiseExceptionThrown;
+    }
+
     /**
      * @deprecated
      * @see \Tweakwise\Magento2Tweakwise\Model\Client\EndpointManager::getServerUrl()

diff --git a/Model/Observer/CatalogLastPageRedirect.php b/Model/Observer/CatalogLastPageRedirect.php
@@ -55,6 +55,11 @@ public function execute(Observer $observer)
             return;
         }
 
+        if ($this->config->getTweakwiseExceptionTrown()) {
+            //no api response
+            return;
+        }
+
         $properties = $this->context->getResponse()->getProperties();
         if (!$properties->getNumberOfItems()) {
             return;

diff --git a/Model/Observer/CatalogSearchRedirect.php b/Model/Observer/CatalogSearchRedirect.php
@@ -8,6 +8,7 @@
 
 namespace Tweakwise\Magento2Tweakwise\Model\Observer;
 
+use Tweakwise\Magento2Tweakwise\Exception\ApiException;
 use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\NavigationContext;
 use Tweakwise\Magento2Tweakwise\Model\Config;
 use Magento\Framework\App\Action\Action;
@@ -60,7 +61,18 @@ public function execute(Observer $observer)
             return;
         }
 
-        $redirects = $this->context->getResponse()->getRedirects();
+        if ($this->config->getTweakwiseExceptionTrown()) {
+            //no api response
+            return;
+        }
+
+        try{
+            $redirects = $this->context->getResponse()->getRedirects();
+        }catch (ApiException $e) {
+            //no api response
+            return;
+        }
+
         if (!$redirects) {
             return;
         }

diff --git a/Model/Observer/NavigationHtmlOverride.php b/Model/Observer/NavigationHtmlOverride.php
@@ -63,6 +63,10 @@ public function execute(Observer $observer)
             return;
         }
 
+        if ($this->config->getTweakwiseExceptionTrown()) {
+            return;
+        }
+
         $searchEnabled = $this->config->isSearchEnabled();
         $navigationEnabled = $this->config->isLayeredEnabled();
 

diff --git a/etc/di.xml b/etc/di.xml
@@ -274,28 +274,18 @@
     <!-- Tweakwise virtual collection provider types used in overrides of magento collection providers -->
     <virtualType name="Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\ItemCollectionProvider\Category" type="Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\ItemCollectionProvider">
         <arguments>
-            <argument name="originalProvider" xsi:type="object">Magento\CatalogSearch\Model\Layer\Category\ItemCollectionProvider</argument>
+            <argument name="originalProvider" xsi:type="object">elasticsearchLayerCategoryItemCollectionProvider</argument>
             <argument name="navigationContext" xsi:type="object">Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\NavigationContext\Category</argument>
         </arguments>
     </virtualType>
     <virtualType name="Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\ItemCollectionProvider\Search" type="Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\ItemCollectionProvider">
         <arguments>
-            <argument name="originalProvider" xsi:type="object">Magento\CatalogSearch\Model\Layer\Search\ItemCollectionProvider</argument>
+            <argument name="originalProvider" xsi:type="object">elasticsearchLayerSearchItemCollectionProvider</argument>
             <argument name="navigationContext" xsi:type="object">Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\NavigationContext\Search</argument>
         </arguments>
     </virtualType>
 
     <!-- Override virtual types of magento to inject our product collection -->
-    <virtualType name="Magento\CatalogSearch\Model\Layer\Search\Context">
-        <arguments>
-            <argument name="collectionProvider" xsi:type="object">Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\ItemCollectionProvider\Search</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\CatalogSearch\Model\Layer\Category\Context">
-        <arguments>
-            <argument name="collectionProvider" xsi:type="object">Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\ItemCollectionProvider\Category</argument>
-        </arguments>
-    </virtualType>
     <virtualType name="Magento\Elasticsearch\Model\Layer\Search\Context">
         <arguments>
             <argument name="collectionProvider" xsi:type="object">Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\ItemCollectionProvider\Search</argument>
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,6 +63,10 @@ public function execute(Observer $observer) @@
                 return;
             }
+            if ($this->config->getTweakwiseExceptionTrown()) {
+                return;
+            }
             $searchEnabled = $this->config->isSearchEnabled();
             $navigationEnabled = $this->config->isLayeredEnabled();
@@ Expand Down @@