Merge branch 'MC-43176' of https://github.com/magento-l3/magento2ce into L3-PR-20210908

Author: ArtemVasyliev

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/PriceRange.php

@@ -23,6 +23,8 @@
  */
 class PriceRange implements ResolverInterface
 {
+    private const STORE_FILTER_CACHE_KEY = '_cache_instance_store_filter';
+
     /**
      * @var Discount
      */
@@ -62,6 +64,8 @@ public function resolve(
         /** @var Product $product */
         $product = $value['model'];
         $product->unsetData('minimal_price');
+        // add store filter for the product
+        $product->setData(self::STORE_FILTER_CACHE_KEY, $store);
 
         if ($context) {
             $customerGroupId = $context->getExtensionAttributes()->getCustomerGroupId();

dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogGraphQl/PriceRangeTest.php

@@ -34,6 +34,34 @@ protected function setUp(): void
         $this->getCustomerAuthenticationHeader = $this->objectManager->get(GetCustomerAuthenticationHeader::class);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Store/_files/second_website_with_two_stores.php
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable_in_multiple_websites.php
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable_in_multiple_websites_with_special_price.php
+     */
+    public function testMinimalPriceForConfigurableProductWithSpecialPrice() : void
+    {
+        $headerMapFirstStore['Store'] = 'default';
+        $headerMapSecondStore['Store'] = 'fixture_second_store';
+        $query = $this->getProductsBySkuQuery();
+        $responseForFirstWebsite = $this->graphQlQuery($query, [], '', $headerMapFirstStore);
+        $responseForSecondWebsite = $this->graphQlQuery($query, [], '', $headerMapSecondStore);
+
+        $this->assertNotEmpty($responseForFirstWebsite['products']);
+        $priceRange = $responseForFirstWebsite['products']['items'][0]['price_range'];
+        $this->assertEquals(10, $priceRange['minimum_price']['regular_price']['value']);
+        $this->assertEquals(10, $priceRange['minimum_price']['final_price']['value']);
+        $this->assertEquals(10, $priceRange['maximum_price']['regular_price']['value']);
+        $this->assertEquals(10, $priceRange['maximum_price']['final_price']['value']);
+
+        $this->assertNotEmpty($responseForSecondWebsite['products']);
+        $priceRange = $responseForSecondWebsite['products']['items'][0]['price_range'];
+        $this->assertEquals(20, $priceRange['minimum_price']['regular_price']['value']);
+        $this->assertEquals(4, $priceRange['minimum_price']['final_price']['value']);
+        $this->assertEquals(20, $priceRange['maximum_price']['regular_price']['value']);
+        $this->assertEquals(4, $priceRange['maximum_price']['final_price']['value']);
+    }
+
     /**
      * Test for checking if catalog rule price has been applied for all customer group
      *
@@ -278,6 +306,63 @@ private function getProductSearchQuery(string $productSku): string
     }
   }
 }
+QUERY;
+    }
+
+    /**
+     * Get a query which user filter for product sku and returns price_range
+     *
+     * @param string $productSku
+     * @return string
+     */
+    private function getProductsBySkuQuery() : string
+    {
+        return <<<QUERY
+query getProductsBySku {
+  products(filter: { sku: { eq: "configurable" } }) {
+    items {
+      sku
+      name
+      price_range {
+        minimum_price {
+          regular_price {
+            value
+            currency
+          }
+          discount {
+            amount_off
+            percent_off
+          }
+          final_price {
+            value
+            currency
+          }
+        }
+        maximum_price {
+          regular_price {
+            value
+            currency
+          }
+          discount {
+            amount_off
+            percent_off
+          }
+          final_price {
+            value
+            currency
+          }
+        }
+      }
+      ... on ConfigurableProduct {
+        variants {
+          product {
+            sku
+          }
+        }
+      }
+    }
+  }
+}
 QUERY;
     }
 }

dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_in_multiple_websites_with_special_price.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+Bootstrap::getInstance()->reinitialize();
+
+/** @var WebsiteRepositoryInterface $repository */
+$repository = Bootstrap::getObjectManager()->get(WebsiteRepositoryInterface::class);
+$websiteId = $repository->get('test')->getId();
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = Bootstrap::getObjectManager()
+    ->create(ProductRepositoryInterface::class);
+
+$product = $productRepository->get('simple_20', true);
+$product->setSpecialPrice('4');
+$product->setWebsiteIds([$websiteId]);
+$productRepository->save($product);
+
+$product = $productRepository->get('simple_10', true);
+$product->setWebsiteIds([1]);
+$productRepository->save($product);
+
+$product = $productRepository->get('configurable', true);
+$product->setWebsiteIds([1, $websiteId]);
+$productRepository->save($product);