!!! FEATURE: Bind ContentGraph to workspace

Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php

@@ -17,7 +17,7 @@
 use Behat\Gherkin\Node\TableNode;
 use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Exception\InvalidArgumentException;
-use Neos\ContentGraph\DoctrineDbalAdapter\DoctrineDbalContentGraphProjectionFactory;
+use Neos\ContentGraph\DoctrineDbalAdapter\ContentGraphTableNames;
 use Neos\ContentGraph\DoctrineDbalAdapter\DoctrineDbalProjectionIntegrityViolationDetectionRunnerFactory;
 use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\NodeFactory;
 use Neos\ContentGraph\DoctrineDbalAdapter\Tests\Behavior\Features\Bootstrap\Helpers\TestingNodeAggregateId;
@@ -52,9 +52,9 @@ trait ProjectionIntegrityViolationDetectionTrait
      */
     abstract private function getObject(string $className): object;
 
-    protected function getTableNamePrefix(): string
+    private function tableNames(): ContentGraphTableNames
     {
-        return DoctrineDbalContentGraphProjectionFactory::graphProjectionTableNamePrefix(
+        return ContentGraphTableNames::create(
             $this->currentContentRepository->id
         );
     }
@@ -80,7 +80,7 @@ public function iRemoveTheFollowingSubtreeTag(TableNode $payloadTable): void
             throw new \RuntimeException(sprintf('Failed to remove subtree tag "%s" because that tag is not set', $subtreeTagToRemove->value), 1708618267);
         }
         $this->dbalClient->getConnection()->update(
-            $this->getTableNamePrefix() . '_hierarchyrelation',
+            $this->tableNames()->hierarchyRelation(),
             [
                 'subtreetags' => json_encode($subtreeTags->without($subtreeTagToRemove), JSON_THROW_ON_ERROR | JSON_FORCE_OBJECT),
             ],
@@ -97,7 +97,7 @@ public function iAddTheFollowingHierarchyRelation(TableNode $payloadTable): void
         $dataset = $this->transformPayloadTableToDataset($payloadTable);
         $record = $this->transformDatasetToHierarchyRelationRecord($dataset);
         $this->dbalClient->getConnection()->insert(
-            $this->getTableNamePrefix() . '_hierarchyrelation',
+            $this->tableNames()->hierarchyRelation(),
             $record
         );
     }
