Merge pull request #3 from lizardmedia/async-indexing-fix-+-unit-tests

Correcting async indexers running + adding unit tests.

Api/Adapter/ReactPHP/ChildProcess/ProcessFactoryInterface.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * File:ProcessFactoryInterface.php
+ *
+ * @author Maciej Sławik <maciej.slawik@lizardmedia.pl>
+ * @copyright Copyright (C) 2018 Lizard Media (http://lizardmedia.pl)
+ */
+
+namespace LizardMedia\AdminIndexer\Api\Adapter\ReactPHP\ChildProcess;
+
+use React\ChildProcess\Process;
+
+/**
+ * Interface ProcessFactoryInterface
+ * @package LizardMedia\AdminIndexer\Api\Adapter\ReactPHP
+ */
+interface ProcessFactoryInterface
+{
+    /**
+     * @param string $command
+     * @return Process
+     */
+    public function create(string $command): Process;
+}

Api/Adapter/ReactPHP/EventLoop/LoopFactoryInterface.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * File: LoopFactoryInterface.php
+ *
+ * @author Bartosz Kubicki bartosz.kubicki@lizardmedia.pl>
+ * @copyright Copyright (C) 2018 Lizard Media (http://lizardmedia.pl)
+ */
+
+namespace LizardMedia\AdminIndexer\Api\Adapter\ReactPHP\EventLoop;
+
+use React\EventLoop\Factory;
+use React\EventLoop\LoopInterface;
+
+/**
+ * Interface LoopFactoryInterface
+ * @package LizardMedia\AdminIndexer\Api\Adapter\ReactPHP\EventLoop
+ */
+interface LoopFactoryInterface
+{
+    /**
+     * @return LoopInterface
+     */
+    public function create(): LoopInterface;
+}

Api/IndexerProcessorInterface.php

@@ -12,7 +12,7 @@
 
 namespace LizardMedia\AdminIndexer\Api;
 
-use LizardMedia\AdminIndexer\Exception\ReindexFailureException;
+use LizardMedia\AdminIndexer\Exception\ReindexFailureAggregateException;
 
 /**
  * Interface IndexerProcessorInterface
@@ -23,7 +23,7 @@ interface IndexerProcessorInterface
     /**
      * @param string[] ...$indexerIds
      * @return void
-     * @throws ReindexFailureException
+     * @throws ReindexFailureAggregateException
      */
     public function process(string ...$indexerIds): void;
 }

Api/ReindexRunnerInterface.php

@@ -12,16 +12,18 @@
 
 namespace LizardMedia\AdminIndexer\Api;
 
+use LizardMedia\AdminIndexer\Exception\ReindexFailureAggregateException;
+
 /**
  * Interface ReindexRunnerInterface
  * @package LizardMedia\AdminIndexer\Api
  */
 interface ReindexRunnerInterface
 {
     /**
-     * @param string $indexerId
+     * @param string[] ...$indexerIds
      * @return void
-     * @throws \Exception
+     * @throws ReindexFailureAggregateException
      */
-    public function run(string $indexerId): void;
+    public function run(string ...$indexerIds): void;
 }

Controller/Adminhtml/Indexer/MassReindex.php

@@ -14,7 +14,7 @@
 
 use LizardMedia\AdminIndexer\Api\IndexerProcessorInterface;
 use LizardMedia\AdminIndexer\Api\ReindexRunner\MessageBagInterface;
-use LizardMedia\AdminIndexer\Exception\ReindexFailureException;
+use LizardMedia\AdminIndexer\Exception\ReindexFailureAggregateException;
 use Magento\Backend\App\Action;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\Controller\Result\Redirect;
@@ -60,7 +60,6 @@ public function __construct(
         IndexerProcessorInterface $indexerProcessor
     ) {
         parent::__construct($context);
-
         $this->messageBag = $messageBag;
         $this->redirectFactory = $redirectFactory;
         $this->indexerProcessor = $indexerProcessor;
@@ -69,21 +68,22 @@ public function __construct(
     /**
      * @return Redirect
      */
-    public function execute() : Redirect
+    public function execute(): Redirect
     {
         $indexerIds = $this->getRequest()->getParam('indexer_ids');
 
         if (!$this->validateParam($indexerIds)) {
             $this->messageManager->addErrorMessage(__('Please select at least one index.'));
             return $this->getRedirect();
         }
+
         $indexerIds = $this->castValuesToString($indexerIds);
 
         try {
             $this->indexerProcessor->process(...$indexerIds);
-            $this->displayMessages();
-        } catch (ReindexFailureException $exception) {
-            $this->messageManager->addErrorMessage(__('Reindex failed on indexer %1.', $exception->getIndexerName()));
+            $this->displayMessagesAboutRunningIndexers();
+        } catch (ReindexFailureAggregateException $exception) {
+            $this->displayErrors($exception);
         }
 
         return $this->getRedirect();
@@ -121,17 +121,31 @@ private function validateParam($indexerIds): bool
     private function castValuesToString(array $indexerIds): array
     {
         return array_filter($indexerIds, function ($indexerId) {
-            return (string)$indexerId;
+            return (string) $indexerId;
         });
     }
 
     /**
      * @return void
      */
-    private function displayMessages(): void
+    private function displayMessagesAboutRunningIndexers(): void
     {
         foreach ($this->messageBag->getMessages() as $message) {
             $this->messageManager->addNoticeMessage($message);
         }
     }
+
+    /**
+     * @param ReindexFailureAggregateException $exception
+     * @return void
+     */
+    private function displayErrors(ReindexFailureAggregateException $exception): void
+    {
+        $this->messageManager->addErrorMessage($exception->getMessage());
+        $errors = $exception->getErrors();
+
+        foreach ($errors as $error) {
+            $this->messageManager->addErrorMessage($error->getMessage());
+        }
+    }
 }

Exception/ReindexFailureAggregateException.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * File: ReindexFailureAggregateException.php
+ *
+ * @author Bartosz Kubicki bartosz.kubicki@lizardmedia.pl>
+ * @copyright Copyright (C) 2018 Lizard Media (http://lizardmedia.pl)
+ */
+
+namespace LizardMedia\AdminIndexer\Exception;
+
+use Magento\Framework\Exception\AbstractAggregateException;
+
+/**
+ * Class ReindexFailureAggregateException
+ * @package LizardMedia\AdminIndexer\Exception
+ */
+class ReindexFailureAggregateException extends AbstractAggregateException
+{
+}

Model/Adapter/ReactPHP/ChildProcess/ProcessFactory.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * File:ProcessFactory.php
+ *
+ * @author Maciej Sławik <maciej.slawik@lizardmedia.pl>
+ * @copyright Copyright (C) 2018 Lizard Media (http://lizardmedia.pl)
+ */
+
+namespace LizardMedia\AdminIndexer\Model\Adapter\ReactPHP\ChildProcess;
+
+use LizardMedia\AdminIndexer\Api\Adapter\ReactPHP\ChildProcess\ProcessFactoryInterface;
+use React\ChildProcess\Process;
+
+/**
+ * Class ProcessFactory
+ * @package LizardMedia\AdminIndexer\Model\Adapter\ReactPHP
+ */
+class ProcessFactory implements ProcessFactoryInterface
+{
+    /**
+     * @param string $command
+     * @return Process
+     */
+    public function create(string $command): Process
+    {
+        return new Process($command);
+    }
+}

Model/Adapter/ReactPHP/EventLoop/LoopFactory.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * File: LoopFactory.php
+ *
+ * @author Bartosz Kubicki bartosz.kubicki@lizardmedia.pl>
+ * @copyright Copyright (C) 2018 Lizard Media (http://lizardmedia.pl)
+ */
+
+namespace LizardMedia\AdminIndexer\Model\Adapter\ReactPHP\EventLoop;
+
+use LizardMedia\AdminIndexer\Api\Adapter\ReactPHP\EventLoop\LoopFactoryInterface;
+use React\EventLoop\LoopInterface;
+use React\EventLoop\Factory;
+
+/**
+ * Class LoopFactory
+ * @package LizardMedia\AdminIndexer\Model\Adapter\ReactPHP\EventLoop
+ */
+class LoopFactory implements LoopFactoryInterface
+{
+    /**
+     * @var Factory
+     */
+    private $factory;
+
+    /**
+     * LoopFactory constructor.
+     * @param Factory $factory
+     */
+    public function __construct(
+        Factory $factory
+    ) {
+        $this->factory = $factory;
+    }
+
+    /**
+     * @return LoopInterface
+     */
+    public function create(): LoopInterface
+    {
+        return $this->factory->create();
+    }
+}