Parse response from ES

webgriffe · Feb 20, 2024 · f3b9026 · f3b9026
1 parent 7223279
commit f3b9026
Show file tree

Hide file tree

Showing 15 changed files with 306 additions and 31 deletions.
diff --git a/config/services/controller.php b/config/services/controller.php
@@ -17,6 +17,7 @@
             service('sylius.context.channel'),
             service('lruozzi9.sylius_elasticsearch_plugin.generator.index_name'),
             service('lruozzi9.sylius_elasticsearch_plugin.provider.document_type'),
+            service('lruozzi9.sylius_elasticsearch_plugin.parser.elasticsearch_document'),
         ])
         ->call('setContainer', [service('service_container')])
         ->tag('controller.service_arguments')

diff --git a/config/services/factory.php b/config/services/factory.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use LRuozzi9\SyliusElasticsearchPlugin\Factory\ProductResponseFactory;
+use LRuozzi9\SyliusElasticsearchPlugin\Model\ProductResponse;
+
+return static function (ContainerConfigurator $containerConfigurator) {
+    $services = $containerConfigurator->services();
+
+    $services->set('lruozzi9.sylius_elasticsearch_plugin.factory.product_response', ProductResponseFactory::class)
+        ->args([
+            ProductResponse::class,
+        ])
+    ;
+};
diff --git a/config/services/parser.php b/config/services/parser.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use LRuozzi9\SyliusElasticsearchPlugin\Parser\ElasticsearchProductDocumentParser;
+
+return static function (ContainerConfigurator $containerConfigurator) {
+    $services = $containerConfigurator->services();
+
+    $services->set('lruozzi9.sylius_elasticsearch_plugin.parser.elasticsearch_document', ElasticsearchProductDocumentParser::class)
+        ->args([
+            service('lruozzi9.sylius_elasticsearch_plugin.factory.product_response'),
+            service('sylius.context.locale'),
+            service('sylius.context.channel'),
+            param('sylius_locale.locale'),
+        ])
+    ;
+};
diff --git a/src/Command/IndexCommand.php b/src/Command/IndexCommand.php
@@ -4,6 +4,7 @@
 
 namespace LRuozzi9\SyliusElasticsearchPlugin\Command;
 
+use InvalidArgumentException;
 use LRuozzi9\SyliusElasticsearchPlugin\Message\CreateIndex;
 use LRuozzi9\SyliusElasticsearchPlugin\Provider\DocumentTypeProviderInterface;
 use Sylius\Component\Channel\Repository\ChannelRepositoryInterface;
@@ -30,7 +31,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $channels = $this->channelRepository->findAll();
         foreach ($channels as $channel) {
             foreach ($this->documentTypeProvider->getDocumentsType() as $documentType) {
-                $this->messageBus->dispatch(new CreateIndex($channel->getId(), $documentType->getCode()));
+                $channelId = $channel->getId();
+                if (!is_string($channelId) && !is_int($channelId)) {
+                    throw new InvalidArgumentException('Channel id must be a string or an integer');
+                }
+                $this->messageBus->dispatch(new CreateIndex($channelId, $documentType->getCode()));
             }
         }
 

diff --git a/src/Controller/ElasticsearchController.php b/src/Controller/ElasticsearchController.php
@@ -9,6 +9,7 @@
 use LRuozzi9\SyliusElasticsearchPlugin\Generator\IndexNameGeneratorInterface;
 use LRuozzi9\SyliusElasticsearchPlugin\Model\QueryResult;
 use LRuozzi9\SyliusElasticsearchPlugin\Pagerfanta\ElasticsearchAdapter;
+use LRuozzi9\SyliusElasticsearchPlugin\Parser\DocumentParserInterface;
 use LRuozzi9\SyliusElasticsearchPlugin\Provider\DocumentTypeProviderInterface;
 use Pagerfanta\Pagerfanta;
 use Sylius\Component\Channel\Context\ChannelContextInterface;
@@ -20,6 +21,9 @@
 use Symfony\Component\HttpFoundation\Response;
 use Webmozart\Assert\Assert;
 
