code refactor

Author: marickvantuil

src/Config.php

@@ -9,7 +9,7 @@ class Config
      *
      * @return int
      */
-    public static function maxRetryCount()
+    public static function maxAttemptCount()
     {
         return max(config('laravel-database-emails.retry.attempts', 1), 3);
     }
@@ -59,4 +59,4 @@ public static function cronjobEmailLimit()
     {
         return config('laravel-database-emails.limit', 20);
     }
-}
+}

src/CreateEmailTableCommand.php

@@ -40,7 +40,6 @@ class CreateEmailTableCommand extends Command
      *
      * @param  \Illuminate\Filesystem\Filesystem $files
      * @param  \Illuminate\Support\Composer $composer
-     * @return void
      */
     public function __construct(Filesystem $files, Composer $composer)
     {

src/Decorators/EmailDecorator.php

@@ -2,15 +2,39 @@
 
 namespace Buildcode\LaravelDatabaseEmails;
 
-use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Mail\Message;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Mail;
 use Carbon\Carbon;
 use Exception;
 
+/**
+ * @property $id
+ * @property $label
+ * @property $recipient
+ * @property $cc
+ * @property $bcc
+ * @property $subject
+ * @property $view
+ * @property $variables
+ * @property $body
+ * @property $attempts
+ * @property $sending
+ * @property $failed
+ * @property $error
+ * @property $encrypted
+ * @property $scheduled_at
+ * @property $sent_at
+ * @property $delivered_at
+ */
 class Email extends Model
 {
+    /**
+     * Make sure all encrypted attributes are decrypted.
+     */
+    use HasEncryptedAttributes;
+
     /**
      * The table in which the e-mails are stored.
      *
@@ -62,7 +86,7 @@ public function getLabel()
      */
     public function getRecipient()
     {
-        return $this->getEmailProperty('recipient');
+        return $this->recipient;
     }
 
     /**
@@ -72,12 +96,6 @@ public function getRecipient()
      */
     public function getCc()
     {
-        if ($this->exists) {
-            $cc = $this->getEmailProperty('cc');
-
-            return json_decode($cc, 1);
-        }
-
         return $this->cc;
     }
 
@@ -88,12 +106,6 @@ public function getCc()
      */
     public function getBcc()
     {
-        if ($this->exists) {
-            $bcc = $this->getEmailProperty('bcc');
-
-            return json_decode($bcc, 1);
-        }
-
         return $this->bcc;
     }
 
@@ -104,7 +116,7 @@ public function getBcc()
      */
     public function getSubject()
     {
-        return $this->getEmailProperty('subject');
+        return $this->subject;
     }
 
     /**
@@ -125,16 +137,6 @@ public function getView()
      */
     public function getVariables()
     {
-        if ($this->exists) {
-            $var = $this->getEmailProperty('variables');
-
-            return json_decode($var, 1);
-        }
-
-        if (is_string($this->variables)) {
-            return json_decode($this->variables, 1);
-        }
-
         return $this->variables;
     }
 
@@ -145,7 +147,7 @@ public function getVariables()
      */
     public function getBody()
     {
-        return $this->getEmailProperty('body');
+        return $this->body;
     }
 
     /**
@@ -251,7 +253,7 @@ public function isScheduled()
      */
     public function isEncrypted()
     {
-        return !!$this->encrypted;
+        return !!$this->getOriginal('encrypted');
     }
 
     /**
@@ -274,25 +276,6 @@ public function hasFailed()
         return $this->failed == 1;
     }
 
-    /**
-     * Get a decrypted property.
-     *
-     * @param string $property
-     * @return mixed
-     */
-    private function getEmailProperty($property)
-    {
-        if ($this->exists && $this->isEncrypted()) {
-            try {
-                return decrypt($this->{$property});
-            } catch (DecryptException $e) {
-                return '';
-            }
-        }
-
-        return $this->{$property};
-    }
-
     /**
      * Mark the e-mail as sending.
      *
@@ -318,6 +301,8 @@ public function markAsSent()
         $this->update([
             'sending' => 0,
             'sent_at' => $now,
+            'failed'  => 0,
+            'error'   => '',
         ]);
     }
 
@@ -352,8 +337,8 @@ public function send()
         if (app()->runningUnitTests()) {
             Event::dispatch('before.send');
         }
-        
-        Mail::send([], [], function ($message) {
+
+        Mail::send([], [], function (Message $message) {
             $message->to($this->getRecipient())
                 ->cc($this->hasCc() ? $this->getCc() : [])
                 ->bcc($this->hasBcc() ? $this->getBcc() : [])