MC-42831: [Magento Cloud] Continuation from previous JIRA - "Add configured_variant to ConfigurableCartItem There is a PR and an MC"

Author: dhorytskyi

app/code/Magento/Catalog/Model/Attribute/Config.php

@@ -28,8 +28,8 @@ public function __construct(\Magento\Catalog\Model\Attribute\Config\Data $dataSt
      * @param string $groupName Name of an attribute group
      * @return array
      */
-    public function getAttributeNames($groupName)
+    public function getAttributeNames($groupName): array
     {
-        return $this->_dataStorage->get($groupName, []);
+        return (array) $this->_dataStorage->get($groupName, []);
     }
 }

app/code/Magento/Quote/Model/Quote/Config.php

@@ -23,7 +23,7 @@ public function __construct(\Magento\Catalog\Model\Attribute\Config $attributeCo
     /**
      * @return array
      */
-    public function getProductAttributes()
+    public function getProductAttributes(): array
     {
         return $this->_attributeConfig->getAttributeNames('quote_item');
     }

app/code/Magento/QuoteGraphQl/Plugin/ProductAttributesExtender.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Plugin;
+
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory as AttributeCollectionFactory;
+use Magento\Eav\Api\Data\AttributeInterface;
+use Magento\Framework\GraphQl\Query\Fields;
+use Magento\Quote\Model\Quote\Config as QuoteConfig;
+
+class ProductAttributesExtender
+{
+    /**
+     * @var Fields
+     */
+    private $fields;
+
+    /**
+     * @var AttributeCollectionFactory
+     */
+    private $attributeCollectionFactory;
+
+    /**
+     * @param Fields $fields
+     * @param AttributeCollectionFactory $attributeCollectionFactory
+     */
+    public function __construct(
+        Fields $fields,
+        AttributeCollectionFactory $attributeCollectionFactory
+    ) {
+        $this->fields = $fields;
+        $this->attributeCollectionFactory = $attributeCollectionFactory;
+    }
+
+    /**
+     * @param QuoteConfig $subject
+     * @param array $result
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGetProductAttributes(QuoteConfig $subject, array $result): array
+    {
+        $attributeCollection = $this->attributeCollectionFactory->create()
+            ->removeAllFieldsFromSelect()
+            ->addFieldToSelect(AttributeInterface::ATTRIBUTE_CODE)
+            ->setCodeFilter($this->fields->getFieldsUsedInQuery())
+            ->load();
+        $attributes = $attributeCollection->getColumnValues(AttributeInterface::ATTRIBUTE_CODE);
+
+        return array_merge($result, $attributes);
+    }
+}

app/code/Magento/QuoteGraphQl/etc/graphql/di.xml

@@ -20,4 +20,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Quote\Model\Quote\Config">
+        <plugin name="append_requested_graphql_attributes" type="Magento\QuoteGraphQl\Plugin\ProductAttributesExtender"/>
+    </type>
 </config>