From 15c13ab601a44b54f178304558e48a58cb7ef1b8 Mon Sep 17 00:00:00 2001 From: mhsdesign <85400359+mhsdesign@users.noreply.github.com> Date: Mon, 28 Oct 2024 13:49:51 +0100 Subject: [PATCH] TASK: Avoid use of internal `sequenceNumber` for building commands that failed instead we can just generate a uuid as the `sequenceNumber` was also unique for each command that failed see https://github.com/neos/neos-development-collection/pull/5301#discussion_r1818111183 --- Classes/Infrastructure/ContentRepository/ConflictsFactory.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Classes/Infrastructure/ContentRepository/ConflictsFactory.php b/Classes/Infrastructure/ContentRepository/ConflictsFactory.php index 8bc0be74b6..acf407195c 100644 --- a/Classes/Infrastructure/ContentRepository/ConflictsFactory.php +++ b/Classes/Infrastructure/ContentRepository/ConflictsFactory.php @@ -114,8 +114,8 @@ private function createConflictFromCommandThatFailedDuringRebase( return new Conflict( key: $affectedNode - ? $affectedNode->aggregateId->value - : 'command-' . $commandThatFailedDuringRebase->sequenceNumber->value, + ? $affectedNode->aggregateId->value + : Algorithms::generateUUID(), affectedSite: $affectedSite ? $this->createIconLabelForNode($affectedSite) : null,