wip

mpociot · mpociot · commit b7b8a1313d84 · 2019-01-21T23:38:18.000+01:00
diff --git a/composer.json b/composer.json
@@ -17,9 +17,9 @@
     ],
     "require": {
         "php": "^7.1",
-        "illuminate/log": "5.7.*",
         "illuminate/container": "5.7.*",
         "illuminate/database": "^5.7",
+        "illuminate/log": "5.7.*",
         "illuminate/routing": "5.7.*",
         "illuminate/support": "5.7.*",
         "zbateson/mail-mime-parser": "^1.1"
diff --git a/config/mailbox.php b/config/mailbox.php
@@ -6,6 +6,8 @@
 
     'path' => 'laravel-mailbox',
 
+    'retention_in_days' => 1,
+
     'services' => [
 
         'mailgun' => [
diff --git a/src/InboundEmail.php b/src/InboundEmail.php
@@ -13,6 +13,8 @@
 
 class InboundEmail extends Model
 {
+    protected $table = 'mailbox_inbound_emails';
+
     /** @var MimeMessage */
     protected $mimeMessage;
 
@@ -23,10 +25,19 @@ class InboundEmail extends Model
     public static function fromMessage($message)
     {
         return new static([
-            'message' => $message
+            'message' => $message,
         ]);
     }
 
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::creating(function ($model) {
+            $model->message_id = $model->id();
+        });
+    }
+
     public function id(): string
     {
         return $this->message()->getHeaderValue('Message-Id', str_random());
diff --git a/src/MailboxRouter.php b/src/MailboxRouter.php
@@ -53,10 +53,25 @@ protected function createRoute(string $subject, string $pattern, $action)
     public function callMailboxes(InboundEmail $email)
     {
         if ($email->isValid()) {
+
+            if ($this->shouldStoreInboundEmails()) {
+                $this->storeEmail($email);
+            }
+
             $this->routes->match($email)->map(function (MailboxRoute $route) use ($email) {
                 $route->run($email);
             });
         }
     }
 
+    protected function shouldStoreInboundEmails(): bool
+    {
+        return config('mailbox.retention_in_days') > 0;
+    }
+
+    protected function storeEmail(InboundEmail $email)
+    {
+        $email->save();
+    }
+
 }
diff --git a/tests/InboundEmailTest.php b/tests/InboundEmailTest.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace BeyondCode\Mailbox\Tests;
+
+use BeyondCode\Mailbox\Facades\Mailbox;
+use BeyondCode\Mailbox\InboundEmail;
+use Illuminate\Mail\Mailable;
+use Illuminate\Support\Facades\Mail;
+
+class InboundEmailTest extends TestCase
+{
+
+    protected function getEnvironmentSetUp($app)
+    {
+        parent::getEnvironmentSetUp($app);
+
+        $app['config']['mail.driver'] = 'log';
+        $app['config']['mailbox.driver'] = 'log';
+    }
+
+    /** @test */
+    public function it_stores_inbound_emails()
+    {
+        Mailbox::from('example@beyondco.de', function($email) {
+        });
+
+        Mail::to('someone@beyondco.de')->send(new TestMail);
+        Mail::to('someone@beyondco.de')->send(new TestMail);
+
+        $this->assertSame(2, InboundEmail::query()->count());
+    }
+
+}
+
+class TestMail extends Mailable
+{
+    public function build()
+    {
+        $this->from('example@beyondco.de')
+            ->subject('This is a subject')
+            ->html('<html>Example email content</html>');
+    }
+}
