Merge pull request #27 from keboola/COM-163-ondra-throw-user-exception

throw invalidSheet as UserException
keboola · Mar 11, 2020 · a7fface · a7fface
2 parents 9f07f6f + 42567bf
commit a7fface
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/Keboola/GoogleDriveExtractor/Extractor/Extractor.php b/src/Keboola/GoogleDriveExtractor/Extractor/Extractor.php
@@ -65,9 +65,13 @@ public function run(array $sheets): array
                 try {
                     $this->logger->info('Extracting sheet ' . $sheet['sheetTitle']);
                     $this->export($spreadsheet, $sheet);
+                } catch (UserException $e) {
+                    throw new UserException($e->getMessage(), 0, $e);
                 } catch (\Throwable $e) {
                     $exceptionHandler->handleExportException($e, $sheet);
                 }
+            } catch (UserException $e) {
+                throw new UserException($e->getMessage(), 0, $e);
             } catch (\Throwable $e) {
                 $exceptionHandler->handleGetSpreadsheetException($e, $sheet);
             }

diff --git a/tests/ApplicationTest.php b/tests/ApplicationTest.php
@@ -5,6 +5,7 @@
 namespace Keboola\GoogleDriveExtractor\Tests;
 
 use Keboola\GoogleDriveExtractor\Application;
+use Keboola\GoogleDriveExtractor\Exception\UserException;
 use Symfony\Component\Yaml\Yaml;
 
 class ApplicationTest extends BaseTest
@@ -44,4 +45,15 @@ public function testAppRun(): void
 
         $this->assertEquals($outputTableId, $manifest['destination']);
     }
+
+    public function testInvalidSpreadsheetId(): void
+    {
+        $this->testFile['sheets'][0]['properties']['sheetId'] = 18293729;
+        $this->config = $this->makeConfig($this->testFile);
+        $this->application = new Application($this->config);
+
+        $this->expectException(UserException::class);
+        $this->expectExceptionMessage('Sheet id "18293729" not found');
+        $this->application->run();
+    }
 }