ENGCOM-5385: Feature/9798 updating configurable product options based on produc id and sku #23529

Author: sidolov

app/code/Magento/ConfigurableProduct/Model/OptionRepository.php

@@ -22,6 +22,7 @@
 use Magento\Store\Model\Store;
 
 /**
+ * Repository for performing CRUD operations for a configurable product's options.
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class OptionRepository implements \Magento\ConfigurableProduct\Api\OptionRepositoryInterface
@@ -112,7 +113,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function get($sku, $id)
     {
@@ -131,7 +132,7 @@ public function get($sku, $id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getList($sku)
     {
@@ -141,7 +142,7 @@ public function getList($sku)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function delete(OptionInterface $option)
     {
@@ -167,7 +168,7 @@ public function delete(OptionInterface $option)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function deleteById($sku, $id)
     {
@@ -184,7 +185,7 @@ public function deleteById($sku, $id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function save($sku, OptionInterface $option)
@@ -213,6 +214,16 @@ public function save($sku, OptionInterface $option)
                 throw new \InvalidArgumentException('Incompatible product type');
             }
             $option->setProductId($product->getData($metadata->getLinkField()));
+            if (!empty($option->getProductId() && !empty($option->getAttributeId()))) {
+                $id = $this->optionResource->getIdByProductIdAndAttributeId(
+                    $option,
+                    $option->getProductId(),
+                    $option->getAttributeId()
+                );
+                if (!empty($id)) {
+                    $option->setId($id);
+                }
+            }
         }
 
         try {
@@ -296,6 +307,7 @@ public function validateNewOptionData(OptionInterface $option)
 
     /**
      * Get MetadataPool instance
+     *
      * @return MetadataPool
      */
     private function getMetadataPool()

dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/OptionRepositoryTest.php

@@ -10,6 +10,9 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Eav\Api\AttributeRepositoryInterface;
 
+/**
+ * Class OptionRepositoryTest for testing ConfigurableProductoption integration
+ */
 class OptionRepositoryTest extends \Magento\TestFramework\TestCase\WebapiAbstract
 {
     const SERVICE_NAME = 'configurableProductOptionRepositoryV1';
@@ -210,6 +213,47 @@ public function testUpdate()
         $this->assertEquals($requestBody['option']['label'], $configurableAttribute[0]['label']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     */
+    public function testUpdateWithoutOptionId()
+    {
+        $productSku = 'configurable';
+        /** @var AttributeRepositoryInterface $attributeRepository */
+
+        $attributeRepository = Bootstrap::getObjectManager()->create(AttributeRepositoryInterface::class);
+
+        /** @var \Magento\Eav\Api\Data\AttributeInterface $attribute */
+        $attribute = $attributeRepository->get('catalog_product', 'test_configurable');
+
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH . '/' . $productSku . '/options',
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST
+            ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_NAME . 'Save'
+            ]
+        ];
+
+        $option = [
+            'attribute_id' => $attribute->getAttributeId(),
+            'label' => 'Update Test Configurable with sku and attribute_id',
+            'values' => [
+                [
+                    'value_index' => 1,
+                ]
+            ],
+        ];
+
+        $result = $this->_webApiCall($serviceInfo, ['sku' => $productSku, 'option' => $option]);
+        $this->assertGreaterThan(0, $result);
+        $configurableAttribute = $this->getConfigurableAttribute($productSku);
+        $this->assertEquals($option['label'], $configurableAttribute[0]['label']);
+    }
+
     /**
      * @param string $productSku
      * @return array