MC-42666: GraphQL request returns configurable variants from ALL storeviews

Author: dhorytskyi

app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionSelectBuilder.php

@@ -11,7 +11,6 @@
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Store\Model\Store;
 
 /**
  * Build select object for retrieving configurable options.
@@ -44,6 +43,7 @@ public function __construct(Attribute $attributeResource, MetadataPool $metadata
     public function getSelect(AbstractAttribute $superAttribute, int $productId)
     {
         $productLinkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+
         $select = $this->attributeResource->getConnection()->select()->from(
             ['super_attribute' => $this->attributeResource->getTable('catalog_product_super_attribute')],
             [
@@ -86,7 +86,7 @@ public function getSelect(AbstractAttribute $superAttribute, int $productId)
                 ' AND ',
                 [
                     'super_attribute.product_super_attribute_id = attribute_label.product_super_attribute_id',
-                    'attribute_label.store_id = ' . Store::DEFAULT_STORE_ID,
+                    'attribute_label.store_id = 0',
                 ]
             ),
             []
@@ -111,7 +111,7 @@ public function getSelect(AbstractAttribute $superAttribute, int $productId)
                     ' AND ',
                     [
                         'option_value.option_id = entity_value.value',
-                        'option_value.store_id = ' . Store::DEFAULT_STORE_ID,
+                        'option_value.store_id = 0',
                     ]
                 ),
                 [

app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/ScopedOptionSelectBuilder.php

@@ -13,7 +13,6 @@
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -64,8 +63,9 @@ public function __construct(
      */
     public function getSelect(AbstractAttribute $superAttribute, int $productId)
     {
-        $store = $this->storeManager->getStore();
         $productLinkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+        $store = $this->storeManager->getStore();
+
         $select = $this->attributeResource->getConnection()->select()->from(
             ['super_attribute' => $this->attributeResource->getTable('catalog_product_super_attribute')],
             [
@@ -92,23 +92,23 @@ public function getSelect(AbstractAttribute $superAttribute, int $productId)
             'entity.entity_id = product_link.product_id',
             []
         )->joinInner(
-            ['entity_value' => $superAttribute->getBackendTable()],
+            ['entity_website' => $this->attributeResource->getTable('catalog_product_website')],
             implode(
                 ' AND ',
                 [
-                    'entity_value.attribute_id = super_attribute.attribute_id',
-                    'entity_value.store_id = 0',
-                    "entity_value.$productLinkField = entity.$productLinkField",
+                    "entity_website.product_id = entity.$productLinkField",
+                    "entity_website.website_id = {$store->getWebsiteId()}",
                 ]
             ),
             []
         )->joinInner(
-            ['entity_website' => $this->attributeResource->getTable('catalog_product_website')],
+            ['entity_value' => $superAttribute->getBackendTable()],
             implode(
                 ' AND ',
                 [
-                    "entity_website.product_id = entity.$productLinkField",
-                    "entity_website.website_id = {$store->getWebsiteId()}",
+                    'entity_value.attribute_id = super_attribute.attribute_id',
+                    'entity_value.store_id = 0',
+                    "entity_value.$productLinkField = entity.$productLinkField",
                 ]
             ),
             []
@@ -118,7 +118,7 @@ public function getSelect(AbstractAttribute $superAttribute, int $productId)
                 ' AND ',
                 [
                     'super_attribute.product_super_attribute_id = attribute_label.product_super_attribute_id',
-                    'attribute_label.store_id = ' . Store::DEFAULT_STORE_ID,
+                    'attribute_label.store_id = 0',
                 ]
             ),
             []
@@ -172,7 +172,7 @@ public function getSelect(AbstractAttribute $superAttribute, int $productId)
                     ' AND ',
                     [
                         'default_option_value.option_id = entity_value.value',
-                        'default_option_value.store_id = ' . Store::DEFAULT_STORE_ID,
+                        'default_option_value.store_id = 0',
                     ]
                 ),
                 []

app/code/Magento/ConfigurableProduct/Test/Unit/Model/AttributeOptionProviderTest.php

@@ -12,11 +12,8 @@
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
-use Magento\Framework\App\ScopeInterface;
-use Magento\Framework\App\ScopeResolverInterface;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Select;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -30,16 +27,6 @@ class AttributeOptionProviderTest extends TestCase
      */
     private $model;
 
-    /**
-     * @var ObjectManagerHelper
-     */
-    private $objectManagerHelper;
-
-    /**
-     * @var ScopeResolverInterface|MockObject
-     */
-    private $scopeResolver;
-
     /**
      * @var Select|MockObject
      */
@@ -55,11 +42,6 @@ class AttributeOptionProviderTest extends TestCase
      */
     private $abstractAttribute;
 
-    /**
-     * @var ScopeInterface|MockObject
-     */
-    private $scope;
-
     /**
      * @var Attribute|MockObject
      */
@@ -72,45 +54,13 @@ class AttributeOptionProviderTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->select = $this->getMockBuilder(Select::class)
-            ->setMethods([])
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->connectionMock = $this->getMockBuilder(AdapterInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+        $this->select = $this->createMock(Select::class);
+        $this->connectionMock = $this->createMock(AdapterInterface::class);
+        $this->attributeResource = $this->createMock(Attribute::class);
+        $this->optionSelectBuilder = $this->createMock(OptionSelectBuilderInterface::class);
+        $this->abstractAttribute = $this->createMock(AbstractAttribute::class);
 
-        $this->scope = $this->getMockBuilder(ScopeInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
-        $this->scopeResolver = $this->getMockBuilder(ScopeResolverInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
-        $this->attributeResource = $this->getMockBuilder(Attribute::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->optionSelectBuilder = $this->getMockBuilder(OptionSelectBuilderInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
-        $this->abstractAttribute = $this->getMockBuilder(AbstractAttribute::class)
-            ->setMethods(['getSourceModel', 'getSource'])
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
-        $this->objectManagerHelper = new ObjectManagerHelper($this);
-        $this->model = $this->objectManagerHelper->getObject(
-            AttributeOptionProvider::class,
-            [
-                'attributeResource' => $this->attributeResource,
-                'scopeResolver' => $this->scopeResolver,
-                'optionSelectBuilder' => $this->optionSelectBuilder,
-            ]
-        );
+        $this->model = new AttributeOptionProvider($this->attributeResource, $this->optionSelectBuilder);
     }
 
     /**
@@ -119,13 +69,9 @@ protected function setUp(): void
      */
     public function testGetAttributeOptions(array $options)
     {
-        $this->scopeResolver->expects($this->any())
-            ->method('getScope')
-            ->willReturn($this->scope);
-
-        $this->optionSelectBuilder->expects($this->any())
+        $this->optionSelectBuilder->expects($this->once())
             ->method('getSelect')
-            ->with($this->abstractAttribute, 4, $this->scope)
+            ->with($this->abstractAttribute, 4)
             ->willReturn($this->select);
 
         $this->attributeResource->expects($this->once())
@@ -149,14 +95,7 @@ public function testGetAttributeOptions(array $options)
      */
     public function testGetAttributeOptionsWithBackendModel(array $options)
     {
-        $this->scopeResolver->expects($this->any())
-            ->method('getScope')
-            ->willReturn($this->scope);
-
-        $source = $this->getMockBuilder(AbstractSource::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getAllOptions'])
-            ->getMockForAbstractClass();
+        $source = $this->createMock(AbstractSource::class);
         $source->expects($this->once())
             ->method('getAllOptions')
             ->willReturn([
@@ -165,16 +104,16 @@ public function testGetAttributeOptionsWithBackendModel(array $options)
                 ['value' => 15, 'label' => 'Option Value for index 15']
             ]);
 
-        $this->abstractAttribute->expects($this->any())
+        $this->abstractAttribute->expects($this->atLeastOnce())
             ->method('getSource')
             ->willReturn($source);
         $this->abstractAttribute->expects($this->atLeastOnce())
             ->method('getSourceModel')
             ->willReturn('getSourceModel value');
 
-        $this->optionSelectBuilder->expects($this->any())
+        $this->optionSelectBuilder->expects($this->once())
             ->method('getSelect')
-            ->with($this->abstractAttribute, 1, $this->scope)
+            ->with($this->abstractAttribute, 1)
             ->willReturn($this->select);
 
         $this->attributeResource->expects($this->once())