Merge pull request #29 from Itonomy/feature/CMP-55-publish-events

Ivan Tagil · web-flow · commit c7e77c287b03 · 2021-07-28T09:17:12.000+03:00
CMP - 55 dispatch events
diff --git a/Service/OrderService.php b/Service/OrderService.php
@@ -18,6 +18,7 @@
 use CM\Payments\Client\Api\OrderInterface as CMOrderClientInterface;
 use CM\Payments\Exception\EmptyOrderKeyException;
 use CM\Payments\Logger\CMPaymentsLogger;
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 
 class OrderService implements OrderServiceInterface
@@ -57,6 +58,11 @@ class OrderService implements OrderServiceInterface
      */
     private $logger;
 
+    /**
+     * @var ManagerInterface
+     */
+    private $eventManager;
+
     /**
      * OrderService constructor.
      *
@@ -66,6 +72,7 @@ class OrderService implements OrderServiceInterface
      * @param CMOrderRepositoryInterface $cmOrderRepository
      * @param OrderRequestBuilderInterface $orderRequestBuilder
      * @param CMOrderInterfaceFactory $cmOrderInterfaceFactory
+     * @param ManagerInterface $eventManager
      * @param CMPaymentsLogger $cmPaymentsLogger
      */
     public function __construct(
@@ -75,6 +82,7 @@ public function __construct(
         CMOrderRepositoryInterface $cmOrderRepository,
         OrderRequestBuilderInterface $orderRequestBuilder,
         CMOrderInterfaceFactory $cmOrderInterfaceFactory,
+        ManagerInterface $eventManager,
         CMPaymentsLogger $cmPaymentsLogger
     ) {
         $this->orderRepository = $orderRepository;
@@ -83,6 +91,7 @@ public function __construct(
         $this->cmOrderRepository = $cmOrderRepository;
         $this->orderRequestBuilder = $orderRequestBuilder;
         $this->cmOrderInterfaceFactory = $cmOrderInterfaceFactory;
+        $this->eventManager = $eventManager;
         $this->logger = $cmPaymentsLogger;
     }
 
@@ -102,6 +111,11 @@ public function create(string $orderId): CMOrderInterface
             ]
         );
 
+        $this->eventManager->dispatch('cmpayments_before_order_create', [
+            'order' => $order,
+            'orderCreateRequest' => $orderCreateRequest,
+        ]);
+
         $orderCreateResponse = $this->orderClient->create(
             $orderCreateRequest
         );
@@ -130,13 +144,20 @@ public function create(string $orderId): CMOrderInterface
         $order->getPayment()->setAdditionalInformation($additionalInformation);
         $this->orderRepository->save($order);
 
-        return $this->cmOrderInterfaceFactory->create(
+        $cmOrder = $this->cmOrderInterfaceFactory->create(
             [
                 'url' => $orderCreateResponse->getUrl(),
                 'orderReference' => $orderCreateRequest->getPayload()['order_reference'],
                 'orderKey' => $orderCreateResponse->getOrderKey(),
                 'expiresOn' => $orderCreateResponse->getExpiresOn()
             ]
         );
+
+        $this->eventManager->dispatch('cmpayments_after_order_create', [
+            'order' => $order,
+            'cmOrder' => $cmOrder,
+        ]);
+
+        return $cmOrder;
     }
 }
diff --git a/Service/PaymentService.php b/Service/PaymentService.php
@@ -19,6 +19,7 @@
 use CM\Payments\Client\Model\CMPaymentFactory;
 use CM\Payments\Exception\EmptyPaymentIdException;
 use CM\Payments\Logger\CMPaymentsLogger;
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 
 class PaymentService implements PaymentServiceInterface
@@ -63,6 +64,11 @@ class PaymentService implements PaymentServiceInterface
      */
     private $logger;
 
