WIP - started work on softdeletes

Author: mikebronner

README.md

@@ -180,8 +180,11 @@ This comes in handy when manually making updates to the database. You could also
 trigger this after making updates to the database from sources outside your
 Laravel app.
 
-## Possible Future Improvements
+## Things That Don't Work Currently
+The following items currently do no work with this package:
 - [caching of lazy-loaded relationships, see #127](https://github.com/GeneaLabs/laravel-model-caching/issues/127).
+- [using select() clauses in Eloquent queries, see #238](https://github.com/GeneaLabs/laravel-model-caching/issues/238) (word-around discussed in the issue)
+- [using SoftDeletes on Models, see #237](https://github.com/GeneaLabs/laravel-model-caching/issues/237)
 
 ## Summary
 **That's all you need to do. All model queries and relationships are now

src/CachedBuilder.php

@@ -76,6 +76,10 @@ public function first($columns = ["*"])
             return parent::first($columns);
         }
 
+        if (! is_array($columns)) {
+            $columns = [$columns];
+        }
+
         $cacheKey = $this->makeCacheKey($columns, null, "-first");
 
         return $this->cachedValue(func_get_args(), $cacheKey);

tests/Fixtures/Author.php

@@ -5,10 +5,12 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 class Author extends Model
 {
     use Cachable;
+    use SoftDeletes;
 
     protected $casts = [
         "finances" => "array",

tests/Fixtures/UncachedAuthor.php

@@ -4,9 +4,12 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 class UncachedAuthor extends Model
 {
+    use SoftDeletes;
+    
     protected $casts = [
         "finances" => "array",
     ];

tests/Integration/CachedBuilder/SoftDeletesTest.php

@@ -0,0 +1,67 @@
+<?php namespace GeneaLabs\LaravelModelCaching\Tests\Integration\CachedBuilder;
+
+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 SoftDeletesTest extends IntegrationTestCase
+{
+    public function testWithTrashedIsCached()
+    {
+        $key = sha1('genealabs:laravel-model-caching:testing::memory::authors:genealabslaravelmodelcachingtestsfixturesauthor-authors.id_=_1-first');
+        $tags = [
+            'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor',
+        ];
+        $author = (new UncachedAuthor)
+            ->first();
+        $author->delete();
+
+        $deletedAuthor = (new Author)
+            ->withTrashed()
+            ->find($author->id);
+        $cachedResults = $this
+            ->cache()
+            ->tags($tags)
+            ->get($key)['value'];
+        $deletedUncachedAuthor = (new UncachedAuthor)
+            ->withTrashed()
+            ->find($author->id);
+
+        $this->assertEquals($cachedResults->toArray(), $deletedAuthor->toArray());
+        $this->assertEquals($cachedResults->toArray(), $deletedUncachedAuthor->toArray());
+    }
+
+    // public function testWithoutTrashedIsCached()
+    // {
+    //     $key = sha1('genealabs:laravel-model-caching:testing::memory::authors:genealabslaravelmodelcachingtestsfixturesauthor_1-first');
+    //     $tags = [
+    //         'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor',
+    //     ];
+    //     $author = (new UncachedAuthor)
+    //         ->first();
+    //     $author->delete();
+
+    //     $deletedAuthor = (new Author)
+    //         ->first($author->id);
+    //     $cachedResults = $this
+    //         ->cache()
+    //         ->tags($tags)
+    //         ->get($key)['value'];
+    //     $deletedUncachedAuthor = (new UncachedAuthor)
+    //         ->first($author->id);
+
+    //     $this->assertEquals($cachedResults->toArray(), $deletedAuthor->toArray());
+    //     $this->assertEquals($cachedResults->toArray(), $deletedUncachedAuthor->toArray());
+    // }
+}

tests/Integration/CachedModelTest.php

@@ -111,7 +111,7 @@ public function testWhereHasIsBeingCached()
             })
             ->get();
 
-        $key = sha1('genealabs:laravel-model-caching:testing::memory::books:genealabslaravelmodelcachingtestsfixturesbook-exists-and_books.author_id_=_authors.id-id_=_1-testing::memory::author');
+        $key = sha1('genealabs:laravel-model-caching:testing::memory::books:genealabslaravelmodelcachingtestsfixturesbook-exists-and_books.author_id_=_authors.id-id_=_1-authors.deleted_at_null-testing::memory::author');
         $tags = [
             'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesbook',
             'genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor',

tests/database/migrations/2017_09_21_010055_create_authors.php

@@ -10,6 +10,7 @@ public function up()
         Schema::create('authors', function (Blueprint $table) {
             $table->increments('id');
             $table->timestamps();
+            $table->softDeletes();
 
             $table->string('email');
             $table->string('name');