WIP

Author: mikebronner

src/CacheKey.php

@@ -114,15 +114,26 @@ protected function getValuesClause(array $where = null) : string
             return "";
         }
 
-        $values = is_array(array_get($where, "values"))
+        $values = $this->getValuesFromWhere($where);
+        $values = $this->getValuesFromBindings($values);
+
+        return "_" . $values;
+    }
+
+    protected function getValuesFromWhere(array $where) : string
+    {
+        return is_array(array_get($where, "values"))
             ? implode("_", $where["values"])
             : "";
+    }
 
+    protected function getValuesFromBindings(string $values) : string
+    {
         if (! $values && $this->query->bindings["where"] ?? false) {
             $values = implode("_", $this->query->bindings["where"]);
         }
 
-        return "_" . $values;
+        return $values;
     }
 
     protected function getWhereClauses(array $wheres = []) : string

src/Traits/Cachable.php

@@ -56,7 +56,7 @@ public function flushCache(array $tags = [])
 
         $this->cache($tags)->flush();
 
-        [$cacheCooldown, $invalidatedAt, $savedAt] = $this->getModelCacheCooldown($this);
+        [$cacheCooldown] = $this->getModelCacheCooldown($this);
 
         if ($cacheCooldown) {
             $cachePrefix = "genealabs:laravel-model-caching:"
@@ -73,6 +73,14 @@ public function flushCache(array $tags = [])
         }
     }
 
+    protected function getCachePrefix() : string
+    {
+        return "genealabs:laravel-model-caching:"
+            . (config('laravel-model-caching.cache-prefix')
+                ? config('laravel-model-caching.cache-prefix', '') . ":"
+                : "");
+    }
+
     protected function makeCacheKey(
         array $columns = ['*'],
         $idColumn = null,
@@ -96,10 +104,7 @@ protected function makeCacheTags() : array
 
     protected function getModelCacheCooldown(Model $instance)
     {
-        $cachePrefix = "genealabs:laravel-model-caching:"
-            . (config('laravel-model-caching.cache-prefix')
-                ? config('laravel-model-caching.cache-prefix', '') . ":"
-                : "");
+        $cachePrefix = $this->getCachePrefix();
         $modelClassName = get_class($instance);
 
         $cacheCooldown = $instance
@@ -135,10 +140,7 @@ protected function checkCooldownAndRemoveIfExpired(Model $instance)
             return;
         }
 
-        $cachePrefix = "genealabs:laravel-model-caching:"
-            . (config('laravel-model-caching.cache-prefix')
-                ? config('laravel-model-caching.cache-prefix', '') . ":"
-                : "");
+        $cachePrefix = $this->getCachePrefix();
         $modelClassName = get_class($instance);
 
         $instance