MC-29839: [GraphQL] Configurable Options id/code Type Mismatch

Author: danielrenaud

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

@@ -9,11 +9,11 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product;
-use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\CollectionFactory;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection
     as AttributeCollection;
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute;
-use Magento\Catalog\Model\ProductFactory;
+use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\CollectionFactory;
 use Magento\Framework\EntityManager\MetadataPool;
 
 /**
@@ -121,6 +121,8 @@ private function fetch() : array
             $attributeData = $attribute->getData();
             $this->attributeMap[$productId][$attribute->getId()] = $attribute->getData();
             $this->attributeMap[$productId][$attribute->getId()]['id'] = $attribute->getId();
+            $this->attributeMap[$productId][$attribute->getId()]['attribute_id_v2']
+                = $attribute->getProductAttribute()->getAttributeId();
             $this->attributeMap[$productId][$attribute->getId()]['attribute_code']
                 = $attribute->getProductAttribute()->getAttributeCode();
             $this->attributeMap[$productId][$attribute->getId()]['values'] = $attributeData['options'];

app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls

@@ -22,7 +22,8 @@ type ConfigurableAttributeOption @doc(description: "ConfigurableAttributeOption
 
 type ConfigurableProductOptions @doc(description: "ConfigurableProductOptions defines configurable attributes for the specified product") {
     id: Int @doc(description: "The configurable option ID number assigned by the system")
-    attribute_id: String @doc(description: "The ID assigned to the attribute")
+    attribute_id: String @deprecated(reason: "Use attribute_id_v2 instead") @doc(description: "The ID assigned to the attribute")
+    attribute_id_v2: Int @doc(description: "The ID assigned to the attribute")
     attribute_code: String @doc(description: "A string that identifies the attribute")
     label: String @doc(description: "A string that describes the configurable product option, which is displayed on the UI")
     position: Int @doc(description: "A number that indicates the order in which the attribute is displayed")

dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php

@@ -96,6 +96,7 @@ public function testQueryConfigurableProductLinks()
         configurable_options {
           id
           attribute_id
+          attribute_id_v2
           label
           position
           use_default
@@ -335,23 +336,15 @@ private function assertConfigurableVariants($actualResponse)
                 $mediaGalleryEntries,
                 "Precondition failed since there are incorrect number of media gallery entries"
             );
-            $this->assertIsArray($actualResponse['variants']
-                    [$variantKey]
-                    ['product']
-                    ['media_gallery_entries']
-                
-            );
+            $this->assertIsArray($actualResponse['variants'][$variantKey]['product']['media_gallery_entries']);
             $this->assertCount(
                 1,
                 $actualResponse['variants'][$variantKey]['product']['media_gallery_entries'],
                 "there must be 1 record in the media gallery"
             );
             $mediaGalleryEntry = $mediaGalleryEntries[0];
             $this->assertResponseFields(
-                $actualResponse['variants']
-                [$variantKey]
-                ['product']
-                ['media_gallery_entries'][0],
+                $actualResponse['variants'][$variantKey]['product']['media_gallery_entries'][0],
                 [
                     'disabled' => (bool)$mediaGalleryEntry->isDisabled(),
                     'file' => $mediaGalleryEntry->getFile(),
@@ -363,12 +356,7 @@ private function assertConfigurableVariants($actualResponse)
             );
             $videoContent = $mediaGalleryEntry->getExtensionAttributes()->getVideoContent();
             $this->assertResponseFields(
-                $actualResponse['variants']
-                [$variantKey]
-                ['product']
-                ['media_gallery_entries']
-                [0]
-                ['video_content'],
+                $actualResponse['variants'][$variantKey]['product']['media_gallery_entries'][0]['video_content'],
                 [
                     'media_type' =>$videoContent->getMediaType(),
                     'video_description' => $videoContent->getVideoDescription(),
@@ -454,6 +442,11 @@ private function assertConfigurableProductOptions($actualResponse)
             $actualResponse['configurable_options'][0]['attribute_id'],
             $configurableAttributeOption['attribute_id']
         );
+        $this->assertEquals(
+            $actualResponse['configurable_options'][0]['attribute_id_v2'],
+            $configurableAttributeOption['attribute_id']
+        );
+        $this->assertIsInt($actualResponse['configurable_options'][0]['attribute_id_v2']);
         $this->assertEquals(
             $actualResponse['configurable_options'][0]['label'],
             $configurableAttributeOption['label']