Merge pull request #79 from BitBagCommerce/AD-79/Order_confirmation_e…

…mails Moved sending emails to order transition instead of on authorized payment
BitBagCommerce · Dec 20, 2022 · 6ef3294 · 6ef3294
2 parents 66b0b20 + a4f374e
commit 6ef3294
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 42 deletions.
diff --git a/src/Bus/Handler/PaymentFinalizationHandler.php b/src/Bus/Handler/PaymentFinalizationHandler.php
@@ -18,7 +18,6 @@
 use Sylius\Component\Payment\PaymentTransitions;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
-use Symfony\Component\Messenger\MessageBusInterface;
 
 final class PaymentFinalizationHandler implements MessageHandlerInterface
 {
@@ -30,16 +29,12 @@ final class PaymentFinalizationHandler implements MessageHandlerInterface
     /** @var RepositoryInterface */
     private $orderRepository;
 
-    private MessageBusInterface $commandBus;
-
     public function __construct(
         FactoryInterface $stateMachineFactory,
-        RepositoryInterface $orderRepository,
-        MessageBusInterface $commandBus
+        RepositoryInterface $orderRepository
     ) {
         $this->stateMachineFactory = $stateMachineFactory;
         $this->orderRepository = $orderRepository;
-        $this->commandBus = $commandBus;
     }
 
     private function updatePaymentState(PaymentInterface $payment, string $transition): void
@@ -65,29 +60,8 @@ public function __invoke(PaymentFinalizationCommand $command): void
         if (!$this->isAccepted($payment)) {
             return;
         }
-        $order = $payment->getOrder();
-        $this->updatePaymentState($payment, $command->getPaymentTransition());
-        if (null !== $order) {
-            $token = $order->getTokenValue();
-
-            // This is necessary because in Sylius 1.11 namespace of SendOrderConfirmation has been changed
-            if (null !== $token) {
-                /**
-                 * @psalm-suppress MixedArgument
-                 * @psalm-suppress UndefinedClass
-                 */
-                if (class_exists('\Sylius\Bundle\ApiBundle\Command\SendOrderConfirmation')) {
-                    $this->commandBus->dispatch(new \Sylius\Bundle\ApiBundle\Command\SendOrderConfirmation($token));
-                } elseif (class_exists('\Sylius\Bundle\ApiBundle\Command\Checkout\SendOrderConfirmation')) {
-                    /**
-                     * @psalm-suppress MixedArgument
-                     * @psalm-suppress UndefinedClass
-                     */
-                    $this->commandBus->dispatch(new \Sylius\Bundle\ApiBundle\Command\Checkout\SendOrderConfirmation($token));
-                }
-            }
-        }
 
+        $this->updatePaymentState($payment, $command->getPaymentTransition());
         $this->updatePayment($payment);
     }
 

