Extract model creation into method and always return model if it exists

DirectoryTree · Oct 10, 2024 · c153717 · c153717
1 parent 1f77c5c
commit c153717
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/src/Query.php b/src/Query.php
@@ -39,17 +39,11 @@ public function find(?string $id): ?Model
             return $this->whereKey($id)->first();
         }
 
-        $hash = $this->model->getBaseHashWithKey($id);
-        $attributes = $this->cache->getAttributes($hash);
-
-        if (empty($attributes)) {
+        if (! $this->cache->exists($hash = $this->model->getBaseHashWithKey($id))) {
             return null;
         }
 
-        return $this->model->newFromBuilder([
-            ...$attributes,
-            $this->model->getKeyName() => $this->getKeyValue($hash),
-        ]);
+        return $this->newModelFromHash($hash);
     }
 
     /**
@@ -232,10 +226,7 @@ public function chunk(int $count, Closure $callback): void
             $models = $this->model->newCollection();
 
             foreach ($chunk as $hash) {
-                $models->add($this->model->newFromBuilder([
-                    ...$this->cache->getAttributes($hash),
-                    $this->model->getKeyName() => $this->getKeyValue($hash),
-                ]));
+                $models->add($this->newModelFromHash($hash));
             }
 
             if ($callback($models) === false) {
@@ -244,6 +235,17 @@ public function chunk(int $count, Closure $callback): void
         }
     }
 
+    /**
+     * Create a new model instance from the given hash.
+     */
+    protected function newModelFromHash(string $hash): Model
+    {
+        return $this->model->newFromBuilder([
+            ...$this->cache->getAttributes($hash),
+            $this->model->getKeyName() => $this->getKeyValue($hash),
+        ]);
+    }
+
     /**
      * Get the model key's value from the given hash.
      */