Merge pull request #5075 from neos/task/remove-transaction-closures

TASK: Remove transaction closures from projections
neos · May 20, 2024 · a20c7fd · a20c7fd
2 parents 314f6dd + a7a4412
commit a20c7fd
Show file tree

Hide file tree

Showing 18 changed files with 1,035 additions and 1,196 deletions.
diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjection.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjection.php
diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/NodeMove.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/NodeMove.php
@@ -33,40 +33,38 @@ abstract protected function getProjectionContentGraph(): ProjectionContentGraph;
      */
     private function whenNodeAggregateWasMoved(NodeAggregateWasMoved $event): void
     {
-        $this->transactional(function () use ($event) {
-            foreach ($event->succeedingSiblingsForCoverage as $succeedingSiblingForCoverage) {
-                $nodeToBeMoved = $this->getProjectionContentGraph()->findNodeInAggregate(
+        foreach ($event->succeedingSiblingsForCoverage as $succeedingSiblingForCoverage) {
+            $nodeToBeMoved = $this->getProjectionContentGraph()->findNodeInAggregate(
+                $event->contentStreamId,
+                $event->nodeAggregateId,
+                $succeedingSiblingForCoverage->dimensionSpacePoint
+            );
+
+            if (is_null($nodeToBeMoved)) {
+                throw EventCouldNotBeAppliedToContentGraph::becauseTheSourceNodeIsMissing(get_class($event));
+            }
+
+            if ($event->newParentNodeAggregateId) {
+                $this->moveNodeBeneathParent(
+                    $event->contentStreamId,
+                    $nodeToBeMoved,
+                    $event->newParentNodeAggregateId,
+                    $succeedingSiblingForCoverage
+                );
+                $this->moveSubtreeTags(
                     $event->contentStreamId,
-                    $event->nodeAggregateId,
+                    $event->newParentNodeAggregateId,
                     $succeedingSiblingForCoverage->dimensionSpacePoint
                 );
-
-                if (is_null($nodeToBeMoved)) {
-                    throw EventCouldNotBeAppliedToContentGraph::becauseTheSourceNodeIsMissing(get_class($event));
-                }
-
-                if ($event->newParentNodeAggregateId) {
-                    $this->moveNodeBeneathParent(
-                        $event->contentStreamId,
-                        $nodeToBeMoved,
-                        $event->newParentNodeAggregateId,
-                        $succeedingSiblingForCoverage
-                    );
-                    $this->moveSubtreeTags(
-                        $event->contentStreamId,
-                        $event->newParentNodeAggregateId,
-                        $succeedingSiblingForCoverage->dimensionSpacePoint
-                    );
-                } else {
-                    $this->moveNodeBeforeSucceedingSibling(
-                        $event->contentStreamId,
-                        $nodeToBeMoved,
-                        $succeedingSiblingForCoverage,
-                    );
-                    // subtree tags stay the same if the parent doesn't change
-                }
+            } else {
+                $this->moveNodeBeforeSucceedingSibling(
+                    $event->contentStreamId,
+                    $nodeToBeMoved,
+                    $succeedingSiblingForCoverage,
+                );
+                // subtree tags stay the same if the parent doesn't change
             }
-        });
+        }
     }
 
     /**
@@ -223,6 +221,4 @@ private function findIngoingHierarchyRelationToBeMoved(
 
 
     abstract protected function getDatabaseConnection(): Connection;
-
-    abstract protected function transactional(\Closure $operations): void;
 }
diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/NodeRemoval.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/NodeRemoval.php
@@ -29,17 +29,15 @@ private function whenNodeAggregateWasRemoved(NodeAggregateWasRemoved $event): vo
     {
         // the focus here is to be correct; that's why the method is not overly performant (for now at least). We might
         // lateron find tricks to improve performance
-        $this->transactional(function () use ($event) {
-            $ingoingRelations = $this->getProjectionContentGraph()->findIngoingHierarchyRelationsForNodeAggregate(
-                $event->contentStreamId,
-                $event->nodeAggregateId,
-                $event->affectedCoveredDimensionSpacePoints
-            );
+        $ingoingRelations = $this->getProjectionContentGraph()->findIngoingHierarchyRelationsForNodeAggregate(
+            $event->contentStreamId,
+            $event->nodeAggregateId,
+            $event->affectedCoveredDimensionSpacePoints
+        );
 
-            foreach ($ingoingRelations as $ingoingRelation) {
-                $this->removeRelationRecursivelyFromDatabaseIncludingNonReferencedNodes($ingoingRelation);
-            }
-        });
+        foreach ($ingoingRelations as $ingoingRelation) {
+            $this->removeRelationRecursivelyFromDatabaseIncludingNonReferencedNodes($ingoingRelation);
+        }
     }
 
     /**
@@ -83,6 +81,4 @@ protected function removeRelationRecursivelyFromDatabaseIncludingNonReferencedNo
     }
 
     abstract protected function getDatabaseConnection(): Connection;
-
-    abstract protected function transactional(\Closure $operations): void;
 }