diff --git a/src/Bus/Handler/PaymentStatusReceivedHandler.php b/src/Bus/Handler/PaymentStatusReceivedHandler.php
@@ -21,6 +21,7 @@
 use Sylius\Component\Core\OrderCheckoutTransitions;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use Symfony\Component\Messenger\MessageBusInterface;
 
 final class PaymentStatusReceivedHandler implements MessageHandlerInterface
 {
@@ -40,16 +41,21 @@ final class PaymentStatusReceivedHandler implements MessageHandlerInterface
     /** @var RepositoryInterface */
     private $orderRepository;
 
+    /** @var MessageBusInterface */
+    private $commandBus;
+
     public function __construct(
         FactoryInterface $stateMachineFactory,
         RepositoryInterface $paymentRepository,
         RepositoryInterface $orderRepository,
-        DispatcherInterface $dispatcher
+        DispatcherInterface $dispatcher,
+        MessageBusInterface $commandBus
     ) {
         $this->stateMachineFactory = $stateMachineFactory;
         $this->paymentRepository = $paymentRepository;
         $this->dispatcher = $dispatcher;
         $this->orderRepository = $orderRepository;
+        $this->commandBus = $commandBus;
     }
 
     public function __invoke(PaymentStatusReceived $command): void
@@ -84,9 +90,30 @@ private function processCode(string $resultCode, PaymentStatusReceived $command)
     private function updateOrderState(OrderInterface $order): void
     {
         $sm = $this->stateMachineFactory->get($order, OrderCheckoutTransitions::GRAPH);
-        $sm->apply(OrderCheckoutTransitions::TRANSITION_COMPLETE, true);
-
-        $this->orderRepository->add($order);
+        if ($sm->can(OrderCheckoutTransitions::TRANSITION_COMPLETE)) {
+            $sm->apply(OrderCheckoutTransitions::TRANSITION_COMPLETE, true);
+
+            $this->orderRepository->add($order);
+
+            $token = $order->getTokenValue();
+
+            // This is necessary because in Sylius 1.11 namespace of SendOrderConfirmation has been changed
+            if (null !== $token) {
+                /**
+                 * @psalm-suppress MixedArgument
+                 * @psalm-suppress UndefinedClass
+                 */
+                if (class_exists('\Sylius\Bundle\ApiBundle\Command\SendOrderConfirmation')) {
+                    $this->commandBus->dispatch(new \Sylius\Bundle\ApiBundle\Command\SendOrderConfirmation($token));
+                } elseif (class_exists('\Sylius\Bundle\ApiBundle\Command\Checkout\SendOrderConfirmation')) {
+                    /**
+                     * @psalm-suppress MixedArgument
+                     * @psalm-suppress UndefinedClass
+                     */
+                    $this->commandBus->dispatch(new \Sylius\Bundle\ApiBundle\Command\Checkout\SendOrderConfirmation($token));
+                }
+            }
+        }
     }
 
     private function getResultCode(PaymentInterface $payment): string

diff --git a/src/Resources/config/services/bus.xml b/src/Resources/config/services/bus.xml
@@ -16,7 +16,6 @@
         >
             <argument type="service" id="sm.factory"/>
             <argument type="service" id="sylius.repository.order"/>
-            <argument type="service" id="sylius.command_bus"/>
 
             <tag name="bitbag.sylius_adyen_plugin.command_bus" bus="sylius.command_bus" />
         </service>
@@ -29,6 +28,7 @@
             <argument type="service" id="sylius.repository.payment"/>
             <argument type="service" id="sylius.repository.order"/>
             <argument type="service" id="bitbag.sylius_adyen_plugin.bus.dispatcher"/>
+            <argument type="service" id="sylius.command_bus"/>
 
             <tag name="bitbag.sylius_adyen_plugin.command_bus" bus="sylius.command_bus" />
         </service>

diff --git a/tests/Unit/Bus/Handler/PaymentFinalizationHandlerTest.php b/tests/Unit/Bus/Handler/PaymentFinalizationHandlerTest.php
@@ -31,21 +31,15 @@ class PaymentFinalizationHandlerTest extends TestCase
     /** @var mixed|\PHPUnit\Framework\MockObject\MockObject|EntityRepository */
     private $orderRepository;
 
-    /** @var mixed|\Symfony\Component\Messenger\MessageBusInterface */
-    private $commandBus;
-
     protected function setUp(): void
     {
         $this->setupStateMachineMocks();
 
         $this->orderRepository = $this->createMock(EntityRepository::class);
 
-        $this->commandBus = $this->createMock(MessageBusInterface::class);
-
         $this->handler = new PaymentFinalizationHandler(
             $this->stateMachineFactory,
-            $this->orderRepository,
-            $this->commandBus,
+            $this->orderRepository
         );
     }
 

diff --git a/tests/Unit/Bus/Handler/PaymentStatusReceivedHandlerTest.php b/tests/Unit/Bus/Handler/PaymentStatusReceivedHandlerTest.php
@@ -17,6 +17,7 @@
 use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
 use Sylius\Component\Core\Model\Order;
 use Sylius\Component\Core\Model\Payment;
+use Symfony\Component\Messenger\MessageBusInterface;
 
 class PaymentStatusReceivedHandlerTest extends TestCase
 {
@@ -36,18 +37,23 @@ class PaymentStatusReceivedHandlerTest extends TestCase
     /** @var \PHPUnit\Framework\MockObject\MockObject|EntityRepository */
     private $orderRepository;
 
+    /** @var mixed|\Symfony\Component\Messenger\MessageBusInterface */
+    private $commandBus;
+
     protected function setUp(): void
     {
         $this->setupStateMachineMocks();
 
         $this->paymentRepository = $this->createMock(EntityRepository::class);
         $this->orderRepository = $this->createMock(EntityRepository::class);
         $this->dispatcher = $this->createMock(DispatcherInterface::class);
+        $this->commandBus = $this->createMock(MessageBusInterface::class);
         $this->handler = new PaymentStatusReceivedHandler(
             $this->stateMachineFactory,
             $this->paymentRepository,
             $this->orderRepository,
-            $this->dispatcher
+            $this->dispatcher,
+            $this->commandBus,
         );
     }
 
@@ -85,7 +91,7 @@ public function testFlow(string $resultCode, bool $shouldPass): void
         $invocation = $shouldPass ? $this->once() : $this->never();
         $this->stateMachine
             ->expects($invocation)
-            ->method('apply')
+            ->method('can')
         ;
 
         $this->dispatcher