From 71a567e923186fc3573fd5ea73e6146a78461ff5 Mon Sep 17 00:00:00 2001
From: drkthunder02 <mancuso.christopher@gmail.com>
Date: Mon, 22 Feb 2021 20:27:40 +0900
Subject: [PATCH] fetch mining taxes ledgers job

---
 app/Console/Commands/MiningTaxes/MiningTaxesObservers.php | 2 +-
 .../Commands/MiningTaxes/FetchMiningTaxesLedgersJob.php   | 8 +++-----
 .../Commands/MiningTaxes/FetchMiningTaxesObserversJob.php | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/Console/Commands/MiningTaxes/MiningTaxesObservers.php b/app/Console/Commands/MiningTaxes/MiningTaxesObservers.php
index c68492214..807d68a52 100644
--- a/app/Console/Commands/MiningTaxes/MiningTaxesObservers.php
+++ b/app/Console/Commands/MiningTaxes/MiningTaxesObservers.php
@@ -104,7 +104,7 @@ class MiningTaxesObservers extends Command
         /**
          * Cleanup stale data that hasn't been updated in at least 1 week.
          */
-        $date = Carbon::now()->subMonths(2);
+        $date = Carbon::now()->subDays(60);
         Observer::where('last_updated', '<', $date)->delete();
 
 
diff --git a/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesLedgersJob.php b/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesLedgersJob.php
index 0fc0b85e1..f8362acd0 100644
--- a/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesLedgersJob.php
+++ b/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesLedgersJob.php
@@ -85,9 +85,6 @@ class FetchMiningTaxesLedgersJob implements ShouldQueue
         //Declare variables
         $lookup = new LookupHelper;
         $mHelper = new MoonCalc;
-        $final = array();
-        $items = array();
-        $notSorted = array();
 
         //Get the ledger from ESI
         try {
@@ -104,7 +101,9 @@ class FetchMiningTaxesLedgersJob implements ShouldQueue
         foreach($ledgers as $ledger) {
             //Get some basic information we need to work with
             $charName = $lookup->CharacterIdToName($ledger->character_id);
-            $typeName = $lookup->ItemIdToName($ledger->ore);
+            //Get the type name from the ledger ore stuff
+            $typeName = $lookup->ItemIdToName($ledger->type_id);
+            //Decode the date and store it.
             $updated = $this->esi->DecodeDate($ledger->last_updated);
 
             $price = $mHelper->CalculateOrePrice($ledger->type_id);
@@ -134,6 +133,5 @@ class FetchMiningTaxesLedgersJob implements ShouldQueue
 
         //Clean up old data
         Ledger::where(['updated_at', '<', Carbon::now()->subDays(120)])->delete();
-        
     }
 }
diff --git a/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesObserversJob.php b/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesObserversJob.php
index 031b21188..505c3d506 100644
--- a/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesObserversJob.php
+++ b/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesObserversJob.php
@@ -110,7 +110,7 @@ class FetchMiningTaxesObserversJob implements ShouldQueue
         /**
          * Cleanup stale data that hasn't been updated in at least 1 week.
          */
-        $date = Carbon::now()->subDay(7);
+        $date = Carbon::now()->subDays(60);
         Observer::where('updated_at', '<', $date)->delete();
     }
 }