Merge remote-tracking branch 'origin/ACP2E-4212' into PR_2025_10_16_muntianu

katmoon · katmoon · commit 601fa83f55e2 · 2025-10-20T09:35:27.000-05:00
diff --git a/app/code/Magento/Bundle/Model/LinkManagement.php b/app/code/Magento/Bundle/Model/LinkManagement.php
@@ -252,6 +252,9 @@ private function processLinkedProduct(
             throw new CouldNotSaveException(__('Could not save child: "%1"', $e->getMessage()), $e);
         }
 
+        $linkedProduct->setId($selectionModel->getId());
+        $linkedProduct->setSelectionId($selectionModel->getId());
+        $linkedProduct->setOptionId($optionId);
         return (int)$selectionModel->getId();
     }
 
@@ -450,14 +453,16 @@ public function removeChild($sku, $optionId, $childSku)
         $excludeSelectionIds = [];
         $usedProductIds = [];
         $removeSelectionIds = [];
+        $removeProductIds = [];
         foreach ($this->getOptions($product) as $option) {
             /** @var Selection $selection */
             foreach ($option->getSelections() as $selection) {
                 if ((strcasecmp($selection->getSku(), $childSku) == 0) && ($selection->getOptionId() == $optionId)) {
                     $removeSelectionIds[] = $selection->getSelectionId();
-                    $usedProductIds[] = $selection->getProductId();
+                    $removeProductIds[] = $selection->getProductId();
                     continue;
                 }
+                $usedProductIds[] = $selection->getProductId();
                 $excludeSelectionIds[] = $selection->getSelectionId();
             }
         }
@@ -470,7 +475,10 @@ public function removeChild($sku, $optionId, $childSku)
         /* @var $resource Bundle */
         $resource = $this->bundleFactory->create();
         $resource->dropAllUnneededSelections($product->getData($linkField), $excludeSelectionIds);
-        $resource->removeProductRelations($product->getData($linkField), array_unique($usedProductIds));
+        $productRelationsToRemove = array_diff($removeProductIds, $usedProductIds);
+        if ($productRelationsToRemove) {
+            $resource->removeProductRelations($product->getData($linkField), array_unique($productRelationsToRemove));
+        }
 
         return true;
     }
diff --git a/app/code/Magento/Bundle/Model/Product/CopyConstructor/Bundle.php b/app/code/Magento/Bundle/Model/Product/CopyConstructor/Bundle.php
@@ -35,10 +35,15 @@ public function build(Product $product, Product $duplicate)
              * Set option and selection ids to 'null' in order to create new option(selection) for duplicated product,
              * but not modifying existing one, which led to lost of option(selection) in original product.
              */
-            $productLinks = $duplicatedBundleOption->getProductLinks() ?: [];
-            foreach ($productLinks as $productLink) {
-                $productLink->setSelectionId(null);
+            $productLinks = [];
+            foreach ($duplicatedBundleOption->getProductLinks() ?: [] as $productLink) {
+                $productLinkDuplicate = clone $productLink;
+                $productLinkDuplicate->setId(null);
+                $productLinkDuplicate->setSelectionId(null);
+                $productLinkDuplicate->setOptionId(null);
+                $productLinks[] = $productLinkDuplicate;
             }
+            $duplicatedBundleOption->setProductLinks($productLinks);
             $duplicatedBundleOption->setOptionId(null);
             $duplicatedBundleOptions[$key] = $duplicatedBundleOption;
         }
