Fix CwaFixtureBuilder crash for non-timestamped components, sort value collision, and component location count

- CwaFixtureBuilder.phaseOne: guard persistTimestampedFields with isConfigured() check so
  non-timestamped components (e.g. HtmlContent, NavigationLink) don't throw; add isConfigured()
  to TimestampedDataPersister as a passthrough to the attribute reader
- ComponentPositionSortValueHelper: only shift existing positions when an actual sortValue
  collision exists; avoids double-shifting when the caller has pre-shifted upstream
- ResourcePublishableMetadata/ResourceMetadata: add locationCount field populated from
  getComponentPositions() count so admins can see how many positions use a component
- Reopen #170: write-side allowedComponents validation for pageDataProperty still needs
  coordinated pageDataClass field from module side

Author: silverbackdan

features/bootstrap/DoctrineContext.php

@@ -1558,4 +1558,32 @@ public function aRefreshTokenShouldHaveBeenGenerated(int $count): void
         }
         Assert::assertLessThanOrEqual(1, $nonExpiredCount, \sprintf('There should only be 1 token that is not expired. There are %d', $nonExpiredCount));
     }
+
+    /**
+     * @Given there is a published DummyPublishableComponent in :count component positions
+     */
+    public function thereIsAPublishedDummyPublishableComponentInPositions(int $count): void
+    {
+        $component = new DummyPublishableComponent();
+        $component->setPublishedAt(new \DateTime());
+        $this->manager->persist($component);
+        $this->restContext->resources['publishable_component'] = $this->iriConverter->getIriFromResource($component);
+
+        for ($i = 0; $i < $count; ++$i) {
+            $componentGroup = new ComponentGroup();
+            $componentGroup->reference = 'test_group_' . $i;
+            $componentGroup->location = 'test_group_' . $i;
+            $this->timestampedHelper->persistTimestampedFields($componentGroup, true);
+            $this->manager->persist($componentGroup);
+
+            $position = new ComponentPosition();
+            $position->sortValue = 0;
+            $position->component = $component;
+            $position->componentGroup = $componentGroup;
+            $this->timestampedHelper->persistTimestampedFields($position, true);
+            $this->manager->persist($position);
+        }
+
+        $this->manager->flush();
+    }
 }

features/main/component_position.feature

@@ -134,3 +134,27 @@ Feature: Component positions
     And I send a "GET" request to the resource "position_3"
     And the response status code should be 200
     And the JSON node "sortValue" should be equal to the number 3
+
+  @loginUser
+  Scenario: Inserting a ComponentPosition at a sortValue with no collision does not shift existing positions
+    Given there is a ComponentGroup with 3 components
+    When I send a "POST" request to "/_/component_positions" with data:
+      | componentGroup            | component             | sortValue |
+      | resource[component_group] | resource[component_0] | 5         |
+    Then the response status code should be 201
+    And the JSON node "sortValue" should be equal to the number 5
+    And I add "Content-Type" header equal to "application/ld+json"
+    And I add "Accept" header equal to "application/ld+json"
+    And I send a "GET" request to the resource "position_0"
+    And the response status code should be 200
+    And the JSON node "sortValue" should be equal to the number 0
+    And I add "Content-Type" header equal to "application/ld+json"
+    And I add "Accept" header equal to "application/ld+json"
+    And I send a "GET" request to the resource "position_1"
+    And the response status code should be 200
+    And the JSON node "sortValue" should be equal to the number 1
+    And I add "Content-Type" header equal to "application/ld+json"
+    And I add "Accept" header equal to "application/ld+json"
+    And I send a "GET" request to the resource "position_2"
+    And the response status code should be 200
+    And the JSON node "sortValue" should be equal to the number 2

features/publishable/publishable.feature

@@ -437,3 +437,11 @@ Feature: Access to unpublished/draft resources should be configurable
     Then the response status code should be 204
     And the resource component_position should not exist
     And the resource publishable_draft should not exist
+
+
+  @loginAdmin
+  Scenario: A publishable component's location count is returned in metadata
+    Given there is a published DummyPublishableComponent in 2 component positions
+    When I send a "GET" request to the resource "publishable_component"
+    Then the response status code should be 200
+    And the JSON node "_metadata.publishable.locationCount" should be equal to the number 2

src/Fixture/CwaFixtureBuilder.php

