drkthunder02/w4rpservices
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

re-arranged function

Browse Source
This commit is contained in:
drkthunder02
2019-05-30 02:46:53 -05:00
parent 2ae0b3f97d
commit 82c9f6d762
2 changed files with 50 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Console/Commands/GetStructures.php
View File

@@ -97,8 +97,7 @@ class GetStructuresCommand extends Command
$totalPages = 1;
try {
$structures = $esi->page($currentPage)
->invoke('get', '/corporations/{corporation_id}/structures/', [
$structures = $esi->invoke('get', '/corporations/{corporation_id}/structures/', [
'corporation_id' => $corpId,
]);
} catch (RequestFailedException $e) {
@@ -111,7 +110,7 @@ class GetStructuresCommand extends Command
$job->charId = $charId;
$job->corpId = $corpId;
$job->page = $i;
ProcessStructureJob::dispatch($job)->onQueue('default');
ProcessStructureJob::dispatch($job)->onQueue('structures');
}
//Mark the job as finished

72
app/Library/Structures/StructureHelper.php
View File

@@ -31,35 +31,24 @@ use App\Models\Esi\EsiScope;
class StructureHelper {
public function Start($charId, $corpId, $page) {
//Setup the esi authentication container
$config = config('esi');
//Get the refresh token from the database
$token = EsiToken::where(['character_id' => $charId])->get(['refresh_token']);
$authentication = new EsiAuthentication([
'client_id' => $config['client_id'],
'secret' => $config['secret'],
'refresh_token' => $token[0]->refresh_token,
]);
$esi = new Eseye($authentication);
$structures = $this->GetListOfStructures($page, $corpId, $esi);
$structures = $this->GetListOfStructures($page, $corpId);
foreach($structures as $structure) {
$info = $this->GetStructureInfo($structure->structure_id, $esi);
if(isset($info->solar_system_id)) {
$solarName = $this->GetSolarSystemName($info->solar_system_id, $esi);
} else {
Log::critical("Couldn't get solar system name for structure " . $structure->structure_id);
Log::critical("Check access lists.");
$solarName = null;
}
$info = $this->GetStructureInfo($structure->structure_id);
//Record the structure information into the database
//Find if the structure exists
$found = Structure::where(['structure_id' => $structure->structure_id])->get();
if(!$found) {
if(isset($info->solar_system_id)) {
$solarName = $this->GetSolarSystemName($info->solar_system_id);
} else {
Log::critical("Couldn't get solar system name for structure " . $structure->structure_id);
Log::critical("Check access lists.");
$solarName = null;
}
$sHelper->StoreNewStructure($structure, $info, $solarName);
} else {
$sHelper->UpdateExistingStructure($structure, $info, $solarName);
@@ -150,7 +139,18 @@ class StructureHelper {
$struct->save();
}
private function GetSolarSystemName($systemId, $esi) {
private function GetSolarSystemName($systemId) {
//Setup the esi authentication container
$config = config('esi');
//Get the refresh token from the database
$token = EsiToken::where(['character_id' => $charId])->get(['refresh_token']);
$authentication = new EsiAuthentication([
'client_id' => $config['client_id'],
'secret' => $config['secret'],
'refresh_token' => $token[0]->refresh_token,
]);
$esi = new Eseye($authentication);
//Attempt to get the solar system name from ESI
try {
@@ -168,7 +168,19 @@ class StructureHelper {
}
}
private function GetStructureInfo($structureId, $esi) {
private function GetStructureInfo($structureId) {
//Setup the esi authentication container
$config = config('esi');
//Get the refresh token from the database
$token = EsiToken::where(['character_id' => $charId])->get(['refresh_token']);
$authentication = new EsiAuthentication([
'client_id' => $config['client_id'],
'secret' => $config['secret'],
'refresh_token' => $token[0]->refresh_token,
]);
$esi = new Eseye($authentication);
try {
$info = $esi->invoke('get', '/universe/structures/{structure_id}/', [
'structure_id' => $structureId,
@@ -185,7 +197,19 @@ class StructureHelper {
return $info;
}
private function GetListOfStructures($page, $corpId, $esi) {
private function GetListOfStructures($page, $corpId) {
//Setup the esi authentication container
$config = config('esi');
//Get the refresh token from the database
$token = EsiToken::where(['character_id' => $charId])->get(['refresh_token']);
$authentication = new EsiAuthentication([
'client_id' => $config['client_id'],
'secret' => $config['secret'],
'refresh_token' => $token[0]->refresh_token,
]);
$esi = new Eseye($authentication);
try {
$structures = $esi->page($page)
->invoke('get', '/corporations/{corporation_id}/structures/', [