ENGCOM-5496: customizable_options.values contains everything but value(s) #712

Author: naydav

app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/CustomizableOptionValue/Multiple.php

@@ -54,6 +54,7 @@ public function getData(
             $selectedOptionValueData[] = [
                 'id' => $selectedOption->getId(),
                 'label' => $optionValue->getTitle(),
+                'value' => $optionId,
                 'price' => [
                     'type' => strtoupper($optionValue->getPriceType()),
                     'units' => $priceValueUnits,

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

@@ -327,7 +327,7 @@ type SelectedCustomizableOption {
 type SelectedCustomizableOptionValue {
     id: Int!
     label: String!
-    value: String
+    value: String!
     price: CartItemSelectedOptionValuePrice!
 }
 

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductWithCustomOptionsToCartTest.php

@@ -64,9 +64,10 @@ public function testAddSimpleProductWithOptions()
         $customizableOptionsOutput = $response['addSimpleProductsToCart']['cart']['items'][0]['customizable_options'];
         $assignedOptionsCount = count($customOptionsValues);
         for ($counter = 0; $counter < $assignedOptionsCount; $counter++) {
+            $expectedValues = $this->buildExpectedValuesArray($customOptionsValues[$counter]['value_string']);
             self::assertEquals(
-                $customOptionsValues[$counter]['value_string'],
-                $customizableOptionsOutput[$counter]['values'][0]['value']
+                $expectedValues,
+                $customizableOptionsOutput[$counter]['values']
             );
         }
     }
@@ -150,18 +151,38 @@ private function getCustomOptionsValuesForQuery(string $sku): array
             $optionType = $customOption->getType();
             if ($optionType == 'field' || $optionType == 'area') {
                 $customOptionsValues[] = [
-                    'id' => (int) $customOption->getOptionId(),
+                    'id' => (int)$customOption->getOptionId(),
                     'value_string' => 'test'
                 ];
             } elseif ($optionType == 'drop_down') {
                 $optionSelectValues = $customOption->getValues();
                 $customOptionsValues[] = [
-                    'id' => (int) $customOption->getOptionId(),
+                    'id' => (int)$customOption->getOptionId(),
                     'value_string' => reset($optionSelectValues)->getOptionTypeId()
                 ];
+            } elseif ($optionType == 'multiple') {
+                $customOptionsValues[] = [
+                    'id' => (int)$customOption->getOptionId(),
+                    'value_string' => '[' . implode(',', array_keys($customOption->getValues())) . ']'
+                ];
             }
         }
-
         return $customOptionsValues;
     }
+
+    /**
+     * Build the part of expected response.
+     *
+     * @param string $assignedValue
+     * @return array
+     */
+    private function buildExpectedValuesArray(string $assignedValue) : array
+    {
+        $assignedOptionsArray = explode(',', trim($assignedValue, '[]'));
+        $expectedArray = [];
+        foreach ($assignedOptionsArray as $assignedOption) {
+            $expectedArray[] = ['value' => $assignedOption];
+        }
+        return $expectedArray;
+    }
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductWithCustomOptionsToCartTest.php

@@ -64,9 +64,10 @@ public function testAddVirtualProductWithOptions()
         $customizableOptionsOutput = $response['addVirtualProductsToCart']['cart']['items'][0]['customizable_options'];
         $assignedOptionsCount = count($customOptionsValues);
         for ($counter = 0; $counter < $assignedOptionsCount; $counter++) {
+            $expectedValues = $this->buildExpectedValuesArray($customOptionsValues[$counter]['value_string']);
             self::assertEquals(
-                $customOptionsValues[$counter]['value_string'],
-                $customizableOptionsOutput[$counter]['values'][0]['value']
+                $expectedValues,
+                $customizableOptionsOutput[$counter]['values']
             );
         }
     }
@@ -150,18 +151,39 @@ private function getCustomOptionsValuesForQuery(string $sku): array
             $optionType = $customOption->getType();
             if ($optionType == 'field' || $optionType == 'area') {
                 $customOptionsValues[] = [
-                    'id' => (int) $customOption->getOptionId(),
+                    'id' => (int)$customOption->getOptionId(),
                     'value_string' => 'test'
                 ];
             } elseif ($optionType == 'drop_down') {
                 $optionSelectValues = $customOption->getValues();
                 $customOptionsValues[] = [
-                    'id' => (int) $customOption->getOptionId(),
+                    'id' => (int)$customOption->getOptionId(),
                     'value_string' => reset($optionSelectValues)->getOptionTypeId()
                 ];
+            } elseif ($optionType == 'multiple') {
+                $customOptionsValues[] = [
+                    'id' => (int)$customOption->getOptionId(),
+                    'value_string' => '[' . implode(',', array_keys($customOption->getValues())) . ']'
+                ];
             }
         }
 
         return $customOptionsValues;
     }
+
+    /**
+     * Build the part of expected response.
+     *
+     * @param string $assignedValue
+     * @return array
+     */
+    private function buildExpectedValuesArray(string $assignedValue) : array
+    {
+        $assignedOptionsArray = explode(',', trim($assignedValue, '[]'));
+        $expectedArray = [];
+        foreach ($assignedOptionsArray as $assignedOption) {
+            $expectedArray[] = ['value' => $assignedOption];
+        }
+        return $expectedArray;
+    }
 }

dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_options.php

@@ -84,6 +84,28 @@
                 'sort_order' => 2,
             ],
         ],
+    ],
+    [
+        'title' => 'multiple option',
+        'type' => 'multiple',
+        'is_require' => false,
+        'sort_order' => 5,
+        'values' => [
+            [
+                'title' => 'multiple option 1',
+                'price' => 10,
+                'price_type' => 'fixed',
+                'sku' => 'multiple option 1 sku',
+                'sort_order' => 1,
+            ],
+            [
+                'title' => 'multiple option 2',
+                'price' => 20,
+                'price_type' => 'fixed',
+                'sku' => 'multiple option 2 sku',
+                'sort_order' => 2,
+            ],
+        ],
     ]
 ];
 

dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_with_options.php

@@ -84,6 +84,28 @@
                 'sort_order' => 2,
             ],
         ],
+    ],
+    [
+        'title' => 'multiple option',
+        'type' => 'multiple',
+        'is_require' => false,
+        'sort_order' => 5,
+        'values' => [
+            [
+                'title' => 'multiple option 1',
+                'price' => 10,
+                'price_type' => 'fixed',
+                'sku' => 'multiple option 1 sku',
+                'sort_order' => 1,
+            ],
+            [
+                'title' => 'multiple option 2',
+                'price' => 20,
+                'price_type' => 'fixed',
+                'sku' => 'multiple option 2 sku',
+                'sort_order' => 2,
+            ],
+        ],
     ]
 ];