Fix mercure serialization context

Author: silverbackdan

features/bootstrap/ProfilerContext.php

@@ -98,6 +98,19 @@ public function theMercureMessageShouldContainTimestampedFields()
         Assert::assertArrayHasKey('modifiedAt', $messageArray);
     }
 
+    /**
+     * @Then the Mercure message for component group should contain timestamped fields
+     */
+    public function theMercureMessageForComponentGroupShouldContainTimestampedFields()
+    {
+        $messageObjects = $this->thereShouldBeAPublishedMercureUpdatePublished(2);
+        $update = $messageObjects[1];
+        $messageData = $update->getData();
+        $messageArray = $this->jsonContext->getJsonAsArray($messageData);
+        Assert::assertArrayHasKey('createdAt', $messageArray);
+        Assert::assertArrayHasKey('modifiedAt', $messageArray);
+    }
+
     /**
      * @Then there should be :count mercure messages for draft resources
      */

…tures/main/component_collections.feature features/main/component_groups.featurefeatures/main/component_collections.feature renamed to features/main/component_groups.feature features/main/component_collections.feature renamed to features/main/component_groups.feature

@@ -29,6 +29,7 @@ Feature: ComponentGroup resource
     """
     Then the response status code should be 201
     And the JSON should be valid according to the schema file "component_group.schema.json"
+    And the JSON node "createdAt" should exist
 
   @loginUser
   Scenario: When I delete a component collection resource, locations are also deleted but components are not

features/main/component_position.feature

@@ -13,9 +13,10 @@ Feature: Component positions
     And there is a DummyComponent
     When I send a "POST" request to "/_/component_positions" with data:
       | componentGroup             | component                  |
-      | resource[component_group] | resource[dummy_component] |
+      | resource[component_group]  | resource[dummy_component] |
     Then the response status code should be 201
     And the JSON should be valid according to the schema file "component_position.schema.json"
+    And the Mercure message for component group should contain timestamped fields
 
   @loginUser
   Scenario Outline: I can restrict which components are permitted to be inside a component collection and a component that must be specifically defined as being allowed to pass validation

src/Mercure/MercureResourcePublisher.php

@@ -29,10 +29,12 @@
 use Symfony\Component\ExpressionLanguage\ExpressionFunction;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Mercure\HubRegistry;
 use Symfony\Component\Mercure\Update;
 use Symfony\Component\Messenger\MessageBusInterface;
+use Symfony\Component\Serializer\Encoder\CsvEncoder;
 use Symfony\Component\Serializer\SerializerAwareInterface;
 use Symfony\Component\Serializer\SerializerAwareTrait;
 
@@ -240,11 +242,13 @@ private function publishUpdate(object $object, array $objectData, string $type):
         } else {
             $resourceClass = $this->getObjectClass($object);
 
-
-            $request = $this->requestStack->getCurrentRequest();
-            $baseContext = $request ? $this->serializerContextBuilder->createFromRequest($request, true) : [];
-            $context = $options['normalization_context'] ?? $this->resourceMetadataFactory->create($resourceClass)->getOperation()->getNormalizationContext() ?? [];
-            $context = array_merge($baseContext, $context);
+            $request = new Request();
+            $attributes = [
+                'operation' => $this->resourceMetadataFactory->create($resourceClass)->getOperation(),
+                'resource_class' => $resourceClass
+            ];
+            $baseContext = $this->serializerContextBuilder->createFromRequest($request, true, $attributes);
+            $context = array_merge($baseContext, $options['normalization_context'] ?? []);
             try {
                 $iri = $options['topics'] ?? $this->iriConverter->getIriFromResource($object, UrlGeneratorInterface::ABS_URL);
                 $data = $options['data'] ?? $this->serializer->serialize($object, key($this->formats), $context);

src/Serializer/ContextBuilder/TimestampedContextBuilder.php

@@ -43,7 +43,7 @@ public function createFromRequest(Request $request, bool $normalization, array $
         } else {
             $context['groups'][] = sprintf('%s:%s:write', $reflectionClass->getShortName(), TimestampedLoader::GROUP_NAME);
         }
-dump($resourceClass, $context['groups']);
+
         return $context;
     }
 }