diff --git a/app/Console/Commands/Data/CleanStaleDataCommand.php b/app/Console/Commands/Data/CleanStaleDataCommand.php index aad81c1a8..6dd158b3d 100644 --- a/app/Console/Commands/Data/CleanStaleDataCommand.php +++ b/app/Console/Commands/Data/CleanStaleDataCommand.php @@ -7,9 +7,6 @@ use Illuminate\Console\Command; use Carbon\Carbon; use Log; -//Library -use Commands\Library\CommandHelper; - //Models use App\Models\Lookups\AllianceLookup; use App\Models\Lookups\CharacterLookup; @@ -57,9 +54,6 @@ class CleanStaleDataCommand extends Command */ public function handle() { - $command = new CommandHelper; - $command->CleanJobStatusTable(); - //Empty the item lookup table ItemLookup::truncate(); diff --git a/app/Console/Commands/Eve/ItemPricesUpdateCommand.php b/app/Console/Commands/Eve/ItemPricesUpdateCommand.php index db22b7e30..ab62279ef 100644 --- a/app/Console/Commands/Eve/ItemPricesUpdateCommand.php +++ b/app/Console/Commands/Eve/ItemPricesUpdateCommand.php @@ -6,7 +6,6 @@ use Illuminate\Console\Command; //Library use App\Library\Moons\MoonCalc; -use Commands\Library\CommandHelper; //Job use App\Jobs\Commands\Eve\ItemPricesUpdateJob; @@ -46,17 +45,10 @@ class ItemPricesUpdateCommand extends Command { //Declare variables $moonHelper = new MoonCalc; - $task = new CommandHelper('ItemPricesUpdateCommand'); - - //Set the task as started - $task->SetStartStatus(); //Fetch new prices from fuzzwork.co.uk for the item pricing schemes $moonHelper->FetchNewPrices(); - //Set the task as completed - $task->SetStopStatus(); - return 0; } } diff --git a/app/Console/Commands/Finances/UpdateAllianceWalletJournal.php b/app/Console/Commands/Finances/UpdateAllianceWalletJournal.php index cf11946d2..0ea0e40b6 100644 --- a/app/Console/Commands/Finances/UpdateAllianceWalletJournal.php +++ b/app/Console/Commands/Finances/UpdateAllianceWalletJournal.php @@ -9,7 +9,6 @@ use Carbon\Carbon; //Application Library use App\Library\Helpers\FinanceHelper; -use Commands\Library\CommandHelper; //Jobs use App\Jobs\Commands\Finances\UpdateAllianceWalletJournalJob; diff --git a/app/Console/Commands/Library/CommandHelper.php b/app/Console/Commands/Library/CommandHelper.php deleted file mode 100644 index 22acdf761..000000000 --- a/app/Console/Commands/Library/CommandHelper.php +++ /dev/null @@ -1,48 +0,0 @@ -job_name = $name; - $this->job_state = 'Starting'; - $this->system_time = Carbon::now(); - } - - public function SetStartStatus() { - //Add an entry into the jobs table - $job = new ScheduleJob; - $job->job_name = $this->job_name; - $job->job_state = $this->job_state; - $job->system_time = $this->system_time; - $job->save(); - } - - public function SetStopStatus() { - //Mark the job as finished - ScheduleJob::where([ - 'system_time' => $this->system_time, - 'job_name' => $this->job_name, - ])->update([ - 'job_state' => 'Finished', - ]); - } - - public function CleanJobStatusTable() { - //Delete old jobs - ScheduleJob::where(['system_time', '<', Carbon::now()->subMonths(3)])->delete(); - } -} - -?> \ No newline at end of file diff --git a/app/Jobs/Commands/Finances/UpdateAllianceWalletJournalJob.php b/app/Jobs/Commands/Finances/UpdateAllianceWalletJournalJob.php index 3d73942d1..16321837c 100644 --- a/app/Jobs/Commands/Finances/UpdateAllianceWalletJournalJob.php +++ b/app/Jobs/Commands/Finances/UpdateAllianceWalletJournalJob.php @@ -12,7 +12,6 @@ use Carbon\Carbon; //Application Library use App\Library\Helpers\FinanceHelper; -use Commands\Library\CommandHelper; //Models use App\Models\Finances\AllianceWalletJournal; diff --git a/app/Jobs/Commands/MiningTaxes/PreFetchMiningTaxesLedgers.php b/app/Jobs/Commands/MiningTaxes/PreFetchMiningTaxesLedgers.php index 0e34f9320..6e0f8e0f2 100644 --- a/app/Jobs/Commands/MiningTaxes/PreFetchMiningTaxesLedgers.php +++ b/app/Jobs/Commands/MiningTaxes/PreFetchMiningTaxesLedgers.php @@ -10,9 +10,6 @@ use Illuminate\Queue\SerializesModels; use Log; use Carbon\Carbon; -//Application Library -use Commands\Library\CommandHelper; - //Models use App\Models\MiningTax\Observer;