Merge branch 'main' into ECP-9240

Adyen · Dec 24, 2024 · 08fe89e · 08fe89e
2 parents f3854c7 + 10722e4
commit 08fe89e
Show file tree

Hide file tree

Showing 12 changed files with 137 additions and 95 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/docker-compose.e2e.yml b/.github/docker-compose.e2e.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   playwright:
-    image: mcr.microsoft.com/playwright:v1.49.0
+    image: mcr.microsoft.com/playwright:v1.49.1
     shm_size: 1gb
     ipc: host
     cap_add:

diff --git a/Gateway/Http/Client/TransactionRefund.php b/Gateway/Http/Client/TransactionRefund.php
@@ -88,6 +88,8 @@ public function placeRequest(TransferInterface $transferObject): array
                 $this->adyenHelper->logResponse($responseData);
             } catch (AdyenException $e) {
                 $this->adyenHelper->logAdyenException($e);
+                $responseData['error'] = $e->getMessage();
+                $responseData['errorCode'] = $e->getAdyenErrorCode();
             }
             $responses[] = $responseData;
         }

diff --git a/Model/Sales/OrderRepository.php b/Model/Sales/OrderRepository.php
@@ -16,6 +16,7 @@
 use Magento\Framework\Api\Search\FilterGroupBuilder;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Api\SortOrderBuilder;
 use Magento\Framework\Serialize\Serializer\Json as JsonSerializer;
 use Magento\Payment\Api\Data\PaymentAdditionalInfoInterfaceFactory;
 use Magento\Sales\Api\Data\OrderExtensionFactory;
