Merge pull request #16 from CoopBelvedere/restored_lazy_collection_on…

…_nodes_list Restored lazy collection on nodes list
CoopBelvedere · Oct 6, 2019 · 46aac48 · 46aac48
2 parents 042fda0 + 8233c67
commit 46aac48
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 27 deletions.
diff --git a/src/Contracts/Models/Rankings/RankerContract.php b/src/Contracts/Models/Rankings/RankerContract.php
@@ -2,7 +2,6 @@
 
 namespace Belvedere\FormMaker\Contracts\Models\Rankings;
 
-use Illuminate\Support\Collection;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
 
 interface RankerContract
@@ -119,10 +118,10 @@ public function shuffle(): void;
     /**
      * Order the list according to the items position in the ranking.
      *
-     * @param \Illuminate\Support\Collection $nodes
-     * @return \Illuminate\Support\Collection
+     * @param \Illuminate\Support\LazyCollection|\Illuminate\Support\Collection $nodes
+     * @return mixed
      */
-    public function sortByRank(Collection $nodes);
+    public function sortByRank($nodes);
 
     /**
      * Toggle two nodes in the ranking.

diff --git a/src/Contracts/Repositories/NodeRepositoryContract.php b/src/Contracts/Repositories/NodeRepositoryContract.php
@@ -2,8 +2,8 @@
 
 namespace Belvedere\FormMaker\Contracts\Repositories;
 
-use Illuminate\Support\Collection;
 use Belvedere\FormMaker\Models\Model;
+use Illuminate\Support\LazyCollection;
 use Belvedere\FormMaker\Models\Nodes\Node;
 
 interface NodeRepositoryContract
@@ -13,9 +13,9 @@ interface NodeRepositoryContract
      *
      * @param \Belvedere\FormMaker\Models\Model $parent
      * @param string|null $type
-     * @return \Illuminate\Support\Collection
+     * @return \Illuminate\Support\LazyCollection
      */
-    public function all(Model $parent, ?string $type = null): Collection;
+    public function all(Model $parent, ?string $type = null): LazyCollection;
 
     /**
      * Add a node to the parent model.

diff --git a/src/Contracts/Traits/Nodes/HasNodesContract.php b/src/Contracts/Traits/Nodes/HasNodesContract.php
@@ -2,7 +2,7 @@
 
 namespace Belvedere\FormMaker\Contracts\Traits\Nodes;
 
-use Illuminate\Support\Collection;
+use Illuminate\Support\LazyCollection;
 use Belvedere\FormMaker\Models\Nodes\Node;
 use Belvedere\FormMaker\Contracts\Traits\Rankings\HasRankingsContract;
 
@@ -59,7 +59,7 @@ public function node($key): ?Node;
      * Get the nodes filtered by type or not and sorted by their position in the ranking.
      *
      * @param string|null $type
-     * @return \Illuminate\Support\Collection
+     * @return \Illuminate\Support\LazyCollection
      */
-    public function nodes(?string $type = null): Collection;
+    public function nodes(?string $type = null): LazyCollection;
 }
diff --git a/src/Contracts/Traits/Nodes/HasOptionsContract.php b/src/Contracts/Traits/Nodes/HasOptionsContract.php
@@ -2,7 +2,7 @@
 
 namespace Belvedere\FormMaker\Contracts\Traits\Nodes;
 
-use Illuminate\Support\Collection;
+use Illuminate\Support\LazyCollection;
 use Belvedere\FormMaker\Contracts\Traits\Rankings\HasRankingsContract;
 use Belvedere\FormMaker\Contracts\Models\Nodes\Inputs\Option\OptionerContract;
 
@@ -35,7 +35,7 @@ public function option($key): ?OptionerContract;
     /**
      * Get the options sorted by their position in the ranking.
      *
-     * @return \Illuminate\Support\Collection
+     * @return \Illuminate\Support\LazyCollection
      */
-    public function options(): Collection;
+    public function options(): LazyCollection;
 }
diff --git a/src/Models/Rankings/Ranker.php b/src/Models/Rankings/Ranker.php
@@ -2,7 +2,6 @@
 
 namespace Belvedere\FormMaker\Models\Rankings;
 
