From 241aa23af873a503deb2527508c98eb4a4457a33 Mon Sep 17 00:00:00 2001
From: drkthunder02 <mancuso.christopher@gmail.com>
Date: Sat, 4 May 2019 00:24:01 -0500
Subject: [PATCH] job updates

---
 app/Console/Commands/calculatemarkettax.php |  3 +--
 app/Jobs/SendEveMail.php                    | 24 +++++++++++++++------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/Console/Commands/calculatemarkettax.php b/app/Console/Commands/calculatemarkettax.php
index 3100749d1..0c3a26035 100644
--- a/app/Console/Commands/calculatemarkettax.php
+++ b/app/Console/Commands/calculatemarkettax.php
@@ -94,9 +94,8 @@ class CalculateMarketTaxCommand extends Command
                         '<br>Please remit to Spatial Forces';
             $mail->recipient = (int)$info->character_id;
             $mail->recipient_type = 'character';
-            $mail->save();
 
-            SendEveMail::dispatch($mail)->delay(Carbon::now()->addSeconds(15));
+            SendEveMail::dispatch($mail);
         }
         
         //Mark the job as finished
diff --git a/app/Jobs/SendEveMail.php b/app/Jobs/SendEveMail.php
index 41f2dce18..d3e2fd350 100644
--- a/app/Jobs/SendEveMail.php
+++ b/app/Jobs/SendEveMail.php
@@ -16,7 +16,7 @@ use Seat\Eseye\Exceptions\RequestFailedException;
 use App\Models\Esi\EsiScope;
 use App\Models\Esi\EsiToken;
 
-use App\Models\Mail\EveMail as EveMailModel;
+use App\Models\Mail\EveMail;
 
 class SendEveMail implements ShouldQueue
 {
@@ -41,13 +41,23 @@ class SendEveMail implements ShouldQueue
      */
     public $retries = 3;
 
+    private $body;
+    private $recipient;
+    private $recipient_type;
+    private $subject;
+
     /**
      * Create a new job instance.
      *
      * @return void
      */
-    public function __construct(EveMailModel $mail) {
-        $this->eveMail = $mail;
+    public function __construct(EveMail $mail) {
+        $this->body = $mail->body;
+        $this->recipient = $mail->recipient;
+        $this->recipient_type = $mail->recipient_type;
+        $this->subject = $mail->subject;
+        
+        $this->connection = 'database';
     }
 
     /**
@@ -78,12 +88,12 @@ class SendEveMail implements ShouldQueue
         try {
             $esi->setBody([
                 'approved_cost' => 0,
-                'body' => $this->eveMail->body,
+                'body' => $this->body,
                 'recipients' => [[
-                    'recipient_id' => (int)$this->eveMail->recipient,
-                    'recipient_type' => $this->eveMail->recipient_type,
+                    'recipient_id' => (int)$this->recipient,
+                    'recipient_type' => $this->recipient_type,
                 ]],
-                'subject' => $this->eveMail->subject,
+                'subject' => $this->subject,
             ])->invoke('post', '/characters/{character_id}/mail/', [
                 'character_id'=> 93738489,
             ]);