Add a shipmondo id to the order and add the doctrine_transaction midd…

…leware to the command bus
Setono · Apr 11, 2024 · c038deb · c038deb
1 parent efb1e70
commit c038deb
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 3 deletions.
diff --git a/src/DependencyInjection/SetonoSyliusShipmondoExtension.php b/src/DependencyInjection/SetonoSyliusShipmondoExtension.php
@@ -29,7 +29,12 @@ public function load(array $configs, ContainerBuilder $container): void
         $container->setParameter('setono_sylius_shipmondo.webhooks.key', $config['webhooks']['key']);
         $container->setParameter('setono_sylius_shipmondo.webhooks.name_prefix', $config['webhooks']['name_prefix']);
 
-        $this->registerResources('setono_sylius_shipmondo', SyliusResourceBundle::DRIVER_DOCTRINE_ORM, $config['resources'], $container);
+        $this->registerResources(
+            'setono_sylius_shipmondo',
+            SyliusResourceBundle::DRIVER_DOCTRINE_ORM,
+            $config['resources'],
+            $container,
+        );
 
         $loader->load('services.xml');
     }
@@ -39,7 +44,11 @@ public function prepend(ContainerBuilder $container): void
         $container->prependExtensionConfig('framework', [
             'messenger' => [
                 'buses' => [
-                    'setono_sylius_shipmondo.command_bus' => null,
+                    'setono_sylius_shipmondo.command_bus' => [
+                        'middleware' => [
+                            'doctrine_transaction',
+                        ],
+                    ],
                 ],
             ],
             'webhook' => [

diff --git a/src/Message/CommandHandler/UploadOrderHandler.php b/src/Message/CommandHandler/UploadOrderHandler.php
@@ -40,7 +40,9 @@ public function __invoke(UploadOrder $message): void
 
         $salesOrder = $this->salesOrderDataMapper->map($order);
 
-        $this->shipmondoClient->salesOrders()->create($salesOrder);
+        $response = $this->shipmondoClient->salesOrders()->create($salesOrder);
+
+        $order->setShipmondoId($response->id);
 
         $this->orderWorkflow->apply($order, OrderWorkflow::TRANSITION_COMPLETE_UPLOAD);
     }

diff --git a/src/Model/OrderInterface.php b/src/Model/OrderInterface.php
@@ -20,4 +20,11 @@ interface OrderInterface extends BaseOrderInterface, VersionedInterface
     public function getShipmondoState(): string;
 
     public function setShipmondoState(string $shipmondoState): void;
+
+    /**
+     * Returns the Shipmondo id (if the order has been uploaded to Shipmondo)
+     */
+    public function getShipmondoId(): ?int;
+
+    public function setShipmondoId(?int $shipmondoId): void;
 }
diff --git a/src/Model/OrderTrait.php b/src/Model/OrderTrait.php
@@ -25,6 +25,10 @@ trait OrderTrait
     #[ORM\Column(type: 'string')]
     protected string $shipmondoState = OrderInterface::SHIPMONDO_STATE_PENDING;
 
+    /** @ORM\Column(type="integer") */
+    #[ORM\Column(type: 'integer', nullable: true)]
+    protected ?int $shipmondoId = null;
+
     public function getVersion(): int
     {
         return $this->version;
@@ -44,4 +48,14 @@ public function setShipmondoState(string $shipmondoState): void
     {
         $this->shipmondoState = $shipmondoState;
     }
+
+    public function getShipmondoId(): ?int
+    {
+        return $this->shipmondoId;
+    }
+
+    public function setShipmondoId(?int $shipmondoId): void
+    {
+        $this->shipmondoId = $shipmondoId;
+    }
 }