MAGETWO-91684: Issue with Newsletter subscriptions

- Changing subscription behavior to websites

Author: vprohorov

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

@@ -5,6 +5,9 @@
  */
 namespace Magento\Newsletter\Model\ResourceModel;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Store\Model\StoreManagerInterface;
+
 /**
  * Newsletter subscriber resource model
  *
@@ -48,22 +51,30 @@ class Subscriber extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      */
     protected $mathRandom;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * Construct
      *
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
      * @param \Magento\Framework\Math\Random $mathRandom
      * @param string $connectionName
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
         \Magento\Framework\Stdlib\DateTime\DateTime $date,
         \Magento\Framework\Math\Random $mathRandom,
-        $connectionName = null
+        $connectionName = null,
+        StoreManagerInterface $storeManager = null
     ) {
         $this->_date = $date;
         $this->mathRandom = $mathRandom;
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
         parent::__construct($context, $connectionName);
     }
 
@@ -117,19 +128,15 @@ public function loadByEmail($subscriberEmail)
      */
     public function loadByCustomerData(\Magento\Customer\Api\Data\CustomerInterface $customer)
     {
+        $storeIds = $this->storeManager->getWebsite($customer->getWebsiteId())->getStoreIds();
+
         $select = $this->connection
             ->select()
             ->from($this->getMainTable())
-            ->where('customer_id=:customer_id and store_id=:store_id');
-
-        $result = $this->connection
-            ->fetchRow(
-                $select,
-                [
-                    'customer_id' => $customer->getId(),
-                    'store_id' => $customer->getStoreId()
-                ]
-            );
+            ->where('customer_id = ?', $customer->getId())
+            ->where('store_id IN (?)', $storeIds);
+
+        $result = $this->connection->fetchRow($select);
 
         if ($result) {
             return $result;
@@ -138,16 +145,10 @@ public function loadByCustomerData(\Magento\Customer\Api\Data\CustomerInterface
         $select = $this->connection
             ->select()
             ->from($this->getMainTable())
-            ->where('subscriber_email=:subscriber_email and store_id=:store_id');
-
-        $result = $this->connection
-            ->fetchRow(
-                $select,
-                [
-                    'subscriber_email' => $customer->getEmail(),
-                    'store_id' => $customer->getStoreId()
-                ]
-            );
+            ->where('subscriber_email = ?', $customer->getEmail())
+            ->where('store_id IN (?)', $storeIds);
+
+        $result = $this->connection->fetchRow($select);
 
         if ($result) {
             return $result;

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

@@ -392,6 +392,9 @@ public function loadByCustomerId($customerId)
         try {
             $customerData = $this->customerRepository->getById($customerId);
             $customerData->setStoreId($this->_storeManager->getStore()->getId());
+            if ($customerData->getWebsiteId() === null) {
+                $customerData->setWebsiteId($this->_storeManager->getStore()->getWebsiteId());
+            }
             $data = $this->getResource()->loadByCustomerData($customerData);
             $this->addData($data);
             if (!empty($data) && $customerData->getId() && !$this->getCustomerId()) {