Merge pull request #553 from magento-firedrakes/MAGETWO-51969

[Firedrakes] Bugfixes

Author: dkvashninbay

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

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

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

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