FEATURE: ContentGraphAdapter for write side access

Neos.ContentGraph.DoctrineDbalAdapter/src/ContentGraphAdapterFactory.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace Neos\ContentGraph\DoctrineDbalAdapter;
+
+use Doctrine\DBAL\Connection;
+use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\DimensionSpacePointsRepository;
+use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\NodeFactory;
+use Neos\ContentRepository\Core\Factory\ProjectionFactoryDependencies;
+use Neos\ContentRepository\Core\Feature\ContentGraphAdapterFactoryInterface;
+use Neos\ContentRepository\Core\Feature\ContentGraphAdapterInterface;
+use Neos\ContentRepository\Core\NodeType\NodeTypeManager;
+use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
+use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
+use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
+
+/**
+ * Factory for the ContentGraphAdapter implementation for doctrine DBAL
+ *
+ * @internal
+ */
+class ContentGraphAdapterFactory implements ContentGraphAdapterFactoryInterface
+{
+    private NodeFactory $nodeFactory;
+
+    private NodeTypeManager $nodeTypeManager;
+
+    private string $tableNamePrefix;
+
+    private ContentRepositoryId $contentRepositoryId;
+
+    public function __construct(
+        private readonly Connection $dbalConnection,
+        ProjectionFactoryDependencies $projectionFactoryDependencies
+    ) {
+        $tableNamePrefix = DoctrineDbalContentGraphProjectionFactory::graphProjectionTableNamePrefix(
+            $projectionFactoryDependencies->contentRepositoryId
+        );
+        $this->tableNamePrefix = $tableNamePrefix;
+        $this->contentRepositoryId = $projectionFactoryDependencies->contentRepositoryId;
+
+        $dimensionSpacePointsRepository = new DimensionSpacePointsRepository($this->dbalConnection, $tableNamePrefix);
+        $this->nodeTypeManager = $projectionFactoryDependencies->nodeTypeManager;
+        $this->nodeFactory = new NodeFactory(
+            $projectionFactoryDependencies->contentRepositoryId,
+            $projectionFactoryDependencies->nodeTypeManager,
+            $projectionFactoryDependencies->propertyConverter,
+            $dimensionSpacePointsRepository
+        );
+    }
+
+    public function create(WorkspaceName $workspaceName, ContentStreamId $contentStreamId): ContentGraphAdapterInterface
+    {
+        return new ContentGraphAdapter($this->dbalConnection, $this->tableNamePrefix, $this->contentRepositoryId, $this->nodeFactory, $this->nodeTypeManager, $workspaceName, $contentStreamId);
+    }
+
+    public function createFromContentStreamId(ContentStreamId $contentStreamId): ContentGraphAdapterInterface
+    {
+        return new ContentGraphAdapter($this->dbalConnection, $this->tableNamePrefix, $this->contentRepositoryId, $this->nodeFactory, $this->nodeTypeManager, null, $contentStreamId);
+    }
+
+    public function createFromWorkspaceName(WorkspaceName $workspaceName): ContentGraphAdapterInterface
+    {
+        return new ContentGraphAdapter($this->dbalConnection, $this->tableNamePrefix, $this->contentRepositoryId, $this->nodeFactory, $this->nodeTypeManager, $workspaceName, null);
+    }
+}

Neos.ContentGraph.DoctrineDbalAdapter/src/ContentGraphAdapterFactoryBuilder.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Neos\ContentGraph\DoctrineDbalAdapter;
+
+use Neos\ContentRepository\Core\Factory\ProjectionFactoryDependencies;
+use Neos\ContentRepository\Core\Feature\ContentGraphAdapterFactoryBuilderInterface;
+use Neos\ContentRepository\Core\Infrastructure\DbalClientInterface;
+
+/**
+ * Builder to combine injected dependencies and ProjectionFActoryDependencies into a ContentGraphAdapterFactory
+ * @internal
+ */
+class ContentGraphAdapterFactoryBuilder implements ContentGraphAdapterFactoryBuilderInterface
+{
+    public function __construct(private readonly DbalClientInterface $dbalClient)
+    {
+    }
+
+    public function build(ProjectionFactoryDependencies $projectionFactoryDependencies): ContentGraphAdapterFactory
+    {
+        return new ContentGraphAdapterFactory($this->dbalClient->getConnection(), $projectionFactoryDependencies);
+    }
+}

