Merge pull request #76 from Zales0123/refactor-refund-payment-creation

bartoszpietrzak1994 · web-flow · commit 2702b2da6cbb · 2018-09-28T12:24:54.000+02:00
🌊
diff --git a/spec/Event/RefundPaymentGeneratedSpec.php b/spec/Event/RefundPaymentGeneratedSpec.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace spec\Sylius\RefundPlugin\Event;
+
+use PhpSpec\ObjectBehavior;
+
+final class RefundPaymentGeneratedSpec extends ObjectBehavior
+{
+    function it_represents_an_immutable_fact_that_refund_payment_has_been_generated(): void
+    {
+        $this->beConstructedWith(1, '000222', 10000, 'GBP', 2);
+
+        $this->id()->shouldReturn(1);
+        $this->orderNumber()->shouldReturn('000222');
+        $this->amount()->shouldReturn(10000);
+        $this->currencyCode()->shouldReturn('GBP');
+        $this->paymentMethodId()->shouldReturn(2);
+    }
+}
diff --git a/spec/ProcessManager/RefundPaymentProcessManagerSpec.php b/spec/ProcessManager/RefundPaymentProcessManagerSpec.php
@@ -2,57 +2,68 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\RefundPlugin\Listener;
+namespace spec\Sylius\RefundPlugin\ProcessManager;
 
 use Doctrine\ORM\EntityManagerInterface;
 use PhpSpec\ObjectBehavior;
+use Prooph\ServiceBus\EventBus;
+use Prophecy\Argument;
 use Sylius\RefundPlugin\Entity\RefundPaymentInterface;
+use Sylius\RefundPlugin\Event\RefundPaymentGenerated;
 use Sylius\RefundPlugin\Event\UnitsRefunded;
 use Sylius\RefundPlugin\Factory\RefundPaymentFactoryInterface;
 use Sylius\RefundPlugin\Model\OrderItemUnitRefund;
 use Sylius\RefundPlugin\StateResolver\OrderFullyRefundedStateResolverInterface;
-use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
-use Symfony\Component\HttpFoundation\Session\Session;
 
