Merge branch 'main' into ECP-9152

.github/docker-compose.e2e.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   playwright:
-    image: mcr.microsoft.com/playwright:v1.47.0
+    image: mcr.microsoft.com/playwright:v1.47.2
     shm_size: 1gb
     ipc: host
     cap_add:

Cron/WebhookProcessor.php

@@ -99,6 +99,8 @@ public function doProcessWebhook()
 
         // Loop through and process notifications.
         $count = 0;
+        $queued = 0;
+
         /** @var Notification[] $notifications */
         foreach ($notifications as $notification) {
             // ignore duplicate notification
@@ -128,6 +130,7 @@ public function doProcessWebhook()
 
             if ($this->configHelper->useQueueProcessor()) {
                 $this->notificationPublisher->execute($notification);
+                $queued++;
                 $count++;
             } elseif ($this->webhookHelper->processNotification($notification)) {
                 $count++;
@@ -139,7 +142,8 @@ public function doProcessWebhook()
                 "Cronjob updated %s notification(s)", $count
             ), [
                 'pspReference' => $notification->getPspreference(),
-                'merchantReference' => $notification->getMerchantReference()
+                'merchantReference' => $notification->getMerchantReference(),
+                'queued' => $queued
             ]);
         }
     }

Model/Queue/Notification/Publisher.php

@@ -3,29 +3,43 @@
 namespace Adyen\Payment\Model\Queue\Notification;
 
 use Adyen\Payment\Api\Data\NotificationInterface;
