moved removing subscriber queue to separate class

Author: engcom-Charlie

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

@@ -7,27 +7,25 @@
 
 namespace Magento\Newsletter\Model\Plugin;
 
-use Magento\Newsletter\Model\ResourceModel\Queue as QueueResource;
+use Magento\Newsletter\Model\RemoveSubscriberFromQueueLink;
 use Magento\Newsletter\Model\Subscriber;
 
 /**
- * Plugin responsible for removing subscriber from queue after unsubscribe
+ * Plugin for removing subscriber from queue after unsubscribe
  */
 class RemoveSubscriberFromQueue
 {
-    private const STATUS = 'subscriber_status';
-
     /**
-     * @var QueueResource
+     * @var RemoveSubscriberFromQueueLink
      */
-    private $queueResource;
+    private $removeSubscriberFromQueue;
 
     /**
-     * @param QueueResource $queueResource
+     * @param RemoveSubscriberFromQueueLink $removeSubscriberFromQueue
      */
-    public function __construct(QueueResource $queueResource)
+    public function __construct(RemoveSubscriberFromQueueLink $removeSubscriberFromQueue)
     {
-        $this->queueResource = $queueResource;
+        $this->removeSubscriberFromQueue = $removeSubscriberFromQueue;
     }
 
     /**
@@ -41,7 +39,7 @@ public function __construct(QueueResource $queueResource)
     public function afterUnsubscribe(Subscriber $subject, Subscriber $subscriber): Subscriber
     {
         if ($subscriber->isStatusChanged() && $subscriber->getSubscriberStatus() === Subscriber::STATUS_UNSUBSCRIBED) {
-            $this->queueResource->removeSubscriberFromQueue((int) $subscriber->getId());
+            $this->removeSubscriberFromQueue->execute((int) $subscriber->getId());
         }
 
         return $subscriber;

app/code/Magento/Newsletter/Model/RemoveSubscriberFromQueueLink.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Newsletter\Model;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+
+/**
+ * Responsible for removing subscriber from queue
+ */
+class RemoveSubscriberFromQueueLink
+{
+    /**
+     * @var AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * @param ResourceConnection $resource
+     */
+    public function __construct(ResourceConnection $resource)
+    {
+        $this->connection = $resource->getConnection();
+    }
+
+    /**
+     * Removes subscriber from queue
+     *
+     * @param int $subscriberId
+     * @return void
+     */
+    public function execute(int $subscriberId): void
+    {
+        $this->connection->delete(
+            $this->connection->getTableName('newsletter_queue_link'),
+            ['subscriber_id = ?' => $subscriberId, 'letter_sent_at IS NULL']
+        );
+    }
+}

app/code/Magento/Newsletter/Model/ResourceModel/Queue.php

@@ -125,20 +125,6 @@ public function removeSubscribersFromQueue(ModelQueue $queue)
         }
     }
 
-    /**
-     * Removes subscriber from queue
-     *
-     * @param int $subscriberId
-     * @return void
-     */
-    public function removeSubscriberFromQueue(int $subscriberId): void
-    {
-        $this->getConnection()->delete(
-            $this->getTable('newsletter_queue_link'),
-            ['subscriber_id = ?' => $subscriberId, 'letter_sent_at IS NULL']
-        );
-    }
-
     /**
      * Links queue to store
      *