Fix where clauses using DateTime

Author: mikebronner

CHANGELOG.md

@@ -4,6 +4,10 @@ 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.5.1] - 21 May 2019
+### Fixed
+- caching of where clauses using DateTime instead of Carbon.
+
 ## [0.5.0] - 20 May 2019
 ### Changed
 - implementation of model-based cache prefix.

src/CacheKey.php

@@ -147,6 +147,13 @@ protected function getValuesClause(array $where = []) : string
 
     protected function getValuesFromWhere(array $where) : string
     {
+        if (array_key_exists("value", $where)
+            && is_object($where["value"])
+            && get_class($where["value"]) === "DateTime"
+        ) {
+            return $where["value"]->format("Y-m-d-H-i-s");
+        }
+
         if (is_array((new Arr)->get($where, "values"))) {
             return implode("_", collect($where["values"])->flatten()->toArray());
         }
@@ -166,6 +173,12 @@ protected function getValuesFromBindings(array $where, string $values) : string
             }
         }
 
+        if (is_object($values)
+            && get_class($values) === "DateTime"
+        ) {
+            $values = $values->format("Y-m-d-H-i-s");
+        }
+
         return $values;
     }
 

tests/Integration/CachedBuilder/DateTimeTest.php

@@ -1,14 +1,16 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Tests\Integration\CachedBuilder;
 
+use DateInterval;
+use DateTime;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
 use GeneaLabs\LaravelModelCaching\Tests\Fixtures\UncachedBook;
 use GeneaLabs\LaravelModelCaching\Tests\IntegrationTestCase;
 
 class DateTimeTest extends IntegrationTestCase
 {
-    public function testDateWhereCreatesCorrectCacheKey()
+    public function testWhereClauseWorksWithCarbonDate()
     {
-        $dateTime = now()->subYears(10)->toDateString();
+        $dateTime = now()->subYears(10);
         $key = sha1("genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:books:genealabslaravelmodelcachingtestsfixturesbook-publish_at_>_{$dateTime}");
         $tags = [
             "genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesbook",
@@ -30,4 +32,31 @@ public function testDateWhereCreatesCorrectCacheKey()
         $this->assertNotEmpty($cachedResults);
         $this->assertNotEmpty($liveResults);
     }
+
+    public function testWhereClauseWorksWithDateTimeObject()
+    {
+        $dateTime = (new DateTime('@' . time()))
+            ->sub(new DateInterval("P10Y"));
+        $dateTimeString = $dateTime->format("Y-m-d-H-i-s");
+        $key = sha1("genealabs:laravel-model-caching:testing:/Users/mike/Developer/Sites/laravel-model-caching/tests/database/testing.sqlite:books:genealabslaravelmodelcachingtestsfixturesbook-publish_at_>_{$dateTimeString}");
+        $tags = [
+            "genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesbook",
+        ];
+
+        $results = (new Book)
+            ->where("publish_at", ">", $dateTime)
+            ->get();
+        $cachedResults = $this->cache()
+            ->tags($tags)
+            ->get($key)['value'];
+        $liveResults = (new UncachedBook)
+            ->where("publish_at", ">", $dateTime)
+            ->get();
+
+        $this->assertEquals($liveResults->pluck("id"), $results->pluck("id"));
+        $this->assertEquals($liveResults->pluck("id"), $cachedResults->pluck("id"));
+        $this->assertNotEmpty($results);
+        $this->assertNotEmpty($cachedResults);
+        $this->assertNotEmpty($liveResults);
+    }
 }