Catch exceptions when updating inventory and use the async command in…

… the console command
Setono · Aug 29, 2024 · 38813a3 · 38813a3
1 parent e604e94
commit 38813a3
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 41 deletions.
diff --git a/src/Command/UpdateInventoryCommand.php b/src/Command/UpdateInventoryCommand.php
@@ -4,19 +4,20 @@
 
 namespace Setono\SyliusPeakPlugin\Command;
 
-use Setono\SyliusPeakPlugin\Updater\InventoryUpdaterInterface;
+use Setono\SyliusPeakPlugin\Message\Command\UpdateInventory;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
 
 #[AsCommand(
     name: 'setono:sylius-peak-wms:update-inventory',
     description: 'This will update the inventory for all product variants',
 )]
 final class UpdateInventoryCommand extends Command
 {
-    public function __construct(private readonly InventoryUpdaterInterface $inventoryUpdater)
+    public function __construct(private readonly MessageBusInterface $commandBus)
     {
         parent::__construct();
     }
@@ -25,7 +26,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         // todo allow the user to specify a product variant id to update
         // todo allow the user to force the update of _ALL_ product variants regardless of the last update time
-        $this->inventoryUpdater->updateAll();
+        $this->commandBus->dispatch(UpdateInventory::forAll());
 
         return 0;
     }

diff --git a/src/Model/InventoryUpdateInterface.php b/src/Model/InventoryUpdateInterface.php
@@ -15,6 +15,8 @@ interface InventoryUpdateInterface extends ResourceInterface, VersionedInterface
 
     final public const STATE_COMPLETED = 'completed';
 
+    final public const STATE_FAILED = 'failed';
+
     public function getId(): ?int;
 
     public function getState(): string;

diff --git a/src/Resources/config/services/command.xml b/src/Resources/config/services/command.xml
@@ -36,7 +36,7 @@
         </service>
 
         <service id="Setono\SyliusPeakPlugin\Command\UpdateInventoryCommand">
-            <argument type="service" id="Setono\SyliusPeakPlugin\Updater\InventoryUpdaterInterface"/>
+            <argument type="service" id="setono_sylius_peak.command_bus"/>
 
             <tag name="console.command"/>
         </service>

diff --git a/src/Updater/InventoryUpdater.php b/src/Updater/InventoryUpdater.php
@@ -68,51 +68,62 @@ public function updateAll(bool $onlyUpdated = true): void
         $inventoryUpdate = $this->inventoryUpdateProvider->getInventoryUpdate();
         $this->getManager($inventoryUpdate)->persist($inventoryUpdate);
 
