From 6c90f9f642b5249715b7ee5d659a38700358ffcb Mon Sep 17 00:00:00 2001
From: drkthunder02 <mancuso.christopher@gmail.com>
Date: Tue, 18 May 2021 18:08:46 +0900
Subject: [PATCH] fetchminingtaxesobservers

---
 .../MiningTaxes/FetchMiningTaxesObservers.php |  5 +++--
 app/Library/Helpers/StructureHelper.php       | 22 +++++--------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesObservers.php b/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesObservers.php
index beeedd223..6059ab830 100644
--- a/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesObservers.php
+++ b/app/Jobs/Commands/MiningTaxes/FetchMiningTaxesObservers.php
@@ -13,6 +13,7 @@ use Carbon\Carbon;
 //Application Library
 use Seat\Eseye\Exceptions\RequestFailedException;
 use App\Library\Esi\Esi;
+use App\Library\Helpers\LookupHelper;
 use App\Library\Helpers\StructureHelper;
 
 //Models
@@ -103,7 +104,7 @@ class FetchMiningTaxesObservers implements ShouldQueue
                         'observer_name' => $structureInfo->name,
                         'last_updated' => $observer->last_updated,
                         'solar_system_id' => $structureInfo->solar_system_id,
-                        'solar_system_name' => $sHelper->GetSolarSystemName($structureInfo->solar_system_id),
+                        'solar_system_name' => $lookup->SystemIdToName($structureInfo->solar_system_id),
                     ]);
                 } else {
                     //Add a new observer into the observer table
@@ -113,7 +114,7 @@ class FetchMiningTaxesObservers implements ShouldQueue
                     $newObs->observer_name = $structureInfo->name;
                     $newObs->last_updated = $observer->last_updated;
                     $newObs->solar_system_id = $structureInfo->solar_system_id;
-                    $newObs->solar_system_name = $sHelper->GetSolarSystemName($structureInfo->solar_system_id);
+                    $newObs->solar_system_name = $lookup->SystemIdToName($structureInfo->solar_system_id);
                     $newObs->save();
                 }
             }            
diff --git a/app/Library/Helpers/StructureHelper.php b/app/Library/Helpers/StructureHelper.php
index 39fcbcd8e..675765b29 100644
--- a/app/Library/Helpers/StructureHelper.php
+++ b/app/Library/Helpers/StructureHelper.php
@@ -14,7 +14,7 @@ use Log;
 use App\Jobs\Library\JobHelper;
 use Seat\Eseye\Exceptions\RequestFailedException;
 use App\Library\Esi\Esi;
-use App\Library\Lookups\LookupHelper;
+use App\Library\Helpers\LookupHelper;
 
 //App Models
 use App\Models\Jobs\JobStatus;
@@ -73,19 +73,6 @@ class StructureHelper {
         }
     }
 
-    public function GetSolarSystemName($systemId) {
-        //Declare some variables
-        $lookup = new LookupHelper;
-
-        $solar = $lookup->SystemIdToName($systemId);
-
-        if($solar != null) {
-            return $solar;
-        } else {
-            return null;
-        }
-    }
-
     public function GetStructureName($structureId) {
         try {
             $info = $this->esi->invoke('get', '/universe/structures/{structure_id}/', [
@@ -248,12 +235,13 @@ class StructureHelper {
     }
 
     private function SaveNewStructure($structure, $info) {
+        //Declare helper variable needed
+        $lookup = new LookupHelper;
 
         if(isset($info->solar_system_id)) {
-            $solarName = $this->GetSolarSystemName($info->solar_system_id);
+            $solarName = $lookup->SolarSystemIdToName($info->solar_system_id);
         } else {
-            Log::critical("Couldn't get solar system name for structure " . $structure->structure_id);
-            Log::critical("Check access lists.");
+            Log::critical("Couldn't get solar system name for structure " . $structure->structure_id . " in SaveNewStructure in StructureHelper.php");
             $solarName = null;
         }