MC-38930: Product type changed from virtual to simple

Author: tsviklinskyi

app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/UpdateConfigurations.php

@@ -115,9 +115,9 @@ protected function getConfigurations()
                     if (isset($item['qty'])) {
                         $result[$item['id']]['quantity_and_stock_status']['qty'] = $item['qty'];
                     }
-                    
+
                     // Changing product to simple on weight change
-                    if (isset($item['weight']) && $item['weight'] >= 0) {
+                    if (!empty($item['weight']) && $item['weight'] >= 0) {
                         $result[$item['id']]['type_id'] = \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE;
                         $result[$item['id']]['product_has_weight'] = WeightResolver::HAS_WEIGHT;
                     }

app/code/Magento/ConfigurableProduct/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/UpdateConfigurationsTest.php

@@ -119,6 +119,22 @@ private function getConfigurableMatrix()
                 'price' => '3.33',
                 'weight' => '5.55',
             ],
+            [
+                'newProduct' => false,
+                'id' => 'product5',
+                'status' => 'simple5_status',
+                'sku' => 'simple5_sku',
+                'name' => 'simple5_name',
+                'price' => '3.33',
+                'configurable_attribute' => 'simple5_configurable_attribute',
+                'weight' => '',
+                'media_gallery' => 'simple5_media_gallery',
+                'swatch_image' => 'simple5_swatch_image',
+                'small_image' => 'simple5_small_image',
+                'thumbnail' => 'simple5_thumbnail',
+                'image' => 'simple5_image',
+                'was_changed' => true,
+            ],
         ];
     }
 
@@ -144,12 +160,26 @@ public function testAfterInitialize()
             ],
             'product3' => [
                 'quantity_and_stock_status' => ['qty' => '3']
-            ]
+            ],
+            'product5' => [
+                'status' => 'simple5_status',
+                'sku' => 'simple5_sku',
+                'name' => 'simple5_name',
+                'price' => '3.33',
+                'configurable_attribute' => 'simple5_configurable_attribute',
+                'weight' => '',
+                'media_gallery' => 'simple5_media_gallery',
+                'swatch_image' => 'simple5_swatch_image',
+                'small_image' => 'simple5_small_image',
+                'thumbnail' => 'simple5_thumbnail',
+                'image' => 'simple5_image',
+            ],
         ];
         /** @var Product[]|MockObject[] $productMocks */
         $productMocks = [
             'product2' => $this->getProductMock($configurations['product2'], true, true),
             'product3' => $this->getProductMock($configurations['product3'], false, true),
+            'product5' => $this->getProductMock($configurations['product5'], false, true),
         ];
 
         $this->requestMock->expects(static::any())
@@ -169,15 +199,17 @@ public function testAfterInitialize()
             ->willReturnMap(
                 [
                     ['product2', false, 0, false, $productMocks['product2']],
-                    ['product3', false, 0, false, $productMocks['product3']]
+                    ['product3', false, 0, false, $productMocks['product3']],
+                    ['product5', false, 0, false, $productMocks['product5']],
                 ]
             );
         $this->variationHandlerMock->expects(static::any())
             ->method('processMediaGallery')
             ->willReturnMap(
                 [
                     [$productMocks['product2'], $configurations['product2'], $configurations['product2']],
-                    [$productMocks['product3'], $configurations['product3'], $configurations['product3']]
+                    [$productMocks['product3'], $configurations['product3'], $configurations['product3']],
+                    [$productMocks['product5'], $configurations['product5'], $configurations['product5']]
                 ]
             );