Add handling of whereJsonContains and orWhereJsonContains

Fixes #176

Author: mikebronner

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.3.2] - 3 Nov 2018
+### Added
+- handling of `whereJsonContains()` and `orWhereJsonContains()`.
+
+### Fixed
+- price field value generation in BookFactory to not exceed database field limits.
+
 ## [0.3.1] - 7 Oct 2018
 ### Changed
 - use of `cache()` helper method to `app("cache")` to allow for better Lumen compatibility. Thanks @nope7777!

phpunit.xml

@@ -31,5 +31,9 @@
         <env name="SESSION_DRIVER" value="array"/>
         <env name="QUEUE_DRIVER" value="sync"/>
         <env name="DB_CONNECTION" value="testing"/>
+        <env name="DB_HOST" value="192.168.10.10"/>
+        <env name="DB_DATABASE" value="testing"/>
+        <env name="DB_USERNAME" value="homestead"/>
+        <env name="DB_PASSWORD" value="secret"/>
     </php>
 </phpunit>

src/CacheKey.php

@@ -97,7 +97,7 @@ protected function getQueryColumns(array $columns) : string
 
     protected function getTypeClause($where) : string
     {
-        $type = in_array($where["type"], ["In", "NotIn", "Null", "NotNull", "between", "NotInSub", "InSub"])
+        $type = in_array($where["type"], ["In", "NotIn", "Null", "NotNull", "between", "NotInSub", "InSub", "JsonContains"])
             ? strtolower($where["type"])
             : strtolower($where["operator"]);
 

tests/CreatesApplication.php

@@ -74,6 +74,12 @@ protected function getPackageProviders($app)
 
     protected function getEnvironmentSetUp($app)
     {
+        $app['config']->set('database.default', 'testing');
+        $app['config']->set('database.connections.testbench', [
+            'driver' => 'sqlite',
+            'database' => ':memory:',
+            'prefix' => '',
+        ]);
         $app['config']->set('database.redis.cache', [
             'host' => env('REDIS_HOST', '192.168.10.10'),
         ]);

tests/Fixtures/Author.php

@@ -10,9 +10,13 @@ class Author extends Model
 {
     use Cachable;
 
+    protected $casts = [
+        "finances" => "array",
+    ];
     protected $fillable = [
         'name',
         'email',
+        "finances",
     ];
 
     public function books() : HasMany

tests/Fixtures/UncachedAuthor.php

@@ -7,9 +7,13 @@
 
 class UncachedAuthor extends Model
 {
+    protected $casts = [
+        "finances" => "array",
+    ];
     protected $fillable = [
         'name',
         'email',
+        "finances",
     ];
     protected $table = 'authors';
 

tests/Integration/CachedBuilder/FirstOrCreateTest.php

@@ -17,8 +17,6 @@
 
 class FirstOrCreateTest extends IntegrationTestCase
 {
-    
-
     public function testFirstOrCreateFlushesCacheForModel()
     {
         (new Author)->truncate();

tests/Integration/CachedBuilder/FirstTest.php

@@ -17,8 +17,6 @@
 
 class FirstTest extends IntegrationTestCase
 {
-    
-
     public function testFirstReturnsAllAttributesForModel()
     {
         $author = (new Author)->where("id", "=", 1)->first();

tests/Integration/CachedBuilder/WhereJsonContainsTest.php

@@ -0,0 +1,59 @@
+<?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;
+use Illuminate\Support\Facades\Config;
+
+class WhereJsonContainsTest extends IntegrationTestCase
+{
+    use RefreshDatabase;
+
+    protected function getEnvironmentSetUp($app)
+    {
+        parent::getEnvironmentSetUp($app);
+
+        $app['config']->set('database.default', 'pgsql');
+    }
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->loadMigrationsFrom(__DIR__ . '/../../database/migrations');
+    }
+
+    public function testWithInUsingCollectionQuery()
+    {
+        $key = sha1('genealabs:laravel-model-caching:pgsql:testing:genealabslaravelmodelcachingtestsfixturesauthor-finances->total_jsoncontains_5000');
+        $tags = [
+            'genealabs:laravel-model-caching:pgsql:testing:genealabslaravelmodelcachingtestsfixturesauthor',
+        ];
+
+        $authors = (new Author)
+            ->whereJsonContains("finances->total", 5000)
+            ->get();
+        $liveResults = (new UncachedAuthor)
+            ->whereJsonContains("finances->total", 5000)
+            ->get();
+
+        $cachedResults = $this
+            ->cache()
+            ->tags($tags)
+            ->get($key)['value'];
+
+        $this->assertEquals($liveResults->pluck("id"), $authors->pluck("id"));
+        $this->assertEquals($liveResults->pluck("id"), $cachedResults->pluck("id"));
+    }
+}

tests/database/factories/AuthorFactory.php

@@ -7,5 +7,10 @@
     return [
         'name' => $faker->name,
         'email' => $faker->unique()->safeEmail,
+        "finances" => [
+            "total" => 5000,
+            "weekly" => 100,
+            "daily" => 20,
+        ],
     ];
 });

tests/database/factories/BookFactory.php

@@ -8,6 +8,6 @@
         'title' => $faker->title,
         'description' => $faker->optional()->paragraphs(3, true),
         'published_at' => $faker->dateTime,
-        'price' => $faker->randomFloat(2),
+        'price' => $faker->randomFloat(2, 0, 999999),
     ];
 });

tests/database/migrations/2017_09_21_010055_create_authors.php

@@ -13,6 +13,7 @@ public function up()
 
             $table->string('email');
             $table->string('name');
+            $table->json("finances")->nullable();
         });
     }