This commit is contained in:
2021-05-24 21:24:17 +09:00
parent 8d5ba9c42e
commit b48b118032
4 changed files with 84 additions and 7 deletions

View File

@@ -12,10 +12,12 @@ use Illuminate\Support\Str;
//Application Library //Application Library
use App\Library\Helpers\LookupHelper; use App\Library\Helpers\LookupHelper;
use App\Library\Esi\Esi;
//Models //Models
use App\Models\MiningTax\Invoice; use App\Models\MiningTax\Invoice;
use App\Models\MiningTax\Ledger; use App\Models\MiningTax\Ledger;
use App\Models\MiningTax\Observer;
use App\Models\User\UserAlt; use App\Models\User\UserAlt;
use App\Models\User\User; use App\Models\User\User;
@@ -31,10 +33,6 @@ class TestController extends Controller
return view('test.char.display')->with('char', $char); return view('test.char.display')->with('char', $char);
} }
public function CharacterLookupTest(Request $request) {
}
public function DebugMiningTaxesInvoices() { public function DebugMiningTaxesInvoices() {
$lookup = new LookupHelper; $lookup = new LookupHelper;
$ledgers = new Collection; $ledgers = new Collection;
@@ -69,7 +67,7 @@ class TestController extends Controller
'amount' => $row->amount, 'amount' => $row->amount,
'invoiced' => $row->invoiced, 'invoiced' => $row->invoiced,
'invoice_id' => $row->invoice_id, 'invoice_id' => $row->invoice_id,
]) ]);
} }
} }
@@ -92,7 +90,7 @@ class TestController extends Controller
'amount' => $row->amount, 'amount' => $row->amount,
'invoiced' => $row->invoiced, 'invoiced' => $row->invoiced,
'invoice_id' => $row->invoice_id, 'invoice_id' => $row->invoice_id,
]) ]);
} }
} }
} }
@@ -101,6 +99,58 @@ class TestController extends Controller
return view('test.miningtax.invoice')->with('ledgers', $ledgers); return view('test.miningtax.invoice')->with('ledgers', $ledgers);
} }
public function DebugMiningObservers() {
$ledgers = new Collection;
$lookup = new LookupHelper;
$config = config('esi');
$esiHelper = new Esi;
$refreshToken = $esiHelper->GetRefreshToken($config['primary']);
$esi = $esiHelper->SetupEsiAuthentication($refreshToken);
$response = $esi->invoke('get', '/corporation/{corporation_id}/mining/observers/', [
'corporation' => $config['corporation'],
]);
$resp = json_decode($response->raw, true);
$currentPage = 1;
$totalPages = 1;
foreach($observers as $observer) {
do {
if($esiHelper->TokenExpired($refreshToken)) {
$refreshToken = $esiHelper->GetRefreshToken($config['primary']);
$esi = $esiHelper->SetupEsiAuthentication($refreshToken);
}
$response = $esi->page($currentPage)
->invoke('get', '/corporation/{corporation_id}/mining/observers/{observer_id}', [
'corporation_id' => $config['corporation'],
'observer_id' => $observer['observer_id'],
]);
if($currentPage == 1) {
$totalPages = $response->pages;
}
$tempLedgers = json_decode($response->raw, true);
foreach($tempLedgers as $ledg) {
$ledgers->push([
'observer_id' => $observer['observer_id'],
'character_id' => $ledg['character_id'],
'last_updated' => $ledg['last_updated'],
'type_id' => $ledg['type_id'],
'quantity' => $ledg['quantity'],
]);
}
} while($currentPage <= $totalPages);
}
return view('test.miningtax.observers')->with('ledgers', $ledgers);
}
public function DebugMiningTaxes($invoiceId) { public function DebugMiningTaxes($invoiceId) {
$invoice = array(); $invoice = array();
$ores = array(); $ores = array();

View File

@@ -105,7 +105,7 @@ class FetchMiningTaxesLedgers implements ShouldQueue
* library functionality. * library functionality.
*/ */
if($esiHelper->TokenExpired($refreshToken)) { if($esiHelper->TokenExpired($refreshToken)) {
$refreshToken = $esiHelper->GetRefreshToken($charId); $refreshToken = $esiHelper->GetRefreshToken($this->charId);
$esi = $esiHelper->SetupEsiAuthentication($refreshToken); $esi = $esiHelper->SetupEsiAuthentication($refreshToken);
} }

View File

@@ -0,0 +1,26 @@
@extends('layouts.user.dashb4')
@section('content')
<br>
<div class="container">
<table class="table table-striped table-bordered">
<thead>
<th>Observer Id</th>
<th>Character Id</th>
<th>Last Updated</th>
<th>Type Id</th>
<th>Quantity</th>
</thead>
<tbody>
@foreach($ledgers as $ledger)
<tr>
<td>{{ $ledger['observer_id'] }}</td>
<td>{{ $ledger['character_id'] }}</td>
<td>{{ $ledger['last_updated'] }}</td>
<td>{{ $ledger['type_id'] }}</td>
<td>{{ $ledger['quantity'] }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
@endsection

View File

@@ -149,6 +149,7 @@ Route::group(['middleware' => ['auth']], function(){
*/ */
Route::get('/test/char/display', 'Test\TestController@displayCharTest'); Route::get('/test/char/display', 'Test\TestController@displayCharTest');
Route::get('/test/miningtax/invoice', 'Test\TestController@DebugMiningTaxesInvoices'); Route::get('/test/miningtax/invoice', 'Test\TestController@DebugMiningTaxesInvoices');
Route::get('/test/miningtax/observers', 'Test\TestController@DebugMiningObservers');
}); });