Merge remote-tracking branch 'l3/ACP2E-412' into PR_L3_18_04_2022

Author: veloraven

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

@@ -227,6 +227,10 @@ public function save($sku, OptionInterface $option)
         }
 
         try {
+            if ($product->getTypeId() === ProductType::TYPE_SIMPLE) {
+                $product->setTypeId(ConfigurableType::TYPE_CODE);
+                $product->save();
+            }
             $option->save();
         } catch (\Exception $e) {
             throw new CouldNotSaveException(__('An error occurred while saving the option. Please try to save again.'));

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

@@ -9,16 +9,17 @@
 namespace Magento\ConfigurableProduct\Api;
 
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Model\ProductRepository;
 use Magento\Eav\Api\AttributeRepositoryInterface;
 
 /**
  * Class OptionRepositoryTest for testing ConfigurableProductoption integration
  */
 class OptionRepositoryTest extends \Magento\TestFramework\TestCase\WebapiAbstract
 {
-    const SERVICE_NAME = 'configurableProductOptionRepositoryV1';
-    const SERVICE_VERSION = 'V1';
-    const RESOURCE_PATH = '/V1/configurable-products';
+    public const SERVICE_NAME = 'configurableProductOptionRepositoryV1';
+    public const SERVICE_VERSION = 'V1';
+    public const RESOURCE_PATH = '/V1/configurable-products';
 
     /**
      * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
@@ -166,6 +167,9 @@ public function testAdd(): void
         $attribute = $attributeRepository->get('catalog_product', 'test_configurable');
 
         $productSku = 'simple';
+        $productRepository = Bootstrap::getObjectManager()->create(ProductRepository::class);
+        $product = $productRepository->get($productSku);
+        $this->assertEquals('simple', $product->getTypeId());
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH . '/' . $productSku . '/options',
@@ -189,6 +193,9 @@ public function testAdd(): void
         /** @var int $result */
         $result = $this->_webApiCall($serviceInfo, ['sku' => $productSku, 'option' => $option]);
         $this->assertGreaterThan(0, $result);
+        $updatedproductRepo = Bootstrap::getObjectManager()->create(ProductRepository::class);
+        $updatedproduct = $updatedproductRepo->get($productSku);
+        $this->assertEquals('configurable', $updatedproduct->getTypeId());
     }
 
     /**