Merge remote-tracking branch 'origin/MAGETWO-50828' into MPI-BUGFIXES

Author: Viktor Tymchynskyi

app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php

@@ -77,7 +77,7 @@ public function afterInitialize(
                     if (!$linkData || (isset($linkData['is_delete']) && (bool)$linkData['is_delete'])) {
                         continue;
                     } else {
-                        unset($linkData['link_id']);
+                        //unset($linkData['link_id']);
                         // TODO: need to implement setLinkFileContent()
                         $link = $this->linkFactory->create(['data' => $linkData]);
                         if (isset($linkData['type'])) {
@@ -89,7 +89,9 @@ public function afterInitialize(
                         if (isset($linkData['file_content'])) {
                             $link->setLinkFileContent($linkData['file_content']);
                         }
-                        $link->setId(null);
+                        if (isset($linkData['link_id'])) {
+                            $link->setId($linkData['link_id']);
+                        }
                         if (isset($linkData['sample']['type'])) {
                             $link->setSampleType($linkData['sample']['type']);
                         }
@@ -125,10 +127,11 @@ public function afterInitialize(
                     if (!$sampleData || (isset($sampleData['is_delete']) && (bool)$sampleData['is_delete'])) {
                         continue;
                     } else {
-                        unset($sampleData['sample_id']);
                         $sample = $this->sampleFactory->create(['data' => $sampleData]);
-                        $sample->setId(null);
                         $sample->setStoreId($product->getStoreId());
+                        if (isset($sampleData['sample_id'])) {
+                            $sample->setId($sampleData['sample_id']);
+                        }
                         if (isset($sampleData['type'])) {
                             $sample->setSampleType($sampleData['type']);
                         }

app/code/Magento/Downloadable/Model/Link/SaveHandler.php

@@ -36,17 +36,26 @@ public function __construct(LinkRepository $linkRepository)
      */
     public function execute($entityType, $entity, $arguments = [])
     {
+        /** @var \Magento\Catalog\Api\Data\ProductInterface $entity */
         if ($entity->getTypeId() !== 'downloadable') {
             return $entity;
         }
-        /** @var \Magento\Catalog\Api\Data\ProductInterface $entity */
-        foreach ($this->linkRepository->getList($entity->getSku()) as $link) {
-            $this->linkRepository->delete($link->getId());
-        }
+
+        $oldLinks = $this->linkRepository->getList($entity->getSku());
         $links = $entity->getExtensionAttributes()->getDownloadableProductLinks() ?: [];
+        $updatedLinkIds = [];
         foreach ($links as $link) {
+            if ($link->getId()) {
+                $updatedLinkIds[] = $link->getId();
+            }
             $this->linkRepository->save($entity->getSku(), $link, !(bool)$entity->getStoreId());
         }
+        foreach ($oldLinks as $link) {
+            if (!in_array($link->getId(), $updatedLinkIds)) {
+                $this->linkRepository->delete($link->getId());
+            }
+        }
+
         return $entity;
     }
 }

app/code/Magento/Downloadable/Model/Sample/SaveHandler.php

@@ -39,14 +39,22 @@ public function execute($entityType, $entity, $arguments = [])
         if ($entity->getTypeId() != \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE) {
             return $entity;
         }
-        /** @var \Magento\Catalog\Api\Data\ProductInterface $entity */
-        foreach ($this->sampleRepository->getList($entity->getSku()) as $sample) {
-            $this->sampleRepository->delete($sample->getId());
-        }
+
+        $oldSamples = $this->sampleRepository->getList($entity->getSku());
         $samples = $entity->getExtensionAttributes()->getDownloadableProductSamples() ?: [];
+        $updatedSampleIds = [];
         foreach ($samples as $sample) {
+            if ($sample->getId()) {
+                $updatedSampleIds[] = $sample->getId();
+            }
             $this->sampleRepository->save($entity->getSku(), $sample, !(bool)$entity->getStoreId());
         }
+        foreach ($oldSamples as $sample) {
+            if (!in_array($sample->getId(), $updatedSampleIds)) {
+                $this->sampleRepository->delete($sample->getId());
+            }
+        }
+
         return $entity;
     }
 }