add pre_handle event

Consumer/EventConsumer.php

@@ -5,6 +5,7 @@
 use Arthem\Bundle\RabbitBundle\Consumer\Event\EventMessage;
 use Arthem\Bundle\RabbitBundle\Consumer\Event\EventMessageHandlerInterface;
 use Arthem\Bundle\RabbitBundle\Consumer\Exception\MessageResponseException;
+use Arthem\Bundle\RabbitBundle\Event\PreHandleEvent;
 use Arthem\Bundle\RabbitBundle\Event\TerminateEvent;
 use Exception;
 use OldSound\RabbitMqBundle\RabbitMq\ConsumerInterface;
@@ -35,41 +36,44 @@ public function addHandler(string $name, EventMessageHandlerInterface $handler)
 
     public function processMessage(AMQPMessage $message): int
     {
-        $message = EventMessage::fromJson($message->getBody());
-        if (!$message instanceof EventMessage) {
+        $event = EventMessage::fromJson($message->getBody());
+        if (!$event instanceof EventMessage) {
             throw new Exception(sprintf('$message is not an instance of %s', EventMessage::class));
         }
 
-        if (!isset($this->handlers[$message->getType()])) {
-            throw new Exception(sprintf('No handler found for type "%s"', $message->getType()));
+        if (!isset($this->handlers[$event->getType()])) {
+            throw new Exception(sprintf('No handler found for type "%s"', $event->getType()));
         }
 
         /** @var EventMessageHandlerInterface $handler */
-        $handler = $this->handlers[$message->getType()];
+        $handler = $this->handlers[$event->getType()];
 
-        $this->logger->info(sprintf('Consume event message "%s"', $message->getType()), [
-            'payload' => $message->getPayload(),
+        $this->eventDispatcher->dispatch(new PreHandleEvent($event), PreHandleEvent::NAME);
+
+        $this->logger->info(sprintf('Consume event message "%s"', $event->getType()), [
+            'payload' => $event->getPayload(),
         ]);
 
         $handler->preHandle();
 
         try {
             try {
-                $handler->handle($message);
+                $handler->handle($event);
                 $response = ConsumerInterface::MSG_ACK;
             } catch (MessageResponseException $e) {
                 $response = $e->getResponse();
             }
         } catch (Throwable $e) {
             $handler->postHandle();
-            $this->eventDispatcher->dispatch(new TerminateEvent(), TerminateEvent::NAME);
+            $this->eventDispatcher->dispatch(new TerminateEvent($event), TerminateEvent::NAME);
             throw $e;
         }
 
         $handler->postHandle();
-        $this->eventDispatcher->dispatch(new TerminateEvent(), TerminateEvent::NAME);
 
-        $this->logger->info(sprintf('Message "%s" consumed with response %s', $message->getType(), $response));
+        $this->logger->info(sprintf('Message "%s" consumed with response %s', $event->getType(), $response));
+
+        $this->eventDispatcher->dispatch(new TerminateEvent($event), TerminateEvent::NAME);
 
         return $response;
     }

Event/AbstractEvent.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Arthem\Bundle\RabbitBundle\Event;
+
+use Arthem\Bundle\RabbitBundle\Consumer\Event\EventMessage;
+use Symfony\Contracts\EventDispatcher\Event;
+
+abstract class AbstractEvent extends Event
+{
+    private EventMessage $eventMessage;
+
+    public function __construct(EventMessage $eventMessage)
+    {
+        $this->eventMessage = $eventMessage;
+    }
+
+    public function getEventMessage(): EventMessage
+    {
+        return $this->eventMessage;
+    }
+}

Event/PreHandleEvent.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Arthem\Bundle\RabbitBundle\Event;
+
+class PreHandleEvent extends AbstractEvent
+{
+    const NAME = 'rabbit_handler.pre_handle';
+}

Event/TerminateEvent.php

@@ -4,9 +4,7 @@
 
 namespace Arthem\Bundle\RabbitBundle\Event;
 
-use Symfony\Contracts\EventDispatcher\Event;
-
-class TerminateEvent extends Event
+class TerminateEvent extends AbstractEvent
 {
     const NAME = 'rabbit_handler.terminate';
 }