Add nested relationship test

Author: mikebronner

tests/Fixtures/Book.php

@@ -20,6 +20,11 @@ public function author() : BelongsTo
         return $this->belongsTo(Author::class);
     }
 
+    public function publisher() : BelongsTo
+    {
+        return $this->belongsTo(Publisher::class);
+    }
+
     public function stores() : BelongsToMany
     {
         return $this->belongsToMany(Store::class);

tests/Fixtures/Publisher.php

@@ -0,0 +1,16 @@
+<?php namespace GeneaLabs\LaravelModelCaching\Tests\Fixtures;
+
+use GeneaLabs\LaravelModelCaching\CachedModel;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+class Publisher extends CachedModel
+{
+    protected $fillable = [
+        'name',
+    ];
+
+    public function books() : HasMany
+    {
+        return $this->hasMany(Book::class);
+    }
+}

tests/Fixtures/UncachedBook.php

@@ -21,6 +21,11 @@ public function author() : BelongsTo
         return $this->belongsTo(UncachedAuthor::class);
     }
 
+    public function publisher() : BelongsTo
+    {
+        return $this->belongsTo(UncachedPublisher::class);
+    }
+
     public function stores() : BelongsToMany
     {
         return $this->belongsToMany(UncachedStore::class);

tests/Fixtures/UncachedPublisher.php

@@ -0,0 +1,17 @@
+<?php namespace GeneaLabs\LaravelModelCaching\Tests\Fixtures;
+
+use GeneaLabs\LaravelModelCaching\CachedModel;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+class UncachedPublisher extends CachedModel
+{
+    protected $fillable = [
+        'name',
+    ];
+    protected $table = 'publishers';
+
+    public function books() : HasMany
+    {
+        return $this->hasMany(Book::class, 'publisher_id', 'id');
+    }
+}

tests/Unit/CachedBuilderTest.php

@@ -3,10 +3,12 @@
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Author;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
 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\UncachedProfile;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedPublisher;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedStore;
 use GeneaLabs\LaravelModelCaching\Tests\TestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
@@ -23,11 +25,13 @@ public function setUp()
         parent::setUp();
 
         cache()->flush();
+        $publishers = factory(Publisher::class, 10)->create();
         factory(Author::class, 10)->create()
-            ->each(function($author) {
+            ->each(function($author) use ($publishers) {
                 factory(Book::class, random_int(2, 10))->make()
-                    ->each(function ($book) use ($author) {
+                    ->each(function ($book) use ($author, $publishers) {
                         $book->author()->associate($author);
+                        $book->publisher()->associate($publishers[rand(0, 9)]);
                         $book->save();
                     });
                 factory(Profile::class)->make([
@@ -407,4 +411,31 @@ public function testValueModelResultsCreatesCache()
         $this->assertEquals($authors, $cachedResults);
         $this->assertEquals($liveResults, $cachedResults);
     }
+
+    public function testNestedRelationshipEagerloading()
+    {
+        $authors = collect()->push(
+            (new Author)->with('books.publisher')
+                ->first()
+        );
+        $key = 'genealabslaravelmodelcachingtestsfixturesauthor-books-books.publisher-first';
+        $tags = [
+            'genealabslaravelmodelcachingtestsfixturesauthor',
+            'genealabslaravelmodelcachingtestsfixturesbook',
+            'genealabslaravelmodelcachingtestsfixturespublisher',
+        ];
+
+        $cachedResults = collect()->push(
+            cache()->tags($tags)
+                ->get($key)
+        );
+
+        $liveResults = collect()->push(
+            (new UncachedAuthor)->with('books.publisher')
+                ->first()
+        );
+
+        $this->assertEmpty($authors->diffAssoc($cachedResults));
+        $this->assertEmpty($liveResults->diffAssoc($cachedResults));
+    }
 }

tests/Unit/CachedModelTest.php

@@ -3,10 +3,12 @@
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Author;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
 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\UncachedProfile;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedPublisher;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedStore;
 use GeneaLabs\LaravelModelCaching\Tests\TestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
@@ -20,11 +22,13 @@ public function setUp()
         parent::setUp();
 
         cache()->flush();
+        $publishers = factory(Publisher::class, 10)->create();
         factory(Author::class, 10)->create()
-            ->each(function($author) {
+            ->each(function($author) use ($publishers) {
                 factory(Book::class, random_int(2, 10))->make()
-                    ->each(function ($book) use ($author) {
+                    ->each(function ($book) use ($author, $publishers) {
                         $book->author()->associate($author);
+                        $book->publisher()->associate($publishers[rand(0, 9)]);
                         $book->save();
                     });
                 factory(Profile::class)->make([

tests/database/factories/PublisherFactory.php

@@ -0,0 +1,10 @@
+<?php
+
+use Faker\Generator as Faker;
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Publisher;
+
+$factory->define(Publisher::class, function (Faker $faker) {
+    return [
+        'name' => $faker->name,
+    ];
+});

tests/database/migrations/2017_09_21_010100_create_publishers.php

@@ -0,0 +1,22 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreatePublishers extends Migration
+{
+    public function up()
+    {
+        Schema::create('publishers', function (Blueprint $table) {
+            $table->increments('id');
+            $table->timestamps();
+
+            $table->string('name');
+        });
+    }
+
+    public function down()
+    {
+        //
+    }
+}

tests/database/migrations/2017_09_21_010109_create_books.php

@@ -10,11 +10,23 @@ public function up()
         Schema::create('books', function (Blueprint $table) {
             $table->increments('id');
             $table->unsignedInteger('author_id');
+            $table->unsignedInteger('publisher_id');
             $table->timestamps();
 
             $table->text('description');
             $table->dateTime('published_at');
             $table->string('title');
+
+            $table->foreign('author_id')
+                ->references('id')
+                ->on('authors')
+                ->onUpdate('CASCADE')
+                ->onDelete('CASCADE');
+            $table->foreign('publisher_id')
+                ->references('id')
+                ->on('publishers')
+                ->onUpdate('CASCADE')
+                ->onDelete('CASCADE');
         });
     }