+/**
+ * @psalm-suppress PropertyNotSetInConstructor
+ */
 final class ElasticsearchController extends AbstractController
 {
     public function __construct(
@@ -29,6 +33,7 @@ public function __construct(
         private readonly ChannelContextInterface $channelContext,
         private readonly IndexNameGeneratorInterface $indexNameGenerator,
         private readonly DocumentTypeProviderInterface $documentTypeProvider,
+        private readonly DocumentParserInterface $documentParser,
     ) {
     }
 
@@ -42,7 +47,8 @@ public function taxonAction(string $slug): Response
         $channel = $this->channelContext->getChannel();
         Assert::isInstanceOf($channel, ChannelInterface::class);
 
-        $result = $this->indexManager->query([
+        $aliasName = $this->indexNameGenerator->generateAlias($channel, $this->documentTypeProvider->getDocumentType(ProductDocumentType::CODE));
+        $query = [
             'query' => [
                 'bool' => [
                     'must' => [
@@ -54,8 +60,15 @@ public function taxonAction(string $slug): Response
                     ],
                 ],
             ],
-        ], $this->indexNameGenerator->generateAlias($channel, $this->documentTypeProvider->getDocumentType(ProductDocumentType::CODE)));
-        $products = new Pagerfanta(new ElasticsearchAdapter(new QueryResult($result['hits']['hits'])));
+        ];
+        $result = $this->indexManager->query($query, $aliasName);
+        $responses = [];
+        /** @var array{_index: string, _id: string, score: float, _source: array} $hit */
+        foreach ($result['hits']['hits'] as $hit) {
+            $responses[] = $this->documentParser->parse($hit);
+        }
+        $queryResult = new QueryResult($responses);
+        $products = new Pagerfanta(new ElasticsearchAdapter($queryResult));
 
         return $this->render('@LRuozzi9SyliusElasticsearchPlugin/Product/index.html.twig', [
             'taxon' => $taxon,

diff --git a/src/DocumentType/ProductDocumentType.php b/src/DocumentType/ProductDocumentType.php
@@ -78,6 +78,20 @@ public function getMappings(): array
                         ],
                     ],
                 ],
+                'slug' => [
+                    'type' => 'nested',
+                    'dynamic' => 'false',
+                    'include_in_parent' => true,
+                    'properties' => [
+                        'locale' => [
+                            'type' => 'text',
+                            'index' => false,
+                        ],
+                        'value' => [
+                            'type' => 'keyword',
+                        ],
+                    ],
+                ],
                 'main_taxon' => [
                     'type' => 'object',
                     'dynamic' => false,
@@ -150,6 +164,7 @@ private function normalizeProduct(ProductInterface $product): array
             'code' => $product->getCode(),
             'name' => [],
             'description' => [],
+            'slug' => [],
             'taxons' => [],
         ];
         /** @var ProductTranslationInterface $productTranslation */
@@ -162,6 +177,10 @@ private function normalizeProduct(ProductInterface $product): array
                 'locale' => $productTranslation->getLocale(),
                 'value' => $productTranslation->getDescription(),
             ];
