BUG#AC-8227:Tax Class set to None when creating new configurable variations in multi store mode

Author: glo80326

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -130,14 +130,14 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
 
     /**
      * @deprecated 103.0.2
-     *
+     * @see MAGETWO-71174
      * @var ImageContentInterfaceFactory
      */
     protected $contentFactory;
 
     /**
      * @deprecated 103.0.2
-     *
+     * @see MAGETWO-71174
      * @var ImageProcessorInterface
      */
     protected $imageProcessor;
@@ -149,7 +149,7 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
 
     /**
      * @deprecated 103.0.2
-     *
+     * @see MAGETWO-71174
      * @var \Magento\Catalog\Model\Product\Gallery\Processor
      */
     protected $mediaGalleryProcessor;
@@ -322,6 +322,12 @@ public function getById($productId, $editMode = false, $storeId = null, $forceRe
                 $product->setData('store_id', $storeId);
             }
             $product->load($productId);
+            foreach ($product->getAttributes() as $attributeKey => $attributeValue) {
+                $defaultValue = $attributeValue->getDefaultValue();
+                if (!$product->hasData($attributeKey) && $defaultValue) {
+                    $product->setData($attributeKey, $defaultValue);
+                }
+            }
             if (!$product->getId()) {
                 throw new NoSuchEntityException(
                     __("The product that was requested doesn't exist. Verify the product and try again.")
@@ -736,6 +742,7 @@ private function addExtensionAttributes(Collection $collection) : Collection
      * Helper function that adds a FilterGroup to the collection.
      *
      * @deprecated 102.0.0
+     * @see MAGETWO-71174
      * @param \Magento\Framework\Api\Search\FilterGroup $filterGroup
      * @param Collection $collection
      * @return void
@@ -795,6 +802,7 @@ private function getMediaGalleryProcessor()
      * Retrieve collection processor
      *
      * @deprecated 102.0.0
+     * @see MAGETWO-71174
      * @return CollectionProcessorInterface
      */
     private function getCollectionProcessor()

app/code/Magento/ConfigurableProduct/Model/Product/VariationHandler.php

@@ -200,9 +200,11 @@ protected function fillSimpleProductData(
                 continue;
             }
 
-            $product->setData($attribute->getAttributeCode(), $parentProduct->getData($attribute->getAttributeCode()));
+            $product->setData(
+                $attribute->getAttributeCode(),
+                $parentProduct->getData($attribute->getAttributeCode()) ?? $attribute->getDefaultValue()
+            );
         }
-
         $keysFilter = ['item_id', 'product_id', 'stock_id', 'type_id', 'website_id'];
         $postData['stock_data'] = array_diff_key((array)$parentProduct->getStockData(), array_flip($keysFilter));
         $stockStatus = $parentProduct->getQuantityAndStockStatus();
@@ -212,9 +214,6 @@ protected function fillSimpleProductData(
 
         $postData = $this->processMediaGallery($product, $postData);
         $postData['status'] = $postData['status'] ?? Status::STATUS_ENABLED;
-        $defaultTaxClassId = isset($this->attributes['tax_class_id']) ?
-            $this->attributes['tax_class_id']->getDefaultValue() : null;
-        $postData['tax_class_id'] = $postData['tax_class_id'] ?? $parentProduct->getTaxClassId() ?? $defaultTaxClassId;
         $product->addData(
             $postData
         )->setWebsiteIds(

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/VariationHandlerTest.php

@@ -73,7 +73,6 @@ public function testGenerateSimpleProducts(array $productsData): void
             ->setSmallImage('some_test_image.jpg')
             ->setThumbnail('some_test_image.jpg')
             ->setSwatchImage('some_test_image.jpg')
-            ->setTaxClassId(2)
             ->setNewVariationsAttributeSetId($this->product->getDefaultAttributeSetId());
         $generatedProducts = $this->variationHandler->generateSimpleProducts($this->product, $productsData);
         $this->assertCount(3, $generatedProducts);
@@ -89,7 +88,6 @@ public function testGenerateSimpleProducts(array $productsData): void
             $this->assertNull($product->getSmallImage());
             $this->assertNull($product->getThumbnail());
             $this->assertNull($product->getSwatchImage());
-            $this->assertEquals(2, $product->getTaxClassId());
         }
     }
 
@@ -111,6 +109,20 @@ public function testGenerateSimpleProductsWithPartialData(array $productsData):
         }
     }
 
+    /**
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @dataProvider generateSimpleProductsWithPartialDataDataProvider
+     * @param array $productsData
+     * @return void
+     */
+    public function testGeneratedSimpleProductInheritTaxClassFromParent(array $productsData): void
+    {
+        $this->product->setTaxClassId(2);
+        $generatedProduct = $this->variationHandler->generateSimpleProducts($this->product, $productsData);
+        $product = $this->productRepository->getById(reset($generatedProduct));
+        $this->assertEquals(2, $product->getTaxClassId());
+    }
+
     /**
      * @return array
      */