mirror of
https://github.com/Part-DB/Part-DB-server.git
synced 2025-06-24 10:49:00 +02:00
Cache the trees structures for treeViews used in the sidebar.
This commit is contained in:
parent
9668d1084b
commit
ad69c32832
13 changed files with 653 additions and 70 deletions
53
src/Repository/NamedDBElementRepository.php
Normal file
53
src/Repository/NamedDBElementRepository.php
Normal file
|
@ -0,0 +1,53 @@
|
|||
<?php
|
||||
/**
|
||||
* This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
|
||||
*
|
||||
* Copyright (C) 2019 Jan Böhmer (https://github.com/jbtronics)
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
namespace App\Repository;
|
||||
|
||||
|
||||
use App\Entity\Base\NamedDBElement;
|
||||
use App\Entity\Base\StructuralDBElement;
|
||||
use App\Helpers\TreeViewNode;
|
||||
use Doctrine\ORM\EntityRepository;
|
||||
use Doctrine\ORM\Mapping\Entity;
|
||||
|
||||
|
||||
class NamedDBElementRepository extends EntityRepository
|
||||
{
|
||||
/**
|
||||
* Gets a tree of TreeViewNode elements. The root elements has $parent as parent.
|
||||
* The treeview is generic, that means the href are null and ID values are set.
|
||||
* @return TreeViewNode[]
|
||||
*/
|
||||
public function getGenericNodeTree() : array
|
||||
{
|
||||
$result = [];
|
||||
|
||||
$entities = $this->findAll();
|
||||
foreach ($entities as $entity) {
|
||||
/** @var $entity NamedDBElement */
|
||||
$node = new TreeViewNode($entity->getName(), null, null);
|
||||
$node->setId($entity->getID());
|
||||
$result[] = $node;
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
}
|
|
@ -22,9 +22,12 @@
|
|||
namespace App\Repository;
|
||||
|
||||
use App\Entity\Base\StructuralDBElement;
|
||||
use App\Helpers\Trees\StructuralDBElementIterator;
|
||||
use App\Helpers\TreeViewNode;
|
||||
use Doctrine\ORM\EntityRepository;
|
||||
use Symfony\Component\Stopwatch\Stopwatch;
|
||||
|
||||
class StructuralDBElementRepository extends EntityRepository
|
||||
class StructuralDBElementRepository extends NamedDBElementRepository
|
||||
{
|
||||
/**
|
||||
* Finds all nodes without a parent node. They are our root nodes.
|
||||
|
@ -36,6 +39,31 @@ class StructuralDBElementRepository extends EntityRepository
|
|||
return $this->findBy(['parent' => null], ['name' => 'ASC']);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets a tree of TreeViewNode elements. The root elements has $parent as parent.
|
||||
* The treeview is generic, that means the href are null and ID values are set.
|
||||
* @param StructuralDBElement|null $parent The parent the root elements should have.
|
||||
* @return TreeViewNode[]
|
||||
*/
|
||||
public function getGenericNodeTree(?StructuralDBElement $parent = null) : array
|
||||
{
|
||||
$result = [];
|
||||
|
||||
$entities = $this->findBy(['parent' => $parent], ['name' => 'ASC']);
|
||||
foreach ($entities as $entity) {
|
||||
/** @var StructuralDBElement $entity */
|
||||
//Make a recursive call to find all children nodes
|
||||
$children = $this->getGenericNodeTree($entity);
|
||||
$node = new TreeViewNode($entity->getName(), null, $children);
|
||||
//Set the ID of this entity to later be able to reconstruct the URL
|
||||
$node->setId($entity->getID());
|
||||
$result[] = $node;
|
||||
}
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets a flattened hierarchical tree. Useful for generating option lists.
|
||||
*
|
||||
|
@ -49,16 +77,13 @@ class StructuralDBElementRepository extends EntityRepository
|
|||
|
||||
$entities = $this->findBy(['parent' => $parent], ['name' => 'ASC']);
|
||||
|
||||
/*
|
||||
* I think it is very difficult to replace this recursive array_merge,
|
||||
* so if you want to change it you should have a better idea than adding each list to $result array
|
||||
* and do an array_merge(...$result) at the end.
|
||||
*/
|
||||
$elementIterator = new StructuralDBElementIterator($entities);
|
||||
$recursiveIterator = new \RecursiveIteratorIterator($elementIterator, \RecursiveIteratorIterator::SELF_FIRST);
|
||||
//$result = iterator_to_array($recursiveIterator);
|
||||
|
||||
foreach ($entities as $entity) {
|
||||
/* @var StructuralDBElement $entity */
|
||||
$result[] = $entity;
|
||||
$result = array_merge($result, $this->toNodesList($entity));
|
||||
//We can not use iterator_to_array here or we get only the parent elements
|
||||
foreach($recursiveIterator as $item) {
|
||||
$result[] = $item;
|
||||
}
|
||||
|
||||
return $result;
|
||||
|
|
|
@ -37,7 +37,7 @@ use Symfony\Component\Security\Core\User\UserInterface;
|
|||
* @method User[] findAll()
|
||||
* @method User[] findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
|
||||
*/
|
||||
class UserRepository extends EntityRepository implements PasswordUpgraderInterface
|
||||
class UserRepository extends NamedDBElementRepository implements PasswordUpgraderInterface
|
||||
{
|
||||
protected $anonymous_user;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue