add entity path as link and not as property

Author: usu

api/config/services.yaml

@@ -86,9 +86,6 @@ services:
 
     App\Serializer\Normalizer\ContentTypeNormalizer:
         decorates: 'api_platform.hal.normalizer.item'
-        arguments:
-            - '@.inner'
-            - '@api_platform.route_name_resolver'
 
     App\Serializer\Normalizer\UriTemplateNormalizer:
         decorates: 'api_platform.hal.normalizer.entrypoint'

api/src/Entity/Day.php

@@ -95,7 +95,7 @@ public function getDayNumber(): int {
      * @return ScheduleEntry[]
      */
     #[ApiProperty(example: '/schedule_entries?period=%2Fperiods%2F1a2b3c4d&start%5Bstrictly_before%5D=2022-01-03T00%3A00%3A00%2B00%3A00&end%5Bafter%5D=2022-01-02T00%3A00%3A00%2B00%3A00')]
-    #[RelatedCollectionLink('scheduleEntry', ['period' => 'period', 'start[strictly_before]' => 'end', 'end[after]' => 'start'])]
+    #[RelatedCollectionLink(ScheduleEntry::class, ['period' => 'period', 'start[strictly_before]' => 'end', 'end[after]' => 'start'])]
     #[Groups(['read'])]
     public function getScheduleEntries(): array {
         return array_filter(

api/src/Metadata/Resource/Factory/UriTemplateFactory.php

@@ -35,8 +35,21 @@ public function __construct(
      * @return array contains the templated URI (or null when not successful), as well as a boolean flag which
      *               indicates whether any template parameters are present in the URI
      */
-    public function create(string $shortName): array {
+    public function createFromShortname(string $shortName): array {
         $resourceClass = $this->resourceNameMapping[lcfirst($shortName)] ?? null;
+
+        return $this->createFromResourceClass($resourceClass);
+    }
+
+    /**
+     * Create an URI template based on the allowed parameters for the specified entity.
+     *
+     * @throws ResourceClassNotFoundException
+     *
+     * @return array contains the templated URI (or null when not successful), as well as a boolean flag which
+     *               indicates whether any template parameters are present in the URI
+     */
+    public function createFromResourceClass(string $resourceClass): array {
         if (!$resourceClass) {
             return [null, false];
         }

api/src/Serializer/Normalizer/ContentTypeNormalizer.php

@@ -2,11 +2,8 @@
 
 namespace App\Serializer\Normalizer;
 
-use ApiPlatform\Core\Api\OperationType;
-use ApiPlatform\Core\Api\UrlGeneratorInterface;
-use ApiPlatform\Core\Bridge\Symfony\Routing\RouteNameResolverInterface;
 use App\Entity\ContentType;
-use Symfony\Component\Routing\RouterInterface;
+use App\Metadata\Resource\Factory\UriTemplateFactory;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\SerializerAwareInterface;
 use Symfony\Component\Serializer\SerializerInterface;
@@ -17,8 +14,7 @@
 class ContentTypeNormalizer implements NormalizerInterface, SerializerAwareInterface {
     public function __construct(
         private NormalizerInterface $decorated,
-        private RouteNameResolverInterface $routeNameResolver,
-        private RouterInterface $router,
+        private UriTemplateFactory $uriTemplateFactory,
     ) {
     }
 
@@ -30,7 +26,11 @@ public function normalize($object, $format = null, array $context = []) {
         $data = $this->decorated->normalize($object, $format, $context);
 
         if ($object instanceof ContentType && isset($data['entityClass'])) {
-            $data['entityPath'] = $this->router->generate($this->routeNameResolver->getRouteName($data['entityClass'], OperationType::COLLECTION), [], UrlGeneratorInterface::ABS_PATH);
+            [$uriTemplate, $templated] = $this->uriTemplateFactory->createFromResourceClass($data['entityClass']);
+            $data['_links']['contentNodes']['href'] = $uriTemplate;
+            $data['_links']['contentNodes']['templated'] = $templated;
+
+            unset($data['entityClass']);
         }
 
         return $data;

api/src/Serializer/Normalizer/RelatedCollectionLinkNormalizer.php

@@ -138,7 +138,7 @@ public function getRelatedCollectionHref($object, $rel, array $context = []): st
         if ($annotation = $this->getRelatedCollectionLinkAnnotation($resourceClass, $rel)) {
             // If there is an explicit annotation, there is no need to inspect the Doctrine metadata
             $params = $this->extractUriParams($object, $annotation->getParams());
-            [$uriTemplate] = $this->uriTemplateFactory->create($annotation->getRelatedEntity());
+            [$uriTemplate] = $this->uriTemplateFactory->createFromResourceClass($annotation->getRelatedEntity());
 
             return $this->uriTemplate->expand($uriTemplate, $params);
         }

api/src/Serializer/Normalizer/UriTemplateNormalizer.php

@@ -31,7 +31,7 @@ public function normalize($object, $format = null, array $context = []) {
                 continue;
             }
 
-            [$uriTemplate, $templated] = $this->uriTemplateFactory->create($rel);
+            [$uriTemplate, $templated] = $this->uriTemplateFactory->createFromShortname($rel);
             if (!$uriTemplate) {
                 continue;
             }