1. Small improving validation of order pay input data.

2. Implementing pay order, logic with http request
3. Fixing core bug of updating entity
4. Unit tests for controller pay action and order pay service

composer.json

@@ -13,7 +13,8 @@
         "symfony/yaml": "^4.3",
         "symfony/dependency-injection": "^4.3",
         "symfony/config": "^4.3",
-        "symfony/expression-language": "^4.3"
+        "symfony/expression-language": "^4.3",
+        "guzzlehttp/guzzle": "^6.3"
     },
     "require-dev": {
         "phpunit/phpunit": "^7.5",

config/services.yaml

@@ -1,6 +1,9 @@
 imports:
     - { resource: parameters/db.yaml }
 
+parameters:
+    order.pay_check_url: 'http://ya.ru'
+
 services:
     _defaults:
         autowire: true
@@ -32,4 +35,11 @@ services:
 
     App\Service\CreateOrderServiceInterface: '@App\Service\CreateOrderService'
 
+    App\Service\OrderPayService:
+        arguments:
+            $payCheckURL: '%order.pay_check_url%'
+
     App\Service\OrderPayServiceInterface: '@App\Service\OrderPayService'
+
+    GuzzleHttp\ClientInterface:
+        class: GuzzleHttp\Client

config/services_test.yaml

@@ -19,6 +19,9 @@ services:
     test.create_order_service:
         alias: 'App\Service\CreateOrderService'
         public: true
+    test.pay_order_service:
+        alias: 'App\Service\OrderPayService'
+        public: true
 
     App\Repository\OrderRepository:
         public: true

installer/db_schema.sql

@@ -34,4 +34,3 @@ CREATE TABLE order_item
 	CONSTRAINT order_item_pkey
 		PRIMARY KEY (order_id, item_id)
 );
-

src/Controller/OrderController.php

@@ -5,10 +5,10 @@
 namespace App\Controller;
 
 use App\Core\RequestAwareInterface;
-use App\Entity\Order;
 use App\Service\CreateOrderServiceInterface;
 use App\Service\Exception\APIServiceException;
 use App\Service\OrderPayServiceInterface;
+use App\Validator\ValidatorException;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -93,44 +93,20 @@ public function createOrder(): JsonResponse
     /**
      * Оплата заказа
      *
-     * TODO Вынести валидацию входящих данных в слой формы
-     *
      * @return JsonResponse
      */
     public function payOrder(): JsonResponse
     {
-        $input   = json_decode($this->request->getContent(), true);
-        $orderId = $input['id'] ?? null;
-        if (null === $orderId) {
-            return new JsonResponse(null, JsonResponse::HTTP_BAD_REQUEST);
-        }
-
-        $amount = $input['amount'] ?? null;
-        $amount = filter_var($amount, FILTER_VALIDATE_FLOAT);
-        if (false === $amount) {
-            return new JsonResponse(null, JsonResponse::HTTP_BAD_REQUEST);
-        }
-
         try {
-            $order = $this->orderPayService->payOrder($orderId, $amount);
-            if (Order::STATUS_PAID === $order->getStatus()) {
-                return new JsonResponse(
-                    [
-                        'success' => true,
-                    ]
-                );
-            }
-
-            /*
-             * Случай когда неполная оплата или HTTP запрос на ya.ru не удался
-             */
+            list($orderId, $paymentSum) = $this->validatePayOrderInputData();
+            $this->orderPayService->payOrder($orderId, $paymentSum);
+
             return new JsonResponse(
                 [
-                    'error' => 'Partial payment or HTTP request from API server not OK',
-                ],
-                JsonResponse::HTTP_BAD_REQUEST
+                    'success' => true,
+                ]
             );
-        } catch (APIServiceException $e) {
+        } catch (APIServiceException | ValidatorException $e) {
             return new JsonResponse(
                 [
                     'error' => $e->getMessage(),
@@ -139,4 +115,38 @@ public function payOrder(): JsonResponse
             );
         }
     }
+
+    /**
+     * Валидация входящих данных для метода оплаты заказа
+     * TODO Вынести валидацию входящих данных в отдельный класс
+     *
+     * @return array
+     *
+     * @throws ValidatorException
+     */
+    private function validatePayOrderInputData(): array
+    {
+        $input   = json_decode($this->request->getContent(), true);
+        $orderId = $input['id'] ?? null;
+        $amount  = $input['amount'] ?? null;
+
+        if (null === $orderId || null === $amount) {
+            throw new ValidatorException('Required fields are expected');
+        }
+
+        $amount  = filter_var($amount, FILTER_VALIDATE_FLOAT);
+        $orderId = filter_var(
+            $orderId,
+            FILTER_VALIDATE_REGEXP,
+            [
+                'options' => ['regexp' => '/^\d+$/']
+            ]
+        );
+
+        if (false === $orderId || false === $amount) {
+            throw new ValidatorException('Invalid input data');
+        }
+
+        return [$orderId, $amount];
+    }
 }

