Merge branch 'ACP2E-2003' of https://github.com/magento-l3/magento2ce into L3-PR-2023-06-23

Author: ArtemVasyliev

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

@@ -9,12 +9,14 @@
 use Magento\ConfigurableProduct\Api\OptionRepositoryInterface;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable as ResourceModelConfigurable;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\Operation\ExtensionInterface;
 use Magento\ConfigurableProduct\Api\Data\OptionInterface;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 
 /**
- * Class SaveHandler
+ * Class SaveHandler to update configurable options
  */
 class SaveHandler implements ExtensionInterface
 {
@@ -29,20 +31,29 @@ class SaveHandler implements ExtensionInterface
     private $resourceModel;
 
     /**
-     * SaveHandler constructor
-     *
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
      * @param ResourceModelConfigurable $resourceModel
      * @param OptionRepositoryInterface $optionRepository
+     * @param ProductRepositoryInterface|null $productRepository
      */
     public function __construct(
         ResourceModelConfigurable $resourceModel,
-        OptionRepositoryInterface $optionRepository
+        OptionRepositoryInterface $optionRepository,
+        ?ProductRepositoryInterface $productRepository = null
     ) {
         $this->resourceModel = $resourceModel;
         $this->optionRepository = $optionRepository;
+        $this->productRepository =
+            $productRepository ?: ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
     }
 
     /**
+     * Update product options
+     *
      * @param ProductInterface $entity
      * @param array $arguments
      * @return ProductInterface
@@ -59,6 +70,8 @@ public function execute($entity, $arguments = [])
             return $entity;
         }
 
+        // Refresh product in cache
+        $this->productRepository->get($entity->getSku(), false, null, true);
         if ($extensionAttributes->getConfigurableProductOptions() !== null) {
             $this->deleteConfigurableProductAttributes($entity);
         }

app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/SaveHandlerTest.php

@@ -8,13 +8,15 @@
 namespace Magento\ConfigurableProduct\Test\Unit\Model\Product;
 
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ProductRepository;
 use Magento\ConfigurableProduct\Api\Data\OptionInterface;
 use Magento\ConfigurableProduct\Model\OptionRepository;
 use Magento\ConfigurableProduct\Model\Product\SaveHandler;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableModel;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\ConfigurableFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -38,6 +40,11 @@ class SaveHandlerTest extends TestCase
      */
     private $configurable;
 
+    /**
+     * @var ProductRepositoryInterface|MockObject
+     */
+    protected $productRepository;
+
     /**
      * @var SaveHandler
      */
@@ -55,9 +62,15 @@ protected function setUp(): void
 
         $this->initConfigurableFactoryMock();
 
+        $this->productRepository = $this->getMockBuilder(ProductRepository::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['get'])
+            ->getMock();
+
         $this->saveHandler = new SaveHandler(
             $this->configurable,
-            $this->optionRepository
+            $this->optionRepository,
+            $this->productRepository
         );
     }
 
@@ -97,7 +110,7 @@ public function testExecuteWithEmptyExtensionAttributes()
         $product->expects(static::once())
             ->method('getTypeId')
             ->willReturn(ConfigurableModel::TYPE_CODE);
-        $product->expects(static::exactly(1))
+        $product->expects(static::exactly(2))
             ->method('getSku')
             ->willReturn($sku);
 
@@ -147,7 +160,7 @@ public function testExecute()
         $product->expects(static::once())
             ->method('getTypeId')
             ->willReturn(ConfigurableModel::TYPE_CODE);
-        $product->expects(static::exactly(4))
+        $product->expects(static::exactly(5))
             ->method('getSku')
             ->willReturn($sku);
 
@@ -160,6 +173,9 @@ public function testExecute()
             ->method('getExtensionAttributes')
             ->willReturn($extensionAttributes);
 
+        $this->productRepository->expects($this->once())
+            ->method('get')->with($sku, false, null, true);
+
         $attributeNew = $this->getMockBuilder(Attribute::class)
             ->disableOriginalConstructor()
             ->setMethods(['getAttributeId', 'loadByProductAndAttribute', 'setId', 'getId'])