Merge branch 'feature/fix-morph-many-not-busting-cache'

Author: mikebronner

src/Traits/ModelCaching.php

@@ -25,6 +25,10 @@ public static function all($columns = ['*'])
 
     public static function bootCachable()
     {
+        static::created(function ($instance) {
+            $instance->checkCooldownAndFlushAfterPersiting($instance);
+        });
+
         static::deleted(function ($instance) {
             $instance->checkCooldownAndFlushAfterPersiting($instance);
         });
@@ -33,6 +37,11 @@ public static function bootCachable()
             $instance->checkCooldownAndFlushAfterPersiting($instance);
         });
 
+        // TODO: figure out how to add this listener
+        // static::restored(function ($instance) {
+        //     $instance->checkCooldownAndFlushAfterPersiting($instance);
+        // });
+
         static::pivotAttached(function ($instance) {
             $instance->checkCooldownAndFlushAfterPersiting($instance);
         });

tests/Fixtures/Book.php

@@ -3,6 +3,7 @@
 use GeneaLabs\LaravelModelCaching\Traits\Cachable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
 class Book extends Model
@@ -27,6 +28,11 @@ public function author() : BelongsTo
         return $this->belongsTo(Author::class);
     }
 
+    public function comments() : MorphMany
+    {
+        return $this->morphMany(Comment::class, "commentable");
+    }
+
     public function publisher() : BelongsTo
     {
         return $this->belongsTo(Publisher::class);

tests/Fixtures/Comment.php

@@ -0,0 +1,20 @@
+<?php namespace GeneaLabs\LaravelModelCaching\Tests\Fixtures;
+
+use GeneaLabs\LaravelModelCaching\Traits\Cachable;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
+
+class Comment extends Model
+{
+    use Cachable;
+
+    protected $fillable = [
+        'description',
+        'subject',
+    ];
+
+    public function commentable() : MorphTo
+    {
+        return $this->morphTo();
+    }
+}

tests/Fixtures/UncachedComment.php

@@ -0,0 +1,19 @@
+<?php namespace GeneaLabs\LaravelModelCaching\Tests\Fixtures;
+
+use GeneaLabs\LaravelModelCaching\Traits\Cachable;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
+
+class UncachedComment extends Model
+{
+    protected $fillable = [
+        'description',
+        'subject',
+    ];
+    protected $table = "comments";
+
+    public function commentable() : MorphTo
+    {
+        return $this->morphTo();
+    }
+}

tests/Integration/CachedBuilder/WithCountTest.php

@@ -2,11 +2,13 @@
 
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Author;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Comment;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Profile;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Publisher;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Store;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedAuthor;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedBook;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedComment;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedProfile;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedPublisher;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedStore;
@@ -39,4 +41,24 @@ public function testWithCountUpdatesAfterRecordIsAdded()
         $this->assertNotEquals($author1->books_count, $author2->books_count);
         $this->assertEquals($author1->books_count + 1, $author2->books_count);
     }
+
+    public function testWithCountOnMorphManyRelationshipUpdatesAfterRecordIsAdded()
+    {
+        $book1 = (new Book)
+            ->withCount("comments")
+            ->first();
+        $comment = factory(Comment::class, 1)
+            ->create()
+            ->first();
+
+        $book1->comments()->save($comment);
+
+        $book2 = (new Book)
+            ->withCount("comments")
+            ->where("id", $book1->id)
+            ->first();
+
+        $this->assertNotEquals($book1->comments_count, $book2->comments_count);
+        $this->assertEquals($book1->comments_count + 1, $book2->comments_count);
+    }
 }

tests/database/factories/CommentFactory.php

@@ -0,0 +1,11 @@
+<?php
+
+use Faker\Generator as Faker;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Comment;
+
+$factory->define(Comment::class, function (Faker $faker) {
+    return [
+        'description' => $faker->paragraphs(3, true),
+        'subject' => $faker->sentence,
+    ];
+});

tests/database/migrations/2018_06_03_202000_create_comments.php

@@ -0,0 +1,25 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateComments extends Migration
+{
+    public function up()
+    {
+        Schema::create('comments', function (Blueprint $table) {
+            $table->increments('id');
+            $table->timestamps();
+
+            $table->unsignedInteger("commentable_id")->nullable();
+            $table->string("commentable_type")->nullable();
+            $table->text("description");
+            $table->string("subject");
+        });
+    }
+
+    public function down()
+    {
+        //
+    }
+}