diff --git a/app/code/Magento/Bundle/Model/Product/SaveHandler.php b/app/code/Magento/Bundle/Model/Product/SaveHandler.php
@@ -141,10 +141,7 @@ protected function removeOptionLinks($entitySku, $option)
         $links = $option->getProductLinks();
         if (!empty($links)) {
             foreach ($links as $link) {
-                $linkCanBeDeleted = $this->checkOptionLinkIfExist->execute($entitySku, $option, $link);
-                if ($linkCanBeDeleted) {
-                    $this->productLinkManagement->removeChild($entitySku, $option->getId(), $link->getSku());
-                }
+                $this->productLinkManagement->removeChild($entitySku, $option->getId(), $link->getSku());
             }
         }
     }
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php b/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php
@@ -639,14 +639,11 @@ static function () {
      */
     public function testAddChild(): void
     {
-        $productLink = $this->getMockBuilder(LinkInterface::class)
-            ->onlyMethods(['getSku', 'getOptionId'])
-            ->addMethods(['getSelectionId'])
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-        $productLink->method('getSku')->willReturn('linked_product_sku');
-        $productLink->method('getOptionId')->willReturn(1);
-        $productLink->method('getSelectionId')->willReturn(1);
+        $selectionId = 42;
+        $optionId = 1;
+        $sku = 'linked_product_sku';
+        $productLink = $this->createPartialMock(\Magento\Bundle\Model\Link::class, []);
+        $productLink->setSku($sku);
 
         $this->metadataMock->expects($this->exactly(2))->method('getLinkField')->willReturn($this->linkField);
         $productMock = $this->createMock(Product::class);
@@ -662,7 +659,7 @@ public function testAddChild(): void
         $this->productRepository
             ->expects($this->once())
             ->method('get')
-            ->with('linked_product_sku')
+            ->with($sku)
             ->willReturn($linkedProductMock);
 
         $store = $this->createMock(Store::class);
@@ -698,10 +695,14 @@ public function testAddChild(): void
 
         $selection = $this->createPartialMock(Selection::class, ['save', 'getId', 'load']);
         $selection->expects($this->once())->method('save');
-        $selection->expects($this->once())->method('getId')->willReturn(42);
+        $selection->expects($this->any())->method('getId')->willReturn($selectionId);
         $this->bundleSelectionMock->expects($this->once())->method('create')->willReturn($selection);
-        $result = $this->model->addChild($productMock, 1, $productLink);
-        $this->assertEquals(42, $result);
+
+        $result = $this->model->addChild($productMock, $optionId, $productLink);
+        $this->assertEquals($selectionId, $result);
+        $this->assertEquals($selectionId, $productLink->getId());
+        $this->assertEquals($selectionId, $productLink->getSelectionId());
+        $this->assertEquals($optionId, $productLink->getOptionId());
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Product/CopyConstructor/BundleTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Product/CopyConstructor/BundleTest.php
@@ -7,8 +7,8 @@
 
 namespace Magento\Bundle\Test\Unit\Model\Product\CopyConstructor;
 
-use Magento\Bundle\Api\Data\BundleOptionInterface;
 use Magento\Bundle\Model\Link;
+use Magento\Bundle\Model\Option;
 use Magento\Bundle\Model\Product\CopyConstructor\Bundle;
 use Magento\Catalog\Api\Data\ProductExtensionInterface;
 use Magento\Catalog\Model\Product;
@@ -65,38 +65,39 @@ public function testBuildPositive()
         $product->expects($this->once())
             ->method('getExtensionAttributes')
             ->willReturn($extensionAttributesProduct);
-
-        $productLink = $this->getMockBuilder(Link::class)
-            ->addMethods(['setSelectionId'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $productLink->expects($this->exactly(2))
-            ->method('setSelectionId')
-            ->with($this->identicalTo(null));
-        $firstOption = $this->getMockBuilder(BundleOptionInterface::class)
-            ->addMethods(['getProductLinks'])
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-        $firstOption->expects($this->once())
-            ->method('getProductLinks')
-            ->willReturn([$productLink]);
-        $firstOption->expects($this->once())
-            ->method('setOptionId')
-            ->with($this->identicalTo(null));
-        $secondOption = $this->getMockBuilder(BundleOptionInterface::class)
-            ->addMethods(['getProductLinks'])
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-        $secondOption->expects($this->once())
-            ->method('getProductLinks')
-            ->willReturn([$productLink]);
-        $secondOption->expects($this->once())
-            ->method('setOptionId')
-            ->with($this->identicalTo(null));
-        $bundleOptions = [
-            $firstOption,
-            $secondOption
+        
+        $bundleOptionsData = [
+            [
+                'option_id' => 1,
+                'title' => 'Option 1',
+                'product_links' => [
+                    [
+                        'option_id' => 1,
+                        'id' => 1,
+                        'selection_id' => 1,
+                        'sku' => 'sku-1'
+                    ],
+                ]
+            ],
+            [
+                'option_id' => 2,
+                'title' => 'Option 2',
+                'product_links' => [
+                    [
+                        'option_id' => 2,
+                        'id' => 2,
+                        'selection_id' => 2,
+                        'sku' => 'sku-2'
+                    ]
+                ]
+            ]
         ];
+        $bundleOptions = array_map(
+            fn ($optionData) => $this->createOptionMock(
+                [...$optionData, 'product_links' => array_map($this->createLinkMock(...), $optionData['product_links'])]
+            ),
+            $bundleOptionsData
+        );
         $extensionAttributesProduct->expects($this->once())
             ->method('getBundleProductOptions')
             ->willReturn($bundleOptions);
@@ -115,13 +116,57 @@ public function testBuildPositive()
             ->willReturn($extensionAttributesDuplicate);
         $extensionAttributesDuplicate->expects($this->once())
             ->method('setBundleProductOptions')
-            ->willReturnCallback(function ($bundleOptions) {
-                if ($bundleOptions) {
-                    return null;
-                }
-            });
+            ->with(
+                $this->callback(function ($options) use (&$bundleOptionsClone) {
+                    $bundleOptionsClone = $options;
+                    return !empty($bundleOptionsClone);
+                })
+            );
 
         $this->model->build($product, $duplicate);
+        foreach ($bundleOptionsData as $key => $optionData) {
+            $bundleOption = $bundleOptions[$key];
+            $bundleOptionClone = $bundleOptionsClone[$key];
+            
+            $this->assertEquals($optionData['option_id'], $bundleOption->getOptionId());
+            $this->assertEquals($optionData['title'], $bundleOption->getTitle());
+            
+            $this->assertNotEquals($bundleOption, $bundleOptionClone);
+            
+            $this->assertNull($bundleOptionClone->getOptionId());
+            $this->assertEquals($optionData['title'], $bundleOptionClone->getTitle());
+            
+            foreach ($optionData['product_links'] as $productLinkKey => $productLinkData) {
+                $productLink = $bundleOption->getProductLinks()[$productLinkKey];
+                $productLinkClone = $bundleOptionClone->getProductLinks()[$productLinkKey];
+                
+                $this->assertEquals($productLinkData['option_id'], $productLink->getOptionId());
+                $this->assertEquals($productLinkData['id'], $productLink->getId());
+                $this->assertEquals($productLinkData['selection_id'], $productLink->getSelectionId());
+                $this->assertEquals($productLinkData['sku'], $productLink->getSku());
+                
+                $this->assertNotEquals($productLink, $productLinkClone);
+                
+                $this->assertNull($productLinkClone->getId());
+                $this->assertNull($productLinkClone->getOptionId());
+                $this->assertNull($productLinkClone->getSelectionId());
+                $this->assertEquals($productLinkData['sku'], $productLinkClone->getSku());
+            }
+        }
+    }
+
+    private function createOptionMock(array $data): Option
+    {
+        $option = $this->createPartialMock(Option::class, []);
+        $option->addData($data);
+        return $option;
+    }
+
+    private function createLinkMock(array $data): Link
+    {
+        $productLink = $this->createPartialMock(Link::class, []);
+        $productLink->addData($data);
+        return $productLink;
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/SaveHandlerTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/SaveHandlerTest.php
diff --git a/setup/src/Magento/Setup/Model/FixtureGenerator/BundleProductGenerator.php b/setup/src/Magento/Setup/Model/FixtureGenerator/BundleProductGenerator.php

Original file line number	Diff line number	Diff line change
`@@ -141,10 +141,7 @@ protected function removeOptionLinks($entitySku, $option)`
`141`	`141`	`$links = $option->getProductLinks();`
`142`	`142`	`if (!empty($links)) {`
`143`	`143`	`foreach ($links as $link) {`
`144`		`- $linkCanBeDeleted = $this->checkOptionLinkIfExist->execute($entitySku, $option, $link);`
`145`		`- if ($linkCanBeDeleted) {`
`146`		`- $this->productLinkManagement->removeChild($entitySku, $option->getId(), $link->getSku());`
`147`		`- }`
	`144`	`+ $this->productLinkManagement->removeChild($entitySku, $option->getId(), $link->getSku());`
`148`	`145`	`}`
`149`	`146`	`}`
`150`	`147`	`}`