Merge branch '2.4-develop' into bluetooth_delivery

Author: magento-devops-queue-mgr-svc

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

@@ -105,6 +105,16 @@ public function getAttributesByProductId(int $productId): array
         return $attributes[$productId];
     }
 
+    /**
+     * Retrieve all attributes
+     *
+     * @return array
+     */
+    public function getAttributes(): array
+    {
+        return $this->fetch();
+    }
+
     /**
      * Fetch attribute data
      *

app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/ConfigurableVariant.php

@@ -98,7 +98,18 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $this->optionCollection->addProductId((int)$value[$linkField]);
 
         $result = function () use ($value, $linkField, $context) {
-            $children = $this->variantCollection->getChildProductsByParentId((int)$value[$linkField], $context);
+            $attributeCodes = [];
+            foreach ($this->optionCollection->getAttributes() as $productAttributes) {
+                foreach ($productAttributes as $attribute) {
+                    $attributeCodes[] = $attribute['attribute_code'];
+                }
+            }
+            $attributeCodes = array_unique($attributeCodes);
+            $children = $this->variantCollection->getChildProductsByParentId(
+                (int)$value[$linkField],
+                $context,
+                $attributeCodes
+            );
             $options = $this->optionCollection->getAttributesByProductId((int)$value[$linkField]);
             $variants = [];
             /** @var Product $child */

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

@@ -123,11 +123,12 @@ public function addEavAttributes(array $attributeCodes) : void
      *
      * @param int $id
      * @param ContextInterface $context
+     * @param array $attributeCodes
      * @return array
      */
-    public function getChildProductsByParentId(int $id, ContextInterface $context) : array
+    public function getChildProductsByParentId(int $id, ContextInterface $context, array $attributeCodes) : array
     {
-        $childrenMap = $this->fetch($context);
+        $childrenMap = $this->fetch($context, $attributeCodes);
 
         if (!isset($childrenMap[$id])) {
             return [];
@@ -140,67 +141,47 @@ public function getChildProductsByParentId(int $id, ContextInterface $context) :
      * Fetch all children products from parent id's.
      *
      * @param ContextInterface $context
+     * @param array $attributeCodes
      * @return array
      */
-    private function fetch(ContextInterface $context) : array
+    private function fetch(ContextInterface $context, array $attributeCodes) : array
     {
         if (empty($this->parentProducts) || !empty($this->childrenMap)) {
             return $this->childrenMap;
         }
 
+        /** @var ChildCollection $childCollection */
+        $childCollection = $this->childCollectionFactory->create();
         foreach ($this->parentProducts as $product) {
-            $attributeData = $this->getAttributesCodes($product);
-            /** @var ChildCollection $childCollection */
-            $childCollection = $this->childCollectionFactory->create();
             $childCollection->setProductFilter($product);
-            $childCollection->addWebsiteFilter($context->getExtensionAttributes()->getStore()->getWebsiteId());
-            $this->collectionProcessor->process(
-                $childCollection,
-                $this->searchCriteriaBuilder->create(),
-                $attributeData,
-                $context
-            );
-            $childCollection->load();
-            $this->collectionPostProcessor->process($childCollection, $attributeData);
-
-            /** @var Product $childProduct */
-            foreach ($childCollection as $childProduct) {
-                if ((int)$childProduct->getStatus() !== Status::STATUS_ENABLED) {
-                    continue;
-                }
-                $formattedChild = ['model' => $childProduct, 'sku' => $childProduct->getSku()];
-                $parentId = (int)$childProduct->getParentId();
-                if (!isset($this->childrenMap[$parentId])) {
-                    $this->childrenMap[$parentId] = [];
-                }
-
-                $this->childrenMap[$parentId][] = $formattedChild;
-            }
         }
-
-        return $this->childrenMap;
-    }
-
-    /**
-     * Get attributes codes for given product
-     *
-     * @param Product $currentProduct
-     * @return array
-     */
-    private function getAttributesCodes(Product $currentProduct): array
-    {
-        $attributeCodes = $this->attributeCodes;
-        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();
-                }
+        $childCollection->addWebsiteFilter($context->getExtensionAttributes()->getStore()->getWebsiteId());
+
+        $attributeCodes = array_unique(array_merge($this->attributeCodes, $attributeCodes));
+
+        $this->collectionProcessor->process(
+            $childCollection,
+            $this->searchCriteriaBuilder->create(),
+            $attributeCodes,
+            $context
+        );
+        $this->collectionPostProcessor->process($childCollection, $attributeCodes);
+
+        /** @var Product $childProduct */
+        foreach ($childCollection as $childProduct) {
+            if ((int)$childProduct->getStatus() !== Status::STATUS_ENABLED) {
+                continue;
             }
+            $formattedChild = ['model' => $childProduct, 'sku' => $childProduct->getSku()];
+            $parentId = (int)$childProduct->getParentId();
+            if (!isset($this->childrenMap[$parentId])) {
+                $this->childrenMap[$parentId] = [];
+            }
+
+            $this->childrenMap[$parentId][] = $formattedChild;
         }
 
-        return $attributeCodes;
+        return $this->childrenMap;
     }
 
     /**