@@ -28,13 +29,15 @@
 class OrderRepository extends SalesOrderRepository
 {
     private SearchCriteriaBuilder $searchCriteriaBuilder;
+    private SortOrderBuilder $sortOrderBuilder;
     private FilterBuilder $filterBuilder;
     private FilterGroupBuilder $filterGroupBuilder;
 
     public function __construct(
         SearchCriteriaBuilder $searchCriteriaBuilder,
         FilterBuilder $filterBuilder,
         FilterGroupBuilder $filterGroupBuilder,
+        SortOrderBuilder $sortOrderBuilder,
         Metadata $metadata,
         SearchResultFactory $searchResultFactory,
         CollectionProcessorInterface $collectionProcessor = null,
@@ -56,6 +59,7 @@ public function __construct(
         );
 
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->sortOrderBuilder = $sortOrderBuilder;
         $this->filterBuilder = $filterBuilder;
         $this->filterGroupBuilder = $filterGroupBuilder;
     }
@@ -68,9 +72,14 @@ public function getOrderByQuoteId(int $quoteId): OrderInterface|false
             ->create();
 
         $quoteIdFilterGroup = $this->filterGroupBuilder->setFilters([$quoteIdFilter])->create();
+        $sortOrder = $this->sortOrderBuilder->setField('entity_id')
+            ->setDescendingDirection()
+            ->create();
 
         $searchCriteria = $this->searchCriteriaBuilder
             ->setFilterGroups([$quoteIdFilterGroup])
+            ->setSortOrders([$sortOrder])
+            ->setPageSize(1)
             ->create();
 
         $orders = $this->getList($searchCriteria)->getItems();

diff --git a/Plugin/GraphQlPlaceOrderAddCartId.php b/Plugin/GraphQlPlaceOrderAddCartId.php
@@ -59,6 +59,10 @@ public function __construct(
      */
     public function afterResolve(PlaceOrder $placeOrder, array $result): array
     {
+        if (!isset($result['order'])) {
+            return $result;
+        }
+
         try {
             $cart = $this->quoteHelper->getQuoteByOrderIncrementId($result['order']['order_number']);
             $maskedId = $this->quoteIdToMaskedQuoteId->execute($cart->getId());

diff --git a/Test/Unit/Gateway/Http/Client/TransactionRefundTest.php b/Test/Unit/Gateway/Http/Client/TransactionRefundTest.php
@@ -21,6 +21,7 @@
 use Adyen\Service\Checkout\ModificationsApi;
 use Magento\Payment\Gateway\Http\TransferInterface;
 use PHPUnit\Framework\MockObject\MockObject;
+use Adyen\AdyenException;
 
 class TransactionRefundTest extends AbstractAdyenTestCase
 {
@@ -102,4 +103,46 @@ public function testPlaceRequestIncludesHeadersInRequest()
         $this->assertCount(1, $responses);
         $this->assertArrayHasKey('pspReference', $responses[0]);
     }
+
+    public function testPlaceRequestHandlesException()
+    {
+        $requestBody = [
+            'amount' => ['value' => 1000, 'currency' => 'EUR'],
+            'paymentPspReference' => '123456789'
+        ];
+
+        $headers = ['idempotencyExtraData' => ['order_id' => '1001']];
+
+        $transferObjectMock = $this->createConfiguredMock(TransferInterface::class, [
+            'getBody' => [$requestBody],
+            'getHeaders' => $headers,
+            'getClientConfig' => []
+        ]);
+
+        $serviceMock = $this->createMock(ModificationsApi::class);
+        $adyenClientMock = $this->createMock(Client::class);
+
+        $this->adyenHelperMock->method('initializeAdyenClientWithClientConfig')->willReturn($adyenClientMock);
+        $this->adyenHelperMock->method('initializeModificationsApi')->willReturn($serviceMock);
+        $this->adyenHelperMock->method('buildRequestHeaders')->willReturn(['custom-header' => 'value']);
+
+        $this->idempotencyHelperMock->expects($this->once())
+            ->method('generateIdempotencyKey')
+            ->with($requestBody, $headers['idempotencyExtraData'])
+            ->willReturn('generated_idempotency_key');
+
+        $serviceMock->expects($this->once())
+            ->method('refundCapturedPayment')
+            ->willThrowException(new AdyenException());
+
+        $this->adyenHelperMock->expects($this->once())
+            ->method('logAdyenException')
+            ->with($this->isInstanceOf(AdyenException::class));
+
+        $responses = $this->transactionRefund->placeRequest($transferObjectMock);
+        $this->assertIsArray($responses);
+        $this->assertCount(1, $responses);
+        $this->assertArrayHasKey('error', $responses[0]);
+        $this->assertArrayHasKey('errorCode', $responses[0]);
+    }
 }
diff --git a/Test/Unit/Model/Sales/OrderRepositoryTest.php b/Test/Unit/Model/Sales/OrderRepositoryTest.php
@@ -19,6 +19,8 @@
 use Magento\Framework\Api\Search\FilterGroupBuilder;
 use Magento\Framework\Api\SearchCriteria;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Api\SortOrder;
+use Magento\Framework\Api\SortOrderBuilder;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\OrderSearchResultInterface;
 use ReflectionClass;
@@ -41,10 +43,15 @@ public function testGetOrderByQuoteId()
         $filterGroupBuilderMock->method('create')
             ->willReturn($this->createMock(FilterGroup::class));
 
+        $sortOrderBuilderMock = $this->createPartialMock(SortOrderBuilder::class, ['create']);
+        $sortOrderBuilderMock->method('create')
+            ->willReturn($this->createMock(SortOrder::class));
+
         $orderRepository = $this->buildOrderRepositoryClass(
             $searchCriteriaBuilderMock,
             $filterBuilderMock,
-            $filterGroupBuilderMock
+            $filterGroupBuilderMock,
+            $sortOrderBuilderMock
         );
 
         $order = $orderRepository->getOrderByQuoteId($quoteId);
@@ -54,7 +61,8 @@ public function testGetOrderByQuoteId()
     public function buildOrderRepositoryClass(
         $searchCriteriaBuilderMock = null,
         $filterBuilderMock = null,
-        $filterGroupBuilderMock = null
+        $filterGroupBuilderMock = null,
+        $sortOrderBuilderMock = null
     ): OrderRepository {
         if (is_null($searchCriteriaBuilderMock)) {
             $searchCriteriaBuilderMock = $this->createMock(SearchCriteriaBuilder::class);
@@ -68,6 +76,10 @@ public function buildOrderRepositoryClass(
             $filterGroupBuilderMock = $this->createMock(FilterGroupBuilder::class);
         }
 
+        if (is_null($sortOrderBuilderMock)) {
+            $sortOrderBuilderMock = $this->createMock(SortOrderBuilder::class);
+        }
+
         $orderRepositoryPartialMock = $this->getMockBuilder(OrderRepository::class)
             ->setMethods(['getList'])
             ->disableOriginalConstructor()
@@ -87,6 +99,10 @@ public function buildOrderRepositoryClass(
         $filterGroupBuilderProperty->setAccessible(true);
         $filterGroupBuilderProperty->setValue($orderRepositoryPartialMock, $filterGroupBuilderMock);
 
+        $sortOrderBuilderProperty = $reflection->getProperty('sortOrderBuilder');
+        $sortOrderBuilderProperty->setAccessible(true);
+        $sortOrderBuilderProperty->setValue($orderRepositoryPartialMock, $sortOrderBuilderMock);
+
         $orderSearchResultMock = $this->createConfiguredMock(OrderSearchResultInterface::class, [
             'getItems' => [$this->createMock(OrderInterface::class)]
         ]);

diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
   "require-dev": {
     "phpunit/phpunit": "~9.6.1",
     "magento/magento-coding-standard": "*",
-    "squizlabs/php_codesniffer": "~3.8.0"
+    "squizlabs/php_codesniffer": "~3.11.0"
   },
   "autoload": {
     "files": [