Merge remote-tracking branch 'github-magento2ce/MAGETWO-91684' into EPAM-PR-18

Author: nikshostko

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

@@ -5,8 +5,8 @@
  */
 namespace Magento\Newsletter\Model\ResourceModel;
 
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Newsletter subscriber resource model
@@ -76,8 +76,7 @@ public function __construct(
     ) {
         $this->_date = $date;
         $this->mathRandom = $mathRandom;
-        $this->storeManager = $storeManager ?: ObjectManager::getInstance()
-            ->get(StoreManagerInterface::class);
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
         parent::__construct($context, $connectionName);
     }
 
@@ -131,43 +130,36 @@ public function loadByEmail($subscriberEmail)
      */
     public function loadByCustomerData(\Magento\Customer\Api\Data\CustomerInterface $customer)
     {
-        $storeId = (int)$customer->getStoreId() ?: $this->storeManager
-            ->getWebsite($customer->getWebsiteId())->getDefaultStore()->getId();
-
-        $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' => $storeId
-                ]
-            );
+        $storeIds = $this->storeManager->getWebsite($customer->getWebsiteId())->getStoreIds();
+
+        if ($customer->getId()) {
+            $select = $this->connection
+                ->select()
+                ->from($this->getMainTable())
+                ->where('customer_id = ?', $customer->getId())
+                ->where('store_id IN (?)', $storeIds)
+                ->limit(1);
 
-        if ($result) {
-            return $result;
+            $result = $this->connection->fetchRow($select);
+
+            if ($result) {
+                return $result;
+            }
         }
 
-        $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' => $storeId
-                ]
-            );
+        if ($customer->getEmail()) {
+            $select = $this->connection
+                ->select()
+                ->from($this->getMainTable())
+                ->where('subscriber_email = ?', $customer->getEmail())
+                ->where('store_id IN (?)', $storeIds)
+                ->limit(1);
+
+            $result = $this->connection->fetchRow($select);
 
-        if ($result) {
-            return $result;
+            if ($result) {
+                return $result;
+            }
         }
 
         return [];

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()) {