TASK: Use legacy dimension value combinations from cr adpter package for compatibility

Author: mficzel

Diff for: Classes/Command/GraphIndexNewCommandController.php

@@ -135,6 +135,12 @@ class GraphIndexNewCommandController extends CommandController
      */
     protected $contentDimensionCombinator;
 
+    /**
+     * @Flow\Inject
+     * @var DimensionsService
+     */
+    protected $dimensionService;
+
     /**
      * @Flow\Inject
      * @var WorkspaceIndexer
@@ -249,15 +255,9 @@ public function buildCommand(int $limit = null, bool $update = false, string $wo
         $this->nodeIndexer->setContentGraph($graph);
         $this->outputLine('<success>Done</success> (took %s seconds)', [number_format(microtime(true) - $timeStart, 2)]);
 
-        $dimensionSpacePointSet = $this->contentDimensionZookeeper->getAllowedDimensionSubspace();
-        $workspaceDimensionIdentifier = new ContentDimensionIdentifier('_workspace');
-        foreach ($dimensionSpacePointSet as $dimensionSpacePoint) {
-            if ($dimensionSpacePoint->getCoordinate($workspaceDimensionIdentifier) === 'live') {
-                $coordinates = $dimensionSpacePoint->getCoordinates();
-                unset($coordinates['_workspace']);
-                $dimensionSpacepointWithoutWorkspace = new DimensionSpacePoint($coordinates);
-                $this->buildIndexForDimensionSpacePoint($graph, $dimensionSpacepointWithoutWorkspace, $postfix, $limit);
-            }
+        $dimensionCombinations = new ArrayCollection($this->contentDimensionCombinator->getAllAllowedCombinations());
+        foreach ($dimensionCombinations as $dimensionCombination) {
+            $this->buildIndexForDimensionSpacePoint($graph, $dimensionCombination, $postfix, $limit);
         }
 
         $runAndLog($refresh, 'Refresh indicies');
@@ -296,18 +296,19 @@ private function aliasesExist(): bool
      * Build up the node index
      *
      * @param ContentGraph $graph
-     * @param DimensionSpacePoint $dimensionSpacePoint
+     * @param array $dimensionValues
      * @param string|null $postfix
      * @param int|null $limit
      * @throws ConfigurationException
      * @throws Exception
      * @throws RuntimeException
      * @throws SubProcessException
      */
-    private function buildIndexForDimensionSpacePoint(ContentGraph $graph, DimensionSpacePoint $dimensionSpacePoint, string $postfix, $limit = null): void
+    private function buildIndexForDimensionSpacePoint(ContentGraph $graph, array $dimensionValues, string $postfix, $limit = null): void
     {
-        $dimensionsValues = $dimensionSpacePoint->getCoordinates();
-        $dimensionsValues = $this->configureNodeIndexer($dimensionsValues, $postfix);
+        $dimensionsValues = $this->configureNodeIndexer($dimensionValues, $postfix);
+        $dimensionSpacePoint = DimensionSpacePoint::fromLegacyDimensionArray($dimensionsValues);
+        $dimensionHash = $this->dimensionService->hash($dimensionsValues);
 
         $this->output("Indexing dimension %s" . '... ' , [json_encode($dimensionsValues)]);
 
@@ -331,7 +332,7 @@ private function buildIndexForDimensionSpacePoint(ContentGraph $graph, Dimension
                 continue;
             }
 
-            $this->nodeIndexer->indexGraphNode($node, $dimensionSpacePoint);
+            $this->nodeIndexer->indexGraphNode($node, $dimensionSpacePoint, $dimensionHash);
             $indexedHierarchyRelations += count($node->getIncomingHierarchyRelations());
             $nodesSinceLastFlush++;
             $nodesIndexed++;

Diff for: Classes/Indexer/NodeIndexer.php

@@ -52,7 +52,7 @@ public function setContentGraph(ContentGraph $contentGraph): void
         $this->contentGraph = $contentGraph;
     }
 
-    public function indexGraphNode(Node $dataNode, DimensionSpacePoint $dimensionSpacePoint): void
+    public function indexGraphNode(Node $dataNode, DimensionSpacePoint $dimensionSpacePoint, string $dimensionHash): void
     {
         $occupiedDimensionSpacePoints = new DimensionSpacePointSet([$dataNode->getOriginDimensionSpacePoint()]);
         $isFulltextRoot = IsFulltextRoot::isSatisfiedBy($dataNode);
@@ -123,9 +123,8 @@ public function indexGraphNode(Node $dataNode, DimensionSpacePoint $dimensionSpa
                 ];
             }
 
-            $hash = $this->dimensionService->hash($dimensionSpacePoint->getCoordinates());
-            $this->currentBulkRequest[] = new BulkRequestPart($hash, $this->indexerDriver->document($this->getIndexName(), $nodeAdapter, $document, $documentData));
-            $this->currentBulkRequest[] = new BulkRequestPart($hash, $this->indexerDriver->fulltext($nodeAdapter, $fulltextIndexOfNode));
+            $this->currentBulkRequest[] = new BulkRequestPart($dimensionHash, $this->indexerDriver->document($this->getIndexName(), $nodeAdapter, $document, $documentData));
+            $this->currentBulkRequest[] = new BulkRequestPart($dimensionHash, $this->indexerDriver->fulltext($nodeAdapter, $fulltextIndexOfNode));
 
             $serializedVariant = json_encode([
                 'nodeAggregateIdentifier' => $virtualVariant->getNodeAggregateIdentifier(),