Issue-33519. Added logic for grouping alerts by store

app/code/Magento/ProductAlert/Model/Mailing/AlertProcessor.php

@@ -165,44 +165,45 @@ private function processAlerts(string $alertType, array $customerIds, int $websi
         $defaultStoreId = $website->getDefaultStore()->getId();
         $products = [];
 
-        /** @var Price|Stock $alert */
-        foreach ($collection as $alert) {
-            try {
-                if ($alert->getStoreId()) {
-                    $email->setStoreId($alert->getStoreId());
+        $groupedByStore = $this->groupAlertsByStore($collection, (int)$defaultStoreId);
+
+        foreach ($groupedByStore as $storeId => $alerts) {
+            $email->setStoreId($storeId);
+
+            /** @var Price|Stock $alert */
+            foreach ($alerts as $alert) {
+                try {
+                    if ($customer === null) {
+                        $customer = $this->customerRepository->getById($alert->getCustomerId());
+                    } elseif ((int)$customer->getId() !== (int)$alert->getCustomerId()) {
+                        $this->sendEmail($customer, $email);
+                        $customer = $this->customerRepository->getById($alert->getCustomerId());
+                    }
+
+                    if (!isset($products[$alert->getProductId()])) {
+                        $product = $this->productRepository->getById(
+                            $alert->getProductId(),
+                            false,
+                            $defaultStoreId,
+                            true
+                        );
+                        $products[$alert->getProductId()] = $product;
+                    } else {
+                        $product = $products[$alert->getProductId()];
+                    }
+
+                    $this->saveAlert($alertType, $alert, $product, $website, $customer, $email);
+                } catch (\Exception $e) {
+                    $errors[] = $e->getMessage();
                 }
-                if ($customer === null) {
-                    $customer = $this->customerRepository->getById($alert->getCustomerId());
-                } elseif ((int)$customer->getId() !== (int)$alert->getCustomerId()) {
-                    $this->sendEmail($customer, $email);
-                    $customer = $this->customerRepository->getById($alert->getCustomerId());
-                }
-
-                if (!isset($products[$alert->getProductId()])) {
-                    $product = $this->productRepository->getById($alert->getProductId(), false, $defaultStoreId, true);
-                    $products[$alert->getProductId()] = $product;
-                } else {
-                    $product = $products[$alert->getProductId()];
-                }
-
-                switch ($alertType) {
-                    case self::ALERT_TYPE_STOCK:
-                        $this->saveStockAlert($alert, $product, $website, $email);
-                        break;
-                    case self::ALERT_TYPE_PRICE:
-                        $this->savePriceAlert($alert, $product, $customer, $email);
-                        break;
-                }
-            } catch (\Exception $e) {
-                $errors[] = $e->getMessage();
             }
-        }
 
-        if ($customer !== null) {
-            try {
-                $this->sendEmail($customer, $email);
-            } catch (\Exception $e) {
-                $errors[] = $e->getMessage();
+            if ($customer !== null) {
+                try {
+                    $this->sendEmail($customer, $email);
+                } catch (\Exception $e) {
+                    $errors[] = $e->getMessage();
+                }
             }
         }
 
@@ -256,6 +257,56 @@ private function getAlertCollection(string $alertType, array $customerIds, int $
         return $collection;
     }
 
+    /**
+     * Prepare an array of alerts grouped by store ID
+     *
+     * @param AbstractCollection $collection
+     * @param int $defaultStoreId
+     * @return array
+     */
+    private function groupAlertsByStore(AbstractCollection $collection, int $defaultStoreId): array
+    {
+        $groupedByStore = [];
+        foreach ($collection as $item) {
+            if ($storeId = $item->getStoreId()) {
+                $groupedByStore[$storeId][] = $item;
+            } else {
+                $groupedByStore[$defaultStoreId][] = $item;
+            }
+        }
+
+        return $groupedByStore;
+    }
+
+    /**
+     * Save alert by type
+     *
+     * @param string $alertType
+     * @param Stock|Price $alert
+     * @param ProductInterface $product
+     * @param WebsiteInterface $website
+     * @param CustomerInterface $customer
+     * @param Email $email
+     * @throws \Exception
+     */
+    private function saveAlert(
+        string $alertType,
+        $alert,
+        ProductInterface $product,
+        WebsiteInterface $website,
+        CustomerInterface $customer,
+        Email $email
+    ): void {
+        switch ($alertType) {
+            case self::ALERT_TYPE_STOCK:
+                $this->saveStockAlert($alert, $product, $website, $email);
+                break;
+            case self::ALERT_TYPE_PRICE:
+                $this->savePriceAlert($alert, $product, $customer, $email);
+                break;
+        }
+    }
+
     /**
      * Save Price Alert
      *

dev/tests/integration/framework/Magento/TestFramework/Mail/TransportInterfaceMock.php

@@ -18,6 +18,11 @@ class TransportInterfaceMock implements \Magento\Framework\Mail\TransportInterfa
      */
     private $message;
 
+    /**
+     * @var int
+     */
+    private static $sentMsgCount = 0;
+
     /**
      * TransportInterfaceMock constructor.
      *
@@ -35,6 +40,7 @@ public function __construct($message = null)
      */
     public function sendMessage()
     {
+        self::$sentMsgCount++;
         //phpcs:ignore Squiz.PHP.NonExecutableCode.ReturnNotRequired
         return;
     }
@@ -48,4 +54,25 @@ public function getMessage()
     {
         return $this->message;
     }
+
+    /**
+     * Returns count of sent messages
+     *
+     * @return int
+     */
+    public function getSentMsgCount(): int
+    {
+        return self::$sentMsgCount;
+    }
+
+    /**
+     * Reset amount of sent message
+     *
+     * @param int $count
+     * @return void
+     */
+    public function resetSentMsgCount($count = 0): void
+    {
+        self::$sentMsgCount = $count;
+    }
 }

dev/tests/integration/testsuite/Magento/ProductAlert/Model/Mailing/AlertProcessorTest.php

@@ -12,7 +12,9 @@
 use Magento\Catalog\Test\Fixture\Product as ProductFixture;
 use Magento\Customer\Test\Fixture\Customer as CustomerFixture;
 use Magento\Framework\Mail\EmailMessage;
+use Magento\ProductAlert\Model\ResourceModel\Stock\CollectionFactory as StockCollectionFactory;
 use Magento\ProductAlert\Test\Fixture\PriceAlert as PriceAlertFixture;
+use Magento\ProductAlert\Test\Fixture\StockAlert as StockAlertFixture;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
 use Magento\Store\Test\Fixture\Group as StoreGroupFixture;
@@ -26,6 +28,7 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Helper\Xpath;
 use Magento\TestFramework\Mail\Template\TransportBuilderMock;
+use Magento\TestFramework\Mail\TransportInterfaceMock;
 use Magento\TestFramework\ObjectManager;
 use Magento\Translation\Test\Fixture\Translation as TranslationFixture;
 use PHPUnit\Framework\TestCase;
@@ -44,20 +47,25 @@ class AlertProcessorTest extends TestCase
     private $objectManager;
 
     /**
-     * @var Publisher
+     * @var AlertProcessor
      */
-    private $publisher;
+    private $alertProcessor;
 
     /**
-     * @var AlertProcessor
+     * @var StockCollectionFactory
      */
-    private $alertProcessor;
+    private $stockCollectionFactory;
 
     /**
      * @var TransportBuilderMock
      */
     private $transportBuilder;
 
+    /**
+     * @var TransportInterfaceMock
+     */
+    private $transportInterface;
+
     /**
      * @var DataFixtureStorage
      */
@@ -69,8 +77,11 @@ class AlertProcessorTest extends TestCase
     protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
-        $this->publisher = $this->objectManager->get(Publisher::class);
         $this->alertProcessor = $this->objectManager->get(AlertProcessor::class);
+        $this->stockCollectionFactory = $this->objectManager->get(StockCollectionFactory::class);
+
+        $this->transportInterface = $this->objectManager->get(TransportInterfaceMock::class);
+        $this->transportInterface->resetSentMsgCount();
 
         $this->transportBuilder = $this->objectManager->get(TransportBuilderMock::class);
         $this->fixtures = DataFixtureStorageManager::getStorage();
@@ -243,6 +254,38 @@ public function testValidateCurrentTheme()
         );
     }
 
+    #[
+        DbIsolation(false),
+        Config('catalog/productalert/allow_stock', 1),
+        DataFixture(CustomerFixture::class, as: 'customer'),
+        DataFixture(ProductFixture::class, as: 'product'),
+        DataFixture(StoreFixture::class, ['store_group_id' => 1, 'code' => 'pt_br_store'], 'store2'),
+        DataFixture(
+            StockAlertFixture::class,
+            [
+                'customer_id' => '$customer.id$',
+                'product_id' => '$product.id$',
+                'website_id' => 1,
+                'store_id' => 1,
+            ]
+        ),
+        DataFixture(
+            StockAlertFixture::class,
+            [
+                'customer_id' => '$customer.id$',
+                'product_id' => '$product.id$',
+                'website_id' => 1,
+                'store_id' => '$store2.id$',
+            ]
+        ),
+    ]
+    public function testCustomerShouldGetEmailForEveryStoreView()
+    {
+        $customerId = (int) $this->fixtures->get('customer')->getId();
+        $this->processAlerts($customerId, 1, AlertProcessor::ALERT_TYPE_STOCK);
+        $this->assertEquals(2, $this->transportInterface->getSentMsgCount());
+    }
+
     /**
      * @param int $customerId
      * @param int $websiteId