modified schedule to remove PI transacitons.
This commit is contained in:
@@ -21,7 +21,6 @@ class Kernel extends ConsoleKernel
|
|||||||
Commands\UpdateMoonPriceCommand::class,
|
Commands\UpdateMoonPriceCommand::class,
|
||||||
Commands\HoldingFinancesCommand::class,
|
Commands\HoldingFinancesCommand::class,
|
||||||
Commands\MoonMailerCommand::class,
|
Commands\MoonMailerCommand::class,
|
||||||
Commands\PiTransactionsCommand::class,
|
|
||||||
Commands\GetStructuresCommand::class,
|
Commands\GetStructuresCommand::class,
|
||||||
Commands\GetAssetsCommand::class,
|
Commands\GetAssetsCommand::class,
|
||||||
Commands\GetEveContractsCommand::class,
|
Commands\GetEveContractsCommand::class,
|
||||||
@@ -48,9 +47,6 @@ class Kernel extends ConsoleKernel
|
|||||||
$schedule->command('services:MoonMailer')
|
$schedule->command('services:MoonMailer')
|
||||||
->monthlyOn(1, '00:01')
|
->monthlyOn(1, '00:01')
|
||||||
->withoutOverlapping();
|
->withoutOverlapping();
|
||||||
$schedule->command('services:PiTransactions')
|
|
||||||
->hourly()
|
|
||||||
->withoutOverlapping();
|
|
||||||
$schedule->command('services:GetStructures')
|
$schedule->command('services:GetStructures')
|
||||||
->dailyAt('09:00')
|
->dailyAt('09:00')
|
||||||
->withoutOverlapping();
|
->withoutOverlapping();
|
||||||
|
|||||||
@@ -1,75 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Jobs;
|
|
||||||
|
|
||||||
//Internal Libraries
|
|
||||||
use Illuminate\Bus\Queueable;
|
|
||||||
use Illuminate\Queue\SerializesModels;
|
|
||||||
use Illuminate\Queue\InteractsWithQueue;
|
|
||||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
|
||||||
use Illuminate\Foundation\Bus\Dispatchable;
|
|
||||||
use Log;
|
|
||||||
|
|
||||||
//App Library
|
|
||||||
use App\Library\Finances\Helper\FinanceHelper;
|
|
||||||
use App\Jobs\Library\JobHelper;
|
|
||||||
|
|
||||||
//App Models
|
|
||||||
use App\Models\Jobs\JobProcessWalletTransaction;
|
|
||||||
use App\Models\Jobs\JobStatus;
|
|
||||||
|
|
||||||
class ProcessWalletTransactionJob implements ShouldQueue
|
|
||||||
{
|
|
||||||
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Timeout in seconds
|
|
||||||
*
|
|
||||||
* @var int
|
|
||||||
*/
|
|
||||||
public $timeout = 3600;
|
|
||||||
|
|
||||||
public $tries = 3;
|
|
||||||
|
|
||||||
private $division;
|
|
||||||
private $charId;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a new job instance.
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
public function __construct(JobProcessWalletTransaction $pwt)
|
|
||||||
{
|
|
||||||
$this->division = $pwt->division;
|
|
||||||
$this->charId = $pwt->charId;
|
|
||||||
|
|
||||||
$this->connection = 'redis';
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Execute the job.
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
public function handle()
|
|
||||||
{
|
|
||||||
//Declare the class variables
|
|
||||||
$finance = new FinanceHelper();
|
|
||||||
|
|
||||||
$exception = $finance->GetWalletTransaction($this->division, $this->charId);
|
|
||||||
|
|
||||||
//After the job is completed, delete the job
|
|
||||||
$this->delete();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The job failed to process
|
|
||||||
*
|
|
||||||
* @param Exception $exception
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
public function failed($exception) {
|
|
||||||
Log::critical($exception);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -41,65 +41,6 @@ use Seat\Eseye\Exceptions\RequestFailedException;
|
|||||||
|
|
||||||
class FinanceHelper {
|
class FinanceHelper {
|
||||||
|
|
||||||
public function GetWalletTransaction($division, $charId) {
|
|
||||||
//Declare the class helpers
|
|
||||||
$lookups = new LookupHelper();
|
|
||||||
$esiHelper = new Esi();
|
|
||||||
|
|
||||||
//Setup array for PI items
|
|
||||||
$pi_items = $this->GetPIMaterialsArray();
|
|
||||||
|
|
||||||
//Get the ESI refresh token for the corporation to add new wallet journals into the database
|
|
||||||
$hasScope = $esiHelper->HaveEsiScope($charId, 'esi-wallet.read_corporation_wallets.v1');
|
|
||||||
if($hasScope == false) {
|
|
||||||
Log::critical('Esi scope check for esi-wallet.read_corporation_wallets.v1 has failed for character id: ' . $hcarId);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
$token = $esiHelper->GetRefreshToken($charId);
|
|
||||||
if($token == null) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
//Reference to see if the character is in our look up table for corporations and characters
|
|
||||||
$corpId = $lookups->LookupCharacter($charId);
|
|
||||||
|
|
||||||
//Create an ESI authentication container
|
|
||||||
$config = config('esi');
|
|
||||||
$authentication = new EsiAuthentication([
|
|
||||||
'client_id' => $config['client_id'],
|
|
||||||
'secret' => $config['secret'],
|
|
||||||
'refresh_token' => $token,
|
|
||||||
]);
|
|
||||||
|
|
||||||
//Create the esi class varialble
|
|
||||||
$esi = new Eseye($authentication);
|
|
||||||
|
|
||||||
//Get the entries of the journal for transactions
|
|
||||||
try {
|
|
||||||
$journals = $esi->invoke('get', '/corporations/{corporation_id}/wallets/{division}/transactions/', [
|
|
||||||
'corporation_id' => 98287666,
|
|
||||||
'division' => 5,
|
|
||||||
]);
|
|
||||||
} catch(RequestFailedException $e) {
|
|
||||||
Log::critical($e->getEsiResponse());
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
//Decode the wallet from json into an array
|
|
||||||
$wallet = json_decode($journals->raw, true);
|
|
||||||
|
|
||||||
//For each transactional entry, attempt to store it in the database.
|
|
||||||
//The PutWalletJournal function checks to see if it's already in the database.
|
|
||||||
foreach($wallet as $entry) {
|
|
||||||
if($division == 5 && $charId == 94415555) {
|
|
||||||
if(in_array($entry['type_id'], $pi_items, false)) {
|
|
||||||
$pi = new PISale();
|
|
||||||
$pi->InsertPISale($entry, 98287666);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public function GetWalletJournal($division, $charId) {
|
public function GetWalletJournal($division, $charId) {
|
||||||
//Declare new class variables
|
//Declare new class variables
|
||||||
$market = new MarketTax();
|
$market = new MarketTax();
|
||||||
|
|||||||
Reference in New Issue
Block a user