+            $normalizedProduct['slug'][] = [
+                'locale' => $productTranslation->getLocale(),
+                'value' => $productTranslation->getSlug(),
+            ];
         }
         $mainTaxon = $product->getMainTaxon();
         if ($mainTaxon instanceof TaxonInterface) {

diff --git a/src/Factory/ProductResponseFactory.php b/src/Factory/ProductResponseFactory.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LRuozzi9\SyliusElasticsearchPlugin\Factory;
+
+use LRuozzi9\SyliusElasticsearchPlugin\Model\ProductResponseInterface;
+use Webmozart\Assert\Assert;
+
+final readonly class ProductResponseFactory implements ProductResponseFactoryInterface
+{
+    /**
+     * @param class-string $responseClass
+     */
+    public function __construct(
+        private string $responseClass,
+    ) {
+    }
+
+    /**
+     * @psalm-suppress MixedMethodCall
+     */
+    public function createNew(): ProductResponseInterface
+    {
+        $response = new $this->responseClass();
+        Assert::isInstanceOf($response, ProductResponseInterface::class);
+
+        return $response;
+    }
+}
diff --git a/src/Factory/ProductResponseFactoryInterface.php b/src/Factory/ProductResponseFactoryInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LRuozzi9\SyliusElasticsearchPlugin\Factory;
+
+use LRuozzi9\SyliusElasticsearchPlugin\Model\ProductResponseInterface;
+
+interface ProductResponseFactoryInterface
+{
+    public function createNew(): ProductResponseInterface;
+}
diff --git a/src/Model/AbstractResponse.php b/src/Model/AbstractResponse.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LRuozzi9\SyliusElasticsearchPlugin\Model;
+
+abstract class AbstractResponse implements ResponseInterface
+{
+    private ?string $routeName = null;
+
+    /** @var array<string, mixed>|null */
+    private ?array $routeParams = null;
+
+    public function getRouteName(): ?string
+    {
+        return $this->routeName;
+    }
+
+    public function setRouteName(?string $routeName): void
+    {
+        $this->routeName = $routeName;
+    }
+
+    public function getRouteParams(): ?array
+    {
+        return $this->routeParams;
+    }
+
+    public function setRouteParams(?array $routeParams): void
+    {
+        $this->routeParams = $routeParams;
+    }
+}
diff --git a/src/Model/ProductResponse.php b/src/Model/ProductResponse.php
@@ -4,44 +4,32 @@
 
 namespace LRuozzi9\SyliusElasticsearchPlugin\Model;
 
-final class ProductResponse implements ProductResponseInterface
+final class ProductResponse extends AbstractResponse implements ProductResponseInterface
 {
-    /**
-     * @param array<string, string>|null $routeParams
-     */
-    public function __construct(
-        private ?string $routeName = null,
-        private ?array $routeParams = [],
-    ) {
-    }
+    private ?string $name = null;
 
     public function getImage(): string
     {
         return 'TODO';
     }
 
-    public function getName(): string
+    public function getName(): ?string
     {
-        return 'TODO';
+        return $this->name;
     }
 
-    public function getPrice(): int
+    public function setName(?string $name): void
     {
-        return 0;
+        $this->name = $name;
     }
 
-    public function getOriginalPrice(): int
+    public function getPrice(): int
     {
         return 0;
     }
 
-    public function getRouteName(): string
-    {
-        return (string) $this->routeName;
-    }
-
-    public function getRouteParams(): array
+    public function getOriginalPrice(): int
     {
-        return $this->routeParams ?? [];
+        return 0;
     }
 }
diff --git a/src/Model/ProductResponseInterface.php b/src/Model/ProductResponseInterface.php
@@ -6,9 +6,11 @@
 
 interface ProductResponseInterface extends ResponseInterface
 {
-    public function getImage(): string;
+    public function getName(): ?string;
+
+    public function setName(?string $name): void;
 
-    public function getName(): string;
+    public function getImage(): string;
 
     public function getPrice(): int;
 

diff --git a/src/Model/ResponseInterface.php b/src/Model/ResponseInterface.php
@@ -6,10 +6,17 @@
 
 interface ResponseInterface
 {
-    public function getRouteName(): string;
+    public function getRouteName(): ?string;
+
+    public function setRouteName(?string $routeName): void;
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function getRouteParams(): ?array;
 
     /**
-     * @return array<string, string>
+     * @param array<string, mixed> $routeParams
      */
-    public function getRouteParams(): array;
+    public function setRouteParams(?array $routeParams): void;
 }
diff --git a/src/Parser/DocumentParserInterface.php b/src/Parser/DocumentParserInterface.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LRuozzi9\SyliusElasticsearchPlugin\Parser;
+
+use LRuozzi9\SyliusElasticsearchPlugin\Model\ResponseInterface;
+
+interface DocumentParserInterface
+{
+    /**
+     * @param array{_index: string, _id: string, score: float, _source: array} $document
+     */
+    public function parse(array $document): ResponseInterface;
+}