[Cart] Dispatch CartPickedUp after doctrine transaction

spec/Handler/Cart/PickupCartHandlerSpec.php

@@ -17,6 +17,7 @@
 use Sylius\ShopApiPlugin\Handler\Cart\PickupCartHandler;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\MessageBusInterface;
+use Symfony\Component\Messenger\Stamp\DispatchAfterCurrentBusStamp;
 
 final class PickupCartHandlerSpec extends ObjectBehavior
 {
@@ -66,7 +67,7 @@ function it_handles_cart_pickup_for_not_logged_in_user(
 
         $cartPickedUp = new CartPickedUp('ORDERTOKEN');
 
-        $eventBus->dispatch($cartPickedUp)->willReturn(new Envelope($cartPickedUp))->shouldBeCalled();
+        $eventBus->dispatch($cartPickedUp, [new DispatchAfterCurrentBusStamp()])->willReturn(new Envelope($cartPickedUp))->shouldBeCalled();
 
         $this(new PickupCart('ORDERTOKEN', 'CHANNEL_CODE'));
     }

src/Handler/Cart/PickupCartHandler.php

@@ -12,6 +12,7 @@
 use Sylius\ShopApiPlugin\Command\Cart\PickupCart;
 use Sylius\ShopApiPlugin\Event\CartPickedUp;
 use Symfony\Component\Messenger\MessageBusInterface;
+use Symfony\Component\Messenger\Stamp\DispatchAfterCurrentBusStamp;
 use Webmozart\Assert\Assert;
 
 final class PickupCartHandler
@@ -56,6 +57,6 @@ public function __invoke(PickupCart $pickupCart): void
 
         $this->cartRepository->add($cart);
 
-        $this->eventBus->dispatch(new CartPickedUp($pickupCart->orderToken()));
+        $this->eventBus->dispatch(new CartPickedUp($pickupCart->orderToken()), [new DispatchAfterCurrentBusStamp()]);
     }
 }

src/Resources/config/app/config.yml

@@ -21,6 +21,7 @@ framework:
             sylius_shop_api_plugin.command_bus:
                 middleware:
                     - doctrine_transaction
+                    - messenger.middleware.dispatch_after_current_bus
             sylius_shop_api_plugin.event_bus:
                 default_middleware: allow_no_handlers