Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#8810 - REST API - Attribute option creation -> no ID returned #12920

Merged
merged 7 commits into from
Jul 3, 2018
Merged

#8810 - REST API - Attribute option creation -> no ID returned #12920

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
07a4b3b
#8810 - REST API - Attribute option creation -> no ID returned
sanjay-wagento Nov 1, 2017
fc00146
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-feature-re…
sanjay-wagento Jan 8, 2018
b9e0abe
#8810 - Solved api functional test issue
sanjay-wagento Jan 8, 2018
e31ea92
#8810 - fixed php code style issue
sanjay-wagento Jan 9, 2018
9b57e79
Merge remote-tracking branch 'upstream/2.3-develop' into 2.3-feature-…
sanjay-wagento Jan 9, 2018
294e200
Merge remote-tracking branch 'mainline/2.3-develop' into sanjay-wagen…
Apr 25, 2018
5eef1d9
magento/magento2#12920: Fixed review issues
Apr 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function getItems($attributeCode);
* @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
* @throws \Magento\Framework\Exception\StateException
* @throws \Magento\Framework\Exception\InputException
* @return bool
* @return \Magento\Eav\Api\Data\AttributeOptionInterface
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please return the option ID instead of object

*/
public function add($attributeCode, $option);

Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ interface AttributeOptionManagementInterface
* @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
* @throws \Magento\Framework\Exception\StateException
* @throws \Magento\Framework\Exception\InputException
* @return bool
* @return \Magento\Eav\Api\Data\AttributeOptionInterface
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please return the option ID instead of object

*/
public function add($entityType, $attributeCode, $option);

Expand Down
29 changes: 27 additions & 2 deletions app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,10 @@ public function add($entityType, $attributeCode, $option)
throw new StateException(__('Attribute %1 doesn\'t work with options', $attributeCode));
}

$optionLabel = $option->getLabel();
$optionId = $this->getOptionId($option);
$options = [];
$options['value'][$optionId][0] = $option->getLabel();
$options['value'][$optionId][0] = $optionLabel;
$options['order'][$optionId] = $option->getSortOrder();

if (is_array($option->getStoreLabels())) {
Expand All @@ -67,11 +68,14 @@ public function add($entityType, $attributeCode, $option)
$attribute->setOption($options);
try {
$this->resourceModel->save($attribute);
if ($optionLabel && $attribute->getAttributeCode()) {
$this->setOptionValue($option, $attribute, $optionLabel);
}
} catch (\Exception $e) {
throw new StateException(__('Cannot save attribute %1', $attributeCode));
}

return true;
return $option;
}

/**
Expand Down Expand Up @@ -147,4 +151,25 @@ private function getOptionId($option)
{
return $option->getValue() ?: 'new_option';
}

/**
* @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
* @param \Magento\Eav\Api\Data\AttributeInterface $attribute
* @param string $optionLabel
* @return void
*/
protected function setOptionValue($option, $attribute, $optionLabel)
{
$optionId = $attribute->getSource()->getOptionId($optionLabel);
if ($optionId) {
$option->setValue($attribute->getSource()->getOptionId($optionId));
} elseif (is_array($option->getStoreLabels())) {
foreach ($option->getStoreLabels() as $label) {
if ($optionId = $attribute->getSource()->getOptionId($label->getLabel())) {
$option->setValue($attribute->getSource()->getOptionId($optionId));
break;
}
}
}
}
}
2 changes: 1 addition & 1 deletion app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public function testAdd()
$attributeMock->expects($this->once())->method('setDefault')->with(['new_option']);
$attributeMock->expects($this->once())->method('setOption')->with($option);
$this->resourceModelMock->expects($this->once())->method('save')->with($attributeMock);
$this->assertTrue($this->model->add($entityType, $attributeCode, $optionMock));
$this->assertEquals($optionMock, $this->model->add($entityType, $attributeCode, $optionMock));
}

/**
Expand Down
2 changes: 1 addition & 1 deletion ...unctional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public function testAdd($optionData)
]
);

$this->assertTrue($response);
$this->assertNotNull($response[AttributeOptionInterface::VALUE]);
$updatedData = $this->getAttributeOptions($testAttributeCode);
$lastOption = array_pop($updatedData);
$this->assertEquals(
Expand Down
2 changes: 1 addition & 1 deletion ...nal/testsuite/Magento/Catalog/Api/ProductSwatchAttributeOptionManagementInterfaceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public function testAdd($optionData)
]
);

$this->assertTrue($response);
$this->assertNotNull($response[AttributeOptionInterface::VALUE]);
$updatedData = $this->getAttributeOptions($testAttributeCode);
$lastOption = array_pop($updatedData);
$this->assertEquals(
Expand Down