-use Illuminate\Support\Collection;
 use Illuminate\Database\Eloquent\Model as Eloquent;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Belvedere\FormMaker\Contracts\Models\Rankings\RankerContract;
@@ -358,10 +357,10 @@ public function shuffle(): void
     /**
      * Order the list according to the nodes position in the ranking.
      *
-     * @param \Illuminate\Support\Collection $nodes
-     * @return \Illuminate\Support\Collection
+     * @param \Illuminate\Support\LazyCollection|\Illuminate\Support\Collection $nodes
+     * @return mixed
      */
-    public function sortByRank(Collection $nodes)
+    public function sortByRank($nodes)
     {
         return $nodes->sortBy(function ($node, $key) {
             return $this->rank($node);

diff --git a/src/Repositories/NodeRepository.php b/src/Repositories/NodeRepository.php
@@ -2,9 +2,9 @@
 
 namespace Belvedere\FormMaker\Repositories;
 
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Belvedere\FormMaker\Models\Model;
+use Illuminate\Support\LazyCollection;
 use Belvedere\FormMaker\Models\Nodes\Node;
 use Belvedere\FormMaker\Contracts\Repositories\NodeRepositoryContract;
 
@@ -48,9 +48,9 @@ class NodeRepository implements NodeRepositoryContract
      *
      * @param \Belvedere\FormMaker\Models\Model $parent
      * @param string|null $type
-     * @return \Illuminate\Support\Collection
+     * @return \Illuminate\Support\LazyCollection
      */
-    public function all(Model $parent, ?string $type = null): Collection
+    public function all(Model $parent, ?string $type = null): LazyCollection
     {
         $query = DB::table(config('form-maker.database.form_nodes_table', 'form_nodes'))
             ->where('nodable_type', $parent->getMorphClass())
@@ -63,7 +63,7 @@ public function all(Model $parent, ?string $type = null): Collection
             $query->where('type', $type);
         }
 
-        return $query->get()->groupBy('type')->map(function ($nodes, $key) {
+        return $query->cursor()->groupBy('type')->map(function ($nodes, $key) {
             return $this->resolve($nodes[0]->type)::hydrate($nodes->toArray());
         })->flatten(1);
     }

diff --git a/src/Traits/Nodes/HasNodes.php b/src/Traits/Nodes/HasNodes.php
@@ -2,7 +2,7 @@
 
 namespace Belvedere\FormMaker\Traits\Nodes;
 
-use Illuminate\Support\Collection;
+use Illuminate\Support\LazyCollection;
 use Belvedere\FormMaker\Models\Nodes\Node;
 use Belvedere\FormMaker\Contracts\Repositories\NodeRepositoryContract;
 
@@ -102,9 +102,9 @@ public function node($key): ?Node
      * Get the nodes filtered by type or not and sorted by their position in the ranking.
      *
      * @param string|null $type
-     * @return \Illuminate\Support\Collection
+     * @return \Illuminate\Support\LazyCollection
      */
-    public function nodes(?string $type = null): Collection
+    public function nodes(?string $type = null): LazyCollection
     {
         $nodeRepository = resolve(NodeRepositoryContract::class);
 

diff --git a/src/Traits/Nodes/HasOptions.php b/src/Traits/Nodes/HasOptions.php
@@ -2,7 +2,7 @@
 
 namespace Belvedere\FormMaker\Traits\Nodes;
 
-use Illuminate\Support\Collection;
+use Illuminate\Support\LazyCollection;
 use Belvedere\FormMaker\Contracts\Repositories\NodeRepositoryContract;
 use Belvedere\FormMaker\Contracts\Models\Nodes\Inputs\Option\OptionerContract;
 
@@ -64,9 +64,9 @@ public function option($key): ?OptionerContract
     /**
      * Get the options sorted by their position in the ranking.
      *
-     * @return \Illuminate\Support\Collection
+     * @return \Illuminate\Support\LazyCollection
      */
-    public function options(): Collection
+    public function options(): LazyCollection
     {
         $nodeRepository = resolve(NodeRepositoryContract::class);