Merge pull request #4 from TheDoctor0/feature-track-email-subjects

Add feature subject.
akhan619 · Apr 5, 2023 · 39f0e03 · 39f0e03
2 parents a5ce237 + 1c3bccd
commit 39f0e03
Show file tree

Hide file tree

Showing 26 changed files with 80 additions and 22 deletions.
diff --git a/database/factories/EmailFactory.php b/database/factories/EmailFactory.php
@@ -28,6 +28,7 @@ public function definition()
             'message_id'    => $this->faker->uuid(),
             'email'         => $this->faker->unique()->safeEmail(),
             'name'          => $this->faker->name(),
+            'subject'       => $this->faker->sentence(),
         ];
     }
 

diff --git a/database/migrations/add_subject_to_emails_table.php.stub b/database/migrations/add_subject_to_emails_table.php.stub
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table(config('laravel-ses-event-manager.database_name_prefix') . '_emails', function (Blueprint $table) {
+            $table->string('subject')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table(config('laravel-ses-event-manager.database_name_prefix') . '_emails', function (Blueprint $table) {
+            $table->dropColumn('subject');
+        });
+    }
+};
diff --git a/src/App/Models/Email.php b/src/App/Models/Email.php
@@ -43,6 +43,7 @@ protected static function newFactory()
         'message_id',
         'email',
         'name',
+        'subject',
         'has_send',
         'has_rendering_failure',
         'has_reject',
@@ -64,6 +65,7 @@ protected static function newFactory()
         'message_id'                => 'string',
         'email'                     => 'string',
         'name'                      => 'string',
+        'subject'                   => 'string',
         'has_send'                  => 'boolean',
         'has_rendering_failure'     => 'boolean',
         'has_reject'                => 'boolean',

diff --git a/src/Implementations/SesMailer.php b/src/Implementations/SesMailer.php
@@ -134,7 +134,7 @@ public function isMessageSent($result): bool
     }
 
     /**
-     * Save the email in the databse.
+     * Save the email in the database.
      *
      * @return void
      */
@@ -149,6 +149,7 @@ public function createEmailRecord($result): void
                 'message_id'        => $result->getOriginalMessage()->getHeaders()->get('X-SES-Message-ID')->getValue(),
                 'email'             => current($result->getOriginalMessage()->getTo())->getAddress(),
                 'name'              => current($result->getOriginalMessage()->getTo())->getName(),
+                'subject'           => $result->getOriginalMessage()->getSubject(),
             ]);
         }
     }

diff --git a/src/LaravelSesEventManagerServiceProvider.php b/src/LaravelSesEventManagerServiceProvider.php
@@ -90,6 +90,7 @@ protected function bootForConsole(): void
             __DIR__.'/../database/migrations/create_email_rendering_failures_table.php.stub' => database_path('migrations/'.date('Y_m_d_His', now()->addSeconds(8)->timestamp).'_create_'.config('laravel-ses-event-manager.database_name_prefix').'_email_rendering_failures_table.php'),
             __DIR__.'/../database/migrations/create_email_delivery_delays_table.php.stub'    => database_path('migrations/'.date('Y_m_d_His', now()->addSeconds(9)->timestamp).'_create_'.config('laravel-ses-event-manager.database_name_prefix').'_email_delivery_delays_table.php'),
             __DIR__.'/../database/migrations/create_email_subscriptions_table.php.stub'      => database_path('migrations/'.date('Y_m_d_His', now()->addSeconds(10)->timestamp).'_create_'.config('laravel-ses-event-manager.database_name_prefix').'_email_subscriptions_table.php'),
+            __DIR__.'/../database/migrations/add_subject_to_emails_table.php.stub'           => database_path('migrations/'.date('Y_m_d_His', now()->addSeconds(11)->timestamp).'_create_'.config('laravel-ses-event-manager.database_name_prefix').'_add_subject_to_emails_table.php'),
         ], self::PREFIX.'-migrations');
     }
 

