Show the creating or last editing user in part or structure info.

This commit is contained in:
Jan Böhmer 2020-02-06 19:22:01 +01:00
parent 8a7b90d0ea
commit 73c2aa232d
7 changed files with 152 additions and 8 deletions

View file

@ -129,7 +129,7 @@ abstract class AbstractLogEntry extends AbstractDBElement
];
/** @var User The user which has caused this log entry
* @ORM\ManyToOne(targetEntity="App\Entity\UserSystem\User")
* @ORM\ManyToOne(targetEntity="App\Entity\UserSystem\User", fetch="EAGER")
* @ORM\JoinColumn(name="id_user", nullable=false)
*/
protected $user;

View file

@ -26,7 +26,11 @@ namespace App\Repository;
use App\Entity\Base\AbstractDBElement;
use App\Entity\LogSystem\AbstractLogEntry;
use App\Entity\LogSystem\ElementCreatedLogEntry;
use App\Entity\LogSystem\ElementEditedLogEntry;
use App\Entity\UserSystem\User;
use Doctrine\ORM\EntityRepository;
use Doctrine\ORM\QueryBuilder;
class LogEntryRepository extends EntityRepository
{
@ -34,8 +38,9 @@ class LogEntryRepository extends EntityRepository
{
//Emulate a target element criteria by splitting it manually in the needed criterias
if (isset($criteria['target']) && $criteria['target'] instanceof AbstractDBElement) {
/** @var AbstractDBElement $element */
$element = $criteria['target'];
$criteria['target_id'] = $element;
$criteria['target_id'] = $element->getID();
$criteria['target_type'] = AbstractLogEntry::targetTypeClassToID(get_class($element));
unset($criteria['target']);
}
@ -93,4 +98,49 @@ class LogEntryRepository extends EntityRepository
return $this->getEntityManager()->find($class, $id);
}
protected function getLastUser(AbstractDBElement $element, string $class)
{
$qb = $this->createQueryBuilder('log');
$qb->select('log')
//->where('log INSTANCE OF App\Entity\LogSystem\ElementEditedLogEntry')
->where('log INSTANCE OF ' . $class)
->andWhere('log.target_type = :target_type')
->andWhere('log.target_id = :target_id')
->orderBy('log.timestamp', 'DESC');
$qb->setParameters([
'target_type' => AbstractLogEntry::targetTypeClassToID(get_class($element)),
'target_id' => $element->getID()
]);
$query = $qb->getQuery();
$query->setMaxResults(1);
/** @var AbstractLogEntry[] $results */
$results = $query->execute();
if (isset($results[0])) {
return $results[0]->getUser();
}
return null;
}
/**
* Returns the last user that has edited the given element.
* @param AbstractDBElement $element
* @return User|null A user object, or null if no user could be determined.
*/
public function getLastEditingUser(AbstractDBElement $element): ?User
{
return $this->getLastUser($element, ElementEditedLogEntry::class);
}
/**
* Returns the user that has created the given element.
* @param AbstractDBElement $element
* @return User|null A user object, or null if no user could be determined.
*/
public function getCreatingUser(AbstractDBElement $element): ?User
{
return $this->getLastUser($element, ElementCreatedLogEntry::class);
}
}

View file

@ -0,0 +1,49 @@
<?php
/**
* This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
*
* Copyright (C) 2019 - 2020 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\Twig;
use App\Entity\Base\AbstractDBElement;
use App\Entity\LogSystem\AbstractLogEntry;
use Doctrine\ORM\EntityManagerInterface;
use Twig\Extension\AbstractExtension;
use Twig\TwigFunction;
class LastUserExtension extends AbstractExtension
{
private $em;
private $repo;
public function __construct(EntityManagerInterface $em)
{
$this->em = $em;
$this->repo = $em->getRepository(AbstractLogEntry::class);
}
public function getFunctions()
{
return [
new TwigFunction('getLastEditingUser', [$this->repo, 'getLastEditingUser']),
new TwigFunction('getCreatingUser', [$this->repo, 'getCreatingUser'])
];
}
}