Merge branch 'hotfix/fix-first-not-returning-unique-results'

src/CachedBuilder.php

@@ -60,7 +60,7 @@ public function first($columns = ["*"])
             return parent::first($columns);
         }
 
-        $cacheKey = $this->makeCacheKey($columns);
+        $cacheKey = $this->makeCacheKey($columns, null, "-first");
 
         return $this->cachedValue(func_get_args(), $cacheKey);
     }

tests/Integration/CachedBuilderMultipleQueryTest.php

@@ -0,0 +1,41 @@
+<?php namespace GeneaLabs\LaravelModelCaching\Tests\Integration;
+
+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\Fixtures\Http\Resources\Author as AuthorResource;
+use GeneaLabs\LaravelModelCaching\Tests\IntegrationTestCase;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Collection;
+
+class CachedBuilderMultipleQueryTest extends IntegrationTestCase
+{
+    use RefreshDatabase;
+
+    public function testCallingAllThenFirstQueriesReturnsDifferingResults()
+    {
+        $allAuthors = (new Author)->all();
+        $firstAuthor = (new Author)->first();
+
+        $this->assertNotEquals($allAuthors, $firstAuthor);
+        $this->assertInstanceOf(Author::class, $firstAuthor);
+        $this->assertInstanceOf(Collection::class, $allAuthors);
+    }
+
+    public function testCallingGetThenFirstQueriesReturnsDifferingResults()
+    {
+        $allAuthors = (new Author)->get();
+        $firstAuthor = (new Author)->first();
+
+        $this->assertNotEquals($allAuthors, $firstAuthor);
+        $this->assertInstanceOf(Author::class, $firstAuthor);
+        $this->assertInstanceOf(Collection::class, $allAuthors);
+    }
+}

tests/Integration/CachedBuilderTest.php

@@ -263,7 +263,7 @@ public function testFirstModelResultsCreatesCache()
     {
         $author = (new Author)
             ->first();
-        $key = sha1('genealabs:laravel-model-caching:testing:genealabslaravelmodelcachingtestsfixturesauthor');
+        $key = sha1('genealabs:laravel-model-caching:testing:genealabslaravelmodelcachingtestsfixturesauthor-first');
         $tags = [
             'genealabs:laravel-model-caching:testing:genealabslaravelmodelcachingtestsfixturesauthor',
         ];