Merge pull request #16 from Itonomy/feature/CMP-68_сreate-payment-service-test

CMP-68, CMP-69 - Create payment service test, iDeal tests

Author: Ivan Tagil

.github/workflows/integration-test.yml

@@ -24,6 +24,10 @@ jobs:
       - name: Start Docker
         run: docker run --detach --name magento-project-community-edition michielgerritsen/magento-project-community-edition:${{ matrix.PHP_VERSION }}-magento${{ matrix.MAGENTO_VERSION }}
 
+      # Create separate branch and remove version from `composer.json`.
+      - name: Create branch for Composer and remove version from composer.json
+        run: git checkout -b integration-test-branch && sed -i '/version/d' ./composer.json
+
       # If your code is not in the root but in a subdirectory you need to change this command.
       # Example: If your code is in the `src` folder then you need to do this:
       # run: docker cp $(pwd)/src magento-project-community-edition:/data/extensions/
@@ -32,7 +36,7 @@ jobs:
 
       # Replace <VENDOR> and <MODULE> with the name in your `composer.json`.
       - name: Install the extension in Magento
-        run: docker exec magento-project-community-edition composer require cm/payments:"dev-${GITHUB_SHA} as 1.x-dev"
+        run: docker exec magento-project-community-edition composer require cm/payments:dev-integration-test-branch
 
       # This step is optional but good to include in your pipeline.
       - name: Run setup:di:compile

.github/workflows/unit-test.yml

@@ -25,6 +25,10 @@ jobs:
       - name: Start Docker
         run: docker run --detach --name magento-project-community-edition michielgerritsen/magento-project-community-edition:${{ matrix.PHP_VERSION }}-magento${{ matrix.MAGENTO_VERSION }}
 
+      # Create separate branch and remove version from `composer.json`.
+      - name: Create branch for Composer and remove version from composer.json
+        run: git checkout -b unit-test-branch && sed -i '/version/d' ./composer.json
+
       # If your code is not in the root but in a subdirecty you need to change this command.
       # Example: If your code is in the `src` folder then you need to do this:
       # run: docker cp $(pwd)/src magento-project-community-edition:/data/extensions/
@@ -33,7 +37,7 @@ jobs:
 
       # Replace <VENDOR> and <MODULE> with the name in your `composer.json`.
       - name: Install the extension in Magento
-        run: docker exec magento-project-community-edition composer require cm/payments:"dev-${GITHUB_SHA} as 1.x-dev"
+        run: docker exec magento-project-community-edition composer require cm/payments:dev-unit-test-branch
 
       # Only the tests in your repository will be run, the default Magento tests are not included in this.
       - name: Run tests

Api/Model/OrderRepositoryInterface.php

@@ -13,6 +13,12 @@
 
 interface OrderRepositoryInterface
 {
+    /**
+     * @param string $incrementId
+     * @return OrderInterface
+     */
+    public function getByIncrementId(string $incrementId): OrderInterface;
+
     /**
      * @param string $orderKey
      * @return OrderInterface

Api/Model/PaymentRepositoryInterface.php

@@ -17,4 +17,16 @@ interface PaymentRepositoryInterface
      * @return PaymentInterface
      */
     public function save(PaymentInterface $payment): PaymentInterface;
+
+    /**
+     * @param string $orderKey
+     * @return PaymentInterface
+     */
+    public function getByOrderKey(string $orderKey): PaymentInterface;
+
+    /**
+     * @param string $paymentId
+     * @return PaymentInterface
+     */
+    public function getByPaymentId(string $paymentId): PaymentInterface;
 }

Api/Service/OrderServiceInterface.php

@@ -10,6 +10,7 @@
 
 use CM\Payments\Api\Model\Domain\CMOrderInterface;
 use CM\Payments\Api\Model\Data\OrderInterface as CMOrder;
+use CM\Payments\Client\Api\OrderDetailInterface;
 
 interface OrderServiceInterface
 {
@@ -19,10 +20,4 @@ interface OrderServiceInterface
      * @return CMOrderInterface
      */
     public function create(string $orderId): CMOrderInterface;
-
-    /**
-     * @param CMOrder $cmOrder
-     * @return array
-     */
-    public function get(CMOrder $cmOrder): array;
 }

Api/Service/OrderTransactionServiceInterface.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © CM.com. All rights reserved.
+ * See LICENSE.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace CM\Payments\Api\Service;
+
+use Magento\Framework\Exception\NoSuchEntityException;
+
+interface OrderTransactionServiceInterface
+{
+    /**
+     * Process transaction
+     *
+     * @param string $cmOrderKey
+     * @return void
+     *
+     * @throws NoSuchEntityException
+     */
+    public function process(string $cmOrderKey): void;
+}