Neos.ContentRepository.BehavioralTests/Configuration/Testing/Behat/Settings.ContentRepositoryRegistry.yaml

@@ -10,3 +10,5 @@ Neos:
           factoryObjectName: 'Neos\ContentRepository\BehavioralTests\TestSuite\Behavior\GherkinPyStringNodeBasedNodeTypeManagerFactory'
         contentDimensionSource:
           factoryObjectName: 'Neos\ContentRepository\BehavioralTests\TestSuite\Behavior\GherkinTableNodeBasedContentDimensionSourceFactory'
+        contentGraphAdapterFactory:
+          factoryObjectName: Neos\ContentGraph\DoctrineDbalAdapter\ContentGraphAdapterFactoryBuilder

Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/05-NodeReferencing/01-SetNodeReferences_ConstraintChecks.feature

@@ -77,7 +77,7 @@ Feature: Constraint checks on SetNodeReferences
       | sourceNodeAggregateId | "source-nodandaise"             |
       | referenceName                 | "referenceProperty"             |
       | references                    | [{"target":"anthony-destinode"}] |
-    Then the last command should have thrown an exception of type "ContentStreamDoesNotExistYet" with code 1710407870
+    Then the last command should have thrown an exception of type "ContentStreamDoesNotExistYet" with code 1521386692
 
   # checks for sourceNodeAggregateId
   Scenario: Try to reference nodes in a non-existent node aggregate

Neos.ContentRepository.Core/Classes/ContentRepository.php

@@ -29,6 +29,7 @@
 use Neos\ContentRepository\Core\NodeType\NodeTypeManager;
 use Neos\ContentRepository\Core\Projection\CatchUp;
 use Neos\ContentRepository\Core\Projection\CatchUpOptions;
+use Neos\ContentRepository\Core\Feature\ContentGraphAdapterInterface;
 use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphInterface;
 use Neos\ContentRepository\Core\Projection\ContentStream\ContentStreamFinder;
 use Neos\ContentRepository\Core\Projection\ProjectionInterface;

Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryFactory.php

@@ -21,6 +21,8 @@
 use Neos\ContentRepository\Core\DimensionSpace\InterDimensionalVariationGraph;
 use Neos\ContentRepository\Core\EventStore\EventNormalizer;
 use Neos\ContentRepository\Core\EventStore\EventPersister;
+use Neos\ContentRepository\Core\Feature\ContentGraphAdapterFactoryBuilderInterface;
+use Neos\ContentRepository\Core\Feature\ContentGraphAdapterProvider;
 use Neos\ContentRepository\Core\Feature\ContentStreamCommandHandler;
 use Neos\ContentRepository\Core\Feature\DimensionSpaceAdjustment\DimensionSpaceCommandHandler;
 use Neos\ContentRepository\Core\Feature\NodeAggregateCommandHandler;
@@ -46,6 +48,8 @@ final class ContentRepositoryFactory
     private ProjectionFactoryDependencies $projectionFactoryDependencies;
     private ProjectionsAndCatchUpHooks $projectionsAndCatchUpHooks;
 