@@ -315,7 +315,9 @@ private function phaseOne(): void
 
         foreach ($this->componentBuilders as $componentBuilder) {
             $component = $componentBuilder->getComponent();
-            $this->timestampedPersister->persistTimestampedFields($component, true);
+            if ($this->timestampedPersister->isConfigured($component)) {
+                $this->timestampedPersister->persistTimestampedFields($component, true);
+            }
             $this->persistWithAssociations($component);
             foreach ($componentBuilder->getGroupBuilders() as $groupBuilder) {
                 $this->createAndLinkComponentGroup($groupBuilder, $component);

src/Helper/ComponentPosition/ComponentPositionSortValueHelper.php

@@ -87,10 +87,21 @@ public function calculateSortValue(ComponentPosition $componentPosition, ?int $o
             }
         }
 
+        // Only shift existing positions if there is an actual collision at the target sortValue.
+        // This avoids double-shifting when the caller has already pre-shifted positions upstream.
+        $hasCollision = false;
         foreach ($sortCollection as $existingComponentPosition) {
-            // for every position after this one we push it up 1
-            if ($existingComponentPosition->sortValue >= $componentPosition->sortValue) {
-                ++$existingComponentPosition->sortValue;
+            if ($existingComponentPosition->sortValue === $componentPosition->sortValue) {
+                $hasCollision = true;
+                break;
+            }
+        }
+
+        if ($hasCollision) {
+            foreach ($sortCollection as $existingComponentPosition) {
+                if ($existingComponentPosition->sortValue >= $componentPosition->sortValue) {
+                    ++$existingComponentPosition->sortValue;
+                }
             }
         }
     }

src/Helper/Timestamped/TimestampedDataPersister.php

@@ -30,6 +30,11 @@ public function __construct(ManagerRegistry $registry, TimestampedAttributeReade
         $this->annotationReader = $annotationReader;
     }
 
+    public function isConfigured(object|string $entity): bool
+    {
+        return $this->annotationReader->isConfigured($entity);
+    }
+
     public function persistTimestampedFields(object $timestamped, bool $isNew): void
     {
         $configuration = $this->annotationReader->getConfiguration($timestamped);

src/Serializer/Normalizer/PublishableNormalizer.php

@@ -76,9 +76,10 @@ public function normalize($object, $format = null, array $context = []): float|a
         }
 
         $isPublished = $this->publishableStatusChecker->isActivePublishedAt($object);
+        $locationCount = method_exists($object, 'getComponentPositions') ? count($object->getComponentPositions()) : null;
 
         $resourceMetadata = $this->resourceMetadataProvider->findResourceMetadata($object);
-        $resourceMetadata->setPublishable($isPublished);
+        $resourceMetadata->setPublishable($isPublished, null, $locationCount);
 
         $type = $object::class;
 

src/Serializer/ResourceMetadata/ResourceMetadata.php

@@ -121,15 +121,18 @@ public function getPublishable(): ?ResourcePublishableMetadata
         return $this->publishable;
     }
 
-    public function setPublishable(bool $published, ?string $publishedAt = null): void
+    public function setPublishable(bool $published, ?string $publishedAt = null, ?int $locationCount = null): void
     {
         if ($this->publishable) {
             $this->publishable->published = $published;
             $this->publishable->publishedAt = $publishedAt;
+            if (null !== $locationCount) {
+                $this->publishable->locationCount = $locationCount;
+            }
 
             return;
         }
-        $this->publishable = new ResourcePublishableMetadata($published, $publishedAt);
+        $this->publishable = new ResourcePublishableMetadata($published, $publishedAt, $locationCount);
     }
 
     public function getViolations(): ?ConstraintViolationListInterface

src/Serializer/ResourceMetadata/ResourcePublishableMetadata.php

@@ -20,6 +20,8 @@ public function __construct(
         public bool $published,
         #[Groups('cwa_resource:metadata')]
         public ?string $publishedAt = null,
+        #[Groups('cwa_resource:metadata')]
+        public ?int $locationCount = null,
     ) {
     }
 }

tests/Fixture/CwaFixtureBuilderTest.php

@@ -42,9 +42,10 @@ private function makeBuilder(?ObjectManager $em = null, ?RouteGeneratorInterface
     /**
      * @param array<int, array{entity: object, isNew: bool}> $calls
      */
-    private function recordingTimestampedPersister(array &$calls): TimestampedDataPersister
+    private function recordingTimestampedPersister(array &$calls, bool $isConfigured = true): TimestampedDataPersister
     {
         $persister = $this->createStub(TimestampedDataPersister::class);
+        $persister->method('isConfigured')->willReturn($isConfigured);
         $persister->method('persistTimestampedFields')->willReturnCallback(
             static function (object $entity, bool $isNew) use (&$calls): void {
                 $calls[] = ['entity' => $entity, 'isNew' => $isNew];
@@ -1562,6 +1563,21 @@ public function test_timestamped_persister_called_with_is_new_true_for_component
         }
     }
 
+    public function test_timestamped_persister_not_called_for_non_timestamped_component(): void
+    {
+        $calls = [];
+        $component = new class extends AbstractComponent {};
+
+        $builder = $this->makeBuilder(
+            timestampedPersister: $this->recordingTimestampedPersister($calls, isConfigured: false),
+        );
+        $builder->component($component)->group('items');
+        $builder->flush();
+
+        $componentCalls = array_values(array_filter($calls, static fn ($c) => $c['entity'] === $component));
+        $this->assertEmpty($componentCalls, 'persistTimestampedFields must NOT be called for non-timestamped components');
+    }
+
     // --- LogicalAnd: routeName only stored when route IS set on entity (kills mutants 9+10) ---
 
     public function test_named_route_for_page_not_stored_when_route_generator_does_not_set_route_on_entity(): void