System CLI: Updated to 126de5599c state

[bookstack] / app / Entities / Queries / QueryPopular.php

diff --git a/app/Entities/Queries/QueryPopular.php b/app/Entities/Queries/QueryPopular.php
index b2ca565eb055db8e8d0a161acd7627535f236ac4..85f88a1d19c9bd50804198267f21b0986caa29f6 100644 (file)
--- a/app/Entities/Queries/QueryPopular.php
+++ b/app/Entities/Queries/QueryPopular.php
@@ -4,10 +4,8 @@ namespace BookStack\Entities\Queries;
 
 use BookStack\Activity\Models\View;
 use BookStack\Entities\EntityProvider;
 
 use BookStack\Activity\Models\View;
 use BookStack\Entities\EntityProvider;

-use BookStack\Entities\Models\BookChild;
-use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Tools\MixedEntityListLoader;

 use BookStack\Permissions\PermissionApplicator;
 use BookStack\Permissions\PermissionApplicator;

-use Illuminate\Database\Eloquent\Relations\BelongsTo;

 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 


@@ -16,10 +14,11 @@ class QueryPopular
     public function __construct(
         protected PermissionApplicator $permissions,
         protected EntityProvider $entityProvider,
     public function __construct(
         protected PermissionApplicator $permissions,
         protected EntityProvider $entityProvider,

+        protected MixedEntityListLoader $listLoader,

     ) {
     }
 
     ) {
     }
 

-    public function run(int $count, int $page, array $filterModels = null)
+    public function run(int $count, int $page, array $filterModels = null): Collection

     {
         $query = $this->permissions
             ->restrictEntityRelationQuery(View::query(), 'views', 'viewable_id', 'viewable_type')
     {
         $query = $this->permissions
             ->restrictEntityRelationQuery(View::query(), 'views', 'viewable_id', 'viewable_type')


@@ -31,24 +30,13 @@ class QueryPopular
             $query->whereIn('viewable_type', $this->entityProvider->getMorphClasses($filterModels));
         }
 
             $query->whereIn('viewable_type', $this->entityProvider->getMorphClasses($filterModels));
         }
 

-        $entities = $query->with('viewable')
+        $views = $query

             ->skip($count * ($page - 1))
             ->take($count)
             ->skip($count * ($page - 1))
             ->take($count)

-            ->get()
-            ->pluck('viewable')
-            ->filter();
+            ->get();

 
 

-        $this->loadBooksForChildren($entities);
+        $this->listLoader->loadIntoRelations($views->all(), 'viewable', true);

 
 

-        return $entities;
-    }
-
-    protected function loadBooksForChildren(Collection $entities): void
-    {
-        $bookChildren = $entities->filter(fn(Entity $entity) => $entity instanceof BookChild);
-        $eloquent = (new \Illuminate\Database\Eloquent\Collection($bookChildren));
-        $eloquent->load(['book' => function (BelongsTo $query) {
-            $query->scopes('visible');
-        }]);
+        return $views->pluck('viewable')->filter();

     }
 }
     }
 }