WIP

neos · Nov 8, 2024 · c920a47 · c920a47
1 parent 76a975d
commit c920a47
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeCreation/NodeCreation.php b/Neos.ContentRepository.Core/Classes/Feature/NodeCreation/NodeCreation.php
@@ -91,9 +91,16 @@ private function serializeCreateNodeAggregateWithNode(
             ),
             $this->mapNodeReferencesToSerializedNodeReferences($command->references, $command->nodeTypeName)
         );
-        if (!$command->tetheredDescendantNodeAggregateIds->isEmpty()) {
-            $lowLevelCommand = $lowLevelCommand->withTetheredDescendantNodeAggregateIds($command->tetheredDescendantNodeAggregateIds);
-        }
+
+        $descendantNodeAggregateIds = $command->tetheredDescendantNodeAggregateIds->completeForNodeOfType(
+            $command->nodeTypeName,
+            $this->nodeTypeManager
+        );
+
+        // Write the auto-created descendant node aggregate ids back to the command;
+        // so that when rebasing the command, it stays fully deterministic.
+        $lowLevelCommand = $lowLevelCommand->withTetheredDescendantNodeAggregateIds($descendantNodeAggregateIds);
+
         if ($command->nodeName) {
             $lowLevelCommand = $lowLevelCommand->withNodeName($command->nodeName);
         }
@@ -182,16 +189,8 @@ private function handleCreateNodeAggregateWithNodeAndSerializedProperties(
             $this->requireNodeTypeNotToDeclareTetheredChildNodeName($parentNodeAggregate->nodeTypeName, $command->nodeName);
         }
 
-        $descendantNodeAggregateIds = $command->tetheredDescendantNodeAggregateIds->completeForNodeOfType(
-            $command->nodeTypeName,
-            $this->nodeTypeManager
-        );
-        // Write the auto-created descendant node aggregate ids back to the command;
-        // so that when rebasing the command, it stays fully deterministic.
-        $command = $command->withTetheredDescendantNodeAggregateIds($descendantNodeAggregateIds);
-
         foreach (
-            $descendantNodeAggregateIds->getNodeAggregateIds() as $descendantNodeAggregateId
+            $command->tetheredDescendantNodeAggregateIds->getNodeAggregateIds() as $descendantNodeAggregateId
         ) {
             $this->requireProjectedNodeAggregateToNotExist(
                 $contentGraph,
@@ -217,7 +216,7 @@ private function handleCreateNodeAggregateWithNodeAndSerializedProperties(
             $nodeType,
             $coveredDimensionSpacePoints,
             $command->nodeAggregateId,
-            $descendantNodeAggregateIds,
+            $command->tetheredDescendantNodeAggregateIds,
             null
         )));
 

diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/NodeTypeChange.php b/Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/NodeTypeChange.php
@@ -181,6 +181,7 @@ private function handleChangeNodeAggregateType(
             $command->newNodeTypeName,
             $this->nodeTypeManager
         );
+        // todo
         // Write the auto-created descendant node aggregate ids back to the command;
         // so that when rebasing the command, it stays fully deterministic.
         $command = $command->withTetheredDescendantNodeAggregateIds($descendantNodeAggregateIds);

diff --git a/Neos.ContentRepository.Core/Classes/Feature/RootNodeCreation/RootNodeHandling.php b/Neos.ContentRepository.Core/Classes/Feature/RootNodeCreation/RootNodeHandling.php
@@ -90,6 +90,7 @@ private function handleCreateRootNodeAggregateWithNode(
             $command->nodeTypeName,
             $this->nodeTypeManager
         );
+        // todo (and find other $command = $command things. ..
         // Write the auto-created descendant node aggregate ids back to the command;
         // so that when rebasing the command, it stays fully deterministic.
         $command = $command->withTetheredDescendantNodeAggregateIds($descendantNodeAggregateIds);