Merge pull request #1 from OpenClassrooms/OC-5468_fix_500_on_command

handle 500 errors
OpenClassrooms · Jun 29, 2016 · 3b33b03 · 3b33b03
2 parents 0530c2c + 9448809
commit 3b33b03
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/Gateways/Impl/FileGatewayImpl.php b/Gateways/Impl/FileGatewayImpl.php
@@ -2,6 +2,7 @@
 
 namespace OpenClassrooms\Bundle\OneSkyBundle\Gateways\Impl;
 
+use Guzzle\Http\Exception\ServerErrorResponseException;
 use Onesky\Api\Client;
 use OpenClassrooms\Bundle\OneSkyBundle\EventListener\TranslationDownloadTranslationEvent;
 use OpenClassrooms\Bundle\OneSkyBundle\EventListener\TranslationUploadTranslationEvent;
@@ -73,6 +74,9 @@ private function checkTranslation($downloadedContent, ExportFile $file)
             if (400 === $json['meta']['status']) {
                 throw new NonExistingTranslationException($file->getTargetFilePath());
             }
+            if (500 === $json['meta']['status']) {
+                throw new ServerErrorResponseException($file->getTargetFilePath());
+            }
             throw new InvalidContentException($downloadedContent);
         }
     }

diff --git a/Tests/Gateways/Impl/FileGatewayImplTest.php b/Tests/Gateways/Impl/FileGatewayImplTest.php
@@ -110,6 +110,16 @@ public function WithFileNotOnApiException_download_DoNothing()
         $this->gateway->downloadTranslations([new ExportFileStub1()]);
     }
 
+    /**
+     * @test
+     * @expectedException \Guzzle\Http\Exception\ServerErrorResponseException
+     */
+    public function ApiServerError_download_ThrowException()
+    {
+        ClientMock::$downloadedContent = '{"meta":{"status":500,"message":"Something went wrong. Please try again or contact us at [email protected]"},"data":{}}';
+        $this->gateway->downloadTranslations([new ExportFileStub1()]);
+    }
+
     /**
      * @test
      */