@@ -114,7 +114,7 @@ public function iChangeTheFollowingHierarchyRelationsDimensionSpacePointHash(Tab
         unset($record['position']);
 
         $this->dbalClient->getConnection()->update(
-            $this->getTableNamePrefix() . '_hierarchyrelation',
+            $this->tableNames()->hierarchyRelation(),
             [
                 'dimensionspacepointhash' => $dataset['newDimensionSpacePointHash']
             ],
@@ -134,7 +134,7 @@ public function iChangeTheFollowingHierarchyRelationsEdgeName(TableNode $payload
         unset($record['position']);
 
         $this->dbalClient->getConnection()->update(
-            $this->getTableNamePrefix() . '_hierarchyrelation',
+            $this->tableNames()->hierarchyRelation(),
             [
                 'name' => $dataset['newName']
             ],
@@ -158,7 +158,7 @@ public function iSetTheFollowingPosition(TableNode $payloadTable): void
         ];
 
         $this->dbalClient->getConnection()->update(
-            $this->getTableNamePrefix() . '_hierarchyrelation',
+            $this->tableNames()->hierarchyRelation(),
             [
                 'position' => $dataset['newPosition']
             ],
@@ -176,7 +176,7 @@ public function iDetachTheFollowingReferenceRelationFromItsSource(TableNode $pay
         $dataset = $this->transformPayloadTableToDataset($payloadTable);
 
         $this->dbalClient->getConnection()->update(
-            $this->getTableNamePrefix() . '_referencerelation',
+            $this->tableNames()->referenceRelation(),
             [
                 'nodeanchorpoint' => 7777777
             ],
@@ -194,7 +194,7 @@ public function iSetTheFollowingReferencePosition(TableNode $payloadTable): void
         $dataset = $this->transformPayloadTableToDataset($payloadTable);
 
         $this->dbalClient->getConnection()->update(
-            $this->getTableNamePrefix() . '_referencerelation',
+            $this->tableNames()->referenceRelation(),
             [
                 'position' => $dataset['newPosition']
             ],
@@ -265,8 +265,8 @@ private function findHierarchyRelationByIds(
     ): array {
         $nodeRecord = $this->dbalClient->getConnection()->executeQuery(
             'SELECT h.*
-                FROM ' . $this->getTableNamePrefix() . '_node n
-                INNER JOIN ' . $this->getTableNamePrefix() . '_hierarchyrelation h
+                FROM ' . $this->tableNames()->node() . ' n
+                INNER JOIN ' . $this->tableNames()->hierarchyRelation() . ' h
                 ON n.relationanchorpoint = h.childnodeanchor
                 WHERE n.nodeaggregateid = :nodeAggregateId
                 AND h.contentstreamid = :contentStreamId

Neos.ContentGraph.DoctrineDbalAdapter/src/ContentGraphFactory.php

@@ -0,0 +1,71 @@
+<?php
+
+/*
+ * This file is part of the Neos.ContentGraph.DoctrineDbalAdapter package.
+ *
+ * (c) Contributors of the Neos Project - www.neos.io
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
+
+namespace Neos\ContentGraph\DoctrineDbalAdapter;
+
+use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\ContentGraph;
+use Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\NodeFactory;
+use Neos\ContentRepository\Core\ContentGraphFactoryInterface;
+use Neos\ContentRepository\Core\Infrastructure\DbalClientInterface;
+use Neos\ContentRepository\Core\NodeType\NodeTypeManager;
+use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
+use Neos\ContentRepository\Core\SharedModel\Exception\WorkspaceDoesNotExist;
+use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
+use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
+
+/**
+ * @internal only used inside the
+ * @see ContentGraphFinder
+ */
+final readonly class ContentGraphFactory implements ContentGraphFactoryInterface
+{
+    public function __construct(
+        private DbalClientInterface $client,
+        private NodeFactory $nodeFactory,
+        private ContentRepositoryId $contentRepositoryId,
+        private NodeTypeManager $nodeTypeManager,
+        private ContentGraphTableNames $tableNames
+    ) {
+    }
+
+    public function buildForWorkspace(WorkspaceName $workspaceName): ContentGraph
+    {
+        // FIXME: Should be part of this projection, this is forbidden
+        $tableName = strtolower(sprintf(
+            'cr_%s_p_%s',
+            $this->contentRepositoryId->value,
+            'workspace'
+        ));
+
+        $row = $this->client->getConnection()->executeQuery(
+            '
+                SELECT * FROM ' . $tableName . '
+                WHERE workspaceName = :workspaceName
+                LIMIT 1
+            ',
+            [
+                'workspaceName' => $workspaceName->value,
+            ]
+        )->fetchAssociative();
+
+        if ($row === false) {
+            throw WorkspaceDoesNotExist::butWasSupposedTo($workspaceName);
+        }
+
+        return $this->buildForWorkspaceAndContentStream($workspaceName, ContentStreamId::fromString($row['currentcontentstreamid']));
+    }
+
+    public function buildForWorkspaceAndContentStream(WorkspaceName $workspaceName, ContentStreamId $contentStreamId): ContentGraph
+    {
+        return new ContentGraph($this->client, $this->nodeFactory, $this->contentRepositoryId, $this->nodeTypeManager, $this->tableNames, $workspaceName, $contentStreamId);
+    }
+}

Neos.ContentGraph.DoctrineDbalAdapter/src/ContentGraphTableNames.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Neos\ContentGraph\DoctrineDbalAdapter;
+
+use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
+
+/**
+ * Encapsulates table name generation for content graph tables
+ * @internal
+ */
+final readonly class ContentGraphTableNames
+{
+    private function __construct(
+        private string $tableNamePrefix
+    ) {
+    }
+
+    public static function create(ContentRepositoryId $contentRepositoryId): self
+    {
+        return new self(sprintf('cr_%s_p_graph', $contentRepositoryId->value));
+    }
+
+    public function node(): string
+    {
+        return $this->tableNamePrefix . '_node';
+    }
+
+    public function hierarchyRelation(): string
+    {
+        return $this->tableNamePrefix . '_hierarchyrelation';
+    }
+
+    public function dimensionSpacePoints(): string
+    {
+        return $this->tableNamePrefix . '_dimensionspacepoints';
+    }
+
+    public function referenceRelation(): string
+    {
+        return $this->tableNamePrefix . '_referencerelation';
+    }
+
+    public function checkpoint(): string
+    {
+        return $this->tableNamePrefix . '_checkpoint';
+    }
+}