+    /**
+     * @var ManagerInterface
+     */
+    private $eventManager;
+
     /**
      * PaymentService constructor
      *
@@ -73,6 +79,7 @@ class PaymentService implements PaymentServiceInterface
      * @param CMPaymentFactory $cmPaymentFactory
      * @param CMPaymentRepositoryInterface $cmPaymentRepository
      * @param CMOrderRepositoryInterface $cmOrderRepository
+     * @param ManagerInterface $eventManager
      * @param CMPaymentsLogger $logger
      */
     public function __construct(
@@ -83,6 +90,7 @@ public function __construct(
         CMPaymentFactory $cmPaymentFactory,
         CMPaymentRepositoryInterface $cmPaymentRepository,
         CMOrderRepositoryInterface $cmOrderRepository,
+        ManagerInterface $eventManager,
         CMPaymentsLogger $logger
     ) {
         $this->orderRepository = $orderRepository;
@@ -92,6 +100,7 @@ public function __construct(
         $this->cmPaymentFactory = $cmPaymentFactory;
         $this->cmOrderRepository = $cmOrderRepository;
         $this->cmPaymentRepository = $cmPaymentRepository;
+        $this->eventManager = $eventManager;
         $this->logger = $logger;
     }
 
@@ -112,6 +121,11 @@ public function create(string $orderId): CMPaymentInterface
             ]
         );
 
+        $this->eventManager->dispatch('cmpayments_before_payment_create', [
+            'order' => $order,
+            'paymentCreateRequest' => $paymentCreateRequest,
+        ]);
+
         $paymentCreateResponse = $this->paymentClient->create(
             $paymentCreateRequest
         );
@@ -136,13 +150,20 @@ public function create(string $orderId): CMPaymentInterface
         $order->getPayment()->setAdditionalInformation($additionalInformation);
         $this->orderRepository->save($order);
 
-        return $this->cmPaymentFactory->create(
+        $cmPayment = $this->cmPaymentFactory->create(
             [
                 'id' => $paymentCreateResponse->getId(),
                 'status' => $paymentCreateResponse->getStatus(),
                 'redirectUrl' => $paymentCreateResponse->getRedirectUrl(),
                 'urls' => $paymentCreateResponse->getUrls()
             ]
         );
+
+        $this->eventManager->dispatch('cmpayments_after_payment_create', [
+            'order' => $order,
+            'cmPayment' => $cmPayment,
+        ]);
+
+        return $cmPayment;
     }
 }
diff --git a/Test/Unit/Service/OrderServiceTest.php b/Test/Unit/Service/OrderServiceTest.php
@@ -24,6 +24,7 @@
 use CM\Payments\Service\OrderService;
 use CM\Payments\Test\Unit\UnitTestCase;
 use Exception;
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Sales\Api\Data\OrderAddressInterface;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
@@ -72,6 +73,11 @@ class OrderServiceTest extends UnitTestCase
      */
     private $cmPaymentsLoggerMock;
 
+    /**
+     * @var ManagerInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $eventManagerMock;
+
     public function testCreateOrder()
     {
         $this->orderClientMock->method('create')->willReturn(
@@ -110,6 +116,52 @@ public function testCreateOrderShouldThrowErrorWhenOrderKeyIsEmpty()
         $this->orderService->create('1');
     }
 
+    public function testEventDispatch()
+    {
+        $orderCreateResponse = new \CM\Payments\Client\Model\Response\OrderCreate(
+            [
+                'order_key' => '0287A1617D93780EF28044B98438BF2F',
+                //phpcs:ignore
+                'url' => 'https://testsecure.docdatapayments.com/ps/menu?merchant_name=itonomy_b_v&client_language=NL&payment_cluster_key=0287A1617D93780EF28044B98438BF2F',
+                'expires_on' => '2021-07-12T08:10:57Z'
+            ]
+        );
+
+        $this->orderClientMock->method('create')->willReturn(
+            $orderCreateResponse
+        );
+        $order = $this->getOrderMock();
+        $orderCreateRequest = new OrderCreateRequest(
+            new OrderCreate(
+                '000000001',
+                2000,
+                'EUR',
+                self::ADDRESS_DATA['email_address'],
+                self::LANGUAGE,
+                self::ADDRESS_DATA['country_code'],
+                self::PAYMENT_PROFILE,
+                [
+                    'success' => '',
+                    'pending' => '',
+                    'cancelled' => '',
+                    'error' => ''
+                ]
+            )
+        );
+
+        $this->eventManagerMock->expects($this->exactly(2))->method('dispatch')->withConsecutive(
+            ['cmpayments_before_order_create', ['order' => $order, 'orderCreateRequest' => $orderCreateRequest]],
+            ['cmpayments_after_order_create', ['order' => $order, 'cmOrder' => new CMOrder(
+                $orderCreateResponse->getUrl(),
+               '000000001',
+                $orderCreateResponse->getOrderKey(),
+                $orderCreateResponse->getExpiresOn(),
+            )]]
+        );
+
+        $this->orderService->create('1');
+    }
+
     protected function setUp(): void
     {
         parent::setUp();
@@ -144,6 +196,10 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->eventManagerMock = $this->getMockBuilder(ManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->orderRepositoryMock->method('get')->willReturn($this->getOrderMock());
         $this->orderRepositoryMock->method('save');
         $this->cmOrderRepositoryMock->method('save');
@@ -176,6 +232,7 @@ protected function setUp(): void
             $this->cmOrderRepositoryMock,
             $this->orderRequestBuilderMock,
             $this->cmOrderInterfaceFactoryMock,
+            $this->eventManagerMock,
             $this->cmPaymentsLoggerMock
         );
     }
diff --git a/Test/Unit/Service/PaymentServiceTest.php b/Test/Unit/Service/PaymentServiceTest.php
@@ -26,6 +26,7 @@
 use CM\Payments\Model\Data\Payment as CMPaymentData;
 use CM\Payments\Service\PaymentService;
 use CM\Payments\Test\Unit\UnitTestCase;
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Sales\Api\Data\OrderAddressInterface;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
@@ -79,6 +80,11 @@ class PaymentServiceTest extends UnitTestCase
      */
     private $cmPaymentsLoggerMock;
 