src/Core/BaseRepository.php

@@ -117,10 +117,10 @@ public function save(EntityInterface $entity)
             $data[$field] = $this->formatValueToDBFormat($field, $value);
         }
 
-        $id = $data[static::PRIMARY_KEY] ?? null;
-        if (empty($id)) {
-            unset($data[static::PRIMARY_KEY]);
+        $id = $data[static::PRIMARY_KEY];
+        unset($data[static::PRIMARY_KEY]);
 
+        if (empty($id)) {
             $id = $this->insertRow($data);
             // TODO сделать проставление св-ва id через ReflectionProperty
             $idSetter = 'set'.ucfirst(static::PRIMARY_KEY);
@@ -177,12 +177,14 @@ private function insertRow(array $data)
      */
     private function updateRow(int $id, array $data)
     {
+        $setPart = implode(' = ?,', array_map(function ($field) {
+            return $this->camelToSnakeCase($field);
+        }, array_keys($data))) . ' = ?';
+
         $sql = sprintf(
             'UPDATE "%s" SET %s WHERE %s',
             static::TABLE_NAME,
-            implode(' = ?,', array_map(function ($field) {
-                return $this->camelToSnakeCase($field);
-            }, array_keys($data))),
+            $setPart,
             static::PRIMARY_KEY . ' = ?'
         );
 

src/Service/OrderPayService.php

@@ -7,6 +7,8 @@
 use App\Entity\Order;
 use App\Repository\OrderRepository;
 use App\Service\Exception\APIServiceException;
+use GuzzleHttp\ClientInterface;
+use GuzzleHttp\Exception\RequestException;
 
 /**
  * Сервис оплаты заказа
@@ -20,14 +22,35 @@ class OrderPayService implements OrderPayServiceInterface
      */
     private $orderRepository;
 
+    /**
+     * HTTP клиент
+     *
+     * @var ClientInterface
+     */
+    private $httpClient;
+
+    /**
+     * URL для http запроса
+     *
+     * @var string
+     */
+    private $payCheckURL;
+
     /**
      * Конструктор
      *
      * @param OrderRepository $orderRepository
+     * @param ClientInterface $httpClient
+     * @param string          $payCheckURL
      */
-    public function __construct(OrderRepository $orderRepository)
-    {
+    public function __construct(
+        OrderRepository $orderRepository,
+        ClientInterface $httpClient,
+        string $payCheckURL
+    ) {
         $this->orderRepository = $orderRepository;
+        $this->httpClient      = $httpClient;
+        $this->payCheckURL     = $payCheckURL;
     }
 
     /**
@@ -42,17 +65,45 @@ public function payOrder($orderId, float $paymentSum): Order
     {
         $order = $this->orderRepository->findById($orderId);
         if (null === $order) {
-            throw new APIServiceException('Invalid input data');
+            throw new APIServiceException('Order not found');
         }
 
         if (Order::STATUS_NEW !== $order->getStatus()) {
             throw new APIServiceException('Incorrect order status');
         }
 
-        if ($order->getAmount() !== $paymentSum) {
-            return $order;
+        if ($paymentSum < $order->getAmount()) {
+            throw new APIServiceException('Partial payment is not implemented');
+        }
+
+        if (!$this->httpRequestIsOK()) {
+            throw new APIServiceException('Http request to check payment is not OK');
         }
 
+        $order->setStatus(Order::STATUS_PAID);
+        $this->orderRepository->save($order);
+
         return $order;
     }
+
+    /**
+     * Проверяет успешность http запроса
+     *
+     * @return bool
+     */
+    private function httpRequestIsOK(): bool
+    {
+        try {
+            $response = $this->httpClient->request(
+                'GET',
+                $this->payCheckURL
+            );
+
+            return $response->getStatusCode() === 200;
+        } catch (RequestException $e) {
+            // Умышленно тушим ошибки реквеста
+        }
+
+        return false;
+    }
 }

src/Validator/ValidatorException.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace App\Validator;
+
+/**
+ * Исключения валидации данных
+ */
+class ValidatorException extends \RuntimeException
+{
+
+}