MAGETWO-56260: Recoverable Exception Support

Author: aakimov

app/code/Magento/Catalog/Model/Product/TierPriceManagement.php

@@ -12,7 +12,7 @@
 use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\InputException;
-use Magento\Framework\Exception\TemporaryStateException;
+use Magento\Framework\Exception\TemporaryStateExceptionInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -138,7 +138,7 @@ public function add($sku, $customerGroupId, $price, $qty)
         try {
             $this->productRepository->save($product);
         } catch (\Exception $e) {
-            if ($e instanceof TemporaryStateException) {
+            if ($e instanceof TemporaryStateExceptionInterface) {
                 // temporary state exception must be already localized
                 throw $e;
             }

app/code/Magento/Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php

@@ -12,6 +12,7 @@
 
 use Magento\Customer\Model\GroupManagement;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\TemporaryState\CouldNotSaveException;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -393,6 +394,30 @@ public function testSetThrowsExceptionIfCantSave()
         $this->service->add('product_sku', 1, 100, 2);
     }
 
+    /**
+     * @expectedException \Magento\Framework\Exception\TemporaryState\CouldNotSaveException
+     */
+    public function testAddRethrowsTemporaryStateExceptionIfRecoverableErrorOccurred()
+    {
+        $group = $this->getMock(\Magento\Customer\Model\Data\Group::class, [], [], '', false);
+        $group->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+        $this->productMock
+            ->expects($this->once())
+            ->method('getData')
+            ->with('tier_price')
+            ->will($this->returnValue([]));
+        $this->groupRepositoryMock->expects($this->once())
+            ->method('getById')
+            ->willReturn($group);
+        $this->repositoryMock->expects($this->once())
+            ->method('save')
+            ->willThrowException(new CouldNotSaveException(__('Lock wait timeout')));
+
+        $this->service->add('product_sku', 1, 100, 2);
+    }
+
     /**
      * @param string|int $price
      * @param string|float $qty

app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php

@@ -12,6 +12,7 @@
 use Magento\Catalog\Model\Layer\Filter\Dynamic\AlgorithmFactory;
 use Magento\Framework\Api\Data\ImageContentInterface;
 use Magento\Framework\Api\SortOrder;
+use Magento\Framework\DB\Adapter\ConnectionException;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Model\ScopeInterface;
 
@@ -602,6 +603,36 @@ public function testSaveInvalidProductException()
         $this->model->save($this->productMock);
     }
 
+    /**
+     * @expectedException \Magento\Framework\Exception\TemporaryState\CouldNotSaveException
+     * @expectedExceptionMessage Database connection error
+     */
+    public function testSaveThrowsTemporaryStateExceptionIfDatabaseConnectionErrorOccurred()
+    {
+        $this->productFactoryMock->expects($this->any())
+            ->method('create')
+            ->will($this->returnValue($this->productMock));
+        $this->initializationHelperMock->expects($this->never())
+            ->method('initialize');
+        $this->resourceModelMock->expects($this->once())
+            ->method('validate')
+            ->with($this->productMock)
+            ->willReturn(true);
+        $this->resourceModelMock->expects($this->once())
+            ->method('save')
+            ->with($this->productMock)
+            ->willThrowException(new ConnectionException('Connection lost'));
+        $this->extensibleDataObjectConverterMock
+            ->expects($this->once())
+            ->method('toNestedArray')
+            ->will($this->returnValue($this->productData));
+        $this->productMock->expects($this->once())
+            ->method('getWebsiteIds')
+            ->willReturn([]);
+
+        $this->model->save($this->productMock);
+    }
+
     public function testDelete()
     {
         $this->productMock->expects($this->exactly(2))->method('getSku')->willReturn('product-42');

lib/internal/Magento/Framework/Exception/TemporaryState/CouldNotSaveException.php

@@ -5,15 +5,14 @@
  */
 namespace Magento\Framework\Exception\TemporaryState;
 
-use Magento\Framework\Exception\TemporaryStateException;
+use Magento\Framework\Exception\TemporaryStateExceptionInterface;
+use Magento\Framework\Exception\CouldNotSaveException as LocalizedCouldNotSaveException;
 use Magento\Framework\Phrase;
 
 /**
  * CouldNotSaveException caused by recoverable error
  */
-class CouldNotSaveException
-    extends \Magento\Framework\Exception\CouldNotSaveException
-    implements TemporaryStateException
+class CouldNotSaveException extends LocalizedCouldNotSaveException implements TemporaryStateExceptionInterface
 {
     /**
      * Class constructor

lib/internal/Magento/Framework/Exception/TemporaryStateException.php renamed to lib/internal/Magento/Framework/Exception/TemporaryStateExceptionInterface.php

@@ -8,6 +8,6 @@
 /**
  * Temporary state exception that represent recoverable error
  */
-interface TemporaryStateException
+interface TemporaryStateExceptionInterface
 {
 }