Small improvements and API Test coveragefor uid

Author: eduard13

app/code/Magento/BundleGraphQl/Model/Resolver/Options/BundleEnteredOptionValueIdV2.php renamed to app/code/Magento/BundleGraphQl/Model/Resolver/Options/BundleItemOptionUid.php

@@ -14,17 +14,17 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 
 /**
- * Format new option id_v2 in base64 encode for entered bundle options
+ * Format new option uid in base64 encode for entered bundle options
  */
-class BundleEnteredOptionValueIdV2 implements ResolverInterface
+class BundleItemOptionUid implements ResolverInterface
 {
     /**
      * Option type name
      */
     private const OPTION_TYPE = 'bundle';
 
     /**
-     * Create a option id_v2 for entered option in "<option-type>/<option-id>/<option-value-id>/<quantity>" format
+     * Create a option uid for entered option in "<option-type>/<option-id>/<option-value-id>/<quantity>" format
      *
      * @param Field $field
      * @param ContextInterface $context
@@ -46,11 +46,11 @@ public function resolve(
         array $args = null
     ) {
         if (!isset($value['option_id']) || empty($value['option_id'])) {
-            throw new GraphQlInputException(__('Wrong format option data: option_id should not be empty.'));
+            throw new GraphQlInputException(__('"option_id" value should be specified.'));
         }
 
         if (!isset($value['selection_id']) || empty($value['selection_id'])) {
-            throw new GraphQlInputException(__('Wrong format option data: selection_id should not be empty.'));
+            throw new GraphQlInputException(__('"selection_id" value should be specified.'));
         }
 
         $optionDetails = [

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

@@ -66,7 +66,7 @@ type BundleItemOption @doc(description: "BundleItemOption defines characteristic
     price_type: PriceTypeEnum @doc(description: "One of FIXED, PERCENT, or DYNAMIC.")
     can_change_quantity: Boolean @doc(description: "Indicates whether the customer can change the number of items for this option.")
     product: ProductInterface @doc(description: "Contains details about this product option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Options\\BundleEnteredOptionValueIdV2")
+    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Options\\BundleItemOptionUid") # A Base64 string that encodes option details.
 }
 
 type BundleProduct implements ProductInterface, PhysicalProductInterface, CustomizableProductInterface @doc(description: "BundleProduct defines basic features of a bundle product and contains multiple BundleItems.") {

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableEnteredOptionValueIdV2.php renamed to app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableEnteredOptionValueUid.php

@@ -14,17 +14,17 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 
 /**
- * Format new option id_v2 in base64 encode for entered custom options
+ * Format new option uid in base64 encode for entered custom options
  */
-class CustomizableEnteredOptionValueIdV2 implements ResolverInterface
+class CustomizableEnteredOptionValueUid implements ResolverInterface
 {
     /**
      * Option type name
      */
     private const OPTION_TYPE = 'custom-option';
 
     /**
-     * Create a option id_v2 for entered option in "<option-type>/<option-id>" format
+     * Create a option uid for entered option in "<option-type>/<option-id>" format
      *
      * @param Field $field
      * @param ContextInterface $context
@@ -46,7 +46,7 @@ public function resolve(
         array $args = null
     ) {
         if (!isset($value['option_id']) || empty($value['option_id'])) {
-            throw new GraphQlInputException(__('Wrong format option data: option_id should not be empty.'));
+            throw new GraphQlInputException(__('"option_id" value should be specified.'));
         }
 
         $optionDetails = [

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableSelectedOptionValueIdV2.php renamed to app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableSelectedOptionValueUid.php

@@ -14,17 +14,17 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 
 /**
- * Format new option id_v2 in base64 encode for selected custom options
+ * Format new option uid in base64 encode for selected custom options
  */
-class CustomizableSelectedOptionValueIdV2 implements ResolverInterface
+class CustomizableSelectedOptionValueUid implements ResolverInterface
 {
     /**
      * Option type name
      */
     private const OPTION_TYPE = 'custom-option';
 
     /**
-     * Create a option id_v2 for selected option in "<option-type>/<option-id>/<option-value-id>" format
+     * Create a option uid for selected option in "<option-type>/<option-id>/<option-value-id>" format
      *
      * @param Field $field
      * @param ContextInterface $context
@@ -46,11 +46,11 @@ public function resolve(
         array $args = null
     ) {
         if (!isset($value['option_id']) || empty($value['option_id'])) {
-            throw new GraphQlInputException(__('Wrong format option data: option_id should not be empty.'));
+            throw new GraphQlInputException(__('"option_id" value should be specified.'));
         }
 
         if (!isset($value['option_type_id']) || empty($value['option_type_id'])) {
-            throw new GraphQlInputException(__('Wrong format option data: option_type_id should not be empty.'));
+            throw new GraphQlInputException(__('"option_type_id" value should be specified.'));
         }
 
         $optionDetails = [

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

@@ -132,7 +132,7 @@ type CustomizableAreaValue @doc(description: "CustomizableAreaValue defines the
     price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     max_characters: Int @doc(description: "The maximum number of characters that can be entered for this customizable option.")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueIdV2")
+    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueUid") # A Base64 string that encodes option details.
 }
 
 type CategoryTree implements CategoryInterface @doc(description: "Category Tree implementation.") {
@@ -154,7 +154,7 @@ type CustomizableDateValue @doc(description: "CustomizableDateValue defines the
     price: Float @doc(description: "The price assigned to this option.")
     price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueIdV2")
+    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueUid") # A Base64 string that encodes option details.
 }
 
 type CustomizableDropDownOption implements CustomizableOptionInterface @doc(description: "CustomizableDropDownOption contains information about a drop down menu that is defined as part of a customizable option.") {
@@ -168,7 +168,7 @@ type CustomizableDropDownValue @doc(description: "CustomizableDropDownValue defi
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     title: String @doc(description: "The display name for this option.")
     sort_order: Int @doc(description: "The order in which the option is displayed.")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueIdV2")
+    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueUid") # A Base64 string that encodes option details.
 }
 
 type CustomizableMultipleOption implements CustomizableOptionInterface @doc(description: "CustomizableMultipleOption contains information about a multiselect that is defined as part of a customizable option.") {
@@ -182,7 +182,7 @@ type CustomizableMultipleValue @doc(description: "CustomizableMultipleValue defi
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     title: String @doc(description: "The display name for this option.")
     sort_order: Int @doc(description: "The order in which the option is displayed.")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueIdV2")
+    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueUid")
 }
 
 type CustomizableFieldOption implements CustomizableOptionInterface @doc(description: "CustomizableFieldOption contains information about a text field that is defined as part of a customizable option.") {
@@ -195,7 +195,7 @@ type CustomizableFieldValue @doc(description: "CustomizableFieldValue defines th
     price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     max_characters: Int @doc(description: "The maximum number of characters that can be entered for this customizable option.")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueIdV2")
+    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueUid") # A Base64 string that encodes option details.
 }
 
 type CustomizableFileOption implements CustomizableOptionInterface @doc(description: "CustomizableFileOption contains information about a file picker that is defined as part of a customizable option.") {
@@ -210,7 +210,7 @@ type CustomizableFileValue @doc(description: "CustomizableFileValue defines the
     file_extension: String @doc(description: "The file extension to accept.")
     image_size_x: Int @doc(description: "The maximum width of an image.")
     image_size_y: Int @doc(description: "The maximum height of an image.")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueIdV2")
+    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueUid") # A Base64 string that encodes option details.
 }
 
 interface MediaGalleryInterface @doc(description: "Contains basic information about a product image or video.") @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\MediaGalleryTypeResolver") {
@@ -280,7 +280,7 @@ type CustomizableRadioValue @doc(description: "CustomizableRadioValue defines th
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     title: String @doc(description: "The display name for this option.")
     sort_order: Int @doc(description: "The order in which the radio button is displayed.")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueIdV2")
+    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueUid") # A Base64 string that encodes option details.
 }
 
 type CustomizableCheckboxOption implements CustomizableOptionInterface @doc(description: "CustomizableCheckbbixOption contains information about a set of checkbox values that are defined as part of a customizable option.") {
@@ -294,7 +294,7 @@ type CustomizableCheckboxValue @doc(description: "CustomizableCheckboxValue defi
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     title: String @doc(description: "The display name for this option.")
     sort_order: Int @doc(description: "The order in which the checkbox value is displayed.")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueIdV2")
+    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueUid") # A Base64 string that encodes option details.
 }
 
 type VirtualProduct implements ProductInterface, CustomizableProductInterface @doc(description: "A virtual product is non-tangible product that does not require shipping and is not kept in inventory.") {

app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes.php

@@ -60,7 +60,8 @@ public function resolve(
                     $option['options_map'] ?? [],
                     $code,
                     (int) $optionId,
-                    (int) $model->getData($code)
+                    (int) $model->getData($code),
+                    (int) $option['attribute_id']
                 );
                 if (!empty($optionsFromMap)) {
                     $data[] = $optionsFromMap;
@@ -77,14 +78,20 @@ public function resolve(
      * @param string $code
      * @param int $optionId
      * @param int $attributeCodeId
+     * @param int $attributeId
      * @return array
      */
-    private function getOptionsFromMap(array $optionMap, string $code, int $optionId, int $attributeCodeId): array
-    {
+    private function getOptionsFromMap(
+        array $optionMap,
+        string $code,
+        int $optionId,
+        int $attributeCodeId,
+        int $attributeId
+    ): array {
         $data = [];
         if (isset($optionMap[$optionId . ':' . $attributeCodeId])) {
             $optionValue = $optionMap[$optionId . ':' . $attributeCodeId];
-            $data = $this->getOptionsArray($optionValue, $code);
+            $data = $this->getOptionsArray($optionValue, $code, $attributeId);
         }
         return $data;
     }
@@ -94,15 +101,17 @@ private function getOptionsFromMap(array $optionMap, string $code, int $optionId
      *
      * @param array $optionValue
      * @param string $code
+     * @param int $attributeId
      * @return array
      */
-    private function getOptionsArray(array $optionValue, string $code): array
+    private function getOptionsArray(array $optionValue, string $code, int $attributeId): array
     {
         return [
             'label' => $optionValue['label'] ??  null,
             'code' => $code,
             'use_default_value' => $optionValue['use_default_value'] ?? null,
             'value_index' => $optionValue['value_index'] ?? null,
+            'attribute_id' => $attributeId,
         ];
     }
 }

app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes/ConfigurableAttributeIdV2.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProductGraphQl\Model\Resolver\Variant\Attributes;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * Format new option uid in base64 encode for super attribute options
+ */
+class ConfigurableAttributeUid implements ResolverInterface
+{
+    /**
+     * Option type name
+     */
+    private const OPTION_TYPE = 'configurable';
+
+    /**
+     * Create a option uid for super attribute in "<option-type>/<attribute-id>/<value-index>" format
+     *
+     * @param Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     *
+     * @return string
+     *
+     * @throws GraphQlInputException
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['attribute_id']) || empty($value['attribute_id'])) {
+            throw new GraphQlInputException(__('"attribute_id" value should be specified.'));
+        }
+
+        if (!isset($value['value_index']) || empty($value['value_index'])) {
+            throw new GraphQlInputException(__('"value_index" value should be specified.'));
+        }
+
+        $optionDetails = [
+            self::OPTION_TYPE,
+            $value['attribute_id'],
+            $value['value_index']
+        ];
+
+        $content = implode('/', $optionDetails);
+
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        return base64_encode($content);
+    }
+}