[Cart] Dispatch CartPickedUp after doctrine transaction

Sylius · Oct 30, 2019 · 17297cf · 17297cf
1 parent c684c4d
commit 17297cf
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/spec/Handler/Cart/PickupCartHandlerSpec.php b/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'));
     }

diff --git a/src/Handler/Cart/PickupCartHandler.php b/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()]);
     }
 }
diff --git a/src/Resources/config/app/config.yml b/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
 

diff --git a/tests/Controller/Checkout/CompleteOrderApiTest.php b/tests/Controller/Checkout/CompleteOrderApiTest.php
@@ -62,8 +62,13 @@ public function it_allows_to_complete_checkout(): void
         }
 JSON;
 
+        $this->client->enableProfiler();
+
         $response = $this->complete($token, $data);
         $this->assertResponseCode($response, Response::HTTP_NO_CONTENT);
+
+        $mailCollector = $this->client->getProfile()->getCollector('swiftmailer');
+        $this->assertSame(1, $mailCollector->getMessageCount());
     }
 
     /**