MAGETWO-82710: Fix issue #10032 - Download back-up .tgz always takes the latest that's created (2.2-develop) #11595

Author: ishakhsuvarov

app/code/Magento/Backup/Model/BackupFactory.php

@@ -39,23 +39,20 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      */
     public function create($timestamp, $type)
     {
-        $backupId = $timestamp . '_' . $type;
         $fsCollection = $this->_objectManager->get(\Magento\Backup\Model\Fs\Collection::class);
         $backupInstance = $this->_objectManager->get(\Magento\Backup\Model\Backup::class);
+
         foreach ($fsCollection as $backup) {
-            if ($backup->getId() == $backupId) {
-                $backupInstance->setType(
-                    $backup->getType()
-                )->setTime(
-                    $backup->getTime()
-                )->setName(
-                    $backup->getName()
-                )->setPath(
-                    $backup->getPath()
-                );
+            if ($backup->getTime() === (int) $timestamp && $backup->getType() === $type) {
+                $backupInstance->setData(['id' => $backup->getId()])
+                    ->setType($backup->getType())
+                    ->setTime($backup->getTime())
+                    ->setName($backup->getName())
+                    ->setPath($backup->getPath());
                 break;
             }
         }
+
         return $backupInstance;
     }
 }

app/code/Magento/Backup/Test/Unit/Model/BackupFactoryTest.php

@@ -77,42 +77,29 @@ protected function setUp()
 
     public function testCreate()
     {
-        $this->_backupModel->expects(
-            $this->once()
-        )->method(
-            'setType'
-        )->with(
-            $this->_data['type']
-        )->will(
-            $this->returnSelf()
-        );
-        $this->_backupModel->expects(
-            $this->once()
-        )->method(
-            'setTime'
-        )->with(
-            $this->_data['time']
-        )->will(
-            $this->returnSelf()
-        );
-        $this->_backupModel->expects(
-            $this->once()
-        )->method(
-            'setName'
-        )->with(
-            $this->_data['name']
-        )->will(
-            $this->returnSelf()
-        );
-        $this->_backupModel->expects(
-            $this->once()
-        )->method(
-            'setPath'
-        )->with(
-            $this->_data['path']
-        )->will(
-            $this->returnSelf()
-        );
+        $this->_backupModel->expects($this->once())
+            ->method('setType')
+            ->with($this->_data['type'])
+            ->will($this->returnSelf());
+
+        $this->_backupModel->expects($this->once())
+            ->method('setTime')
+            ->with($this->_data['time'])
+            ->will($this->returnSelf());
+
+        $this->_backupModel->expects($this->once())
+            ->method('setName')
+            ->with($this->_data['name'])
+            ->will($this->returnSelf());
+
+        $this->_backupModel->expects($this->once())
+            ->method('setPath')
+            ->with($this->_data['path'])
+            ->will($this->returnSelf());
+
+        $this->_backupModel->expects($this->once())
+            ->method('setData')
+            ->will($this->returnSelf());
 
         $this->_instance->create('1385661590', 'snapshot');
     }