29251 fix product loading based row_id

Author: Munkh-Ulzii Balidar

app/code/Magento/ConfigurableProduct/Helper/Data.php

@@ -7,9 +7,11 @@
 namespace Magento\ConfigurableProduct\Helper;
 
 use Magento\Catalog\Model\Product\Image\UrlBuilder;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Framework\App\ObjectManager;
 use Magento\Catalog\Helper\Image as ImageHelper;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Image;
 
 /**
@@ -73,7 +75,7 @@ public function getGalleryImages(ProductInterface $product)
     /**
      * Get Options for Configurable Product Options
      *
-     * @param \Magento\Catalog\Model\Product $currentProduct
+     * @param Product $currentProduct
      * @param array $allowedProducts
      * @return array
      */
@@ -100,11 +102,13 @@ public function getOptions($currentProduct, $allowedProducts)
     /**
      * Get allowed attributes
      *
-     * @param \Magento\Catalog\Model\Product $product
+     * @param Product $product
      * @return array
      */
     public function getAllowAttributes($product)
     {
-        return $product->getTypeInstance()->getConfigurableAttributes($product);
+        return ($product->getTypeId() == Configurable::TYPE_CODE)
+            ? $product->getTypeInstance()->getConfigurableAttributes($product)
+            : [];
     }
 }

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

@@ -186,8 +186,8 @@ private function fetch() : array
                         = $this->selectionUidFormatter->encode((int)$attribute->getId(), (int)$value['value_index']);
                     $this->attributeMap[$productId][$attribute->getId()]['values'][$index]
                         ['is_available_for_selection'] =
-                        isset($options[$attribute['attribute_id']][$value['value_index']])
-                        && $options[$attribute['attribute_id']][$value['value_index']];
+                        isset($options[$attribute->getAttributeId()][$value['value_index']])
+                        && $options[$attribute->getAttributeId()][$value['value_index']];
                 }
             }
         }
@@ -196,16 +196,21 @@ private function fetch() : array
     }
 
     /**
-     * Load products by entity ids
+     * Load products by link field ids
      *
      * @param int[] $productIds
      * @return ProductInterface[]
      */
     private function getProducts($productIds)
     {
-        $this->searchCriteriaBuilder->addFilter('entity_id', $productIds, 'in');
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+        $this->searchCriteriaBuilder->addFilter($linkField, $productIds, 'in');
         $searchCriteria = $this->searchCriteriaBuilder->create();
         $products = $this->productRepository->getList($searchCriteria)->getItems();
-        return $products;
+        $productsLinkFieldMap = [];
+        foreach ($products as $product) {
+            $productsLinkFieldMap[$product->getData($linkField)] = $product;
+        }
+        return $productsLinkFieldMap;
     }
 }

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

@@ -9,6 +9,7 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection as ChildCollection;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\CollectionFactory;
 use Magento\Framework\EntityManager\MetadataPool;
@@ -175,19 +176,21 @@ private function fetch(ContextInterface $context = null) : array
     }
 
     /**
-     * Get attributes code
+     * Get attributes codes for given product
      *
-     * @param \Magento\Catalog\Model\Product $currentProduct
+     * @param Product $currentProduct
      * @return array
      */
     private function getAttributesCodes(Product $currentProduct): array
     {
         $attributeCodes = $this->attributeCodes;
-        $allowAttributes = $currentProduct->getTypeInstance()->getConfigurableAttributes($currentProduct);
-        foreach ($allowAttributes as $attribute) {
-            $productAttribute = $attribute->getProductAttribute();
-            if (!\in_array($productAttribute->getAttributeCode(), $attributeCodes)) {
-                $attributeCodes[] = $productAttribute->getAttributeCode();
+        if ($currentProduct->getTypeId() == Configurable::TYPE_CODE) {
+            $allowAttributes = $currentProduct->getTypeInstance()->getConfigurableAttributes($currentProduct);
+            foreach ($allowAttributes as $attribute) {
+                $productAttribute = $attribute->getProductAttribute();
+                if (!\in_array($productAttribute->getAttributeCode(), $attributeCodes)) {
+                    $attributeCodes[] = $productAttribute->getAttributeCode();
+                }
             }
         }