Merge branch 'ACP2E-3009' of https://github.com/adobe-commerce-tier-4/magento2ce into 04-29-24-Tier4-Bugfix-Delivery

Author: thiaramus

app/code/Magento/Catalog/Model/ProductLink/Repository.php

@@ -133,8 +133,14 @@ public function __construct(
      */
     public function save(\Magento\Catalog\Api\Data\ProductLinkInterface $entity)
     {
+        if (!$entity->getSku()) {
+            throw new CouldNotSaveException(__(
+                'The parent product SKU is required for linking child products. '
+                . 'Please ensure the parent product SKU is provided and try again.'
+            ));
+        }
         if (!$entity->getLinkedProductSku()) {
-            throw new NoSuchEntityException(__('The linked product SKU is invalid. Verify the data and try again.'));
+            throw new CouldNotSaveException(__('The linked product SKU is invalid. Verify the data and try again.'));
         }
         $linkedProduct = $this->productRepository->get($entity->getLinkedProductSku());
         $product = $this->productRepository->get($entity->getSku());

app/code/Magento/Catalog/Test/Unit/Model/ProductLink/RepositoryTest.php

@@ -132,7 +132,7 @@ public function testSave()
             ['linkedProduct', false, null, false, $linkedProductMock],
         ]);
         $entityMock->expects($this->any())->method('getLinkedProductSku')->willReturn('linkedProduct');
-        $entityMock->expects($this->once())->method('getSku')->willReturn('product');
+        $entityMock->expects($this->exactly(2))->method('getSku')->willReturn('product');
         $entityMock->expects($this->exactly(1))->method('getLinkType')->willReturn('linkType');
         $this->linkTypeProvider->expects($this->once())->method('getLinkTypes')->willReturn(['linkType' => $typeId]);
         $this->metadataPoolMock->expects($this->once())->method('getHydrator')->willReturn($this->hydratorMock);
@@ -164,7 +164,7 @@ public function testSaveWithException()
             ['linkedProduct', false, null, false, $linkedProductMock],
         ]);
         $entityMock->expects($this->any())->method('getLinkedProductSku')->willReturn('linkedProduct');
-        $entityMock->expects($this->once())->method('getSku')->willReturn('product');
+        $entityMock->expects($this->exactly(2))->method('getSku')->willReturn('product');
         $entityMock->expects($this->exactly(1))->method('getLinkType')->willReturn('linkType');
         $this->linkTypeProvider->expects($this->once())->method('getLinkTypes')->willReturn(['linkType' => $typeId]);
         $this->metadataPoolMock->expects($this->once())->method('getHydrator')->willReturn($this->hydratorMock);
@@ -182,13 +182,27 @@ public function testSaveWithException()
 
     public function testSaveWithoutLinkedProductSku()
     {
-        $this->expectException('Magento\Framework\Exception\NoSuchEntityException');
+        $this->expectException('Magento\Framework\Exception\CouldNotSaveException');
         $this->expectExceptionMessage('The linked product SKU is invalid. Verify the data and try again.');
         $entityMock = $this->createMock(\Magento\Catalog\Model\ProductLink\Link::class);
+        $entityMock->expects($this->any())->method('getSku')->willReturn('sku1');
         $entityMock->expects($this->any())->method('getLinkedProductSku')->willReturn('');
         $this->model->save($entityMock);
     }
 
+    public function testSaveWithoutProductSku()
+    {
+        $this->expectException('Magento\Framework\Exception\CouldNotSaveException');
+        $this->expectExceptionMessage(
+            'The parent product SKU is required for linking child products. '
+            . 'Please ensure the parent product SKU is provided and try again.'
+        );
+        $entityMock = $this->createMock(\Magento\Catalog\Model\ProductLink\Link::class);
+        $entityMock->expects($this->any())->method('getSku')->willReturn('');
+        $entityMock->expects($this->any())->method('getLinkedProductSku')->willReturn('linkedProductSku');
+        $this->model->save($entityMock);
+    }
+
     /**
      * Test method
      */

app/code/Magento/Catalog/i18n/en_US.csv

@@ -823,3 +823,4 @@ Details,Details
 "The url has invalid characters. Please correct and try again.","The url has invalid characters. Please correct and try again."
 "Restricted admin is allowed to perform actions with images or videos, only when the admin has rights to all websites which the product is assigned to.","Restricted admin is allowed to perform actions with images or videos, only when the admin has rights to all websites which the product is assigned to."
 "Synchronize website specific attributes values","Synchronize website specific attributes values"
+"The parent product SKU is required for linking child products. Please ensure the parent product SKU is provided and try again.","The parent product SKU is required for linking child products. Please ensure the parent product SKU is provided and try again."