From 548ca3c97565e99ebe8bcfa42e1f421de23c4898 Mon Sep 17 00:00:00 2001
From: Alexandr Voronoy <servermed@gmail.com>
Date: Mon, 12 Nov 2018 19:11:54 +0200
Subject: [PATCH] Added option_id in response for product with customizable
 options.

---
 app/code/Magento/CatalogGraphQl/etc/schema.graphqls        | 1 +
 .../testsuite/Magento/GraphQl/Catalog/ProductViewTest.php  | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
index 5efe37d8f91f6..5c15d1f4a07e7 100644
--- a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
@@ -358,6 +358,7 @@ interface CustomizableOptionInterface @typeResolver(class: "Magento\\CatalogGrap
     title: String @doc(description: "The display name for this option")
     required: Boolean @doc(description: "Indicates whether the option is required")
     sort_order: Int @doc(description: "The order in which the option is displayed")
+    option_id: Int @doc(description: "Option ID")
 }
 
 interface CustomizableProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\ProductInterfaceTypeResolverComposite") @doc(description: "CustomizableProductInterface contains information about customizable product options.") {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
index 791696b2fa29e..77384165db97f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
@@ -91,6 +91,7 @@ public function testQueryAllFieldsSimpleProduct()
                 title
                 required
                 sort_order
+                option_id
                 ... on CustomizableFieldOption {
                   product_sku
                   field_option: value {
@@ -337,6 +338,7 @@ public function testQueryMediaGalleryEntryFieldsSimpleProduct()
                 title
                 required
                 sort_order
+                option_id
                 ... on CustomizableFieldOption {
                   product_sku
                   field_option: value {
@@ -753,7 +755,8 @@ private function assertOptions($product, $actualResponse)
             $assertionMap = [
                 ['response_field' => 'sort_order', 'expected_value' => $option->getSortOrder()],
                 ['response_field' => 'title', 'expected_value' => $option->getTitle()],
-                ['response_field' => 'required', 'expected_value' => $option->getIsRequire()]
+                ['response_field' => 'required', 'expected_value' => $option->getIsRequire()],
+                ['response_field' => 'option_id', 'expected_value' => $option->getOptionId()]
             ];
 
             if (!empty($option->getValues())) {
@@ -777,7 +780,7 @@ private function assertOptions($product, $actualResponse)
                         ['response_field' => 'product_sku', 'expected_value' => $option->getProductSku()],
                     ]
                 );
-                $valueKeyName = "";
+
                 if ($option->getType() === 'file') {
                     $valueKeyName = 'file_option';
                     $valueAssertionMap = [