Ensure an aborted load is not finalised.

courtney-miles · Sep 17, 2018 · ed8da3a · ed8da3a
1 parent b384e3d
commit ed8da3a
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 3 deletions.
diff --git a/src/Load/DatabaseLoader/DatabaseLoader.php b/src/Load/DatabaseLoader/DatabaseLoader.php
@@ -137,6 +137,14 @@ public function isAborted(): bool
 
     public function finalise(): void
     {
+        if (!$this->hasBegun()) {
+            throw new DatabaseLoaderException('Unable to finalise when loading has not begun.');
+        }
+
+        if ($this->isAborted()) {
+            throw new DatabaseLoaderException('Unable to finalise when loading has been aborted.');
+        }
+
         $this->flush();
         $this->stagedLoad->commit();
     }

diff --git a/src/Load/LoaderInterface.php b/src/Load/LoaderInterface.php
@@ -15,7 +15,9 @@ public function begin(): void;
 
     public function hasBegun(): bool;
 
-    public function finalise(): void;
-
     public function abort(): void;
+
+    public function isAborted(): bool;
+
+    public function finalise(): void;
 }
diff --git a/src/Stage/FinaliseLoadStage.php b/src/Stage/FinaliseLoadStage.php
@@ -25,7 +25,9 @@ public function __construct(LoaderInterface $loader)
 
     public function __invoke(Slurp $slurp): Slurp
     {
-        $this->loader->finalise();
+        if (!$this->loader->isAborted()) {
+            $this->loader->finalise();
+        }
 
         return $slurp;
     }

diff --git a/tests/Slurp/Load/DatabaseLoader/DatabaseLoaderTest.php b/tests/Slurp/Load/DatabaseLoader/DatabaseLoaderTest.php
@@ -185,4 +185,25 @@ public function testExceptionWhenAbortBeforeBegin()
 
         $databaseLoader->abort();
     }
+
+    public function testExceptionWhenFinaliseBeforeBegin()
+    {
+        $this->expectException(DatabaseLoaderException::class);
+
+        $databaseLoader = new DatabaseLoader('', [], $this->mockLoaderFactory, 1);
+
+        $databaseLoader->finalise();
+    }
+
+    public function testExceptionWhenFinaliseAfterAbort()
+    {
+        $this->expectException(DatabaseLoaderException::class);
+
+        $databaseLoader = new DatabaseLoader('', [], $this->mockLoaderFactory, 1);
+
+        $databaseLoader->begin();
+        $databaseLoader->abort();
+
+        $databaseLoader->finalise();
+    }
 }
diff --git a/tests/Slurp/Stage/FinaliseLoadStageTest.php b/tests/Slurp/Stage/FinaliseLoadStageTest.php
@@ -38,6 +38,9 @@ public function setUp()
         parent::setUp();
 
         $this->mockLoader = \Mockery::mock(LoaderInterface::class);
+        $this->mockLoader->shouldReceive('isAborted')
+            ->andReturn(false)
+            ->byDefault();
         $this->mockSlurp = \Mockery::mock(Slurp::class);
 
         $this->stage = new FinaliseLoadStage($this->mockLoader);
@@ -50,4 +53,12 @@ public function testFinaliseLoadOnInvoke()
 
         $this->assertSame($this->mockSlurp, ($this->stage)($this->mockSlurp));
     }
+
+    public function testsDoNotFinaliseIfAborted()
+    {
+        $this->mockLoader->shouldReceive('isAborted')
+            ->andReturn(true);
+        $this->mockLoader->shouldReceive('finalise')
+            ->never();
+    }
 }