+    /**
+     * @var ManagerInterface|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $eventManagerMock;
+
     public function testCreateIdealPayment()
     {
         $this->paymentClientMock->expects($this->once())->method('create')->willReturn(
@@ -107,6 +113,51 @@ public function testCreateIdealPayment()
         );
     }
 
+    public function testEventDispatch()
+    {
+        $paymentCreateResponse =  new \CM\Payments\Client\Model\Response\PaymentCreate(
+            [
+                'id' => 'pid4911257676t',
+                'status' => 'REDIRECTED_FOR_AUTHORIZATION',
+                'urls' => [
+                    0 => [
+                        'purpose' => 'REDIRECT',
+                        'method' => 'GET',
+                        //phpcs:ignore
+                        'url' => 'https://test.docdatapayments.com/ps_sim/idealbanksimulator.jsf?trxid=1625579689224&ec=4911257676&returnUrl=https%3A%2F%2Ftestsecure.docdatapayments.com%2Fps%2FreturnFromAuthorization%3FpaymentReference%3D49112576765AD00EC846B52EAED61E9FC2530CFF90%26checkDigitId%3D49112576765AD00EC846B52EAED61E9FC2530CFF90',
+                        'order' => 1,
+                    ],
+                ]
+            ]
+        );
+
+        $this->paymentClientMock->expects($this->once())->method('create')->willReturn(
+            $paymentCreateResponse
+        );
+        $order = $this->getOrderMock();
+        $paymentCreate = new PaymentCreate(
+            MethodServiceInterface::API_METHODS_MAPPING[ConfigProvider::CODE_IDEAL],
+            [
+                'ideal_details' => ['issuer_id' => 'INGBNL2A']
+            ]
+        );
+        $paymentCreateRequest = new PaymentCreateRequest('0287A1617D93780EF28044B98438BF2F', $paymentCreate);
+
+        $cmPayment = new CMPayment(
+            $paymentCreateResponse->getId(),
+            $paymentCreateResponse->getStatus(),
+            $paymentCreateResponse->getRedirectUrl(),
+            $paymentCreateResponse->getUrls()
+        );
+
+        $this->eventManagerMock->expects($this->exactly(2))->method('dispatch')->withConsecutive(
+            ['cmpayments_before_payment_create', ['order' => $order, 'paymentCreateRequest' => $paymentCreateRequest]],
+            ['cmpayments_after_payment_create', ['order' => $order, 'cmPayment' => $cmPayment]]
+        );
+
+        $this->paymentService->create((string)$order->getEntityId());
+    }
+
     /**
      * @return OrderInterface
      */
@@ -181,6 +232,10 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->eventManagerMock = $this->getMockBuilder(ManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->orderRepositoryMock->method('get')->willReturn($this->getOrderMock());
         $this->orderRepositoryMock->method('save');
         $this->cmOrderRepositoryMock->method('save');
@@ -205,6 +260,7 @@ protected function setUp(): void
             $this->cmPaymentFactoryMock,
             $this->cmPaymentRepositoryMock,
             $this->cmOrderRepositoryMock,
+            $this->eventManagerMock,
             $this->cmPaymentsLoggerMock
         );
     }
