Merge pull request #23 from PcComponentes/feature/allow_set_up_aggreg…

…ate_message_occurred_on_format feat: allow set up aggregate message occurred on format
PcComponentes · Sep 20, 2022 · 178ae62 · 178ae62
2 parents 9e68c73 + 3ea5e4c
commit 178ae62
Show file tree

Hide file tree

Showing 9 changed files with 130 additions and 27 deletions.
diff --git a/composer.json b/composer.json
@@ -25,11 +25,12 @@
   },
   "require": {
     "ext-amqp": "*",
-    "php": "^7.4 || ^8.0",
+    "php": "^8.0",
     "pccomponentes/ddd-logging": "^2.1",
-    "pccomponentes/ddd": "^2.0 || 3.0 || 3.1",
+    "pccomponentes/ddd": "^4.0",
     "beberlei/assert": "^3.2",
-    "ramsey/uuid": "^4.0"
+    "ramsey/uuid": "^4.0",
+    "symfony/framework-bundle": "^4.4|^5.0"
   },
   "require-dev": {
     "pccomponentes/coding-standard": "^1.0",

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -0,0 +1,34 @@
+<?php
+declare(strict_types=1);
+
+namespace PcComponentes\SymfonyMessengerBundle\DependencyInjection;
+
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+
+final class Configuration implements ConfigurationInterface
+{
+    public function getConfigTreeBuilder(): TreeBuilder
+    {
+        $treeBuilder = new TreeBuilder('symfony_messenger');
+        $treeBuilder->getRootNode()
+            ->children()
+                ->arrayNode('aggregate_message')
+                    ->children()
+                        ->arrayNode('occurred_on')
+                            ->addDefaultsIfNotSet()
+                            ->children()
+                                ->enumNode('format')
+                                ->values(['U', 'U.v', 'U.u'])
+                                ->defaultValue('U')
+                                ->end()
+                            ->end()
+                        ->end()
+                    ->end()
+                ->end()
+            ->end()
+        ->end();
+
+        return $treeBuilder;
+    }
+}
diff --git a/src/DependencyInjection/SerializerCompilerPass.php b/src/DependencyInjection/SerializerCompilerPass.php
@@ -3,8 +3,6 @@
 
 namespace PcComponentes\SymfonyMessengerBundle\DependencyInjection;
 
-use PcComponentes\Ddd\Util\Message\Serialization\JsonApi\AggregateMessageJsonApiSerializable;
-use PcComponentes\Ddd\Util\Message\Serialization\JsonApi\AggregateMessageStreamDeserializer;
 use PcComponentes\Ddd\Util\Message\Serialization\JsonApi\SimpleMessageJsonApiSerializable;
 use PcComponentes\Ddd\Util\Message\Serialization\JsonApi\SimpleMessageStreamDeserializer;
 use PcComponentes\DddLogging\DomainTrace\Tracker;
@@ -30,15 +28,6 @@ public function process(ContainerBuilder $container): void
                     new Reference('pccom.messenger_bundle.aggregate_message.serializer.stream_deserializer'),
                 ],
             ),
