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

Author: dhorytskyi

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

@@ -8,7 +8,6 @@
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\App\ScopeInterface;
-use Magento\Framework\DB\Select;
 
 /**
  * Build select object for retrieving configurable options.
@@ -44,6 +43,7 @@ public function __construct(Attribute $attributeResource, OptionProvider $attrib
      */
     public function getSelect(AbstractAttribute $superAttribute, int $productId, ScopeInterface $scope)
     {
+        $productLinkField = $this->attributeOptionProvider->getProductEntityLinkField();
         $select = $this->attributeResource->getConnection()->select()->from(
             ['super_attribute' => $this->attributeResource->getTable('catalog_product_super_attribute')],
             [
@@ -76,8 +76,17 @@ public function getSelect(AbstractAttribute $superAttribute, int $productId, Sco
                 [
                     'entity_value.attribute_id = super_attribute.attribute_id',
                     'entity_value.store_id = 0',
-                    "entity_value.{$this->attributeOptionProvider->getProductEntityLinkField()} = "
-                    . "entity.{$this->attributeOptionProvider->getProductEntityLinkField()}",
+                    "entity_value.$productLinkField = entity.$productLinkField",
+                ]
+            ),
+            []
+        )->joinInner(
+            ['entity_website' => $this->attributeResource->getTable('catalog_product_website')],
+            implode(
+                ' AND ',
+                [
+                    "entity_website.product_id = entity.$productLinkField",
+                    "entity_website.website_id = {$scope->getWebsiteId()}",
                 ]
             ),
             []

app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php

@@ -120,10 +120,10 @@ public function addEavAttributes(array $attributeCodes) : void
      * Retrieve child products from for passed in parent id.
      *
      * @param int $id
-     * @param ContextInterface|null $context
+     * @param ContextInterface $context
      * @return array
      */
-    public function getChildProductsByParentId(int $id, ContextInterface $context = null) : array
+    public function getChildProductsByParentId(int $id, ContextInterface $context) : array
     {
         $childrenMap = $this->fetch($context);
 
@@ -137,10 +137,10 @@ public function getChildProductsByParentId(int $id, ContextInterface $context =
     /**
      * Fetch all children products from parent id's.
      *
-     * @param ContextInterface|null $context
+     * @param ContextInterface $context
      * @return array
      */
-    private function fetch(ContextInterface $context = null) : array
+    private function fetch(ContextInterface $context) : array
     {
         if (empty($this->parentProducts) || !empty($this->childrenMap)) {
             return $this->childrenMap;
@@ -151,6 +151,7 @@ private function fetch(ContextInterface $context = null) : array
             /** @var ChildCollection $childCollection */
             $childCollection = $this->childCollectionFactory->create();
             $childCollection->setProductFilter($product);
+            $childCollection->addWebsiteFilter($context->getExtensionAttributes()->getStore()->getWebsiteId());
             $this->collectionProcessor->process(
                 $childCollection,
                 $this->searchCriteriaBuilder->create(),