-final class UnitsRefundedEventListenerSpec extends ObjectBehavior
+final class RefundPaymentProcessManagerSpec extends ObjectBehavior
 {
     function let(
-        Session $session,
         OrderFullyRefundedStateResolverInterface $orderFullyRefundedStateResolver,
         RefundPaymentFactoryInterface $refundPaymentFactory,
-        EntityManagerInterface $entityManager
+        EntityManagerInterface $entityManager,
+        EventBus $eventBus
     ): void {
         $this->beConstructedWith(
-            $session,
             $orderFullyRefundedStateResolver,
             $refundPaymentFactory,
-            $entityManager
+            $entityManager,
+            $eventBus
         );
     }
 
-    function it_listens_to_units_refunded_event_and_add_success_flash_after_it_occurs(
-        Session $session,
-        FlashBagInterface $flashBag,
+    function it_reacts_on_units_refunded_event_and_creates_refund_payment(
         OrderFullyRefundedStateResolverInterface $orderFullyRefundedStateResolver,
         RefundPaymentFactoryInterface $refundPaymentFactory,
         EntityManagerInterface $entityManager,
-        RefundPaymentInterface $refundPayment
+        RefundPaymentInterface $refundPayment,
+        EventBus $eventBus
     ): void {
         $refundPaymentFactory->createWithData(
             '000222',
             1000,
             'USD',
-            RefundPaymentInterface::STATE_NEW, 1
+            RefundPaymentInterface::STATE_NEW,
+            1
         )->willReturn($refundPayment);
 
         $entityManager->persist($refundPayment)->shouldBeCalled();
         $entityManager->flush()->shouldBeCalled();
 
         $orderFullyRefundedStateResolver->resolve('000222')->shouldBeCalled();
 
-        $session->getFlashBag()->willReturn($flashBag);
+        $refundPayment->getId()->willReturn(10);
+        $refundPayment->getOrderNumber()->willReturn('000222');
+        $refundPayment->getAmount()->willReturn(1000);
 
-        $flashBag->add('success', 'sylius_refund.units_successfully_refunded')->shouldBeCalled();
+        $eventBus->dispatch(Argument::that(function (RefundPaymentGenerated $event): bool {
+            return
+                $event->id() === 10 &&
+                $event->orderNumber() === '000222' &&
+                $event->amount() === 1000 &&
+                $event->currencyCode() === 'USD' &&
+                $event->paymentMethodId() === 1
+            ;
+        }))->shouldBeCalled();
 
         $this(new UnitsRefunded('000222', [new OrderItemUnitRefund(1, 500), new OrderItemUnitRefund(2, 500)], [1], 1, 1000, 'USD', 'Comment'));
     }
diff --git a/src/Action/Admin/RefundUnitsAction.php b/src/Action/Admin/RefundUnitsAction.php
@@ -43,6 +43,8 @@ public function __invoke(Request $request): Response
     {
         try {
             $this->commandBus->dispatch($this->commandCreator->fromRequest($request));
+
+            $this->session->getFlashBag()->add('success', 'sylius_refund.units_successfully_refunded');
         } catch (CommandDispatchException $exception) {
             $this->session->getFlashBag()->add('error', $exception->getPrevious()->getMessage());
         } catch (\InvalidArgumentException $exception) {
diff --git a/src/Entity/RefundPaymentInterface.php b/src/Entity/RefundPaymentInterface.php
@@ -12,6 +12,8 @@ interface RefundPaymentInterface extends ResourceInterface
     public const STATE_NEW = 'New';
     public const STATE_COMPLETED = 'Completed';
 
+    public function getOrderNumber(): string;
+
     public function getAmount(): int;
 
     public function getCurrencyCode(): string;
diff --git a/src/Event/RefundPaymentGenerated.php b/src/Event/RefundPaymentGenerated.php
@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\RefundPlugin\Event;
+
+final class RefundPaymentGenerated
+{
+    /** @var int */
+    private $id;
+
+    /** @var string */
+    private $orderNumber;
+
+    /** @var int */
+    private $amount;
+
+    /** @var string */
+    private $currencyCode;
+
+    /** @var int */
+    private $paymentMethodId;
+
+    public function __construct(int $id, string $orderNumber, int $amount, string $currencyCode, int $paymentMethodId)
+    {
+        $this->id = $id;
+        $this->orderNumber = $orderNumber;
+        $this->amount = $amount;
+        $this->currencyCode = $currencyCode;
+        $this->paymentMethodId = $paymentMethodId;
+    }
+
+    public function id(): int
+    {
+        return $this->id;
+    }
+
+    public function orderNumber(): string
+    {
+        return $this->orderNumber;
+    }
+
+    public function amount(): int
+    {
+        return $this->amount;
+    }
+
+    public function currencyCode(): string
+    {
+        return $this->currencyCode;
+    }
+
+    public function paymentMethodId(): int
+    {
+        return $this->paymentMethodId;
+    }
+}
diff --git a/src/ProcessManager/RefundPaymentProcessManager.php b/src/ProcessManager/RefundPaymentProcessManager.php
@@ -2,20 +2,18 @@
 
 declare(strict_types=1);
 
-namespace Sylius\RefundPlugin\Listener;
+namespace Sylius\RefundPlugin\ProcessManager;
 
 use Doctrine\ORM\EntityManagerInterface;
+use Prooph\ServiceBus\EventBus;
 use Sylius\RefundPlugin\Entity\RefundPaymentInterface;
+use Sylius\RefundPlugin\Event\RefundPaymentGenerated;
 use Sylius\RefundPlugin\Event\UnitsRefunded;
 use Sylius\RefundPlugin\Factory\RefundPaymentFactoryInterface;
 use Sylius\RefundPlugin\StateResolver\OrderFullyRefundedStateResolverInterface;
-use Symfony\Component\HttpFoundation\Session\Session;
 
-final class UnitsRefundedEventListener
+final class RefundPaymentProcessManager
 {
-    /** @var Session */
-    private $session;
-
     /** @var OrderFullyRefundedStateResolverInterface */
     private $orderFullyRefundedStateResolver;
 
@@ -25,16 +23,19 @@ final class UnitsRefundedEventListener
     /** @var EntityManagerInterface */
     private $entityManager;
 
+    /** @var EventBus */
+    private $eventBus;
+
     public function __construct(
-        Session $session,
         OrderFullyRefundedStateResolverInterface $orderFullyRefundedStateResolver,
         RefundPaymentFactoryInterface $refundPaymentFactory,
-        EntityManagerInterface $entityManager
+        EntityManagerInterface $entityManager,
+        EventBus $eventBus
     ) {
-        $this->session = $session;
         $this->orderFullyRefundedStateResolver = $orderFullyRefundedStateResolver;
         $this->refundPaymentFactory = $refundPaymentFactory;
         $this->entityManager = $entityManager;
+        $this->eventBus = $eventBus;
     }
 
     public function __invoke(UnitsRefunded $event): void
@@ -50,7 +51,14 @@ public function __invoke(UnitsRefunded $event): void
         $this->entityManager->persist($refundPayment);
         $this->entityManager->flush();
 
+        $this->eventBus->dispatch(new RefundPaymentGenerated(
+            $refundPayment->getId(),
+            $event->orderNumber(),
+            $event->amount(),
+            $event->currencyCode(),
+            $event->paymentMethodId()
+        ));
+
         $this->orderFullyRefundedStateResolver->resolve($event->orderNumber());
-        $this->session->getFlashBag()->add('success', 'sylius_refund.units_successfully_refunded');
     }
 }
diff --git a/src/Resources/config/services/event_bus.xml b/src/Resources/config/services/event_bus.xml
@@ -6,14 +6,6 @@
 
         <service id="Prooph\ServiceBus\EventBus" alias="prooph_service_bus.sylius_refund_event_bus" />
 
-        <service id="Sylius\RefundPlugin\Listener\UnitsRefundedEventListener">
-            <argument type="service" id="session" />
-            <argument type="service" id="Sylius\RefundPlugin\StateResolver\OrderFullyRefundedStateResolver" />
-            <argument type="service" id="Sylius\RefundPlugin\Factory\RefundPaymentFactory" />
-            <argument type="service" id="doctrine.orm.default_entity_manager" />
-            <tag name="prooph_service_bus.sylius_refund_event_bus.route_target" message-detection="true" />
-        </service>
-
         <service id="Sylius\RefundPlugin\Listener\CreditMemoGeneratedEventListener">
             <argument type="service" id="sylius_refund.repository.credit_memo" />
             <argument type="service" id="sylius.repository.order" />
@@ -25,5 +17,13 @@
             <argument type="service" id="prooph_service_bus.sylius_refund_command_bus" />
             <tag name="prooph_service_bus.sylius_refund_event_bus.route_target" message-detection="true" />
         </service>
+
+        <service id="Sylius\RefundPlugin\ProcessManager\RefundPaymentProcessManager">
+            <argument type="service" id="Sylius\RefundPlugin\StateResolver\OrderFullyRefundedStateResolver" />
+            <argument type="service" id="Sylius\RefundPlugin\Factory\RefundPaymentFactory" />
+            <argument type="service" id="doctrine.orm.default_entity_manager" />
+            <argument type="service" id="prooph_service_bus.sylius_refund_event_bus" />
+            <tag name="prooph_service_bus.sylius_refund_event_bus.route_target" message-detection="true" />
+        </service>
     </services>
 </container>

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@ public function __invoke(Request $request): Response`
`43`	`43`	`{`
`44`	`44`	`try {`
`45`	`45`	`$this->commandBus->dispatch($this->commandCreator->fromRequest($request));`
	`46`	`+`
	`47`	`+ $this->session->getFlashBag()->add('success', 'sylius_refund.units_successfully_refunded');`
`46`	`48`	`} catch (CommandDispatchException $exception) {`
`47`	`49`	`$this->session->getFlashBag()->add('error', $exception->getPrevious()->getMessage());`
`48`	`50`	`} catch (\InvalidArgumentException $exception) {`