-            'pccom.messenger_bundle.aggregate_message.serializer.json_api_serializer' => new Definition(
-                AggregateMessageJsonApiSerializable::class,
-            ),
-            'pccom.messenger_bundle.aggregate_message.serializer.stream_deserializer' => new Definition(
-                AggregateMessageStreamDeserializer::class,
-                [
-                    new Reference('pccom.messenger_bundle.mapping_registry.aggregate_message'),
-                ],
-            ),
         ]);
 
         $container->addDefinitions([

diff --git a/src/DependencyInjection/SymfonyMessengerExtension.php b/src/DependencyInjection/SymfonyMessengerExtension.php
@@ -0,0 +1,38 @@
+<?php
+declare(strict_types=1);
+
+namespace PcComponentes\SymfonyMessengerBundle\DependencyInjection;
+
+use PcComponentes\Ddd\Util\Message\Serialization\JsonApi\AggregateMessageJsonApiSerializable;
+use PcComponentes\Ddd\Util\Message\Serialization\JsonApi\AggregateMessageStreamDeserializer;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Extension\Extension;
+use Symfony\Component\DependencyInjection\Reference;
+
+final class SymfonyMessengerExtension extends Extension
+{
+    public function load(array $configs, ContainerBuilder $container)
+    {
+        $configuration = new Configuration();
+        $config = $this->processConfiguration($configuration, $configs);
+
+        $occurredOnFormat = $config['aggregate_message']['occurred_on']['format'];
+
+        $container->addDefinitions([
+            'pccom.messenger_bundle.aggregate_message.serializer.json_api_serializer' => new Definition(
+                AggregateMessageJsonApiSerializable::class,
+                [
+                    $occurredOnFormat,
+                ],
+            ),
+            'pccom.messenger_bundle.aggregate_message.serializer.stream_deserializer' => new Definition(
+                AggregateMessageStreamDeserializer::class,
+                [
+                    new Reference('pccom.messenger_bundle.mapping_registry.aggregate_message'),
+                    $occurredOnFormat,
+                ],
+            ),
+        ]);
+    }
+}
diff --git a/src/Middleware/SimpleMessagePublisherMiddleware.php b/src/Middleware/SimpleMessagePublisherMiddleware.php
@@ -31,6 +31,7 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope
 
         foreach ($commandsResult as $commands) {
             if (null === $commands) {
+
                 continue;
             }
 

diff --git a/src/Serializer/AggregateMessageSerializer.php b/src/Serializer/AggregateMessageSerializer.php
@@ -42,7 +42,11 @@ public function decode(array $encodedEnvelope): Envelope
         } catch (MessageClassNotFoundException $exception) {
             throw new MessageDecodingFailedException('Message class not found', 0, $exception);
         } catch (Throwable $exception) {
-            throw new MessageDecodingFailedException('Unable to instantiate class for message. ' . $exception->getMessage(), 0, $exception);
+            throw new MessageDecodingFailedException(
+                'Unable to instantiate class for message. ' . $exception->getMessage(),
+                0,
+                $exception,
+            );
         }
 
         $this->obtainDomainTrace($aggregateMessage, $encodedEnvelope);
@@ -84,7 +88,7 @@ private function streamFromEncodedEnvelope(array $encodedEnvelope): AggregateMes
         return new AggregateMessageStream(
             $aggregateMessage['message_id'],
             $aggregateMessage['attributes']['aggregate_id'],
-            (int) $aggregateMessage['occurred_on'],
+            (float) $aggregateMessage['occurred_on'],
             $aggregateMessage['type'],
             self::AGGREGATE_VERSION,
             \json_encode($aggregateMessage['attributes']),
@@ -126,7 +130,7 @@ private function streamFromLegacyEncodedEnvelope(array $encodedEnvelope): Aggreg
         return new AggregateMessageStream(
             $aggregateMessage['message_id'],
             $aggregateMessage['aggregate_id'],
-            $occurredOn->getTimestamp(),
+            (float) $occurredOn->getTimestamp(),
             $aggregateMessage['name'],
             self::AGGREGATE_VERSION,
             \json_encode($aggregateMessage['payload']),

diff --git a/src/Serializer/DomainSerializer.php b/src/Serializer/DomainSerializer.php
@@ -68,12 +68,13 @@ protected function buildRetryCountFromDeathHeader(array $encodedEnvelope): int
         }
 
         $retryCount = 0;
+
         foreach ($encodedEnvelope['headers']['x-death'] as $death) {
             if (false === \array_key_exists('count', $death)) {
                 continue;
             }
 
-            $retryCount = $retryCount + (int) $death['count'];
+            $retryCount += (int) $death['count'];
         }
 
         return $retryCount;
@@ -83,7 +84,9 @@ protected function extractEnvelopeRetryCount(Envelope $envelope): int
     {
         $retryCountStamp = $envelope->last(RedeliveryStamp::class);
 
-        return null !== $retryCountStamp ? $retryCountStamp->getRetryCount() : 0;
+        return null !== $retryCountStamp
+            ? $retryCountStamp->getRetryCount()
+            : 0;
     }
 
     private function getCorrelationId(array $encodedEnvelope): string

diff --git a/src/Serializer/SimpleMessageSerializer.php b/src/Serializer/SimpleMessageSerializer.php
@@ -39,7 +39,11 @@ public function decode(array $encodedEnvelope): Envelope
         } catch (MessageClassNotFoundException $exception) {
             throw new MessageDecodingFailedException('Message class not found', 0, $exception);
         } catch (Throwable $exception) {
-            throw new MessageDecodingFailedException('Unable to instantiate class for message. ' . $exception->getMessage(), 0, $exception);
+            throw new MessageDecodingFailedException(
+                'Unable to instantiate class for message. ' . $exception->getMessage(),
+                0,
+                $exception,
+            );
         }
 
         $this->obtainDomainTrace($simpleMessage, $encodedEnvelope);

diff --git a/tests/Middleware/SimpleMessagePublisherMiddlewareTest.php b/tests/Middleware/SimpleMessagePublisherMiddlewareTest.php
@@ -5,6 +5,7 @@
 
 use PcComponentes\Ddd\Domain\Model\ValueObject\DateTimeValueObject;
 use PcComponentes\Ddd\Domain\Model\ValueObject\Uuid;
+use PcComponentes\Ddd\Util\Message\ValueObject\AggregateId;
 use PcComponentes\SymfonyMessengerBundle\Bus\AllHandledStampExtractor;
 use PcComponentes\SymfonyMessengerBundle\Middleware\SimpleMessagePublisherMiddleware;
 use PcComponentes\SymfonyMessengerBundle\Tests\Mock\CommandMock;
@@ -33,7 +34,14 @@ public function test_given_converters_dispatch_only_one_command_per_converter_th
         $firstMessageId = Uuid::v4();
         $secondMessageId = Uuid::v4();
 
-        $envelope = new Envelope(EventMock::fromPayload(Uuid::v4(), Uuid::v4(), DateTimeValueObject::now(), []));
+        $envelope = new Envelope(
+            EventMock::fromPayload(
+                Uuid::v4(),
+                AggregateId::from(Uuid::v4()->value()),
+                DateTimeValueObject::now(),
+                [],
+            ),
+        );
         $envelope = $envelope->with(
             new HandledStamp(CommandMock::fromPayload($firstMessageId, []), 'ConverterA'),
             new HandledStamp(CommandMock::fromPayload($secondMessageId, []), 'ConverterB'),
@@ -51,7 +59,14 @@ public function test_given_converters_dispatch_one_command_and_the_other_does_no
     {
         $firstMessageId = Uuid::v4();
 
-        $envelope = new Envelope(EventMock::fromPayload(Uuid::v4(), Uuid::v4(), DateTimeValueObject::now(), []));
+        $envelope = new Envelope(
+            EventMock::fromPayload(
+                Uuid::v4(),
+                AggregateId::from(Uuid::v4()->value()),
+                DateTimeValueObject::now(),
+                [],
+            ),
+        );
         $envelope = $envelope->with(
             new HandledStamp(CommandMock::fromPayload($firstMessageId, []), 'ConverterA'),
             new HandledStamp(null, 'ConverterB'),
@@ -70,13 +85,20 @@ public function test_given_converters_dispatch_both_one_command_and_an_array_of_
         $secondMessageId = Uuid::v4();
         $thirdMessageId = Uuid::v4();
 
-        $envelope = new Envelope(EventMock::fromPayload(Uuid::v4(), Uuid::v4(), DateTimeValueObject::now(), []));
+        $envelope = new Envelope(
+            EventMock::fromPayload(
+                Uuid::v4(),
+                AggregateId::from(Uuid::v4()->value()),
+                DateTimeValueObject::now(),
+                [],
+            ),
+        );
         $envelope = $envelope->with(
             new HandledStamp(CommandMock::fromPayload($firstMessageId, []), 'ConverterA'),
             new HandledStamp([
-                    CommandMock::fromPayload($secondMessageId, []),
-                    CommandMock::fromPayload($thirdMessageId, []),
-                ],
+                CommandMock::fromPayload($secondMessageId, []),
+                CommandMock::fromPayload($thirdMessageId, []),
+            ],
                 'ConverterB'
             ),
         );
@@ -96,7 +118,14 @@ public function test_given_converters_dispatch_both_one_command_and_an_array_of_
         $secondMessageId = Uuid::v4();
         $thirdMessageId = Uuid::v4();
 
-        $envelope = new Envelope(EventMock::fromPayload(Uuid::v4(), Uuid::v4(), DateTimeValueObject::now(), []));
+        $envelope = new Envelope(
+            EventMock::fromPayload(
+                Uuid::v4(),
+                AggregateId::from(Uuid::v4()->value()),
+                DateTimeValueObject::now(),
+                [],
+            ),
+        );
         $envelope = $envelope->with(
             new HandledStamp(CommandMock::fromPayload($firstMessageId, []), 'ConverterA'),
             new HandledStamp([
-Original file line number
+Diff line change
@@ Expand Up @@
             foreach ($commandsResult as $commands) {
                 if (null === $commands) {
                     continue;
                 }
@@ Expand Down @@