Some improvements and simplifications for get() function, fixes for correct reloading of nonexistent models in result collection.

Author: nqxcode

src/Nqxcode/LuceneSearch/Query/Builder.php

@@ -60,18 +60,15 @@ public function limit($limit, $offset = 0)
      */
     public function get()
     {
-        $models = $this->runner->getCachedModels($this->query, $this->limit, $this->offset);
+        $models = $this->runner->getCachedModels($this->query);
         if (null === $models) {
             $models = $this->runner->models($this->query);
-
-            $this->runner->setCachedModels($this->query, $models, $this->limit, $this->offset);
+            $this->runner->setCachedModels($this->query, $models);
             $this->runner->setCachedTotal($this->query, $models->count());
         }
-
         if ($this->limit) {
             $models = $models->slice($this->offset, $this->limit);
         }
-
         return Collection::make($models->reload()->all());
     }
 

src/Nqxcode/LuceneSearch/Query/Runner.php

@@ -96,27 +96,23 @@ public function delete($model)
      * Get cached models for query.
      *
      * @param $query
-     * @param $limit
-     * @param $offset
      * @return null|int
      */
-    public function getCachedModels($query, $limit = null, $offset = null)
+    public function getCachedModels($query)
     {
-        $hash = $this->hash($query, compact('limit', 'offset'));
+        $hash = $this->hash($query);
         return isset($this->cachedModels[$hash]) ? $this->cachedModels[$hash] : null;
     }
 
     /**
      * Set cached models for query.
      *
      * @param $query
-     * @param $limit
-     * @param $offset
      * @param $models
      */
-    public function setCachedModels($query, $models, $limit = null, $offset = null)
+    public function setCachedModels($query, $models)
     {
-        $hash = $this->hash($query, compact('limit', 'offset'));
+        $hash = $this->hash($query);
         $this->cachedModels[$hash] = $models;
     }
 
@@ -148,12 +144,11 @@ public function setCachedTotal($query, $total)
      * Get hash for query.
      *
      * @param $query
-     * @param $options
      * @return string
      */
-    private function hash($query, array $options = [])
+    private function hash($query)
     {
-        return md5(serialize($query) . serialize($options));
+        return md5(serialize($query));
     }
 
     /**

src/Nqxcode/LuceneSearch/Support/Collection.php

@@ -4,43 +4,26 @@
 
 class Collection extends \Illuminate\Database\Eloquent\Collection
 {
-    protected $reloaded = false;
-
     /**
-     * Reload each item in collection.
+     * Reload each nonexistent item in collection.
      *
      * @return $this|static
      */
     public function reload()
     {
-        if (!$this->reloaded) {
-            $this->reloaded = true;
-
-            $items = array_map(
-                function (Model $sourceModel) {
-                    $primaryKey = $sourceModel->getKeyName();
-                    $primaryValue = $sourceModel->{$primaryKey};
-
-                    $query = $sourceModel->query();
-                    $query->where($primaryKey, $primaryValue);
-
-                    $targetModel = $query->first();
-
-                    return $targetModel;
-                },
-                $this->items
-            );
-
-            $items = array_filter(
-                $items,
-                function ($item) {
-                    return !is_null($item);
+        /** @var Model $source */
+        foreach ($this->items as $i => $source) {
+            if (!$source->exists) {
+                /** @var Model $target */
+                $target = $source->find($source->{$source->getKeyName()});
+                if (!is_null($target)) {
+                    $source->setRawAttributes($target->getAttributes(), true);
+                    $source->exists = true;
+                } else {
+                    unset($this->items[$i]);
                 }
-            );
-
-            $this->items = $items;
+            }
         }
-
         return $this;
     }
 }

tests/functional/SearchTest.php

@@ -95,15 +95,29 @@ public function testSearchWithPaginate()
     public function testGetWithLimit()
     {
         $query = Search::query('clock,pointer', '*', ['phrase' => false]);
+
+        $query->limit(3, 3);
+        $found = $query->get();
+
+        $this->assertCount(3, $found);
+        $this->assertCount(3, $found->filter(function ($v) {
+            return $v->exists;
+        }));
+
+        $query->limit(null);
         $found = $query->get();
 
         $this->assertCount(6, $found);
-        $this->assertCount(6, $found->filter(function($v){ return $v->exists;}));
+        $this->assertCount(6, $found->filter(function ($v) {
+            return $v->exists;
+        }));
 
-        $query->limit(3, 3);
+        $query->limit(3, 0);
         $found = $query->get();
 
         $this->assertCount(3, $found);
-        $this->assertCount(3, $found->filter(function($v){ return $v->exists;}));
+        $this->assertCount(3, $found->filter(function ($v) {
+            return $v->exists;
+        }));
     }
 }