Api/Client/ApiClientInterface.php renamed to Client/Api/ApiClientInterface.php

@@ -6,14 +6,13 @@
 
 declare(strict_types=1);
 
-namespace CM\Payments\Api\Client;
-
-use CM\Payments\Client\Api\RequestInterface;
+namespace CM\Payments\Client\Api;
 
 interface ApiClientInterface
 {
     /**
      * Execute a request against the CM Payments Api.
+     * @throws GuzzleException
      */
     public function execute(RequestInterface $request): array;
 }

Client/Api/OrderDetailInterface.php

@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © CM.com. All rights reserved.
+ * See LICENSE.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace CM\Payments\Client\Api;
+
+use CM\Payments\Client\Model\Response\Payment\Payment;
+
+interface OrderDetailInterface
+{
+    const LEVEL_SAFE = 'SAFE';
+
+    /**
+     * @return bool
+     */
+    public function isSafe(): bool;
+
+    /**
+     * @return Payment|null
+     */
+    public function getAuthorizedPayment(): ?Payment;
+
+    /**
+     * @return string
+     */
+    public function getOrderReference(): string;
+
+    /**
+     * @return string
+     */
+    public function getExpiresOn(): string;
+
+    /**
+     * @return string
+     */
+    public function getDescription(): string;
+
+    /**
+     * @return int
+     */
+    public function getAmount(): int;
+
+    /**
+     * @return string
+     */
+    public function getEmail(): string;
+
+    /**
+     * @return string
+     */
+    public function getLanguage(): string;
+
+    /**
+     * @return string
+     */
+    public function getCountry(): string;
+
+    /**
+     * @return string
+     */
+    public function getProfile(): string;
+
+    /**
+     * @return string
+     */
+    public function getTimestamp(): string;
+
+    /**
+     * @return array
+     */
+    public function getConsideredSafe(): array;
+
+    /**
+     * @return array
+     */
+    public function getPayments(): array;
+}

Client/Api/OrderInterface.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © CM.com. All rights reserved.
+ * See LICENSE.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace CM\Payments\Client\Api;
+
+use CM\Payments\Client\Model\Response\OrderCreate;
+use CM\Payments\Client\Model\Response\OrderDetail;
+use CM\Payments\Client\Request\OrderCreateRequest;
+use GuzzleHttp\Exception\RequestException;
+
+interface OrderInterface
+{
+    /**
+     * @param string $orderKey
+     * @return OrderDetail
+     *
+     * @throws RequestException
+     */
+    public function getDetail(string $orderKey): OrderDetail;
+
+    /**
+     * @param OrderCreateRequest $orderCreateRequest
+     * @return OrderCreate
+     *
+     * @throws RequestException
+     */
+    public function create(OrderCreateRequest $orderCreateRequest): OrderCreate;
+}

Client/ApiClient.php

@@ -8,7 +8,7 @@
 
 namespace CM\Payments\Client;
 
-use CM\Payments\Api\Client\ApiClientInterface;
+use CM\Payments\Client\Api\ApiClientInterface;
 use CM\Payments\Api\Config\ConfigInterface;
 use CM\Payments\Client\Api\RequestInterface;
 use CM\Payments\Model\AdminHtml\Source\Mode;

Client/Model/Request/PaymentCreate.php

@@ -49,6 +49,7 @@ public function toArray(): array
         if ($this->idealDetails) {
             $data['ideal_details'] =  $this->idealDetails;
         }
+
         return $data;
     }
 

Client/Model/Response/OrderCreate.php

@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © CM.com. All rights reserved.
+ * See LICENSE.txt for license details.
+ */
+
+namespace CM\Payments\Client\Model\Response;
+
+class OrderCreate
+{
+    /**
+     * @var string|null
+     */
+    private $url;
+    /**
+     * @var string|null
+     */
+    private $orderKey;
+    /**
+     * @var string|null
+     */
+    private $expiresOn;
+
+    /**
+     * CMOrder constructor.
+     * @param array $orderCreate
+     */
+    public function __construct(array $orderCreate)
+    {
+        $this->url = $orderCreate['url'] ?? null;
+        $this->orderKey = $orderCreate['order_key'] ?? null;
+        $this->expiresOn = $orderCreate['expires_on'] ?? null;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getUrl(): ?string
+    {
+        return $this->url;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getExpiresOn(): ?string
+    {
+        return $this->expiresOn;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getOrderKey(): ?string
+    {
+        return $this->orderKey;
+    }
+}