Skip to content

Commit 42d5ef9

Browse files
sasha19957099sasha19957099
committed
#31332:Implement the schema changes for Configurable Options Selection - resolved fields according to the new schema
1 parent 427f9bf commit 42d5ef9

File tree

12 files changed

+390
-133
lines changed

12 files changed

+390
-133
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
use Magento\Framework\Api\Search\SearchResultInterface;
1919
use Magento\Framework\Api\SearchCriteriaInterface;
2020
use Magento\Framework\Api\SearchResultsInterface;
21+
use Magento\Framework\Exception\LocalizedException;
22+
use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
2123
use Magento\GraphQl\Model\Query\ContextInterface;
2224

2325
/**
@@ -87,6 +89,7 @@ public function __construct(
8789
* @param array $attributes
8890
* @param ContextInterface|null $context
8991
* @return SearchResultsInterface
92+
* @throws GraphQlNoSuchEntityException
9093
*/
9194
public function getList(
9295
SearchCriteriaInterface $searchCriteria,
@@ -107,6 +110,13 @@ public function getList(
107110
)->apply();
108111

109112
$this->collectionPreProcessor->process($collection, $searchCriteriaForCollection, $attributes, $context);
113+
114+
try {
115+
$collection->addMediaGalleryData();
116+
} catch (LocalizedException $e) {
117+
throw new GraphQlNoSuchEntityException(__('Cannot load media galery'));
118+
}
119+
110120
$collection->load();
111121
$this->collectionPostProcessor->process($collection, $attributes);
112122

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

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
declare(strict_types=1);
8+
9+
namespace Magento\ConfigurableProductGraphQl\Model\Formatter;
10+
11+
use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute;
12+
use Magento\Framework\GraphQl\Query\Uid;
13+
14+
/**
15+
* Formatter for configurable product options
16+
*/
17+
class Option
18+
{
19+
/**
20+
* @var Uid
21+
*/
22+
private $idEncoder;
23+
24+
/**
25+
* @var OptionValue
26+
*/
27+
private $valueFormatter;
28+
29+
/**
30+
* @param Uid $idEncoder
31+
* @param OptionValue $valueFormatter
32+
*/
33+
public function __construct(
34+
Uid $idEncoder,
35+
OptionValue $valueFormatter
36+
) {
37+
$this->idEncoder = $idEncoder;
38+
$this->valueFormatter = $valueFormatter;
39+
}
40+
41+
/**
42+
* Format configurable product options according to the GraphQL schema
43+
*
44+
* @param Attribute $attribute
45+
* @return array|null
46+
*/
47+
public function format(Attribute $attribute): ?array
48+
{
49+
$optionValues = [];
50+
51+
foreach ($attribute->getOptions() as $option) {
52+
$optionValues[] = $this->valueFormatter->format($option, $attribute);
53+
}
54+
55+
return [
56+
'uid' => $this->idEncoder->encode($attribute->getProductSuperAttributeId()),
57+
'attribute_code' => $attribute->getProductAttribute()->getAttributeCode(),
58+
'label' => $attribute->getLabel(),
59+
'values' => $optionValues,
60+
];
61+
}
62+
}

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

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
declare(strict_types=1);
8+
9+
namespace Magento\ConfigurableProductGraphQl\Model\Formatter;
10+
11+
use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute;
12+
use Magento\ConfigurableProductGraphQl\Model\Options\SelectionUidFormatter;
13+
use Magento\SwatchesGraphQl\Model\Resolver\Product\Options\DataProvider\SwatchDataProvider;
14+
15+
/**
16+
* Formatter for configurable product option values
17+
*/
18+
class OptionValue
19+
{
20+
/**
21+
* @var SelectionUidFormatter
22+
*/
23+
private $selectionUidFormatter;
24+
25+
/**
26+
* @var SwatchDataProvider
27+
*/
28+
private $swatchDataProvider;
29+
30+
/**
31+
* @param SelectionUidFormatter $selectionUidFormatter
32+
* @param SwatchDataProvider $swatchDataProvider
33+
*/
34+
public function __construct(
35+
SelectionUidFormatter $selectionUidFormatter,
36+
SwatchDataProvider $swatchDataProvider
37+
) {
38+
$this->selectionUidFormatter = $selectionUidFormatter;
39+
$this->swatchDataProvider = $swatchDataProvider;
40+
}
41+
42+
/**
43+
* Format configurable product option values according to the GraphQL schema
44+
*
45+
* @param array $optionValue
46+
* @param Attribute $attribute
47+
* @return array
48+
*/
49+
public function format(array $optionValue, Attribute $attribute): array
50+
{
51+
$valueIndex = (int)$optionValue['value_index'];
52+
$attributeId = (int)$attribute->getAttributeId();
53+
54+
return [
55+
'uid' => $this->selectionUidFormatter->encode(
56+
$attributeId,
57+
$valueIndex
58+
),
59+
'is_available' => true,
60+
'is_default' => (bool)$attribute->getIsUseDefault(),
61+
'label' => $optionValue['label'],
62+
'swatch' => $this->swatchDataProvider->getData($optionValue['value_index'])
63+
];
64+
}
65+
}

‎app/code/Magento/ConfigurableProductGraphQl/Model/Formatter/Variant.php

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
declare(strict_types=1);
8+
9+
namespace Magento\ConfigurableProductGraphQl\Model\Formatter;
10+
11+
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
12+
13+
/**
14+
* Formatter for configurable product variant
15+
*/
16+
class Variant
17+
{
18+
/**
19+
* Format selected variant of configurable product based on selected options
20+
*
21+
* @param array $options
22+
* @param array $selectedOptions
23+
* @param array $variants
24+
* @return array|null
25+
* @throws GraphQlInputException
26+
*/
27+
public function format(array $options, array $selectedOptions, array $variants): ?array
28+
{
29+
$variant = null;
30+
$productIds = array_keys($variants);
31+
32+
foreach ($selectedOptions as $attributeId => $selectedValue) {
33+
if (!isset($options[$attributeId][$selectedValue])) {
34+
throw new GraphQlInputException(__('configurableOptionValueUids values are incorrect'));
35+
}
36+
37+
$productIds = array_intersect($productIds, $options[$attributeId][$selectedValue]);
38+
}
39+
40+
if (count($productIds) === 1) {
41+
$variantProduct = $variants[array_pop($productIds)];
42+
$variant = $variantProduct->getData();
43+
$variant['url_path'] = $variantProduct->getProductUrl();
44+
$variant['model'] = $variantProduct;
45+
}
46+
47+
return $variant;
48+
}
49+
}

‎app/code/Magento/ConfigurableProductGraphQl/Model/Options/DataProvider/Variant.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
use Magento\Catalog\Api\Data\ProductInterface;
1111
use Magento\CatalogInventory\Model\ResourceModel\Stock\StatusFactory;
1212
use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
13+
use Magento\Framework\DataObject;
14+
use Magento\Framework\Exception\LocalizedException;
1315

1416
/**
1517
* Retrieve child products
@@ -42,10 +44,10 @@ public function __construct(
4244
* Load available child products by parent
4345
*
4446
* @param ProductInterface $product
45-
* @return ProductInterface[]
46-
* @throws \Magento\Framework\Exception\LocalizedException
47+
* @return DataObject[]
48+
* @throws LocalizedException
4749
*/
48-
public function getSalableVariantsByParent(ProductInterface $product)
50+
public function getSalableVariantsByParent(ProductInterface $product): array
4951
{
5052
$collection = $this->configurableType->getUsedProductCollection($product);
5153
$collection
@@ -62,6 +64,6 @@ public function getSalableVariantsByParent(ProductInterface $product)
6264
}
6365
$collection->clear();
6466

65-
return $collection->getItems();
67+
return $collection->getItems() ?? [];
6668
}
6769
}

0 commit comments

Comments
 (0)