Fix ->insert() not invalidating cache

Author: mikebronner

src/CachedBuilder.php

@@ -76,6 +76,13 @@ public function get($columns = ["*"])
         return $this->cachedValue(func_get_args(), $cacheKey);
     }
 
+    public function insert(array $values)
+    {
+        $this->checkCooldownAndFlushAfterPersiting($this->model);
+
+        return parent::insert($values);
+    }
+
     public function max($column)
     {
         if (! $this->isCachable()) {

src/Traits/Cachable.php

@@ -86,14 +86,14 @@ protected function makeCacheTags() : array
         return $tags;
     }
 
-    protected function getModelCacheCooldown(Model $instance)
+    public function getModelCacheCooldown(Model $instance)
     {
         $cachePrefix = $this->getCachePrefix();
         $modelClassName = get_class($instance);
         [$cacheCooldown, $invalidatedAt, $savedAt] = $this
             ->getCacheCooldownDetails($instance, $cachePrefix, $modelClassName);
 
-        if (! $cacheCooldown) {
+        if (! $cacheCooldown || $cacheCooldown === 0) {
             return [null, null, null];
         }
 
@@ -178,7 +178,6 @@ protected function setCacheCooldownSavedAtTimestamp(Model $instance)
 
     public static function bootCachable()
     {
-        // TODO: add for deleted,updated,etc?
         static::saved(function ($instance) {
             $instance->checkCooldownAndFlushAfterPersiting($instance);
         });

tests/Integration/CachedBuilderTest.php

@@ -889,4 +889,24 @@ public function testPaginationIsCached()
         $this->assertEquals($cachedResults->toArray(), $authors->toArray());
         $this->assertEquals($liveResults->toArray(), $authors->toArray());
     }
+
+    public function testInsertInvalidatesCache()
+    {
+        $authors = (new Author)
+            ->get();
+
+        (new Author)
+            ->insert([
+                'name' => 'Test Insert',
+                'email' => '[email protected]',
+            ]);
+        $authorsAfterInsert = (new Author)
+            ->get();
+        $uncachedAuthors = (new UncachedAuthor)
+            ->get();
+
+        $this->assertCount(10, $authors);
+        $this->assertCount(11, $authorsAfterInsert);
+        $this->assertCount(11, $uncachedAuthors);
+    }
 }

tests/Integration/CachedModelTest.php

@@ -118,4 +118,20 @@ public function testModelCacheDoesntInvalidateDuringCooldownPeriod()
         $this->assertCount(11, $uncachedAuthors);
         $this->assertCount(11, $authorsAfterCooldown);
     }
+
+    public function testModelCacheDoesInvalidateWhenNoCooldownPeriod()
+    {
+        $authors = (new Author)
+            ->get();
+
+        factory(Author::class, 1)->create();
+        $authorsAfterCreate = (new Author)
+            ->get();
+        $uncachedAuthors = (new UncachedAuthor)
+            ->get();
+
+        $this->assertCount(10, $authors);
+        $this->assertCount(11, $authorsAfterCreate);
+        $this->assertCount(11, $uncachedAuthors);
+    }
 }