#31332:Schema changes implementation for configurable options selection - added test coverage

Author: sasha19957099

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php

@@ -114,7 +114,7 @@ public function getList(
         try {
             $collection->addMediaGalleryData();
         } catch (LocalizedException $e) {
-            throw new GraphQlNoSuchEntityException(__('Cannot load media galery'));
+            throw new GraphQlNoSuchEntityException(__('Cannot load media gallery'));
         }
 
         $collection->load();

app/code/Magento/ConfigurableProductGraphQl/Model/Formatter/Option.php

@@ -42,14 +42,15 @@ public function __construct(
      *  Format configurable product options according to the GraphQL schema
      *
      * @param Attribute $attribute
+     * @param array $optionIds
      * @return array|null
      */
-    public function format(Attribute $attribute): ?array
+    public function format(Attribute $attribute, array $optionIds): ?array
     {
         $optionValues = [];
 
         foreach ($attribute->getOptions() as $option) {
-            $optionValues[] = $this->valueFormatter->format($option, $attribute);
+            $optionValues[] = $this->valueFormatter->format($option, $attribute, $optionIds);
         }
 
         return [

app/code/Magento/ConfigurableProductGraphQl/Model/Formatter/OptionValue.php

@@ -8,6 +8,7 @@
 
 namespace Magento\ConfigurableProductGraphQl\Model\Formatter;
 
+use Magento\CatalogInventory\Model\StockRegistry;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute;
 use Magento\ConfigurableProductGraphQl\Model\Options\SelectionUidFormatter;
 use Magento\SwatchesGraphQl\Model\Resolver\Product\Options\DataProvider\SwatchDataProvider;
@@ -27,26 +28,35 @@ class OptionValue
      */
     private $swatchDataProvider;
 
+    /**
+     * @var StockRegistry
+     */
+    private $stockRegistry;
+
     /**
      * @param SelectionUidFormatter $selectionUidFormatter
      * @param SwatchDataProvider $swatchDataProvider
+     * @param StockRegistry $stockRegistry
      */
     public function __construct(
         SelectionUidFormatter $selectionUidFormatter,
-        SwatchDataProvider $swatchDataProvider
+        SwatchDataProvider $swatchDataProvider,
+        StockRegistry $stockRegistry
     ) {
         $this->selectionUidFormatter = $selectionUidFormatter;
         $this->swatchDataProvider = $swatchDataProvider;
+        $this->stockRegistry = $stockRegistry;
     }
 
     /**
      * Format configurable product option values according to the GraphQL schema
      *
      * @param array $optionValue
      * @param Attribute $attribute
+     * @param array $optionIds
      * @return array
      */
-    public function format(array $optionValue, Attribute $attribute): array
+    public function format(array $optionValue, Attribute $attribute, array $optionIds): array
     {
         $valueIndex = (int)$optionValue['value_index'];
         $attributeId = (int)$attribute->getAttributeId();
@@ -56,10 +66,27 @@ public function format(array $optionValue, Attribute $attribute): array
                 $attributeId,
                 $valueIndex
             ),
-            'is_available' => true,
-            'is_default' => (bool)$attribute->getIsUseDefault(),
+            'is_available' => $this->getIsAvailable($optionIds[$valueIndex] ?? []),
+            'is_use_default' => (bool)$attribute->getIsUseDefault(),
             'label' => $optionValue['label'],
             'swatch' => $this->swatchDataProvider->getData($optionValue['value_index'])
         ];
     }
+
+    /**
+     * Get is variants available
+     *
+     * @param array $variantIds
+     * @return bool
+     */
+    private function getIsAvailable(array $variantIds): bool
+    {
+        foreach ($variantIds as $variantId) {
+            if ($this->stockRegistry->getProductStockStatus($variantId)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }

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

@@ -12,8 +12,6 @@
 use Magento\ConfigurableProduct\Helper\Data;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute;
 use Magento\ConfigurableProductGraphQl\Model\Formatter\Option;
-use Magento\ConfigurableProductGraphQl\Model\Options\DataProvider\Variant;
-use Magento\ConfigurableProductGraphQl\Model\Formatter\Variant as VariantFormatter;
 
 /**
  * Retrieve metadata for configurable option selection.
@@ -37,7 +35,6 @@ class Metadata
     public function __construct(
         Data $configurableProductHelper,
         Option $configurableOptionsFormatter
-
     ) {
         $this->configurableProductHelper = $configurableProductHelper;
         $this->configurableOptionsFormatter = $configurableOptionsFormatter;
@@ -54,19 +51,20 @@ public function __construct(
     public function getAvailableSelections(ProductInterface $product, array $options, array $selectedOptions): array
     {
         $attributes = $this->getAttributes($product);
-
         $availableSelections = [];
 
         foreach ($options as $attributeId => $option) {
             if ($attributeId === 'index' || isset($selectedOptions[$attributeId])) {
                 continue;
             }
 
-            $availableSelections[] = $this->configurableOptionsFormatter->format($attributes[$attributeId]);
+            $availableSelections[] = $this->configurableOptionsFormatter->format(
+                $attributes[$attributeId],
+                $options[$attributeId] ?? []
+            );
         }
 
         return $availableSelections;
-
     }
 
     /**

app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/OptionsSelectionMetadata.php

@@ -102,11 +102,6 @@ type ConfigurableWishlistItem implements WishlistItemInterface @doc(description:
     configurable_options: [SelectedConfigurableOption!] @resolver(class: "\\Magento\\ConfigurableProductGraphQl\\Model\\Wishlist\\ConfigurableOptions") @doc (description: "An array of selected configurable options")
 }
 
-type ConfigurableOptionAvailableForSelection @doc(description: "Configurable option available for further selection based on current selection.") {
-    option_value_uids: [ID!]! @doc(description: "Configurable option values available for further selection.")
-    attribute_code: String! @doc(description: "Attribute code that uniquely identifies configurable option.")
-}
-
 type StoreConfig @doc(description: "The type contains information about a store config") {
     configurable_thumbnail_source : String @doc(description: "The configuration setting determines which thumbnail should be used in the cart for configurable products.")
 }