MC-30255: In Stock Alert Email Shows Incorrect Item Pricing

Oleksandr Dubovyk · Oleksandr Dubovyk · commit 3a7e6c11b24e · 2020-01-23T15:51:30.000-06:00
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php
@@ -85,11 +85,11 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function build($productId)
+    public function build(int $productId, int $storeId) : array
     {
         $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
         $productTable = $this->resource->getTableName('catalog_product_entity');
-        $websiteId = $this->storeManager->getStore()->getWebsiteId();
+        $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
         $customerGroupId = $this->customerSession->getCustomerGroupId();
 
         $priceSelect = $this->resource->getConnection()->select()
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByBasePrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByBasePrice.php
@@ -74,7 +74,7 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function build($productId)
+    public function build(int $productId, int $storeId) : array
     {
         $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
         $priceAttribute = $this->eavConfig->getAttribute(Product::ENTITY, 'price');
@@ -104,7 +104,7 @@ public function build($productId)
 
         if (!$this->catalogHelper->isPriceGlobal()) {
             $priceSelectStore = clone $priceSelect;
-            $priceSelectStore->where('t.store_id = ?', $this->storeManager->getStore()->getId());
+            $priceSelectStore->where('t.store_id = ?', $storeId);
             $selects[] = $priceSelectStore;
         }
 
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php
@@ -90,14 +90,14 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function build($productId)
+    public function build(int $productId, int $storeId) : array
     {
         $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
         $connection = $this->resource->getConnection();
         $specialPriceAttribute = $this->eavConfig->getAttribute(Product::ENTITY, 'special_price');
         $specialPriceFromDate = $this->eavConfig->getAttribute(Product::ENTITY, 'special_from_date');
         $specialPriceToDate = $this->eavConfig->getAttribute(Product::ENTITY, 'special_to_date');
-        $timestamp = $this->localeDate->scopeTimeStamp($this->storeManager->getStore());
+        $timestamp = $this->localeDate->scopeTimeStamp($this->storeManager->getStore($storeId));
         $currentDate = $this->dateTime->formatDate($timestamp, false);
         $productTable = $this->resource->getTableName('catalog_product_entity');
 
@@ -145,7 +145,7 @@ public function build($productId)
 
         if (!$this->catalogHelper->isPriceGlobal()) {
             $priceSelectStore = clone $specialPrice;
-            $priceSelectStore->where('t.store_id = ?', $this->storeManager->getStore()->getId());
+            $priceSelectStore->where('t.store_id = ?', $storeId);
             $selects[] = $priceSelectStore;
         }
 
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByTierPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByTierPrice.php
@@ -74,7 +74,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function build($productId)
+    public function build(int $productId, int $storeId) : array
     {
         $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
         $productTable = $this->resource->getTableName('catalog_product_entity');
@@ -103,7 +103,7 @@ public function build($productId)
 
         if (!$this->catalogHelper->isPriceGlobal()) {
             $priceSelectStore = clone $priceSelect;
-            $priceSelectStore->where('t.website_id = ?', $this->storeManager->getStore()->getWebsiteId());
+            $priceSelectStore->where('t.website_id = ?', $this->storeManager->getStore($storeId)->getWebsiteId());
             $selects[] = $priceSelectStore;
         }
 
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderComposite.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderComposite.php
@@ -24,11 +24,11 @@ public function __construct($linkedProductSelectBuilder)
     /**
      * {@inheritdoc}
      */
-    public function build($productId)
+    public function build(int $productId, int $storeId) : array
     {
         $selects = [];
         foreach ($this->linkedProductSelectBuilder as $productSelectBuilder) {
-            $selects = array_merge($selects, $productSelectBuilder->build($productId));
+            $selects = array_merge($selects, $productSelectBuilder->build($productId, $storeId));
         }
 
         return $selects;
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderInterface.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderInterface.php
@@ -12,7 +12,8 @@ interface LinkedProductSelectBuilderInterface
 {
     /**
      * @param int $productId
+     * @param int $storeId
      * @return \Magento\Framework\DB\Select[]
      */
-    public function build($productId);
+    public function build(int $productId, int $storeId) : array;
 }
diff --git a/app/code/Magento/CatalogRule/Model/ResourceModel/Product/LinkedProductSelectBuilderByCatalogRulePrice.php b/app/code/Magento/CatalogRule/Model/ResourceModel/Product/LinkedProductSelectBuilderByCatalogRulePrice.php
@@ -86,9 +86,9 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function build($productId)
+    public function build(int $productId, int $storeId) : array
     {
-        $timestamp = $this->localeDate->scopeTimeStamp($this->storeManager->getStore());
+        $timestamp = $this->localeDate->scopeTimeStamp($this->storeManager->getStore($storeId));
         $currentDate = $this->dateTime->formatDate($timestamp, false);
         $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
         $productTable = $this->resource->getTableName('catalog_product_entity');
@@ -108,7 +108,7 @@ public function build($productId)
                 sprintf('t.product_id = %s.%s', BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS, $linkField),
                 []
             )->where('parent.entity_id = ?', $productId)
-            ->where('t.website_id = ?', $this->storeManager->getStore()->getWebsiteId())
+            ->where('t.website_id = ?', $this->storeManager->getStore($storeId)->getWebsiteId())
             ->where('t.customer_group_id = ?', $this->customerSession->getCustomerGroupId())
             ->where('t.rule_date = ?', $currentDate)
             ->order('t.rule_price ' . Select::SQL_ASC)
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/LinkedProductSelectBuilder.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/LinkedProductSelectBuilder.php
@@ -41,9 +41,9 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function build($productId)
+    public function build(int $productId, int $storeId) : array
     {
-        $selects = $this->linkedProductSelectBuilder->build($productId);
+        $selects = $this->linkedProductSelectBuilder->build($productId, $storeId);
 
         foreach ($selects as $select) {
             $this->baseSelectProcessor->process($select);
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionsProvider.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionsProvider.php
@@ -66,10 +66,12 @@ public function __construct(
      */
     public function getProducts(ProductInterface $product)
     {
-        $key = $this->storeManager->getStore()->getId() . '-' . $product->getId();
+        $productId = $product->getId();
+        $storeId = $product->getStoreId();
+        $key = $storeId . '-' . $productId;
         if (!isset($this->linkedProductMap[$key])) {
             $productIds = $this->resource->getConnection()->fetchCol(
-                '(' . implode(') UNION (', $this->linkedProductSelectBuilder->build($product->getId())) . ')'
+                '(' . implode(') UNION (', $this->linkedProductSelectBuilder->build($productId, $storeId)) . ')'
             );
 
             $this->linkedProductMap[$key] = $this->collectionFactory->create()
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/LinkedProductSelectBuilderTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/LinkedProductSelectBuilderTest.php
@@ -50,6 +50,7 @@ protected function setUp()
     public function testBuild()
     {
         $productId = 42;
+        $storeId = 1;
 
         /** @var Select|\PHPUnit_Framework_MockObject_MockObject $selectMock */
         $selectMock = $this->getMockBuilder(Select::class)
@@ -67,6 +68,6 @@ public function testBuild()
             ->method('process')
             ->with($selectMock);
 
-        $this->assertEquals($expectedResult, $this->subject->build($productId));
+        $this->assertEquals($expectedResult, $this->subject->build($productId, $storeId));
     }
 }
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Price/LowestPriceOptionsProviderTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Price/LowestPriceOptionsProviderTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\ConfigurableProduct\Test\Unit\Pricing\Price;
 
+use Magento\Catalog\Model\Product;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Api\Data\StoreInterface;
@@ -102,9 +102,11 @@ protected function setUp()
     public function testGetProducts()
     {
         $productId = 1;
+        $storeId = 1;
         $linkedProducts = ['some', 'linked', 'products', 'dataobjects'];
-        $product = $this->getMockBuilder(ProductInterface::class)->disableOriginalConstructor()->getMock();
+        $product = $this->createMock(Product::class);
         $product->expects($this->any())->method('getId')->willReturn($productId);
+        $product->expects($this->any())->method('getStoreId')->willReturn($storeId);
         $this->linkedProductSelectBuilder->expects($this->any())->method('build')->with($productId)->willReturn([]);
         $this->productCollection
             ->expects($this->once())
diff --git a/app/code/Magento/ProductAlert/Model/Observer.php b/app/code/Magento/ProductAlert/Model/Observer.php
@@ -193,6 +193,7 @@ protected function _getWebsites()
     protected function _processPrice(\Magento\ProductAlert\Model\Email $email)
     {
         $email->setType('price');
+        echo('price ');
         foreach ($this->_getWebsites() as $website) {
             /* @var $website \Magento\Store\Model\Website */
             if (!$website->getDefaultGroup() || !$website->getDefaultGroup()->getDefaultStore()) {
@@ -242,7 +243,6 @@ protected function _processPrice(\Magento\ProductAlert\Model\Email $email)
                     );
 
                     $product->setCustomerGroupId($customer->getGroupId());
-                    $this->_storeManager->getStore()->setWebsiteId($website->getId());
                     if ($alert->getPrice() > $product->getFinalPrice()) {
                         $productPrice = $product->getFinalPrice();
                         $product->setFinalPrice($this->_catalogData->getTaxPrice($product, $productPrice));

Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,11 @@ public function __construct($linkedProductSelectBuilder)`
`24`	`24`	`/**`
`25`	`25`	`* {@inheritdoc}`
`26`	`26`	`*/`
`27`		`- public function build($productId)`
	`27`	`+ public function build(int $productId, int $storeId) : array`
`28`	`28`	`{`
`29`	`29`	`$selects = [];`
`30`	`30`	`foreach ($this->linkedProductSelectBuilder as $productSelectBuilder) {`
`31`		`- $selects = array_merge($selects, $productSelectBuilder->build($productId));`
	`31`	`+ $selects = array_merge($selects, $productSelectBuilder->build($productId, $storeId));`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`return $selects;`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@ interface LinkedProductSelectBuilderInterface`
`12`	`12`	`{`
`13`	`13`	`/**`
`14`	`14`	`* @param int $productId`
	`15`	`+ * @param int $storeId`
`15`	`16`	`* @return \Magento\Framework\DB\Select[]`
`16`	`17`	`*/`
`17`		`- public function build($productId);`
	`18`	`+ public function build(int $productId, int $storeId) : array;`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ protected function setUp()`
`50`	`50`	`public function testBuild()`
`51`	`51`	`{`
`52`	`52`	`$productId = 42;`
	`53`	`+ $storeId = 1;`
`53`	`54`
`54`	`55`	`/** @var Select\|\PHPUnit_Framework_MockObject_MockObject $selectMock */`
`55`	`56`	`$selectMock = $this->getMockBuilder(Select::class)`
`@@ -67,6 +68,6 @@ public function testBuild()`
`67`	`68`	`->method('process')`
`68`	`69`	`->with($selectMock);`
`69`	`70`
`70`		`- $this->assertEquals($expectedResult, $this->subject->build($productId));`
	`71`	`+ $this->assertEquals($expectedResult, $this->subject->build($productId, $storeId));`
`71`	`72`	`}`
`72`	`73`	`}`