Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 12:17:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up for scheduler

Browse Source
This commit is contained in:
David Bomba 2023-01-13 20:23:03 +11:00
parent 9e5417ab1c
commit 35fde4a73e
3 changed files with 54 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Console/Kernel.php
View File

@ -71,7 +71,7 @@ class Kernel extends ConsoleKernel
$schedule->job(new RecurringInvoicesCron)->hourly()->withoutOverlapping()->name('recurring-invoice-job')->onOneServer(); $schedule->job(new RecurringInvoicesCron)->hourly()->withoutOverlapping()->name('recurring-invoice-job')->onOneServer();
/* Stale Invoice Cleanup*/ /* Stale Invoice Cleanup*/
$schedule->job(new CleanStaleInvoiceOrder)->hourly()->withoutOverlapping()->name('stale-invoice-job')->onOneServer(); $schedule->job(new CleanStaleInvoiceOrder)->hourlyAt(30)->withoutOverlapping()->name('stale-invoice-job')->onOneServer();
/* Sends recurring invoices*/ /* Sends recurring invoices*/
$schedule->job(new RecurringExpensesCron)->dailyAt('00:10')->withoutOverlapping()->name('recurring-expense-job')->onOneServer(); $schedule->job(new RecurringExpensesCron)->dailyAt('00:10')->withoutOverlapping()->name('recurring-expense-job')->onOneServer();
@ -89,7 +89,7 @@ class Kernel extends ConsoleKernel
$schedule->job(new SchedulerCheck)->dailyAt('01:10')->withoutOverlapping(); $schedule->job(new SchedulerCheck)->dailyAt('01:10')->withoutOverlapping();
/* Checks for scheduled tasks */ /* Checks for scheduled tasks */
$schedule->job(new TaskScheduler())->dailyAt('06:50')->withoutOverlapping()->name('task-scheduler-job')->onOneServer(); $schedule->job(new TaskScheduler())->hourlyAt(10)->withoutOverlapping()->name('task-scheduler-job')->onOneServer();
/* Performs system maintenance such as pruning the backup table */ /* Performs system maintenance such as pruning the backup table */
$schedule->job(new SystemMaintenance)->sundays()->at('02:30')->withoutOverlapping()->name('system-maintenance-job')->onOneServer(); $schedule->job(new SystemMaintenance)->sundays()->at('02:30')->withoutOverlapping()->name('system-maintenance-job')->onOneServer();

7
app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php
View File

@ -28,8 +28,9 @@ class StoreSchedulerRequest extends Request
public function rules() public function rules()
{ {
nlog($this->all());
$rules = [ $rules = [
'name' => ['bail', 'required', Rule::unique('schedulers')->where('company_id', auth()->user()->company()->id)],
'is_paused' => 'bail|sometimes|boolean', 'is_paused' => 'bail|sometimes|boolean',
'frequency_id' => 'bail|required|integer|digits_between:1,12', 'frequency_id' => 'bail|required|integer|digits_between:1,12',
'next_run' => 'bail|required|date:Y-m-d', 'next_run' => 'bail|required|date:Y-m-d',
@ -37,10 +38,6 @@ nlog($this->all());
'parameters' => 'bail|array', 'parameters' => 'bail|array',
]; ];
$rules['name'] = ['bail', 'required', Rule::unique('schedulers')->where('company_id', auth()->user()->company()->id)];
nlog($rules);
return $rules; return $rules;
} }

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

@ -46,9 +46,10 @@ class TaskScheduler implements ShouldQueue
MultiDB::setDB($db); MultiDB::setDB($db);
Scheduler::with('company') Scheduler::with('company')
->where('paused', false) ->where('is_paused', false)
->where('is_deleted', false) ->where('is_deleted', false)
->where('scheduled_run', '<', now()) ->whereNotNull('next_run')
->where('next_run', '<=', now())
->cursor() ->cursor()
->each(function ($scheduler) { ->each(function ($scheduler) {
$this->doJob($scheduler); $this->doJob($scheduler);
@ -62,55 +63,55 @@ class TaskScheduler implements ShouldQueue
$company = $scheduler->company; $company = $scheduler->company;
$parameters = $scheduler->parameters; // $parameters = $scheduler->parameters;
switch ($scheduler->action_name) { // switch ($scheduler->action_name) {
case Scheduler::CREATE_CLIENT_REPORT: // case Scheduler::CREATE_CLIENT_REPORT:
SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'contacts.csv'); // SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'contacts.csv');
break; // break;
case Scheduler::CREATE_CLIENT_CONTACT_REPORT: // case Scheduler::CREATE_CLIENT_CONTACT_REPORT:
SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'clients.csv'); // SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'clients.csv');
break; // break;
case Scheduler::CREATE_CREDIT_REPORT: // case Scheduler::CREATE_CREDIT_REPORT:
SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'credits.csv'); // SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'credits.csv');
break; // break;
case Scheduler::CREATE_DOCUMENT_REPORT: // case Scheduler::CREATE_DOCUMENT_REPORT:
SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'documents.csv'); // SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'documents.csv');
break; // break;
case Scheduler::CREATE_EXPENSE_REPORT: // case Scheduler::CREATE_EXPENSE_REPORT:
SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'expense.csv'); // SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'expense.csv');
break; // break;
case Scheduler::CREATE_INVOICE_ITEM_REPORT: // case Scheduler::CREATE_INVOICE_ITEM_REPORT:
SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'invoice_items.csv'); // SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'invoice_items.csv');
break; // break;
case Scheduler::CREATE_INVOICE_REPORT: // case Scheduler::CREATE_INVOICE_REPORT:
SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'invoices.csv'); // SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'invoices.csv');
break; // break;
case Scheduler::CREATE_PAYMENT_REPORT: // case Scheduler::CREATE_PAYMENT_REPORT:
SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'payments.csv'); // SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'payments.csv');
break; // break;
case Scheduler::CREATE_PRODUCT_REPORT: // case Scheduler::CREATE_PRODUCT_REPORT:
SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'products.csv'); // SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'products.csv');
break; // break;
case Scheduler::CREATE_PROFIT_AND_LOSS_REPORT: // case Scheduler::CREATE_PROFIT_AND_LOSS_REPORT:
SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'profit_and_loss.csv'); // SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'profit_and_loss.csv');
break; // break;
case Scheduler::CREATE_QUOTE_ITEM_REPORT: // case Scheduler::CREATE_QUOTE_ITEM_REPORT:
SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'quote_items.csv'); // SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'quote_items.csv');
break; // break;
case Scheduler::CREATE_QUOTE_REPORT: // case Scheduler::CREATE_QUOTE_REPORT:
SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'quotes.csv'); // SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'quotes.csv');
break; // break;
case Scheduler::CREATE_RECURRING_INVOICE_REPORT: // case Scheduler::CREATE_RECURRING_INVOICE_REPORT:
SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'recurring_invoices.csv'); // SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'recurring_invoices.csv');
break; // break;
case Scheduler::CREATE_TASK_REPORT: // case Scheduler::CREATE_TASK_REPORT:
SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'tasks.csv'); // SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'tasks.csv');
break; // break;
} // }
$scheduler->scheduled_run = $scheduler->nextScheduledDate(); // $scheduler->scheduled_run = $scheduler->nextScheduledDate();
$scheduler->save(); // $scheduler->save();
} }
} }