Search is available if we have at least one documentable registry

Author: maximehuran

src/Checker/ElasticsearchChecker.php

@@ -13,37 +13,18 @@
 
 namespace MonsieurBiz\SyliusSearchPlugin\Checker;
 
-use MonsieurBiz\SyliusSearchPlugin\Search\ClientFactory;
-use Sylius\Component\Locale\Context\LocaleContextInterface;
-use Sylius\Component\Registry\ServiceRegistryInterface;
+use JoliCode\Elastically\Factory;
 
-class ElasticsearchChecker
+class ElasticsearchChecker implements ElasticsearchCheckerInterface
 {
-    private ClientFactory $clientFactory;
-
-    private ServiceRegistryInterface $documentableRegistry;
-
-    private LocaleContextInterface $localeContext;
-
     private ?bool $isAvailable = null;
 
-    public function __construct(
-        ClientFactory $clientFactory,
-        ServiceRegistryInterface $documentableRegistry,
-        LocaleContextInterface $localeContext
-    ) {
-        $this->clientFactory = $clientFactory;
-        $this->documentableRegistry = $documentableRegistry;
-        $this->localeContext = $localeContext;
-    }
-
     public function check(): bool
     {
         if (null === $this->isAvailable) {
-            $documentables = $this->documentableRegistry->all();
-            $documentable = reset($documentables);
-            $client = $this->clientFactory->getClient($documentable, $this->localeContext->getLocaleCode());
+            $client = (new Factory())->buildClient();
 
+            // Check client response
             try {
                 $client->getStatus()->getResponse();
             } catch (\Exception $e) {

src/Checker/ElasticsearchCheckerInterface.php

@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of Monsieur Biz' Search plugin for Sylius.
+ *
+ * (c) Monsieur Biz <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace MonsieurBiz\SyliusSearchPlugin\Checker;
+
+interface ElasticsearchCheckerInterface
+{
+    public function check(): bool;
+}

src/Resources/config/routing/shop.yaml

@@ -5,7 +5,7 @@ monsieurbiz_search_search:
     _controller: MonsieurBiz\SyliusSearchPlugin\Controller\SearchController::searchAction
   requirements:
     query: .+
-  condition: service('monsieurbiz.search.checker.elasticsearch_checker').check()
+  condition: "not(context.getPathInfo() matches '`^%sylius.security.new_api_route%`') and context.checkElasticsearch()"
 
 monsieurbiz_search_post:
   path: /search
@@ -28,4 +28,4 @@ monsieurbiz_sylius_search_taxon:
       taxon: "expr:notFoundOnNull(service('sylius.repository.taxon').findOneBySlug($slug, service('sylius.context.locale').getLocaleCode()))"
   requirements:
     slug: .+
-  condition: service('monsieurbiz.search.checker.elasticsearch_checker').check()
+  condition: "not(context.getPathInfo() matches '`^%sylius.security.new_api_route%`') and context.checkElasticsearch()"

src/Resources/config/services.yaml

@@ -255,10 +255,14 @@ services:
 
   monsieurbiz.search.checker.elasticsearch_checker:
     class: MonsieurBiz\SyliusSearchPlugin\Checker\ElasticsearchChecker
-    public: true
-    tags:
-      - { name: routing.condition_service }
 
   MonsieurBiz\SyliusSearchPlugin\Twig\Extension\RenderSearchForm:
     arguments:
       $elasticsearchChecker: '@monsieurbiz.search.checker.elasticsearch_checker'
+
+  # Routing Context
+  MonsieurBiz\SyliusSearchPlugin\Routing\RequestContext:
+    decorates: router.request_context
+    arguments:
+      - '@MonsieurBiz\SyliusSearchPlugin\Routing\RequestContext.inner'
+      - '@monsieurbiz.search.checker.elasticsearch_checker'

src/Routing/RequestContext.php

@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of Monsieur Biz' Search plugin for Sylius.
+ *
+ * (c) Monsieur Biz <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace MonsieurBiz\SyliusSearchPlugin\Routing;
+
+use Exception;
+use MonsieurBiz\SyliusSearchPlugin\Checker\ElasticsearchCheckerInterface;
+use Symfony\Component\Routing\RequestContext as BaseRequestContext;
+
+class RequestContext extends BaseRequestContext
+{
+    private BaseRequestContext $decorated;
+
+    private ElasticsearchCheckerInterface $elasticsearchChecker;
+
+    public function __construct(
+        BaseRequestContext $decorated,
+        ElasticsearchCheckerInterface $elasticsearchChecker
+    ) {
+        parent::__construct(
+            $decorated->getBaseUrl(),
+            $decorated->getMethod(),
+            $decorated->getHost(),
+            $decorated->getScheme(),
+            $decorated->getHttpPort(),
+            $decorated->getHttpsPort(),
+            $decorated->getPathInfo(),
+            $decorated->getQueryString()
+        );
+        $this->decorated = $decorated;
+        $this->elasticsearchChecker = $elasticsearchChecker;
+    }
+
+    public function checkElasticsearch(): bool
+    {
+        return $this->elasticsearchChecker->check();
+    }
+
+    /**
+     * @throws Exception
+     *
+     * @return mixed
+     */
+    public function __call(string $name, array $arguments)
+    {
+        $callback = [$this->decorated, $name];
+        if (\is_callable($callback)) {
+            return \call_user_func($callback, $arguments);
+        }
+
+        throw new Exception(sprintf('Method %s not found for class "%s"', $name, \get_class($this->decorated)));
+    }
+}

src/Twig/Extension/RenderSearchForm.php

@@ -13,7 +13,7 @@
 
 namespace MonsieurBiz\SyliusSearchPlugin\Twig\Extension;
 
-use MonsieurBiz\SyliusSearchPlugin\Checker\ElasticsearchChecker;
+use MonsieurBiz\SyliusSearchPlugin\Checker\ElasticsearchCheckerInterface;
 use MonsieurBiz\SyliusSearchPlugin\Form\Type\SearchType;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -30,13 +30,13 @@ class RenderSearchForm extends AbstractExtension
 
     private RequestStack $requestStack;
 
-    private ElasticsearchChecker $elasticsearchChecker;
+    private ElasticsearchCheckerInterface $elasticsearchChecker;
 
     public function __construct(
         FormFactoryInterface $formFactory,
         Environment $templatingEngine,
         RequestStack $requestStack,
-        ElasticsearchChecker $elasticsearchChecker
+        ElasticsearchCheckerInterface $elasticsearchChecker
     ) {
         $this->formFactory = $formFactory;
         $this->templatingEngine = $templatingEngine;