WIP

Author: mikebronner

src/Traits/Cachable.php

@@ -22,21 +22,12 @@ public function cache(array $tags = [])
         }
 
         if (is_subclass_of($cache->getStore(), TaggableStore::class)) {
-            $tags = $this->addTagsWhenCalledFromCachedBuilder($tags);
             $cache = $cache->tags($tags);
         }
 
         return $cache;
     }
 
-    protected function addTagsWhenCalledFromCachedBuilder(array $tags) : array
-    {
-        $usesCachableTrait = collect(class_uses($this))
-            ->contains("GeneaLabs\LaravelModelCaching\Traits\Cachable");
-
-        return $tags;
-    }
-
     public function disableCache()
     {
         $this->isCachable = false;
@@ -99,30 +90,38 @@ protected function getModelCacheCooldown(Model $instance)
     {
         $cachePrefix = $this->getCachePrefix();
         $modelClassName = get_class($instance);
-
-        $cacheCooldown = $instance
-            ->cache()
-            ->get("{$cachePrefix}:{$modelClassName}-cooldown:seconds");
+        [$cacheCooldown, $invalidatedAt, $savedAt] = $this
+            ->getCacheCooldownDetails($instance, $cachePrefix, $modelClassName);
 
         if (! $cacheCooldown) {
             return [null, null, null];
         }
 
-        $invalidatedAt = $instance
-            ->cache()
-            ->get("{$cachePrefix}:{$modelClassName}-cooldown:invalidated-at");
-
-        $savedAt = $instance
-            ->cache()
-            ->get("{$cachePrefix}:{$modelClassName}-cooldown:saved-at");
-
         return [
             $cacheCooldown,
             $invalidatedAt,
             $savedAt,
         ];
     }
 
+    protected function getCacheCooldownDetails(
+        Model $instance,
+        string $cachePrefix,
+        string $modelClassName
+    ) : array {
+        return [
+            $instance
+                ->cache()
+                ->get("{$cachePrefix}:{$modelClassName}-cooldown:seconds"),
+            $instance
+                ->cache()
+                ->get("{$cachePrefix}:{$modelClassName}-cooldown:invalidated-at"),
+            $instance
+                ->cache()
+                ->get("{$cachePrefix}:{$modelClassName}-cooldown:saved-at"),
+        ];
+    }
+
     protected function checkCooldownAndRemoveIfExpired(Model $instance)
     {
         [$cacheCooldown, $invalidatedAt] = $this->getModelCacheCooldown($instance);