diff --git a/tests/Feature/Implementations/EventManagerBounceTest.php b/tests/Feature/Implementations/EventManagerBounceTest.php
@@ -25,6 +25,7 @@ protected function setUp(): void
         $this->tables = [];
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_emails_table.php.stub';
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_email_bounces_table.php.stub';
+        $this->tables[] = include __DIR__.'/../../../database/migrations/add_subject_to_emails_table.php.stub';
         $this->emailTable = config('laravel-ses-event-manager.database_name_prefix').'_emails';
         $this->bounceTable = config('laravel-ses-event-manager.database_name_prefix').'_email_bounces';
 
@@ -35,7 +36,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        foreach ($this->tables as $table) {
+        foreach (array_reverse($this->tables) as $table) {
             $table->down();
         }
 

diff --git a/tests/Feature/Implementations/EventManagerClickTest.php b/tests/Feature/Implementations/EventManagerClickTest.php
@@ -25,6 +25,7 @@ protected function setUp(): void
         $this->tables = [];
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_emails_table.php.stub';
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_email_clicks_table.php.stub';
+        $this->tables[] = include __DIR__.'/../../../database/migrations/add_subject_to_emails_table.php.stub';
         $this->emailTable = config('laravel-ses-event-manager.database_name_prefix').'_emails';
         $this->clickTable = config('laravel-ses-event-manager.database_name_prefix').'_email_clicks';
 
@@ -35,7 +36,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        foreach ($this->tables as $table) {
+        foreach (array_reverse($this->tables) as $table) {
             $table->down();
         }
 

diff --git a/tests/Feature/Implementations/EventManagerComplaintTest.php b/tests/Feature/Implementations/EventManagerComplaintTest.php
@@ -25,6 +25,7 @@ protected function setUp(): void
         $this->tables = [];
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_emails_table.php.stub';
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_email_complaints_table.php.stub';
+        $this->tables[] = include __DIR__.'/../../../database/migrations/add_subject_to_emails_table.php.stub';
         $this->emailTable = config('laravel-ses-event-manager.database_name_prefix').'_emails';
         $this->complaintTable = config('laravel-ses-event-manager.database_name_prefix').'_email_complaints';
 
@@ -35,7 +36,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        foreach ($this->tables as $table) {
+        foreach (array_reverse($this->tables) as $table) {
             $table->down();
         }
 

diff --git a/tests/Feature/Implementations/EventManagerDeliveryDelayTest.php b/tests/Feature/Implementations/EventManagerDeliveryDelayTest.php
@@ -25,6 +25,7 @@ protected function setUp(): void
         $this->tables = [];
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_emails_table.php.stub';
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_email_delivery_delays_table.php.stub';
+        $this->tables[] = include __DIR__.'/../../../database/migrations/add_subject_to_emails_table.php.stub';
         $this->emailTable = config('laravel-ses-event-manager.database_name_prefix').'_emails';
         $this->delayTable = config('laravel-ses-event-manager.database_name_prefix').'_email_delivery_delays';
 
@@ -35,7 +36,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        foreach ($this->tables as $table) {
+        foreach (array_reverse($this->tables) as $table) {
             $table->down();
         }
 

diff --git a/tests/Feature/Implementations/EventManagerDeliveryTest.php b/tests/Feature/Implementations/EventManagerDeliveryTest.php
@@ -25,6 +25,7 @@ protected function setUp(): void
         $this->tables = [];
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_emails_table.php.stub';
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_email_deliveries_table.php.stub';
+        $this->tables[] = include __DIR__.'/../../../database/migrations/add_subject_to_emails_table.php.stub';
         $this->emailTable = config('laravel-ses-event-manager.database_name_prefix').'_emails';
         $this->deliveryTable = config('laravel-ses-event-manager.database_name_prefix').'_email_deliveries';
 
@@ -35,7 +36,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        foreach ($this->tables as $table) {
+        foreach (array_reverse($this->tables) as $table) {
             $table->down();
         }
 

diff --git a/tests/Feature/Implementations/EventManagerOpenTest.php b/tests/Feature/Implementations/EventManagerOpenTest.php
@@ -25,6 +25,7 @@ protected function setUp(): void
         $this->tables = [];
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_emails_table.php.stub';
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_email_opens_table.php.stub';
+        $this->tables[] = include __DIR__.'/../../../database/migrations/add_subject_to_emails_table.php.stub';
         $this->emailTable = config('laravel-ses-event-manager.database_name_prefix').'_emails';
         $this->openTable = config('laravel-ses-event-manager.database_name_prefix').'_email_opens';
 
@@ -35,7 +36,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        foreach ($this->tables as $table) {
+        foreach (array_reverse($this->tables) as $table) {
             $table->down();
         }
 

diff --git a/tests/Feature/Implementations/EventManagerRejectTest.php b/tests/Feature/Implementations/EventManagerRejectTest.php
@@ -25,6 +25,7 @@ protected function setUp(): void
         $this->tables = [];
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_emails_table.php.stub';
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_email_rejects_table.php.stub';
+        $this->tables[] = include __DIR__.'/../../../database/migrations/add_subject_to_emails_table.php.stub';
         $this->emailTable = config('laravel-ses-event-manager.database_name_prefix').'_emails';
         $this->rejectTable = config('laravel-ses-event-manager.database_name_prefix').'_email_rejects';
 
@@ -35,7 +36,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        foreach ($this->tables as $table) {
+        foreach (array_reverse($this->tables) as $table) {
             $table->down();
         }
 

diff --git a/tests/Feature/Implementations/EventManagerRenderingFailureTest.php b/tests/Feature/Implementations/EventManagerRenderingFailureTest.php
@@ -25,6 +25,7 @@ protected function setUp(): void
         $this->tables = [];
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_emails_table.php.stub';
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_email_rendering_failures_table.php.stub';
+        $this->tables[] = include __DIR__.'/../../../database/migrations/add_subject_to_emails_table.php.stub';
         $this->emailTable = config('laravel-ses-event-manager.database_name_prefix').'_emails';
         $this->renderingTable = config('laravel-ses-event-manager.database_name_prefix').'_email_rendering_failures';
 
@@ -35,7 +36,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        foreach ($this->tables as $table) {
+        foreach (array_reverse($this->tables) as $table) {
             $table->down();
         }
 

diff --git a/tests/Feature/Implementations/EventManagerSendTest.php b/tests/Feature/Implementations/EventManagerSendTest.php
@@ -25,6 +25,7 @@ protected function setUp(): void
         $this->tables = [];
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_emails_table.php.stub';
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_email_sends_table.php.stub';
+        $this->tables[] = include __DIR__.'/../../../database/migrations/add_subject_to_emails_table.php.stub';
         $this->emailTable = config('laravel-ses-event-manager.database_name_prefix').'_emails';
         $this->sendTable = config('laravel-ses-event-manager.database_name_prefix').'_email_sends';
 
@@ -35,7 +36,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        foreach ($this->tables as $table) {
+        foreach (array_reverse($this->tables) as $table) {
             $table->down();
         }
 

diff --git a/tests/Feature/Implementations/EventManagerSubscriptionTest.php b/tests/Feature/Implementations/EventManagerSubscriptionTest.php
@@ -25,6 +25,7 @@ protected function setUp(): void
         $this->tables = [];
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_emails_table.php.stub';
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_email_subscriptions_table.php.stub';
+        $this->tables[] = include __DIR__.'/../../../database/migrations/add_subject_to_emails_table.php.stub';
         $this->emailTable = config('laravel-ses-event-manager.database_name_prefix').'_emails';
         $this->subscriptionTable = config('laravel-ses-event-manager.database_name_prefix').'_email_subscriptions';
 
@@ -35,7 +36,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        foreach ($this->tables as $table) {
+        foreach (array_reverse($this->tables) as $table) {
             $table->down();
         }
 

diff --git a/tests/Unit/Models/EmailBounceTest.php b/tests/Unit/Models/EmailBounceTest.php
@@ -19,6 +19,7 @@ protected function setUp(): void
         $this->tables = [];
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_emails_table.php.stub';
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_email_bounces_table.php.stub';
+        $this->tables[] = include __DIR__.'/../../../database/migrations/add_subject_to_emails_table.php.stub';
 
         foreach ($this->tables as $table) {
             $table->up();
@@ -27,7 +28,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        foreach ($this->tables as $table) {
+        foreach (array_reverse($this->tables) as $table) {
             $table->down();
         }
 

diff --git a/tests/Unit/Models/EmailClickTest.php b/tests/Unit/Models/EmailClickTest.php
@@ -19,6 +19,7 @@ protected function setUp(): void
         $this->tables = [];
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_emails_table.php.stub';
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_email_clicks_table.php.stub';
+        $this->tables[] = include __DIR__.'/../../../database/migrations/add_subject_to_emails_table.php.stub';
 
         foreach ($this->tables as $table) {
             $table->up();
@@ -27,7 +28,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        foreach ($this->tables as $table) {
+        foreach (array_reverse($this->tables) as $table) {
             $table->down();
         }
 

diff --git a/tests/Unit/Models/EmailComplaintTest.php b/tests/Unit/Models/EmailComplaintTest.php
@@ -19,6 +19,7 @@ protected function setUp(): void
         $this->tables = [];
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_emails_table.php.stub';
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_email_complaints_table.php.stub';
+        $this->tables[] = include __DIR__.'/../../../database/migrations/add_subject_to_emails_table.php.stub';
 
         foreach ($this->tables as $table) {
             $table->up();
@@ -27,7 +28,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        foreach ($this->tables as $table) {
+        foreach (array_reverse($this->tables) as $table) {
             $table->down();
         }
 

diff --git a/tests/Unit/Models/EmailDeliveryDelayTest.php b/tests/Unit/Models/EmailDeliveryDelayTest.php
@@ -19,6 +19,7 @@ protected function setUp(): void
         $this->tables = [];
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_emails_table.php.stub';
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_email_delivery_delays_table.php.stub';
+        $this->tables[] = include __DIR__.'/../../../database/migrations/add_subject_to_emails_table.php.stub';
 
         foreach ($this->tables as $table) {
             $table->up();
@@ -27,7 +28,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        foreach ($this->tables as $table) {
+        foreach (array_reverse($this->tables) as $table) {
             $table->down();
         }
 

diff --git a/tests/Unit/Models/EmailDeliveryTest.php b/tests/Unit/Models/EmailDeliveryTest.php
@@ -19,6 +19,7 @@ protected function setUp(): void
         $this->tables = [];
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_emails_table.php.stub';
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_email_deliveries_table.php.stub';
+        $this->tables[] = include __DIR__.'/../../../database/migrations/add_subject_to_emails_table.php.stub';
 
         foreach ($this->tables as $table) {
             $table->up();
@@ -27,7 +28,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        foreach ($this->tables as $table) {
+        foreach (array_reverse($this->tables) as $table) {
             $table->down();
         }
 

diff --git a/tests/Unit/Models/EmailOpenTest.php b/tests/Unit/Models/EmailOpenTest.php
@@ -19,6 +19,7 @@ protected function setUp(): void
         $this->tables = [];
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_emails_table.php.stub';
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_email_opens_table.php.stub';
+        $this->tables[] = include __DIR__.'/../../../database/migrations/add_subject_to_emails_table.php.stub';
 
         foreach ($this->tables as $table) {
             $table->up();
@@ -27,7 +28,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        foreach ($this->tables as $table) {
+        foreach (array_reverse($this->tables) as $table) {
             $table->down();
         }
 

diff --git a/tests/Unit/Models/EmailRejectTest.php b/tests/Unit/Models/EmailRejectTest.php
@@ -19,6 +19,7 @@ protected function setUp(): void
         $this->tables = [];
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_emails_table.php.stub';
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_email_rejects_table.php.stub';
+        $this->tables[] = include __DIR__.'/../../../database/migrations/add_subject_to_emails_table.php.stub';
 
         foreach ($this->tables as $table) {
             $table->up();
@@ -27,7 +28,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        foreach ($this->tables as $table) {
+        foreach (array_reverse($this->tables) as $table) {
             $table->down();
         }
 

diff --git a/tests/Unit/Models/EmailRenderingFailureTest.php b/tests/Unit/Models/EmailRenderingFailureTest.php
@@ -19,6 +19,7 @@ protected function setUp(): void
         $this->tables = [];
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_emails_table.php.stub';
         $this->tables[] = include __DIR__.'/../../../database/migrations/create_email_rendering_failures_table.php.stub';
+        $this->tables[] = include __DIR__.'/../../../database/migrations/add_subject_to_emails_table.php.stub';
 
         foreach ($this->tables as $table) {
             $table->up();
@@ -27,7 +28,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        foreach ($this->tables as $table) {
+        foreach (array_reverse($this->tables) as $table) {
             $table->down();
         }