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

created the job for fetch moon ledger

Browse Source
This commit is contained in:
drkthunder02
2020-05-10 18:46:58 -05:00
parent 1d19732eeb
commit b7291a93b7
5 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/Jobs/Commands/FetchMoonLedgerJob.php
View File

@@ -92,6 +92,7 @@ class FetchMoonLedgerJob implements ShouldQueue
])->get(); ])->get();
foreach($observers as $observer) { foreach($observers as $observer) {
//Try to get the ledger data from the esi
try { try {
$ledgers = $esi->invoke('get', '/corporation/{corporation_id}/mining/observers/{observer_id}/', [ $ledgers = $esi->invoke('get', '/corporation/{corporation_id}/mining/observers/{observer_id}/', [
'corporation_id' => $character->corporation_id, 'corporation_id' => $character->corporation_id,
@@ -111,9 +112,31 @@ class FetchMoonLedgerJob implements ShouldQueue
$charInfo = $lookup->GetCharacterInfo($ledger->character_id); $charInfo = $lookup->GetCharacterInfo($ledger->character_id);
//Get the corporation info from the lookup helper //Get the corporation info from the lookup helper
$corpInfo = $lookup->GetCorporationInfo($charInfo->corporation_id); $corpInfo = $lookup->GetCorporationInfo($charInfo->corporation_id);
//Get the recorded corporation information
$recordedCorpInfo = $lookup->GetCorporationInfo($ledger->recorded_corporation_id);
$entries[] = [
'corporation_id' => $corpInfo->corporation_id,
'corporation_name' => $corpInfo->name,
'character_id' => $charInfo->character_id,
'character_name' => $charInfo->name,
'observer_id' => $observer->observer_id,
'observer_name' => $observer->observer_name,
'type_id' => $ledger->type_id,
'ore' => $ore,
'quantity' => $ledger->quantity,
'recorded_corporation_id' => $ledger->recorded_corporation_id,
'recorded_corporation_name' => $recordedCorpInfo->name,
'last_updated' => $ledger->last_updated,
'created_at' => $ledger->last_updated . ' 23:59:59',
'updated_at' => $ledger->last_updated . ' 23:59:59',
];
} }
//Insert or ignore each entry into the database
CorpMoonLedger::insertOrIgnore($entries);
Log::info('FetchMoonLedgerJob inserted up to ' . count($entries) . 'into the database.');
} }
} }
} }

2
app/Jobs/Commands/FetchMoonObserversJob.php
View File

@@ -98,7 +98,7 @@ class FetchMoonObserversJob implements ShouldQueue
CorpMoonObserver::where([ CorpMoonObserver::where([
'observer_id' => $observer->observer_id, 'observer_id' => $observer->observer_id,
])->update([ ])->update([
'last_updated' => $esi->DecodeDate($observer->last_updated), 'last_updated' => $observer->last_updated,
]); ]);
} }
} }

15
app/Jobs/Commands/MoonRentalInvoiceJob.php → app/Jobs/Commands/MoonRentalInvoiceVerify.php
View File

@@ -8,22 +8,9 @@ use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Foundation\Bus\Dispatchable;
class MoonRentalInvoiceJob implements ShouldQueue class MoonRentalInvoiceVerify implements ShouldQueue
{ {
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
/**
* Timeout in seconds
*
* @var int
*/
public $timeout = 3600;
/**
* Retries
*
* @var int
*/
public $retries = 3;
/** /**
* Create a new job instance. * Create a new job instance.

16
app/Jobs/Commands/FetchRentalMoonLedgerJob.php → app/Jobs/Commands/Not Used/FetchRentalMoonLedgerJob.php
View File

@@ -85,7 +85,10 @@ class FetchRentalMoonLedgerJob implements ShouldQueue
//Foreach observer get the ledger //Foreach observer get the ledger
foreach($observers as $observer) { foreach($observers as $observer) {
//Get the observer name. //Get the observer name.
$observerInfo = Structure::where([
'structure_id' => $observer->observer_id,
])->first();
try { try {
$ledgers = $esi->invoke('get', '/corporation/{corporation_id}/mining/observers/{observer_id}/', [ $ledgers = $esi->invoke('get', '/corporation/{corporation_id}/mining/observers/{observer_id}/', [
'corporation_id' => $character->corporation_id, 'corporation_id' => $character->corporation_id,
@@ -106,18 +109,21 @@ class FetchRentalMoonLedgerJob implements ShouldQueue
//Get the corporation information //Get the corporation information
$corpInfo = $lookup->GetCorporationInfo($charInfo->corporation_id); $corpInfo = $lookup->GetCorporationInfo($charInfo->corporation_id);
//Get the recorded corporation information
$recordedCorpInfo = $lookup->GetCorporationInfo($ledger->recorded_corporation_id);
$entries[] = [ $entries[] = [
'corporation_id' => $corpId, 'corporation_id' => $corpInfo->corporation_id,
'corporation_name' => $corpName, 'corporation_name' => $corpInfo->name,
'character_id' => $ledger->character_id, 'character_id' => $ledger->character_id,
'character_name' => $charInfo->name, 'character_name' => $charInfo->name,
'observer_id' => $observer->observer_id, 'observer_id' => $observer->observer_id,
'observer_name' => $observerName, 'observer_name' => $observerInfo->name,
'type_id' => $ledger->type_id, 'type_id' => $ledger->type_id,
'ore' => $ore, 'ore' => $ore,
'quantity' => $ledger->quantity, 'quantity' => $ledger->quantity,
'recorded_corporation_id' => $ledger->recorded_corporation_id, 'recorded_corporation_id' => $ledger->recorded_corporation_id,
'recorded_corporation_name' => $recordedCorpName, 'recorded_corporation_name' => $recordedCorpInfo->name,
'last_updated' => $ledger->last_updated, 'last_updated' => $ledger->last_updated,
'created_at' => $ledger->last_updated . ' 23:59:59', 'created_at' => $ledger->last_updated . ' 23:59:59',
'updated_at' => $ledger->last_updated . ' 23:59:59', 'updated_at' => $ledger->last_updated . ' 23:59:59',

0
app/Jobs/Commands/FetchRentalMoonObserversJob.php → app/Jobs/Commands/Not Used/FetchRentalMoonObserversJob.php
View File