Cache for calculate configuration now take into account the configuration type (#2)

Author: joskfg

src/Scraper/Repositories/Configuration.php

@@ -16,8 +16,6 @@ class Configuration
      */
     private $configurator;
 
-    private $cacheKey = self::class . '-config';
-
     /**
      * Cache TTL in minutes.
      *
@@ -37,7 +35,8 @@ public function findByType(string $type): Collection
 
     public function calculate(string $type): Collection
     {
-        $config = Cache::get($this->cacheKey);
+        $cacheKey = $this->getCacheKey($type);
+        $config   = Cache::get($cacheKey);
         if (!$config) {
             Log::warning('Calculating configuration');
             $scrapedDataset = ScrapedDataset::withType($type)->get();
@@ -47,9 +46,14 @@ public function calculate(string $type): Collection
             }
 
             $config = $this->configurator->configureFromDataset($scrapedDataset);
-            Cache::put($this->cacheKey, $config, self::CACHE_TTL);
+            Cache::put($cacheKey, $config, self::CACHE_TTL);
         }
 
         return $config;
     }
+
+    protected function getCacheKey(string $type): string
+    {
+        return self::class . "-config-{$type}";
+    }
 }

tests/Unit/Scraper/Repositories/ConfigurationTest.php

@@ -100,10 +100,10 @@ public function whenRecalculateItShouldStoreTheNewXpaths()
         ]);
 
         Cache::shouldReceive('get')
-            ->with($this->getCacheKey())
+            ->with(Configuration::class . '-config-post')
             ->andReturnNull();
         Cache::shouldReceive('put')
-            ->with($this->getCacheKey(), $config, Configuration::CACHE_TTL);
+            ->with(Configuration::class . '-config-post', $config, Configuration::CACHE_TTL);
 
         $configurator = \Mockery::mock(Configurator::class);
         $configurator->shouldReceive('configureFromDataset')
@@ -154,7 +154,7 @@ public function whenRecalculateFailsItShouldThrowAnException()
         ]);
 
         Cache::shouldReceive('get')
-            ->with($this->getCacheKey())
+            ->with(Configuration::class . '-config-post')
             ->andReturnNull();
 
         $configurator = \Mockery::mock(Configurator::class);
@@ -183,7 +183,7 @@ public function whenCalculateAfterAnotherCalculateItShouldUseThePrecalclatedConf
         $config = collect('configuration');
 
         Cache::shouldReceive('get')
-            ->with($this->getCacheKey())
+            ->with(Configuration::class . '-config-post')
             ->andReturn($config);
 
         $configuration = new Configuration($configurator);
@@ -192,9 +192,4 @@ public function whenCalculateAfterAnotherCalculateItShouldUseThePrecalclatedConf
             $configuration->calculate('post')
         );
     }
-
-    private function getCacheKey()
-    {
-        return Configuration::class . '-config';
-    }
 }