Extract only the hash to make it fit the database field

Author: seinoxygen

src/Listeners/OnEmailSent.php

@@ -15,9 +15,10 @@ public function handle(MessageSent $event)
         $from           = $this->parseAddresses($event->message->getFrom());
         $body           = $this->parseBodyText($event->message->getBody());
 
+        
         $log = ElasticEmailOutbound::create([
-            'message_id' => !is_null($event->message->getHeaders()->get('X-Message-ID')) ? $event->message->getHeaders()->get('X-Message-ID')->getFieldBody() : $event->message->getId(),
-            'transaction_id' => !is_null($event->message->getHeaders()->get('X-Transaction-ID')) ? $event->message->getHeaders()->get('X-Transaction-ID')->getFieldBody() : $event->message->getId(),
+            'message_id' => !is_null($event->message->getHeaders()->get('X-Message-ID')) ? $event->message->getHeaders()->get('X-Message-ID')->getFieldBody() : $this->parseMessageId($event->message->getId()),
+            'transaction_id' => !is_null($event->message->getHeaders()->get('X-Transaction-ID')) ? $event->message->getHeaders()->get('X-Transaction-ID')->getFieldBody() : $this->parseMessageId($event->message->getId()),
             'from' => $from[0],
             'to' => json_encode($toArr),
             'cc' => $ccArr ? json_encode($ccArr) : NULL,
@@ -34,6 +35,11 @@ public function handle(MessageSent $event)
         return false;
     }
 
+    private function parseMessageId($messageId): string
+    {
+        return explode('@', $messageId)[0];
+    }
+
     private function parseAddresses(array $array): array
     {
         $parsed = [];