mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-06-21 09:35:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add small time differences to the datafixtures log entries, to get a defined order

Browse source
This commit is contained in:
Jan Böhmer 2024-06-23 18:03:54 +02:00
parent a54ce939ca
commit 88ef1788ac
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/DataFixtures/LogEntryFixtures.php
View file

@ -46,11 +46,13 @@ class LogEntryFixtures extends Fixture implements DependentFixtureInterface
$category = $this->getReference(Category::class . '_1', Category::class); $category = $this->getReference(Category::class . '_1', Category::class);
$logEntry = new ElementCreatedLogEntry($category); $logEntry = new ElementCreatedLogEntry($category);
$logEntry->setTimestamp(new \DateTimeImmutable("+1 second"));
$logEntry->setUser($this->getReference(UserFixtures::ADMIN, User::class)); $logEntry->setUser($this->getReference(UserFixtures::ADMIN, User::class));
$logEntry->setComment('Test'); $logEntry->setComment('Test');
$manager->persist($logEntry); $manager->persist($logEntry);
$logEntry = new ElementEditedLogEntry($category); $logEntry = new ElementEditedLogEntry($category);
$logEntry->setTimestamp(new \DateTimeImmutable("+2 second"));
$logEntry->setUser($this->getReference(UserFixtures::ADMIN, User::class)); $logEntry->setUser($this->getReference(UserFixtures::ADMIN, User::class));
$logEntry->setComment('Test'); $logEntry->setComment('Test');
@ -78,6 +80,7 @@ class LogEntryFixtures extends Fixture implements DependentFixtureInterface
$manager->persist($logEntry); $manager->persist($logEntry);
$logEntry = new ElementEditedLogEntry($category); $logEntry = new ElementEditedLogEntry($category);
$logEntry->setTimestamp(new \DateTimeImmutable("+1 second"));
$logEntry->setUser($this->getReference(UserFixtures::ADMIN, User::class)); $logEntry->setUser($this->getReference(UserFixtures::ADMIN, User::class));
$logEntry->setComment('Edit'); $logEntry->setComment('Edit');
$logEntry->setOldData(['name' => 'Test']); $logEntry->setOldData(['name' => 'Test']);
@ -85,6 +88,7 @@ class LogEntryFixtures extends Fixture implements DependentFixtureInterface
$manager->persist($logEntry); $manager->persist($logEntry);
$logEntry = new ElementDeletedLogEntry($category); $logEntry = new ElementDeletedLogEntry($category);
$logEntry->setTimestamp(new \DateTimeImmutable("+2 second"));
$logEntry->setUser($this->getReference(UserFixtures::ADMIN, User::class)); $logEntry->setUser($this->getReference(UserFixtures::ADMIN, User::class));
$logEntry->setOldData(['name' => 'Node 100', 'id' => 100, 'comment' => 'Test comment']); $logEntry->setOldData(['name' => 'Node 100', 'id' => 100, 'comment' => 'Test comment']);
$manager->persist($logEntry); $manager->persist($logEntry);

5
src/Repository/LogEntryRepository.php
View file

@ -225,7 +225,10 @@ class LogEntryRepository extends DBElementRepository
->leftJoin('log.user', 'user') ->leftJoin('log.user', 'user')
->andWhere('log.target_type = :target_type') ->andWhere('log.target_type = :target_type')
->andWhere('log.target_id = :target_id') ->andWhere('log.target_id = :target_id')
->orderBy('log.timestamp', 'DESC'); ->orderBy('log.timestamp', 'DESC')
//Use id as fallback, if timestamp is the same (higher id means newer entry)
->addOrderBy('log.id', 'DESC')
;
$qb->setParameter('target_type', LogTargetType::fromElementClass($element)); $qb->setParameter('target_type', LogTargetType::fromElementClass($element));
$qb->setParameter('target_id', $element->getID()); $qb->setParameter('target_id', $element->getID());