DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 21:24:13 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Cleanup on audit due/overdue console command

Browse source
This commit is contained in:
snipe 2019-05-05 19:22:08 -04:00
parent 4369d6adc6
commit 7b194c678c
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/Console/Commands/SendUpcomingAuditReport.php
View file

@ -47,11 +47,6 @@ class SendUpcomingAuditReport extends Command
{ {
$settings = Setting::getSettings(); $settings = Setting::getSettings();
// Threshold sets the very latest date the next audit could be: $settings->audit_warning_days from today
$threshold = Carbon::now()->addDays($settings->audit_warning_days);
if (($settings->alert_email != '') && ($settings->audit_warning_days) && ($settings->alerts_enabled == 1)) { if (($settings->alert_email != '') && ($settings->audit_warning_days) && ($settings->alerts_enabled == 1)) {
// Send a rollup to the admin, if settings dictate // Send a rollup to the admin, if settings dictate
@ -59,15 +54,18 @@ class SendUpcomingAuditReport extends Command
return new \App\Models\Recipients\AlertRecipient($item); return new \App\Models\Recipients\AlertRecipient($item);
}); });
// Assets due for auditing // Assets due for auditing
$assets = Asset::whereDate('next_audit_date', '<=', $threshold)
$assets = Asset::whereNotNull('next_audit_date')
->dueForAudit($settings)
->orderBy('last_audit_date', 'asc')->get(); ->orderBy('last_audit_date', 'asc')->get();
if ($assets->count() > 0) { if ($assets->count() > 0) {
$this->info(trans_choice('mail.upcoming-audits', $assets->count(), $this->info(trans_choice('mail.upcoming-audits', $assets->count(),
['count' => $assets->count(), 'threshold' => $threshold])); ['count' => $assets->count(), 'threshold' => $settings->audit_warning_days]));
\Notification::send($recipients, new SendUpcomingAuditNotification($assets, $threshold)); \Notification::send($recipients, new SendUpcomingAuditNotification($assets, $settings->audit_warning_days));
$this->info('Audit report sent to '.$settings->alert_email); $this->info('Audit report sent to '.$settings->alert_email);
} else { } else {
$this->info('No assets to be audited. No report sent.'); $this->info('No assets to be audited. No report sent.');