-        $this->transition($inventoryUpdate, InventoryUpdateWorkflow::TRANSITION_RESET);
-        $this->transition($inventoryUpdate, InventoryUpdateWorkflow::TRANSITION_PROCESS);
+        try {
+            $this->transition($inventoryUpdate, InventoryUpdateWorkflow::TRANSITION_RESET);
+            $this->transition($inventoryUpdate, InventoryUpdateWorkflow::TRANSITION_PROCESS);
 
-        $manager = $this->getManager(ProductVariant::class);
-        $productVariantRepository = $this->getRepository(ProductVariant::class);
+            $manager = $this->getManager(ProductVariant::class);
+            $productVariantRepository = $this->getRepository(ProductVariant::class);
 
-        $i = 0;
-        $products = $this->client->product()->iterate(PageQuery::create(updatedAfter: $inventoryUpdate->getNextUpdateThreshold()));
-        foreach ($products as $product) {
-            ++$i;
+            $i = 0;
+            $products = $this->client->product()->iterate(PageQuery::create(updatedAfter: $inventoryUpdate->getNextUpdateThreshold()));
+            foreach ($products as $product) {
+                ++$i;
 
-            if ($i % 100 === 0) {
-                $manager->flush();
-                $manager->clear();
-            }
+                if ($i % 100 === 0) {
+                    $manager->flush();
+                    $manager->clear();
 
-            try {
-                Assert::notNull($product->variantId, sprintf(
-                    'Product with id %d does not have a variant id. It is expected that Peak WMS has the same structure of products as Sylius, namely that all products at least have one variant.',
-                    (int) $product->id,
-                ));
-
-                $productVariant = $productVariantRepository->findOneBy(['code' => $product->variantId]);
-                Assert::notNull($productVariant, sprintf('Product variant with code %s does not exist', $product->variantId));
-
-                if ($product->orderedByCustomers !== $productVariant->getOnHold()) {
-                    $inventoryUpdate->addWarning(sprintf(
-                        'Product variant with code %s has %d on hold in Sylius and %d on hold in Peak WMS',
-                        $product->variantId,
-                        (int) $productVariant->getOnHold(),
-                        (int) $product->orderedByCustomers,
-                    ));
+                    $inventoryUpdate->setProductsProcessed($i);
                 }
 
-                $this->map($product, $productVariant);
-            } catch (\InvalidArgumentException $e) {
-                $inventoryUpdate->addError($e->getMessage());
-            }
-        }
+                try {
+                    Assert::notNull($product->variantId, sprintf(
+                        'Product with id %d does not have a variant id. It is expected that Peak WMS has the same structure of products as Sylius, namely that all products at least have one variant.',
+                        (int) $product->id,
+                    ));
 
-        $inventoryUpdate->setProductsProcessed($i);
+                    $productVariant = $productVariantRepository->findOneBy(['code' => $product->variantId]);
+                    Assert::notNull(
+                        $productVariant,
+                        sprintf('Product variant with code %s does not exist', $product->variantId),
+                    );
+
+                    if ($product->orderedByCustomers !== $productVariant->getOnHold()) {
+                        $inventoryUpdate->addWarning(sprintf(
+                            'Product variant with code %s has %d on hold in Sylius and %d on hold in Peak WMS',
+                            $product->variantId,
+                            (int) $productVariant->getOnHold(),
+                            (int) $product->orderedByCustomers,
+                        ));
+                    }
+
+                    $this->map($product, $productVariant);
+                } catch (\InvalidArgumentException $e) {
+                    $inventoryUpdate->addError($e->getMessage());
+                }
+            }
 
-        $manager->flush();
+            $inventoryUpdate->setProductsProcessed($i);
+            $manager->flush();
 
-        $this->transition($inventoryUpdate, InventoryUpdateWorkflow::TRANSITION_COMPLETE);
+            $this->transition($inventoryUpdate, InventoryUpdateWorkflow::TRANSITION_COMPLETE);
+        } catch (\Throwable $e) {
+            $inventoryUpdate->addError($e->getMessage());
+            $this->transition($inventoryUpdate, InventoryUpdateWorkflow::TRANSITION_FAIL);
+        } finally {
+            $this->getManager($inventoryUpdate)->flush();
+        }
     }
 
     private function transition(InventoryUpdateInterface $inventoryUpdate, string $transition): void

diff --git a/src/Workflow/InventoryUpdateWorkflow.php b/src/Workflow/InventoryUpdateWorkflow.php
@@ -19,6 +19,8 @@ final class InventoryUpdateWorkflow
 
     final public const TRANSITION_RESET = 'reset';
 
+    final public const TRANSITION_FAIL = 'fail';
+
     private function __construct()
     {
     }
@@ -32,6 +34,7 @@ public static function getStates(): array
             InventoryUpdateInterface::STATE_PENDING,
             InventoryUpdateInterface::STATE_PROCESSING,
             InventoryUpdateInterface::STATE_COMPLETED,
+            InventoryUpdateInterface::STATE_FAILED,
         ];
     }
 
@@ -78,9 +81,14 @@ public static function getTransitions(): array
             ),
             new Transition(
                 self::TRANSITION_RESET,
-                [InventoryUpdateInterface::STATE_PENDING, InventoryUpdateInterface::STATE_COMPLETED],
+                [InventoryUpdateInterface::STATE_PENDING, InventoryUpdateInterface::STATE_COMPLETED, InventoryUpdateInterface::STATE_FAILED],
                 InventoryUpdateInterface::STATE_PENDING,
             ),
+            new Transition(
+                self::TRANSITION_FAIL,
+                [InventoryUpdateInterface::STATE_PENDING, InventoryUpdateInterface::STATE_PROCESSING],
+                InventoryUpdateInterface::STATE_FAILED,
+            ),
         ];
     }
 }