Add isMerged property to DimensionContentInterface

sulu · May 18, 2020 · 8a88c1b · 8a88c1b
1 parent 38da24e
commit 8a88c1b
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 5 deletions.
diff --git a/Content/Application/ContentMerger/ContentMerger.php b/Content/Application/ContentMerger/ContentMerger.php
@@ -53,8 +53,8 @@ public function mergeCollection(DimensionContentCollectionInterface $dimensionCo
         $mostSpecificDimension = $mostSpecificDimensionContent->getDimension();
         $contentRichEntity = $mostSpecificDimensionContent->getContentRichEntity();
 
-        // TODO: set isResolved flag of dimension content
         $mergedDimensionContent = $contentRichEntity->createDimensionContent($mostSpecificDimension);
+        $mergedDimensionContent->markAsMerged();
 
         foreach ($dimensionContentCollection as $dimensionContent) {
             $this->merge($mergedDimensionContent, $dimensionContent);

diff --git a/Content/Application/ContentNormalizer/Normalizer/DimensionContentNormalizer.php b/Content/Application/ContentNormalizer/Normalizer/DimensionContentNormalizer.php
@@ -25,6 +25,7 @@ public function getIgnoredAttributes(object $object): array
 
         return [
             'id',
+            'merged',
             'dimension',
             'contentRichEntity',
         ];

diff --git a/Content/Domain/Model/DimensionContentInterface.php b/Content/Domain/Model/DimensionContentInterface.php
@@ -18,4 +18,8 @@ interface DimensionContentInterface
     public function getDimension(): DimensionInterface;
 
     public function getContentRichEntity(): ContentRichEntityInterface;
+
+    public function isMerged(): bool;
+
+    public function markAsMerged(): void;
 }
diff --git a/Content/Domain/Model/DimensionContentTrait.php b/Content/Domain/Model/DimensionContentTrait.php
@@ -20,8 +20,23 @@ trait DimensionContentTrait
      */
     protected $dimension;
 
+    /**
+     * @var bool
+     */
+    private $isMerged = false;
+
     public function getDimension(): DimensionInterface
     {
         return $this->dimension;
     }
+
+    public function isMerged(): bool
+    {
+        return $this->isMerged;
+    }
+
+    public function markAsMerged(): void
+    {
+        $this->isMerged = true;
+    }
 }
diff --git a/Tests/Unit/Content/Application/ContentMerger/ContentMergerTest.php b/Tests/Unit/Content/Application/ContentMerger/ContentMergerTest.php
@@ -86,6 +86,8 @@ public function testMergeCollection(): void
         $merger1->merge($mergedDimensionContent->reveal(), $dimensionContent3->reveal())->shouldBeCalled();
         $merger2->merge($mergedDimensionContent->reveal(), $dimensionContent3->reveal())->shouldBeCalled();
 
+        $mergedDimensionContent->markAsMerged()->shouldBeCalled();
+
         $dimensionContentCollection = new DimensionContentCollection([
             $dimensionContent1->reveal(),
             $dimensionContent2->reveal(),

diff --git a/.../Unit/Content/Application/ContentNormalizer/Normalizer/DimensionContentNormalizerTest.php b/.../Unit/Content/Application/ContentNormalizer/Normalizer/DimensionContentNormalizerTest.php
@@ -43,7 +43,7 @@ public function testIgnoredAttributes(): void
         $object = $this->prophesize(DimensionContentInterface::class);
 
         $this->assertSame(
-            ['id', 'dimension', 'contentRichEntity'],
+            ['id', 'merged', 'dimension', 'contentRichEntity'],
             $normalizer->getIgnoredAttributes($object->reveal())
         );
     }

diff --git a/Tests/Unit/Content/Domain/Model/DimensionContentTraitTest.php b/Tests/Unit/Content/Domain/Model/DimensionContentTraitTest.php
@@ -46,4 +46,15 @@ public function testGetDimension(): void
         $model = $this->getDimensionContentInstance($dimension->reveal());
         $this->assertSame($dimension->reveal(), $model->getDimension());
     }
+
+    public function testGetSetIsMerged(): void
+    {
+        $dimension = $this->prophesize(DimensionInterface::class);
+
+        $model = $this->getDimensionContentInstance($dimension->reveal());
+        $this->assertFalse($model->isMerged());
+
+        $model->markAsMerged();
+        $this->assertTrue($model->isMerged());
+    }
 }
diff --git a/Tests/Unit/Content/Domain/Model/RoutableTraitTest.php b/Tests/Unit/Content/Domain/Model/RoutableTraitTest.php
@@ -71,7 +71,7 @@ public function testGetLocale(): void
         $this->assertSame('en', $model->getLocale());
     }
 
-    public function getContentId(): void
+    public function testGetContentId(): void
     {
         $model = $this->getRoutableInstance();
         $this->assertSame('content-id-123', $model->getContentId());

diff --git a/Tests/Unit/Mocks/DimensionContentMockWrapperTrait.php b/Tests/Unit/Mocks/DimensionContentMockWrapperTrait.php
@@ -32,4 +32,14 @@ public function getContentRichEntity(): ContentRichEntityInterface
     {
         return $this->instance->getContentRichEntity();
     }
+
+    public function isMerged(): bool
+    {
+        return $this->instance->isMerged();
+    }
+
+    public function markAsMerged(): void
+    {
+        $this->instance->markAsMerged();
+    }
 }
diff --git a/Tests/Unit/SuluContentBundleTest.php b/Tests/Unit/SuluContentBundleTest.php
@@ -20,14 +20,14 @@
 
 class SuluContentBundleTest extends TestCase
 {
-    protected function getBundle(): SuluContentBundle
+    protected function getContentBundle(): SuluContentBundle
     {
         return new SuluContentBundle();
     }
 
     public function testPersistenceCompilerPass(): void
     {
-        $bundle = $this->getBundle();
+        $bundle = $this->getContentBundle();
         $containerBuilder = new ContainerBuilder();
 
         $bundle->build($containerBuilder);