WIP

Author: mikebronner

src/Console/Commands/Flush.php

@@ -12,15 +12,25 @@ public function handle()
         $option = $this->option('model');
 
         if (! $option) {
-            cache()
-                ->store(config('laravel-model-caching.store'))
-                ->flush();
+            return $this->flushEntireCache();
+        }
 
-            $this->info("✔︎ Entire model cache has been flushed.");
+        return $this->flushModelCache($option);
+    }
 
-            return 0;
-        }
+    protected function flushEntireCache() : int
+    {
+        cache()
+            ->store(config('laravel-model-caching.store'))
+            ->flush();
+
+        $this->info("✔︎ Entire model cache has been flushed.");
 
+        return 0;
+    }
+
+    protected function flushModelCache(string $option) : int
+    {
         $model = new $option;
         $usesCachableTrait = collect(class_uses($model))
             ->contains("GeneaLabs\LaravelModelCaching\Traits\Cachable");
@@ -34,5 +44,7 @@ public function handle()
 
         $model->flushCache();
         $this->info("✔︎ Cache for model '{$option}' has been flushed.");
+
+        return 0;
     }
 }

src/Traits/Cachable.php

@@ -129,28 +129,28 @@ protected function checkCooldownAndRemoveIfExpired(Model $instance)
     {
         [$cacheCooldown, $invalidatedAt] = $this->getModelCacheCooldown($instance);
 
-        if (! $cacheCooldown) {
+        if (! $cacheCooldown
+            || now()->diffInSeconds($invalidatedAt) < $cacheCooldown
+        ) {
             return;
         }
 
-        if (now()->diffInSeconds($invalidatedAt) >= $cacheCooldown) {
-            $cachePrefix = "genealabs:laravel-model-caching:"
-                . (config('laravel-model-caching.cache-prefix')
-                    ? config('laravel-model-caching.cache-prefix', '') . ":"
-                    : "");
-            $modelClassName = get_class($instance);
-
-            $instance
-                ->cache()
-                ->forget("{$cachePrefix}:{$modelClassName}-cooldown:invalidated-at");
-            $instance
-                ->cache()
-                ->forget("{$cachePrefix}:{$modelClassName}-cooldown:invalidated-at");
-            $instance
-                ->cache()
-                ->forget("{$cachePrefix}:{$modelClassName}-cooldown:saved-at");
-            $instance->flushCache();
-        }
+        $cachePrefix = "genealabs:laravel-model-caching:"
+            . (config('laravel-model-caching.cache-prefix')
+                ? config('laravel-model-caching.cache-prefix', '') . ":"
+                : "");
+        $modelClassName = get_class($instance);
+
+        $instance
+            ->cache()
+            ->forget("{$cachePrefix}:{$modelClassName}-cooldown:invalidated-at");
+        $instance
+            ->cache()
+            ->forget("{$cachePrefix}:{$modelClassName}-cooldown:invalidated-at");
+        $instance
+            ->cache()
+            ->forget("{$cachePrefix}:{$modelClassName}-cooldown:saved-at");
+        $instance->flushCache();
     }
 
     protected function checkCooldownAndFlushAfterPersiting(Model $instance)
@@ -163,19 +163,7 @@ protected function checkCooldownAndFlushAfterPersiting(Model $instance)
             return;
         }
 
-        if ($cacheCooldown) {
-            $cachePrefix = "genealabs:laravel-model-caching:"
-                . (config('laravel-model-caching.cache-prefix')
-                    ? config('laravel-model-caching.cache-prefix', '') . ":"
-                    : "");
-            $modelClassName = get_class($instance);
-            $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:saved-at";
-
-            $instance->cache()
-                ->rememberForever($cacheKey, function () {
-                    return now();
-                });
-        }
+        $this->setCacheCooldownSavedAtTimestamp($instance);
 
         if ($savedAt > $invalidatedAt
                 && now()->diffInSeconds($invalidatedAt) >= $cacheCooldown
@@ -184,6 +172,21 @@ protected function checkCooldownAndFlushAfterPersiting(Model $instance)
         }
     }
 
+    protected function setCacheCooldownSavedAtTimestamp(Model $instance)
+    {
+        $cachePrefix = "genealabs:laravel-model-caching:"
+            . (config('laravel-model-caching.cache-prefix')
+                ? config('laravel-model-caching.cache-prefix', '') . ":"
+                : "");
+        $modelClassName = get_class($instance);
+        $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:saved-at";
+
+        $instance->cache()
+            ->rememberForever($cacheKey, function () {
+                return now();
+            });
+    }
+
     public static function bootCachable()
     {
         // TODO: add for deleted,updated,etc?

tests/Integration/CachedModelTest.php

@@ -97,7 +97,7 @@ public function testWhereHasIsBeingCached()
         $this->assertEquals(1, $books->first()->author->id);
         $this->assertEquals(1, $cachedResults->first()->author->id);
     }
-
+/** @group test */
     public function testModelCacheDoesntInvalidateDuringCooldownPeriod()
     {
         $authors = (new Author)