diff --git a/app/Console/Commands/MiningTaxes/MiningTaxesObservers.php b/app/Console/Commands/MiningTaxes/MiningTaxesObservers.php index 8dc5e90de..8f3b2436a 100644 --- a/app/Console/Commands/MiningTaxes/MiningTaxesObservers.php +++ b/app/Console/Commands/MiningTaxes/MiningTaxesObservers.php @@ -96,14 +96,14 @@ class MiningTaxesObservers extends Command $sHelper = new StructureHelper($config['primary'], $config['corporation']); //Get the structure name from the universe endpoint to store in the database - $observerInfo = $sHelper->GetStructureInfo($observer->observer_id); + $observerName = $sHelper->GetStructureName($observer->observer_id); Observer::updateOrInsert([ 'observer_id' => $observer->observer_id, ], [ 'observer_id' => $observer->observer_id, 'observer_type' => $observer->observer_type, - 'observer_name' => $observerInfo->name, + 'observer_name' => $observerName, 'last_updated' => $observer->last_updated, ]); } diff --git a/app/Library/Helpers/StructureHelper.php b/app/Library/Helpers/StructureHelper.php index 0998d8358..7602019eb 100644 --- a/app/Library/Helpers/StructureHelper.php +++ b/app/Library/Helpers/StructureHelper.php @@ -87,9 +87,23 @@ class StructureHelper { } } + public function GetStructureName($structureId) { + try { + $info = $this->esi->invoke('get', '/universe/structures/{structure_id}/', [ + 'structure_id' => $structureId, + ]); + } catch(RequestFailedException $e) { + Log::warning("Failed to get structure information for structure with id " . $structureId); + Log::warning($e->getCode()); + Log::warning($e->getMessage()); + Log::warning($e->getEsiResponse()); + $info = null; + } + + return $info->name; + } + public function GetStructureInfo($structureId) { - //Declare some variables - $esiHelper = new Esi; try { $info = $this->esi->invoke('get', '/universe/structures/{structure_id}/', [ 'structure_id' => $structureId,