starred/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2026-05-04 18:08:46 +03:00
Code Issues 784 Packages Projects Releases 15 Wiki Activity

Search: Added pagination, updated other search uses

Browse Source 
Also updated hydrator to be created via injection.
This commit is contained in:
Dan Brown
2025-10-28 20:37:41 +00:00
parent f0303de2e5
commit 3fd25bd03e
5 changed files with 31 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/Entities/Tools/EntityHydrator.php
View File

@@ -12,31 +12,22 @@ use Illuminate\Database\Eloquent\Collection;
class EntityHydrator
{
/**
* @var EntityTable[] $entities
*/
protected array $entities;
protected bool $loadTags = false;
protected bool $loadParents = false;
public function __construct(array $entities, bool $loadTags = false, bool $loadParents = false)
{
$this->entities = $entities;
$this->loadTags = $loadTags;
$this->loadParents = $loadParents;
public function __construct(
protected EntityQueries $entityQueries,
) {
}
/**
* Hydrate the entities of this hydrator to return a list of entities represented
* in their original intended models.
* @param EntityTable[] $entities
* @return Entity[]
*/
public function hydrate(): array
public function hydrate(array $entities, bool $loadTags = false, bool $loadParents = false): array
{
$hydrated = [];
foreach ($this->entities as $entity) {
foreach ($entities as $entity) {
$data = $entity->getRawOriginal();
$instance = Entity::instanceFromType($entity->type);
@@ -49,11 +40,11 @@ class EntityHydrator
$hydrated[] = $instance;
}
if ($this->loadTags) {
if ($loadTags) {
$this->loadTagsIntoModels($hydrated);
}
if ($this->loadParents) {
if ($loadParents) {
$this->loadParentsIntoModels($hydrated);
}
@@ -115,10 +106,7 @@ class EntityHydrator
}
}
// TODO - Inject in?
$queries = app()->make(EntityQueries::class);
$parentQuery = $queries->visibleForList();
$parentQuery = $this->entityQueries->visibleForList();
$filtered = count($parentsByType['book']) > 0 || count($parentsByType['chapter']) > 0;
$parentQuery = $parentQuery->where(function ($query) use ($parentsByType) {
foreach ($parentsByType as $type => $ids) {
@@ -132,7 +120,7 @@ class EntityHydrator
});
$parentModels = $filtered ? $parentQuery->get()->all() : [];
$parents = (new EntityHydrator($parentModels))->hydrate();
$parents = $this->hydrate($parentModels);
$parentMap = [];
foreach ($parents as $parent) {
$parentMap[$parent->type . ':' . $parent->id] = $parent;