Merge branch 'MC-30625' of https://github.com/magento-l3/magento2ce into PR-20210423

Author: chittima

app/code/Magento/Catalog/Model/Product/Type.php

@@ -127,6 +127,8 @@ public function factory($product)
 
         $typeModel = $this->_productTypePool->get($typeModelName);
         $typeModel->setConfig($types[$typeId]);
+        $typeModel->setTypeId($typeId);
+
         return $typeModel;
     }
 

app/code/Magento/Catalog/Model/Product/Type/AbstractType.php

@@ -752,6 +752,9 @@ protected function _removeNotApplicableAttributes($product)
      */
     public function beforeSave($product)
     {
+        if (!$product->getTypeId()) {
+            $product->setTypeId($this->_typeId);
+        }
         $this->_removeNotApplicableAttributes($product);
         $product->canAffectOptions(true);
         return $this;

dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php

@@ -814,4 +814,16 @@ public function testConstructionWithCustomAttributesArrayInData()
         $this->assertSame($product->getCustomAttribute('tax_class_id')->getValue(), '3');
         $this->assertSame($product->getCustomAttribute('category_ids')->getValue(), '1,2');
     }
+
+    public function testSetPriceWithoutTypeId()
+    {
+        $this->_model->setAttributeSetId(4);
+        $this->_model->setName('Some name');
+        $this->_model->setSku('some_sku');
+        $this->_model->setPrice(9.95);
+        $this->productRepository->save($this->_model);
+
+        $product = $this->productRepository->get('some_sku', false, null, true);
+        $this->assertEquals(9.95, $product->getPrice());
+    }
 }