+use Adyen\Payment\Model\ResourceModel\Notification;
+use Exception;
 use Magento\Framework\MessageQueue\PublisherInterface;
 
 class Publisher
 {
-    private const TOPIC_NAME = "adyen.notification";
+    public const TOPIC_NAME = "adyen.notification";
 
     /** @var PublisherInterface $publisher */
     private $publisher;
 
+    /** @var Notification $notificationResource */
+    private $notificationResource;
+
     /**
      * @param PublisherInterface $publisher
+     * @param Notification $notificationResource
      */
-    public function __construct(PublisherInterface $publisher)
-    {
+    public function __construct(
+        PublisherInterface $publisher,
+        Notification $notificationResource
+    ) {
         $this->publisher = $publisher;
+        $this->notificationResource = $notificationResource;
     }
 
     /**
      * @param NotificationInterface $notification
      * @return void
+     * @throws Exception
      */
     public function execute(NotificationInterface $notification): void
     {
+        // Set processing=true to skip adding duplicate queue entries
+        $notification->setProcessing(true);
+        $this->notificationResource->save($notification);
+
         $this->publisher->publish(self::TOPIC_NAME, $notification);
     }
 }

Model/Resolver/StoreConfig/StoreLocale.php

@@ -19,15 +19,13 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\GraphQl\Model\Query\Context;
 use Magento\Store\Api\Data\StoreInterface;
-use Reflet\GraphQlFaker\Attribute\FakeResolver;
-use Reflet\GraphQlFaker\Model\Resolver\NullResolver;
 
 class StoreLocale implements ResolverInterface
 {
-    protected Data $dataHelper;
+    protected Data $adyenHelper;
 
     /**
-     * @param Data $adyenHelper
+     * @param \Adyen\Payment\Helper\Data $adyenHelper
      */
     public function __construct(
         Data $adyenHelper

README.md

@@ -36,7 +36,7 @@ The schedule for the current maintained branches is:
 |  Plugin Major Version   | Release Date  | Level 1 Support ends | Level 2 Support ends | Level 3 Support ends |
 |  :-----          |:--------------|:---------------------|:---------------------|:---------------------|
 |  Version 8 |  November 2021 | January 2024         | May 2024             | January 2025         |
-|  Version 9 | October 2023  | --                   | --                   | --                   |
+|  Version 9 | October 2023  | December 2025      | May 2026             | December 2026               |
 
 Or, visualised as a calendar:
 

Test/Unit/Model/Queue/Notification/ConsumerTest.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace Adyen\Payment\Test\Unit\Model\Queue\Notification;
+
+use Adyen\Payment\Helper\Webhook;
+use Adyen\Payment\Logger\AdyenLogger;
+use Adyen\Payment\Model\Notification;
+use Adyen\Payment\Model\Queue\Notification\Consumer;
+use Adyen\Payment\Test\Unit\AbstractAdyenTestCase;
+use Exception;
+use PHPUnit\Framework\MockObject\MockObject;
+
+class ConsumerTest extends AbstractAdyenTestCase
+{
+    /** @var Webhook|MockObject $webhookMock */
+    private $webhookMock;
+
+    /** @var AdyenLogger|MockObject $adyenLoggerMock */
+    private $adyenLoggerMock;
+
+    /** @var Notification|MockObject $notificationMock */
+    private $notificationMock;
+
+    /** @var Consumer $consumer */
+    private $consumer;
+
+    /**
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        $this->webhookMock = $this->createMock(Webhook::class);
+        $this->adyenLoggerMock = $this->createMock(AdyenLogger::class);
+        $this->notificationMock = $this->createMock(Notification::class);
+        $this->consumer = new Consumer($this->webhookMock, $this->adyenLoggerMock);
+    }
+
+    /**
+     * @return void
+     * @throws Exception
+     */
+    public function testExecute(): void
+    {
+        $this->webhookMock->expects($this->once())
+            ->method('processNotification')
+            ->with($this->notificationMock)
+            ->willReturn(true);
+
+        $this->assertTrue($this->consumer->execute($this->notificationMock));
+    }
+
+    /**
+     * @return void
+     * @throws Exception
+     */
+    public function testExecuteThrowsException(): void
+    {
+        $this->webhookMock->expects($this->once())
+            ->method('processNotification')
+            ->with($this->notificationMock)
+            ->willThrowException(new Exception());
+        $this->adyenLoggerMock->expects($this->once())->method('addAdyenWarning');
+
+        $this->expectException(Exception::class);
+        $this->consumer->execute($this->notificationMock);
+    }
+}

Test/Unit/Model/Queue/Notification/PublisherTest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Adyen\Payment\Test\Unit\Model\Queue\Notification;
+
+use Adyen\Payment\Model\Notification;
+use Adyen\Payment\Model\Queue\Notification\Publisher;
+use Adyen\Payment\Model\ResourceModel\Notification as NotificationResourceModel;
+use Adyen\Payment\Test\Unit\AbstractAdyenTestCase;
+use Exception;
+use Magento\Framework\MessageQueue\PublisherInterface;
+
+class PublisherTest extends AbstractAdyenTestCase
+{
+    /**
+     * @return void
+     * @throws Exception
+     */
+    public function testExecute(): void
+    {
+        $publisherMock = $this->createMock(PublisherInterface::class);
+        $notificationResourceMock = $this->createMock(NotificationResourceModel::class);
+        $notificationMock = $this->createMock(Notification::class);
+
+        $notificationMock->expects($this->once())->method('setProcessing')->with(true);
+        $notificationResourceMock->expects($this->once())->method('save')->with($notificationMock);
+        $publisherMock->expects($this->once())->method('publish')->with(Publisher::TOPIC_NAME, $notificationMock);
+
+        $publisher = new Publisher($publisherMock, $notificationResourceMock);
+        $publisher->execute($notificationMock);
+    }
+}

etc/adminhtml/system/adyen_testing_performance.xml

@@ -42,7 +42,7 @@
             <label>Webhook processor</label>
             <source_model>Adyen\Payment\Model\Config\Source\NotificationProcessor</source_model>
             <config_path>payment/adyen_abstract/webhook_notification_processor</config_path>
-            <comment>Use cron or queue (async) to process webhook notifications</comment>
+            <comment>Use cron or queue (async) to process webhook notifications. Queue performs better if you have AMQP service installed, like RabbitMQ.</comment>
         </field>
         <field id="notifications_ip_check" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Check webhook's IP address</label>

etc/queue_consumer.xml

@@ -3,6 +3,5 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
     <consumer name="adyen.notification"
               queue="adyen.notification"
-              connection="amqp"
               handler="Adyen\Payment\Model\Queue\Notification\Consumer::execute"/>
 </config>

etc/queue_publisher.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/publisher.xsd">
-    <publisher topic="adyen.notification">
-        <connection name="amqp" exchange="magento"/>
-    </publisher>
+    <publisher topic="adyen.notification"/>
 </config>

etc/queue_topology.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/topology.xsd">
-    <exchange name="magento" type="topic" connection="amqp">
+    <exchange name="magento" type="topic">
         <binding id="NotificationBinding"
                  topic="adyen.notification"
                  destinationType="queue"