TASK: replace contentStreamId with workspaceName where contentStreamI…

…d still was used
neos · Jun 3, 2024 · e6198c9 · e6198c9
1 parent b0efca7
commit e6198c9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 19 deletions.
diff --git a/Neos.ContentRepository.Export/src/Processors/AssetExportProcessor.php b/Neos.ContentRepository.Export/src/Processors/AssetExportProcessor.php
@@ -47,7 +47,7 @@ public function run(): ProcessorResult
         if ($liveWorkspace === null) {
             return ProcessorResult::error('Failed to find live workspace');
         }
-        $assetFilter = AssetUsageFilter::create()->withContentStream($liveWorkspace->currentContentStreamId)->groupByAsset();
+        $assetFilter = AssetUsageFilter::create()->withWorkspaceName($liveWorkspace->workspaceName)->groupByAsset();
 
         $numberOfExportedAssets = 0;
         $numberOfExportedImageVariants = 0;

diff --git a/Neos.Neos/Classes/AssetUsage/AssetUsageStrategy.php b/Neos.Neos/Classes/AssetUsage/AssetUsageStrategy.php
@@ -51,7 +51,7 @@ public function getUsageReferences(AssetInterface $asset): array
                 $convertedUsages[] = new AssetUsageReference(
                     $asset,
                     ContentRepositoryId::fromString($contentRepositoryId),
-                    $usage->contentStreamId,
+                    $usage->workspaceName,
                     $usage->originDimensionSpacePoint,
                     $usage->nodeAggregateId
                 );

diff --git a/Neos.Neos/Classes/AssetUsage/Service/AssetUsageSyncService.php b/Neos.Neos/Classes/AssetUsage/Service/AssetUsageSyncService.php
@@ -55,8 +55,7 @@ public function isAssetUsageStillValid(AssetUsage $usage): bool
         }
         $dimensionSpacePoint = $usage->originDimensionSpacePoint->toDimensionSpacePoint();
 
-        // FIXME: AssetUsage->workspaceName ?
-        $workspace = $this->contentRepository->getWorkspaceFinder()->findOneByCurrentContentStreamId($usage->contentStreamId);
+        $workspace = $this->contentRepository->getWorkspaceFinder()->findOneByName($usage->workspaceName);
         if (is_null($workspace)) {
             return false;
         }

diff --git a/Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php b/Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php
@@ -284,27 +284,13 @@ public function registerAssetChange(AssetInterface $asset): void
             ->includeVariantsOfAsset();
 
 
-        $workspaceNamesByContentStreamId = [];
         foreach ($this->globalAssetUsageService->findByFilter($filter) as $contentRepositoryId => $usages) {
             foreach ($usages as $usage) {
-                // TODO: Remove when WorkspaceName is part of the AssetUsageProjection
-                $workspaceName = $workspaceNamesByContentStreamId[$contentRepositoryId][$usage->contentStreamId->value] ?? null;
-                if ($workspaceName === null) {
-                    $contentRepository = $this->contentRepositoryRegistry->get(ContentRepositoryId::fromString($contentRepositoryId));
-                    $workspace = $contentRepository->getWorkspaceFinder()->findOneByCurrentContentStreamId($usage->contentStreamId);
-                    if ($workspace === null) {
-                        continue;
-                    }
-                    $workspaceName = $workspace->workspaceName;
-                    $workspaceNamesByContentStreamId[$contentRepositoryId][$usage->contentStreamId->value] = $workspaceName;
-                }
-                //
-
                 $contentRepository = $this->contentRepositoryRegistry->get(ContentRepositoryId::fromString($contentRepositoryId));
                 $tagsToFlush = array_merge(
                     $this->collectTagsForChangeOnNodeAggregate(
                         $contentRepository,
-                        $workspaceName,
+                        $usage->workspaceName,
                         $usage->nodeAggregateId
                     ),
                     $tagsToFlush