#32116

Author: engcom-Charlie

app/code/Magento/Newsletter/Model/Plugin/RemoveSubscriberFromQueue.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Newsletter\Model\Plugin;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Newsletter\Model\Subscriber;
+
+/**
+ * Plugin responsible for removing subscriber from queue after unsubscribe
+ */
+class RemoveSubscriberFromQueue
+{
+    private const STATUS = 'subscriber_status';
+
+    /**
+     * @var AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * @param ResourceConnection $resource
+     */
+    public function __construct(ResourceConnection $resource)
+    {
+        $this->connection = $resource->getConnection();
+    }
+
+    /**
+     * Removes subscriber from queue
+     *
+     * @param Subscriber $subject
+     * @param Subscriber $subscriber
+     * @return Subscriber
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterUnsubscribe(Subscriber $subject, Subscriber $subscriber): Subscriber
+    {
+        if ($subscriber->dataHasChangedFor(self::STATUS)
+            && $subscriber->getSubscriberStatus() === Subscriber::STATUS_UNSUBSCRIBED
+        ) {
+            $this->connection->delete(
+                $this->connection->getTableName('newsletter_queue_link'),
+                ['subscriber_id = ?' => $subscriber->getId(), 'letter_sent_at IS NULL']
+            );
+        }
+
+        return $subscriber;
+    }
+}

app/code/Magento/Newsletter/etc/di.xml

@@ -32,4 +32,8 @@
     </type>
     <preference for="Magento\Newsletter\Model\SubscriptionManagerInterface"
                 type="Magento\Newsletter\Model\SubscriptionManager"/>
+    <type name="Magento\Newsletter\Model\Subscriber">
+        <plugin name="remove_subscriber_from_queue_after_unsubscribe"
+                type="Magento\Newsletter\Model\Plugin\RemoveSubscriberFromQueue"/>
+    </type>
 </config>

dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php

@@ -8,10 +8,10 @@
 namespace Magento\Newsletter\Model;
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Framework\Mail\EmailMessage;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Mail\EmailMessage;
+use Magento\Newsletter\Model\ResourceModel\Subscriber\CollectionFactory;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Mail\Template\TransportBuilderMock;
 use PHPUnit\Framework\TestCase;
@@ -26,27 +26,42 @@ class SubscriberTest extends TestCase
     private const CONFIRMATION_SUBSCRIBE = 'You have been successfully subscribed to our newsletter.';
     private const CONFIRMATION_UNSUBSCRIBE = 'You have been unsubscribed from the newsletter.';
 
-    /** @var ObjectManagerInterface */
-    private $objectManager;
-
-    /** @var SubscriberFactory */
+    /**
+     * @var SubscriberFactory
+     */
     private $subscriberFactory;
 
-    /** @var TransportBuilderMock */
+    /**
+     * @var TransportBuilderMock
+     */
     private $transportBuilder;
 
-    /** @var CustomerRepositoryInterface */
+    /**
+     * @var CustomerRepositoryInterface
+     */
     private $customerRepository;
 
+    /**
+     * @var QueueFactory
+     */
+    private $queueFactory;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $subscriberCollectionFactory;
+
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
-        $this->objectManager = Bootstrap::getObjectManager();
-        $this->subscriberFactory = $this->objectManager->get(SubscriberFactory::class);
-        $this->transportBuilder = $this->objectManager->get(TransportBuilderMock::class);
-        $this->customerRepository = $this->objectManager->get(CustomerRepositoryInterface::class);
+        $objectManager = Bootstrap::getObjectManager();
+        $this->subscriberFactory = $objectManager->get(SubscriberFactory::class);
+        $this->transportBuilder = $objectManager->get(TransportBuilderMock::class);
+        $this->customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
+        $this->queueFactory = $objectManager->get(QueueFactory::class);
+        $this->subscriberCollectionFactory = $objectManager->get(CollectionFactory::class);
     }
 
     /**
@@ -157,6 +172,37 @@ public function testConfirm(): void
         );
     }
 
+    /**
+     * Unsubscribe and check queue
+     *
+     * @magentoDataFixture Magento/Newsletter/_files/queue.php
+     * @magentoDbIsolation disabled
+     *
+     * @return void
+     */
+    public function testUnsubscribeCustomer(): void
+    {
+        $firstSubscriber = $this->subscriberFactory->create()
+            ->load('[email protected]', 'subscriber_email');
+        $secondSubscriber = $this->subscriberFactory->create()
+            ->load('[email protected]', 'subscriber_email');
+
+        $queue = $this->queueFactory->create()
+            ->load('CustomerSupport', 'newsletter_sender_name');
+        $queue->addSubscribersToQueue([$firstSubscriber->getId(), $secondSubscriber->getId()]);
+
+        $secondSubscriber->unsubscribe();
+
+        $collection = $this->subscriberCollectionFactory->create()
+            ->useQueue($queue);
+
+        $this->assertCount(1, $collection);
+        $this->assertEquals(
+            '[email protected]',
+            $collection->getFirstItem()->getData('subscriber_email')
+        );
+    }
+
     /**
      * @magentoDataFixture Magento/Customer/_files/customer_confirmation_config_enable.php
      * @magentoDataFixture Magento/Newsletter/_files/newsletter_unconfirmed_customer.php