Add ContentNotFoundException if dimensions not exist

sulu · Dec 11, 2019 · d796430 · d796430
1 parent e45d7a3
commit d796430
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 0 deletions.
diff --git a/Content/Application/ContentLoader/ContentLoader.php b/Content/Application/ContentLoader/ContentLoader.php
@@ -50,6 +50,11 @@ public function __construct(
     public function load(ContentInterface $content, array $dimensionAttributes): ContentViewInterface
     {
         $dimensionCollection = $this->dimensionRepository->findByAttributes($dimensionAttributes);
+
+        if (0 === \count($dimensionCollection)) {
+            throw new ContentNotFoundException($content, $dimensionAttributes);
+        }
+
         $contentDimensionCollection = $this->contentDimensionRepository->load($content, $dimensionCollection);
 
         if (0 === \count($contentDimensionCollection)) {

diff --git a/Content/Application/ContentWorkflow/ContentWorkflow.php b/Content/Application/ContentWorkflow/ContentWorkflow.php
@@ -86,6 +86,11 @@ public function apply(
         string $transitionName
     ): ContentViewInterface {
         $dimensionCollection = $this->dimensionRepository->findByAttributes($dimensionAttributes);
+
+        if (0 === \count($dimensionCollection)) {
+            throw new ContentNotFoundException($content, $dimensionAttributes);
+        }
+
         $contentDimensionCollection = $this->contentDimensionRepository->load($content, $dimensionCollection);
 
         $localizedContentDimension = $contentDimensionCollection->getLocalizedContentDimension();

diff --git a/Tests/Unit/Content/Application/ContentLoader/ContentLoaderTest.php b/Tests/Unit/Content/Application/ContentLoader/ContentLoaderTest.php
@@ -108,6 +108,34 @@ public function testLoad(): void
         $this->assertSame($contentView->reveal(), $createContentMessageHandler->load($content->reveal(), $attributes));
     }
 
+    public function testLoadDimensionNotFound(): void
+    {
+        $this->expectException(ContentNotFoundException::class);
+
+        $content = $this->prophesize(ContentInterface::class);
+
+        $attributes = [
+            'locale' => 'de',
+        ];
+
+        $dimensionCollection = new DimensionCollection($attributes, []);
+
+        $dimensionRepository = $this->prophesize(DimensionRepositoryInterface::class);
+        $dimensionRepository->findByAttributes($attributes)->willReturn($dimensionCollection)->shouldBeCalled();
+
+        $contentDimensionRepository = $this->prophesize(ContentDimensionRepositoryInterface::class);
+        $contentView = $this->prophesize(ContentViewInterface::class);
+        $viewFactory = $this->prophesize(ViewFactoryInterface::class);
+
+        $createContentMessageHandler = $this->createContentLoaderInstance(
+            $dimensionRepository->reveal(),
+            $contentDimensionRepository->reveal(),
+            $viewFactory->reveal()
+        );
+
+        $this->assertSame($contentView->reveal(), $createContentMessageHandler->load($content->reveal(), $attributes));
+    }
+
     public function testLoadNotFound(): void
     {
         $this->expectException(ContentNotFoundException::class);

diff --git a/Tests/Unit/Content/Application/ContentWorkflow/ContentWorkflowTest.php b/Tests/Unit/Content/Application/ContentWorkflow/ContentWorkflowTest.php
@@ -144,6 +144,37 @@ public function testTransitionNoLocalizedContentDimension(): void
         );
     }
 
+    public function testTransitionNoDimensions(): void
+    {
+        $this->expectException(ContentNotFoundException::class);
+
+        $dimensionRepository = $this->prophesize(DimensionRepositoryInterface::class);
+        $contentDimensionRepository = $this->prophesize(ContentDimensionRepositoryInterface::class);
+        $viewFactory = $this->prophesize(ViewFactoryInterface::class);
+
+        $contentWorkflow = $this->createContentWorkflowInstance(
+            $dimensionRepository->reveal(),
+            $contentDimensionRepository->reveal(),
+            $viewFactory->reveal()
+        );
+
+        $content = $this->prophesize(ContentInterface::class);
+        $dimensionAttributes = ['locale' => 'de', 'stage' => 'draft'];
+        $transitionName = 'request_for_review';
+
+        $dimensionCollection = new DimensionCollection($dimensionAttributes, []);
+
+        $dimensionRepository->findByAttributes($dimensionAttributes)
+            ->willReturn($dimensionCollection)
+            ->shouldBeCalled();
+
+        $contentWorkflow->apply(
+            $content->reveal(),
+            $dimensionAttributes,
+            $transitionName
+        );
+    }
+
     public function testNotExistTransition(): void
     {
         $this->expectException(ContentNotExistTransitionException::class);