Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-10 08:24:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

INA-5 | Refactor of the Scheduler Job, removed unused parts of the code

Browse Source
This commit is contained in:
Nikola Cirkovic 2022-05-30 20:52:12 +02:00
parent 876cb3d93c
commit b0ca7ea1cc
1 changed files with 34 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
app/Jobs/Ninja/TaskScheduler.php
View File

@ -14,8 +14,6 @@ namespace App\Jobs\Ninja;
use App\Jobs\Report\SendToAdmin; use App\Jobs\Report\SendToAdmin;
use App\Libraries\MultiDB; use App\Libraries\MultiDB;
use App\Models\Company;
use App\Models\ScheduledJob;
use App\Models\Scheduler; use App\Models\Scheduler;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
@ -46,22 +44,18 @@ class TaskScheduler implements ShouldQueue
*/ */
public function handle() public function handle()
{ {
foreach (MultiDB::$dbs as $db) foreach (MultiDB::$dbs as $db)
{ {
MultiDB::setDB($db); MultiDB::setDB($db);
$pending_schedulers = $this->fetchJobs(); Scheduler::with('company')
Scheduler::with('company','job')
->where('paused', false) ->where('paused', false)
->where('is_deleted', false) ->where('is_deleted', false)
->where('scheduled_run', '<', now()) ->where('scheduled_run', '<', now())
->cursor() ->cursor()
->each(function ($scheduler){ ->each(function ($scheduler){
$this->doJob($scheduler); $this->doJob($scheduler);
}); });
} }
@ -70,59 +64,55 @@ class TaskScheduler implements ShouldQueue
private function doJob(Scheduler $scheduler) private function doJob(Scheduler $scheduler)
{ {
nlog("Doing job {$scheduler->id}"); nlog("Doing job {$scheduler->action_name}");
$job = $scheduler->job;
$company = $scheduler->company; $company = $scheduler->company;
if (!$job) $parameters = $scheduler->parameters;
return;
$parameters = $job->parameters;
switch ($job->action_name) { switch ($scheduler->action_name) {
case ScheduledJob::CREATE_CLIENT_REPORT: case Scheduler::CREATE_CLIENT_REPORT:
SendToAdmin::dispatch($company, $parameters, $job->action_class, 'contacts.csv'); SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'contacts.csv');
break; break;
case ScheduledJob::CREATE_CLIENT_CONTACT_REPORT: case Scheduler::CREATE_CLIENT_CONTACT_REPORT:
SendToAdmin::dispatch($company, $parameters, $job->action_class, 'clients.csv'); SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'clients.csv');
break; break;
case ScheduledJob::CREATE_CREDIT_REPORT: case Scheduler::CREATE_CREDIT_REPORT:
SendToAdmin::dispatch($company, $parameters, $job->action_class, 'credits.csv'); SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'credits.csv');
break; break;
case ScheduledJob::CREATE_DOCUMENT_REPORT: case Scheduler::CREATE_DOCUMENT_REPORT:
SendToAdmin::dispatch($company, $parameters, $job->action_class, 'documents.csv'); SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'documents.csv');
break; break;
case ScheduledJob::CREATE_EXPENSE_REPORT: case Scheduler::CREATE_EXPENSE_REPORT:
SendToAdmin::dispatch($company, $parameters, $job->action_class, 'expense.csv'); SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'expense.csv');
break; break;
case ScheduledJob::CREATE_INVOICE_ITEM_REPORT: case Scheduler::CREATE_INVOICE_ITEM_REPORT:
SendToAdmin::dispatch($company, $parameters, $job->action_class, 'invoice_items.csv'); SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'invoice_items.csv');
break; break;
case ScheduledJob::CREATE_INVOICE_REPORT: case Scheduler::CREATE_INVOICE_REPORT:
SendToAdmin::dispatch($company, $parameters, $job->action_class, 'invoices.csv'); SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'invoices.csv');
break; break;
case ScheduledJob::CREATE_PAYMENT_REPORT: case Scheduler::CREATE_PAYMENT_REPORT:
SendToAdmin::dispatch($company, $parameters, $job->action_class, 'payments.csv'); SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'payments.csv');
break; break;
case ScheduledJob::CREATE_PRODUCT_REPORT: case Scheduler::CREATE_PRODUCT_REPORT:
SendToAdmin::dispatch($company, $parameters, $job->action_class, 'products.csv'); SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'products.csv');
break; break;
case ScheduledJob::CREATE_PROFIT_AND_LOSS_REPORT: case Scheduler::CREATE_PROFIT_AND_LOSS_REPORT:
SendToAdmin::dispatch($company, $parameters, $job->action_class, 'profit_and_loss.csv'); SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'profit_and_loss.csv');
break; break;
case ScheduledJob::CREATE_QUOTE_ITEM_REPORT: case Scheduler::CREATE_QUOTE_ITEM_REPORT:
SendToAdmin::dispatch($company, $parameters, $job->action_class, 'quote_items.csv'); SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'quote_items.csv');
break; break;
case ScheduledJob::CREATE_QUOTE_REPORT: case Scheduler::CREATE_QUOTE_REPORT:
SendToAdmin::dispatch($company, $parameters, $job->action_class, 'quotes.csv'); SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'quotes.csv');
break; break;
case ScheduledJob::CREATE_RECURRING_INVOICE_REPORT: case Scheduler::CREATE_RECURRING_INVOICE_REPORT:
SendToAdmin::dispatch($company, $parameters, $job->action_class, 'recurring_invoices.csv'); SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'recurring_invoices.csv');
break; break;
case ScheduledJob::CREATE_TASK_REPORT: case Scheduler::CREATE_TASK_REPORT:
SendToAdmin::dispatch($company, $parameters, $job->action_class, 'tasks.csv'); SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'tasks.csv');
break; break;
} }
@ -131,10 +121,4 @@ class TaskScheduler implements ShouldQueue
$scheduler->save(); $scheduler->save();
} }
private function fetchJobs()
{
return ;
}
} }