Email: queued_at field (populated if email is queued by email composer)

Author: vkislichenko

database/migrations/2021_12_02_21000_add_queued_at_to_emails_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddQueuedAtToEmailsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if (Schema::hasColumn('emails', 'queued_at')) {
+            return;
+        }
+
+        Schema::table('emails', function (Blueprint $table) {
+            $table->timestamp('queued_at')->after('encrypted')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

src/Email.php

@@ -23,6 +23,7 @@
  * @property $failed
  * @property $error
  * @property $encrypted
+ * @property $queued_at
  * @property $scheduled_at
  * @property $sent_at
  * @property $delivered_at
@@ -277,6 +278,30 @@ public function getAttempts()
         return $this->attempts;
     }
 
+    /**
+     * Get the queued date.
+     *
+     * @return mixed
+     */
+    public function getQueuedDate()
+    {
+        return $this->queued_at;
+    }
+
+    /**
+     * Get the queued date as a Carbon instance.
+     *
+     * @return Carbon
+     */
+    public function getQueuedDateAsCarbon()
+    {
+        if ($this->queued_at instanceof Carbon) {
+            return $this->queued_at;
+        }
+
+        return Carbon::parse($this->queued_at);
+    }
+
     /**
      * Get the scheduled date.
      *

src/Preparer.php

@@ -36,6 +36,8 @@ public function prepare(EmailComposer $composer)
         $this->prepareScheduled($composer);
 
         $this->prepareImmediately($composer);
+
+        $this->prepareQueued($composer);
     }
 
     /**
@@ -235,4 +237,19 @@ private function prepareImmediately(EmailComposer $composer)
             $composer->getEmail()->fill(['sending' => 1]);
         }
     }
+
+    /**
+     * Prepare the queued date.
+     *
+     * @param EmailComposer $composer
+     */
+    private function prepareQueued(EmailComposer $composer)
+    {
+        if ($this->getData('queued', false) === true) {
+            $composer->getEmail()->fill([
+                'queued_at' => Carbon::now()->toDateTimeString(),
+            ]);
+        }
+    }
+
 }

src/Store.php

@@ -19,6 +19,7 @@ public function getQueue()
         return $query
             ->whereNull('deleted_at')
             ->whereNull('sent_at')
+            ->whereNull('queued_at')
             ->where(function ($query) {
                 $query->whereNull('scheduled_at')
                     ->orWhere('scheduled_at', '<=', Carbon::now()->toDateTimeString());