+    private ContentGraphAdapterProvider $contentGraphAdapterProvider;
+
     public function __construct(
         private readonly ContentRepositoryId $contentRepositoryId,
         EventStoreInterface $eventStore,
@@ -56,6 +60,7 @@ public function __construct(
         private readonly ProjectionCatchUpTriggerInterface $projectionCatchUpTrigger,
         private readonly UserIdProviderInterface $userIdProvider,
         private readonly ClockInterface $clock,
+        ContentGraphAdapterFactoryBuilderInterface $contentGraphAdapterFactoryBuilder,
     ) {
         $contentDimensionZookeeper = new ContentDimensionZookeeper($contentDimensionSource);
         $interDimensionalVariationGraph = new InterDimensionalVariationGraph(
@@ -73,6 +78,8 @@ public function __construct(
             new PropertyConverter($propertySerializer)
         );
         $this->projectionsAndCatchUpHooks = $projectionsAndCatchUpHooksFactory->build($this->projectionFactoryDependencies);
+
+        $this->contentGraphAdapterProvider = new ContentGraphAdapterProvider($contentGraphAdapterFactoryBuilder->build($this->projectionFactoryDependencies));
     }
 
     // The following properties store "singleton" references of objects for this content repository
@@ -120,11 +127,13 @@ public function getOrBuild(): ContentRepository
     public function buildService(
         ContentRepositoryServiceFactoryInterface $serviceFactory
     ): ContentRepositoryServiceInterface {
+
         $serviceFactoryDependencies = ContentRepositoryServiceFactoryDependencies::create(
             $this->projectionFactoryDependencies,
             $this->getOrBuild(),
             $this->buildEventPersister(),
             $this->projectionsAndCatchUpHooks->projections,
+            $this->contentGraphAdapterProvider
         );
         return $serviceFactory->build($serviceFactoryDependencies);
     }
@@ -134,26 +143,31 @@ private function buildCommandBus(): CommandBus
         if (!$this->commandBus) {
             $this->commandBus = new CommandBus(
                 new ContentStreamCommandHandler(
+                    $this->contentGraphAdapterProvider
                 ),
                 new WorkspaceCommandHandler(
                     $this->buildEventPersister(),
                     $this->projectionFactoryDependencies->eventStore,
                     $this->projectionFactoryDependencies->eventNormalizer,
+                    $this->contentGraphAdapterProvider
                 ),
                 new NodeAggregateCommandHandler(
                     $this->projectionFactoryDependencies->nodeTypeManager,
                     $this->projectionFactoryDependencies->contentDimensionZookeeper,
                     $this->projectionFactoryDependencies->interDimensionalVariationGraph,
-                    $this->projectionFactoryDependencies->propertyConverter
+                    $this->projectionFactoryDependencies->propertyConverter,
+                    $this->contentGraphAdapterProvider
                 ),
                 new DimensionSpaceCommandHandler(
                     $this->projectionFactoryDependencies->contentDimensionZookeeper,
-                    $this->projectionFactoryDependencies->interDimensionalVariationGraph
+                    $this->projectionFactoryDependencies->interDimensionalVariationGraph,
+                    $this->contentGraphAdapterProvider
                 ),
                 new NodeDuplicationCommandHandler(
                     $this->projectionFactoryDependencies->nodeTypeManager,
                     $this->projectionFactoryDependencies->contentDimensionZookeeper,
-                    $this->projectionFactoryDependencies->interDimensionalVariationGraph
+                    $this->projectionFactoryDependencies->interDimensionalVariationGraph,
+                    $this->contentGraphAdapterProvider
                 )
             );
         }

Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryServiceFactoryDependencies.php

@@ -20,6 +20,7 @@
 use Neos\ContentRepository\Core\DimensionSpace\InterDimensionalVariationGraph;
 use Neos\ContentRepository\Core\EventStore\EventNormalizer;
 use Neos\ContentRepository\Core\EventStore\EventPersister;
+use Neos\ContentRepository\Core\Feature\ContentGraphAdapterProvider;
 use Neos\ContentRepository\Core\Infrastructure\Property\PropertyConverter;
 use Neos\ContentRepository\Core\NodeType\NodeTypeManager;
 use Neos\ContentRepository\Core\Projection\Projections;
@@ -47,6 +48,7 @@ private function __construct(
         // we don't need CommandBus, because this is included in ContentRepository->handle()
         public EventPersister $eventPersister,
         public Projections $projections,
+        public ContentGraphAdapterProvider $contentGraphAdapterProvider
     ) {
     }
 
@@ -58,6 +60,7 @@ public static function create(
         ContentRepository $contentRepository,
         EventPersister $eventPersister,
         Projections $projections,
+        ContentGraphAdapterProvider $contentGraphAdapterProvider
     ): self {
         return new self(
             $projectionFactoryDependencies->contentRepositoryId,
@@ -71,6 +74,7 @@ public static function create(
             $contentRepository,
             $eventPersister,
             $projections,
+            $contentGraphAdapterProvider
         );
     }
 }