MC-41917: Issue with 'catalog_product_alert' cron

Author: Serhii Balko

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

@@ -204,16 +204,12 @@ private function processAlerts(string $alertType, array $customerIds, int $websi
      * Validate Alert Type
      *
      * @param string $alertType
-     * @throws \Exception
+     * @throws \InvalidArgumentException
      */
     private function validateAlertType(string $alertType): void
     {
-        switch ($alertType) {
-            case self::ALERT_TYPE_STOCK:
-            case self::ALERT_TYPE_PRICE:
-                break;
-            default:
-                throw new \Exception('Invalid alert type');
+        if (!in_array($alertType, [self::ALERT_TYPE_STOCK, self::ALERT_TYPE_PRICE])) {
+            throw new \InvalidArgumentException('Invalid alert type');
         }
     }
 
@@ -222,8 +218,9 @@ private function validateAlertType(string $alertType): void
      *
      * @param string $alertType
      * @param array $customerIds
+     * @param int $websiteId
      * @return AbstractCollection
-     * @throws \Exception
+     * @throws \InvalidArgumentException
      */
     private function getAlertCollection(string $alertType, array $customerIds, int $websiteId): AbstractCollection
     {
@@ -244,7 +241,7 @@ private function getAlertCollection(string $alertType, array $customerIds, int $
                     ->addOrder('product_id');
                 break;
             default:
-                throw new \Exception('Invalid alert type');
+                throw new \InvalidArgumentException('Invalid alert type');
         }
 
         return $collection;

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

@@ -12,6 +12,7 @@
 use Magento\Framework\Mail\Template\TransportBuilder;
 use Magento\Framework\Translate\Inline\StateInterface;
 use Magento\Store\Model\ScopeInterface;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class to send error emails to administrator
@@ -48,19 +49,27 @@ class ErrorEmailSender
      */
     private $inlineTranslation;
 
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @param ScopeConfigInterface $scopeConfig
      * @param TransportBuilder $transportBuilder
      * @param StateInterface $inlineTranslation
+     * @param LoggerInterface $logger
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
         TransportBuilder $transportBuilder,
-        StateInterface $inlineTranslation
+        StateInterface $inlineTranslation,
+        LoggerInterface $logger
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->transportBuilder = $transportBuilder;
         $this->inlineTranslation = $inlineTranslation;
+        $this->logger = $logger;
     }
 
     /**
@@ -76,6 +85,10 @@ public function execute(array $errors, int $storeId): void
             return;
         }
 
+        $this->logger->error(
+            'Product Alerts: ' . count($errors) . ' errors occurred during sending alerts.'
+        );
+
         if (!$this->scopeConfig->getValue(self::XML_PATH_ERROR_TEMPLATE, ScopeInterface::SCOPE_STORE, $storeId)) {
             return;
         }