fix model flush command

Author: mikebronner

src/Console/Commands/Flush.php

@@ -1,6 +1,7 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Console\Commands;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\Collection;
 
 class Flush extends Command
 {
@@ -10,7 +11,7 @@ class Flush extends Command
     public function handle()
     {
         $option = $this->option('model');
-        
+
         if (! $option) {
             return $this->flushEntireCache();
         }
@@ -32,7 +33,7 @@ protected function flushEntireCache() : int
     protected function flushModelCache(string $option) : int
     {
         $model = new $option;
-        $usesCachableTrait = collect(class_uses($model))
+        $usesCachableTrait = $this->getAllTraitsUsedByClass($option)
             ->contains("GeneaLabs\LaravelModelCaching\Traits\Cachable");
 
         if (! $usesCachableTrait) {
@@ -47,4 +48,21 @@ protected function flushModelCache(string $option) : int
 
         return 0;
     }
+
+    protected function getAllTraitsUsedByClass(string $classname, bool $autoload = true) : Collection
+    {
+        $traits = collect();
+
+        if (class_exists($classname, $autoload)) {
+            $traits = collect(class_uses($classname, $autoload));
+        }
+
+        $parentClass = get_parent_class($classname);
+
+        if ($parentClass) {
+            $traits = $traits->merge($this->getAllTraitsUsedByClass($parentClass, $autoload));
+        }
+
+        return $traits;
+    }
 }

tests/Fixtures/PrefixedAuthor.php

@@ -1,14 +1,11 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Tests\Fixtures;
 
-use GeneaLabs\LaravelModelCaching\Traits\Cachable;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 
 class PrefixedAuthor extends BaseModel
 {
-    use Cachable;
-
     protected $fillable = [
         'name',
         'email',

tests/Integration/Console/Commands/FlushTest.php

@@ -6,40 +6,14 @@
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Publisher;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Store;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedAuthor;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\PrefixedAuthor;
 use GeneaLabs\LaravelModelCaching\Tests\IntegrationTestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 
 class FlushTest extends IntegrationTestCase
 {
     use RefreshDatabase;
 
-    public function setUp()
-    {
-        parent::setUp();
-
-        $this->cache->flush();
-        $publishers = factory(Publisher::class, 10)->create();
-        factory(Author::class, 10)->create()
-            ->each(function ($author) use ($publishers) {
-                factory(Book::class, random_int(2, 10))->make()
-                    ->each(function ($book) use ($author, $publishers) {
-                        $book->author()->associate($author);
-                        $book->publisher()->associate($publishers[rand(0, 9)]);
-                        $book->save();
-                    });
-                factory(Profile::class)->make([
-                    'author_id' => $author->id,
-                ]);
-            });
-
-        $bookIds = (new Book)->all()->pluck('id');
-        factory(Store::class, 10)->create()
-            ->each(function ($store) use ($bookIds) {
-                $store->books()->sync(rand($bookIds->min(), $bookIds->max()));
-            });
-        $this->cache->flush();
-    }
-
     public function testGivenModelIsFlushed()
     {
         $authors = (new Author)->all();
@@ -59,6 +33,29 @@ public function testGivenModelIsFlushed()
         $this->assertEquals($result, 0);
     }
 
+    public function testExtendedModelIsFlushed()
+    {
+        $authors = (new PrefixedAuthor)
+            ->get();
+
+        $key = sha1('genealabs:laravel-model-caching:test-prefix:genealabslaravelmodelcachingtestsfixturesprefixedauthor');
+        $tags = ['genealabs:laravel-model-caching:test-prefix:genealabslaravelmodelcachingtestsfixturesprefixedauthor'];
+
+        $cachedResults = $this
+            ->cache
+            ->tags($tags)
+            ->get($key)['value'];
+        $result = $this->artisan('modelCache:flush', ['--model' => PrefixedAuthor::class]);
+        $flushedResults = $this
+            ->cache
+            ->tags($tags)
+            ->get($key)['value'];
+
+        $this->assertEquals($authors, $cachedResults);
+        $this->assertEmpty($flushedResults);
+        $this->assertEquals($result, 0);
+    }
+
     public function testGivenModelWithRelationshipIsFlushed()
     {
         $authors = (new Author)->with('books')->get();