Merge remote-tracking branch 'origin/imported-magento-magento2-30727' into 2.4-develop-pr108

Author: zakdma

app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Action.php

@@ -60,7 +60,7 @@ public function render(\Magento\Framework\DataObject $row)
                     'newsletter/template/preview',
                     [
                         'id' => $row->getTemplateId(),
-                        'subscriber' => $this->_coreRegistry->registry('subscriber')->getId()
+                        'subscriber' => $row->getSubscriberId(),
                     ]
                 ),
                 'target' => '_blank',

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

@@ -225,7 +225,10 @@ public function addCustomerFilter(int $customerId): Collection
             )->join(
                 ['subscriber' => $this->getTable('newsletter_subscriber')],
                 'link.subscriber_id=subscriber.subscriber_id',
-                ['subscriber_store_id' => 'subscriber.store_id']
+                [
+                    'subscriber_store_id' => 'subscriber.store_id',
+                    'subscriber_id' => 'subscriber.subscriber_id',
+                ]
             )->where(
                 'subscriber.customer_id = ?',
                 $customerId

dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/NewsletterTest.php

@@ -76,4 +76,21 @@ public function testRenderingNewsletterBlock()
         $this->assertStringContainsString('\u003Cspan\u003ESubscribed to Newsletter\u003C\/span\u003E', $body);
         $this->assertStringContainsString('\u003ENo Newsletter Found\u003C', $body);
     }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer_sample.php
+     * @magentoDataFixture Magento/Newsletter/_files/newsletter_sample.php
+     * @magentoDataFixture Magento/Newsletter/_files/queue.php
+     */
+    public function testRenderingNewsletterBlockWithQueue()
+    {
+        $this->getRequest()->setParam('id', 1);
+        $this->dispatch('backend/customer/index/edit');
+        $body = $this->getResponse()->getBody();
+
+        $this->assertMatchesRegularExpression(
+            '~.+\/newsletter\\\/template\\\/preview\\\/id\\\/\d+\\\/subscriber\\\/\d+\\\/.+~',
+            $body
+        );
+    }
 }

dev/tests/integration/testsuite/Magento/Newsletter/Model/ResourceModel/Queue/CollectionTest.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Newsletter\Model\ResourceModel\Queue;
+
+use Magento\Newsletter\Model\Subscriber;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Customer filter fields Collection test class
+ */
+class CollectionTest extends TestCase
+{
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer_sample.php
+     * @magentoDataFixture Magento/Newsletter/_files/newsletter_sample.php
+     * @magentoDataFixture Magento/Newsletter/_files/queue.php
+     */
+    public function testLoadWithCustomerFilter()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        /** @var CollectionFactory $collectionFactory */
+        $collectionFactory = $objectManager->get(CollectionFactory::class);
+        $collection = $collectionFactory->create()->addCustomerFilter(1);
+        $item = $collection->getFirstItem();
+
+        /** @var Subscriber $subscriber */
+        $subscriber = $objectManager->get(Subscriber::class);
+        $subscriber->loadByCustomer(1, 1);
+
+        self::assertEquals(
+            $subscriber->getId(),
+            $item->getSubscriberId(),
+            'Wrong subscriber id loaded in collection.'
+        );
+    }
+}