Feature/fix dataset storage per variant (#12)

Improve dataset removal

Author: joskfg

phpunit.xml

@@ -25,7 +25,7 @@
 
     <logging>
         <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
+        <log type="coverage-html" target="build/coverage"/>
         <log type="coverage-text" target="build/coverage.txt"/>
         <log type="coverage-clover" target="build/clover.xml"/>
     </logging>

src/Scraper/Listeners/UpdateDataset.php

@@ -25,13 +25,6 @@ public function handle(Scraped $event)
     private function addDataset(Scraped $event)
     {
         Log::info('Adding new information to dataset', ['request' => $event->scrapeRequest]);
-        $scraperDatasets = ScrapedDataset::withType($event->scrapeRequest->type)
-            ->withVariant($event->variant);
-
-        if (self::DATASET_AMOUNT_LIMIT <= $scraperDatasets->count()) {
-            $scraperDatasets->orderBy('updated_at', 'desc')->first()->delete();
-        }
-
         ScrapedDataset::create(
             [
                 'url'     => $event->scrapeRequest->url,
@@ -40,6 +33,8 @@ private function addDataset(Scraped $event)
                 'data'    => $event->data,
             ]
         );
+
+        $this->deleteExceededDataset($event);
     }
 
     private function updateDataset(ScrapedDataset $dataset, Scraped $event)
@@ -49,4 +44,25 @@ private function updateDataset(ScrapedDataset $dataset, Scraped $event)
 
         $dataset->save();
     }
+
+    private function deleteExceededDataset($event): void
+    {
+        $scraperDatasets = ScrapedDataset::withType($event->scrapeRequest->type)
+            ->withVariant($event->variant);
+
+        $datasetAmountAvailable = $scraperDatasets->count();
+
+        if (self::DATASET_AMOUNT_LIMIT <= $datasetAmountAvailable) {
+            $datasetToBeDeleted = $datasetAmountAvailable - self::DATASET_AMOUNT_LIMIT;
+            Log::debug('Deleting old dataset information', [
+                'limit'       => self::DATASET_AMOUNT_LIMIT,
+                'current'     => $datasetAmountAvailable,
+                'toBeDeleted' => $datasetToBeDeleted,
+            ]);
+
+            $scraperDatasets->orderBy('updated_at', 'desc')
+                ->take($datasetToBeDeleted)
+                ->delete();
+        }
+    }
 }

tests/TestCase.php

@@ -6,7 +6,7 @@
 
 class TestCase extends \Orchestra\Testbench\TestCase
 {
-    public function setUp():void
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Unit/Scraper/Application/ConfiguratorTest.php

@@ -44,7 +44,7 @@ class ConfiguratorTest extends TestCase
      */
     private $configurator;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Unit/Scraper/Application/XpathBuilderTest.php

@@ -17,7 +17,7 @@ class XpathBuilderTest extends TestCase
      */
     private $xpathBuilder;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Unit/Scraper/Application/XpathFinderTest.php

@@ -15,7 +15,7 @@ class XpathFinderTest extends TestCase
 {
     use DatabaseMigrations;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Unit/Scraper/Listeners/ConfigureScraperTest.php

@@ -40,7 +40,7 @@ class ConfigureScraperTest extends TestCase
      */
     private $type;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Unit/Scraper/Listeners/ScrapeTest.php

@@ -43,7 +43,7 @@ class ScrapeTest extends TestCase
      */
     private $scrapeRequest;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Unit/Scraper/Listeners/UpdateDatasetTest.php

@@ -17,7 +17,7 @@ class UpdateDatasetTest extends \Tests\TestCase
      */
     private $updateDataset;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -86,9 +86,9 @@ public function whenDatasetDoesNotExistAndTheDatasetsLimitHasNotBeenReachedItSho
     /**
      * @test
      */
-    public function whenDatasetDoesNotExistAndTheDatasetsLimitHasReachedItShouldReplaceTheOldest()
+    public function whenDatasetDoesNotExistAndTheDatasetsLimitHasReachedItShouldDeleteTheExcess()
     {
-        factory(ScrapedDataset::class, UpdateDataset::DATASET_AMOUNT_LIMIT)->create([
+        factory(ScrapedDataset::class, UpdateDataset::DATASET_AMOUNT_LIMIT + 10)->create([
             'variant' => 'b265521fc089ac61b794bfa3a5ce8a657f6833ce',
         ]);