Allow nullable values and check for request keys

Author: seinoxygen

database/migrations/create_elastic_email_hits_table.php.stub

@@ -24,8 +24,8 @@ class CreateElasticEmailHitsTable extends Migration
 
         Schema::create('elastic_email_outbound', function (Blueprint $table) {
             $table->id();
-            $table->string('message_id')->unique();
-            $table->uuid('transaction_id')->unique();
+            $table->string('message_id')->nullable()->unique();
+            $table->uuid('transaction_id')->nullable()->unique();
             $table->string('from');
             $table->string('to');
             $table->string('cc')->nullable();

src/Listeners/OnEmailSent.php

@@ -16,8 +16,8 @@ public function handle(MessageSent $event)
         $body           = $this->parseBodyText($event->message->getBody());
 
         $log = ElasticEmailOutbound::create([
-            'message_id' => $event->message->getHeaders()->get('X-Message-ID')->getFieldBody() ?? null,
-            'transaction_id' => $event->message->getHeaders()->get('X-Transaction-ID')->getFieldBody() ?? null,
+            'message_id' => !is_null($event->message->getHeaders()->get('X-Message-ID')) ? $event->message->getHeaders()->get('X-Message-ID')->getFieldBody() : null,
+            'transaction_id' => !is_null($event->message->getHeaders()->get('X-Transaction-ID')) ? $event->message->getHeaders()->get('X-Transaction-ID')->getFieldBody() : null,
             'from' => $from[0],
             'to' => json_encode($toArr),
             'cc' => $ccArr ? json_encode($ccArr) : NULL,

src/Listeners/OnWebhookCall.php

@@ -12,6 +12,11 @@ class OnWebhookCall
     public function handle(WebhookCallReceived $event)
     {
         if (config('elasticemail.save_hits')) {
+            
+            if(!isset($event->request->transaction) || !isset($event->request->messageid)){
+                return false;
+            }
+
             ElasticEmailHit::create([
                 'transaction_id' => $event->request->transaction,
                 'message_id' => $event->request->messageid,