Merge pull request #17858 from grokability/ignore-expiring-licenses-with-past-termination-date

snipe · web-flow · commit ad69447b533e · 2025-09-12T17:55:14.000+01:00
Ignore expiring licenses with past termination date
diff --git a/app/Console/Commands/SendExpirationAlerts.php b/app/Console/Commands/SendExpirationAlerts.php
@@ -2,6 +2,7 @@
 
 namespace App\Console\Commands;
 
+use App\Helpers\Helper;
 use App\Mail\ExpiringAssetsMail;
 use App\Mail\ExpiringLicenseMail;
 use App\Models\Asset;
@@ -57,14 +58,27 @@ public function handle()
             if ($assets->count() > 0) {
                 $this->info(trans_choice('mail.assets_warrantee_alert', $assets->count(), ['count' => $assets->count(), 'threshold' => $alert_interval]));
                 Mail::to($recipients)->send(new ExpiringAssetsMail($assets, $alert_interval));
+
+                $this->table(
+                    ['ID', 'Tag', 'Model', 'Model Number', 'EOL', 'EOL Months', 'Warranty Expires', 'Warranty Months'],
+                    $assets->map(fn($item) => ['ID' => $item->id, 'Tag' => $item->asset_tag, 'Model' => $item->model->name, 'Model Number' => $item->model->model_number, 'EOL' => $item->asset_eol_date, 'EOL Months' => $item->model->eol,  'Warranty Expires' => $item->warranty_expires,  'Warranty Months' => $item->warranty_months])
+                );
             }
 
             // Expiring licenses
             $licenses = License::getExpiringLicenses($alert_interval);
             if ($licenses->count() > 0) {
                 $this->info(trans_choice('mail.license_expiring_alert', $licenses->count(), ['count' => $licenses->count(), 'threshold' => $alert_interval]));
                 Mail::to($recipients)->send(new ExpiringLicenseMail($licenses, $alert_interval));
+
+                $this->table(
+                    ['ID', 'Name', 'Expires', 'Termination Date'],
+                    $licenses->map(fn($item) => ['ID' => $item->name, 'Name' => $item->name, 'Expires' => $item->expiration_date, 'Termination Date' => $item->termination_date])
+                );
             }
+
+
+
         } else {
             if ($settings->alert_email == '') {
                 $this->error('Could not send email. No alert email configured in settings');
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
@@ -161,7 +161,6 @@ public function declinedCheckout(User $declinedBy, $signature)
         'eol_explicit',
         'last_audit_date',
         'next_audit_date',
-        'asset_eol_date',
         'last_checkin',
         'last_checkout',
     ];
@@ -826,19 +825,24 @@ public function model()
      */
     public static function getExpiringWarrantee($days = 30)
     {
-        $days = (is_null($days)) ? 30 : $days;
 
-        return self::where('archived', '=', '0') // this can stay for right now, as `archived` defaults to 0 at the db level, but should probably be replaced with assetstatus->archived?
-            ->whereNotNull('warranty_months')
-            ->whereNotNull('purchase_date')
-            ->whereNull('deleted_at')
+        return self::where('archived', '=', '0')
             ->NotArchived()
-            ->whereRaw(
-                'DATE_ADD(`purchase_date`, INTERVAL `warranty_months` MONTH) <= DATE_ADD(NOW(), INTERVAL '
-                                 . $days
-                . ' DAY) AND DATE_ADD(`purchase_date`, INTERVAL `warranty_months` MONTH) > NOW()'
-            )
-            ->orderByRaw('DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH)')
+            ->whereNull('deleted_at')
+
+            // Check for manual asset EOL first
+            ->where(function ($query) use ($days) {
+                $query->whereNotNull('asset_eol_date')
+                    ->whereBetween('asset_eol_date', [Carbon::now(), Carbon::now()->addDays($days)]);
+            })
+            // Otherwise use the warranty months + purchase date + threshold
+            ->orWhere(function ($query) use ($days) {
+                $query->whereNotNull('purchase_date')
+                    ->whereNotNull('warranty_months')
+                    ->whereDate('purchase_date', '<=', Carbon::now()->addMonths('assets.warranty_months')->addDays($days));
+            })
+            ->orderBy('asset_eol_date', 'ASC')
+            ->orderBy('purchase_date', 'ASC')
             ->get();
     }
 
diff --git a/app/Models/License.php b/app/Models/License.php
@@ -708,24 +708,45 @@ public function freeSeats()
     }
 
     /**
-     * Returns expiring licenses
+     * Returns expiring licenses.
      *
-     * @todo should refactor. I don't like get() in model methods
+     * This checks if:
+     *
+     * 1) The license has not been deleted
+     * 2) The expiration date is between now and the number of days specified
+     * 3) There is an expiration date set and the termination date has not passed
+     * 4) The license termination date is null or has not passed
      *
      * @author A. Gianotto <snipe@snipe.net>
      * @since  [v1.0]
      * @return \Illuminate\Database\Eloquent\Relations\Relation
+     * @see \App\Console\Commands\SendExpiringLicenseNotifications
      */
     public static function getExpiringLicenses($days = 60)
     {
-        $days = (is_null($days)) ? 60 : $days;
 
-        return self::whereNotNull('expiration_date')
-            ->whereNull('deleted_at')
-            ->whereRaw('DATE_SUB(`expiration_date`,INTERVAL '.$days.' DAY) <= DATE(NOW()) ')
-            ->where('expiration_date', '>', date('Y-m-d'))
-            ->where('termination_date', '>', date('Y-m-d'))
+        return self::whereNull('deleted_at')
+
+            // The termination date is null or within range
+            ->where(function ($query) use ($days) {
+                $query->whereNull('termination_date')
+                    ->orWhereBetween('termination_date', [Carbon::now(), Carbon::now()->addDays($days)]);
+            })
+            ->where(function ($query) use ($days) {
+                $query->whereNotNull('expiration_date')
+                    // Handle expired licenses without termination dates
+                    ->where(function ($query) use ($days) {
+                        $query->whereNull('termination_date')
+                            ->whereBetween('expiration_date', [Carbon::now(), Carbon::now()->addDays($days)]);
+                    })
+
+                    // Handle expired licenses with termination dates in the future
+                    ->orWhere(function ($query) use ($days) {
+                        $query->whereBetween('termination_date', [Carbon::now(), Carbon::now()->addDays($days)]);
+                    });
+            })
             ->orderBy('expiration_date', 'ASC')
+            ->orderBy('termination_date', 'ASC')
             ->get();
     }
 
diff --git a/resources/lang/en-US/mail.php b/resources/lang/en-US/mail.php
@@ -21,8 +21,8 @@
     'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date',
     'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching',
     'Expected_Checkin_Report' => 'Expected asset checkin report',
-    'Expiring_Assets_Report' => 'Expiring Assets Report.',
-    'Expiring_Licenses_Report' => 'Expiring Licenses Report.',
+    'Expiring_Assets_Report' => 'Expiring Assets Report',
+    'Expiring_Licenses_Report' => 'Expiring Licenses Report',
     'Item_Request_Canceled' => 'Item Request Canceled',
     'Item_Requested' => 'Item Requested',
     'License_Checkin_Notification' => 'License checked in',
@@ -42,8 +42,9 @@
     'asset_name' => 'Asset Name',
     'asset_requested' => 'Asset requested',
     'asset_tag' => 'Asset Tag',
-    'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.',
+    'assets_warrantee_alert' => 'There is :count asset with an expiring warranty or that are reaching their end of life in the next :threshold days.|There are :count assets with expiring warranties or that are reaching their end of life in the next :threshold days.',
     'assigned_to' => 'Assigned To',
+    'eol' => 'EOL',
     'best_regards' => 'Best regards,',
     'canceled' => 'Canceled',
     'checkin_date' => 'Checkin Date',
@@ -68,7 +69,7 @@
     'inventory_report' => 'Inventory Report',
     'item' => 'Item',
     'item_checked_reminder' => 'This is a reminder that you currently have :count items checked out to you that you have not accepted or declined. Please click the link below to confirm your decision.',
-    'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
+    'license_expiring_alert' => 'There is :count license expiring or terminating in the next :threshold days.|There are :count licenses expiring or terminating in the next :threshold days.',
     'link_to_update_password' => 'Please click on the following link to update your :web password:',
     'login' => 'Login',
     'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
diff --git a/resources/views/notifications/markdown/report-expiring-assets.blade.php b/resources/views/notifications/markdown/report-expiring-assets.blade.php
@@ -1,25 +1,48 @@
 @component('mail::message')
 {{ trans_choice('mail.assets_warrantee_alert', $assets->count(), ['count'=>$assets->count(), 'threshold' => $threshold]) }}
-@component('mail::table')
 
+<style>
+
+    th, td {
+        vertical-align: top;
+    }
+    hr {
+        display: block;
+        height: 1px;
+        border: 0;
+        border-top: 1px solid #ccc;
+        margin: 1em 0;
+        padding: 0;
+    }
+</style>
+<x-mail::table>
+
+|        |        |          |
+| ------------- | ------------- | ------------- |
 @foreach ($assets as $asset)
 @php
-$expires = Helper::getFormattedDateObject($asset->present()->warranty_expires, 'date');
-$diff = round(abs(strtotime($asset->present()->warranty_expires) - strtotime(date('Y-m-d')))/86400);
-$icon = ($diff <= ($threshold / 2)) ? '🚨' : (($diff <= $threshold) ? '⚠️' : ' ');
+    $warranty_expires = \App\Helpers\Helper::getFormattedDateObject($asset->present()->warranty_expires, 'date');
+    $eol_date = \App\Helpers\Helper::getFormattedDateObject($asset->asset_eol_date, 'date');
+    $warranty_diff = ($asset->present()->warranty_expires) ? round(\Carbon\Carbon::now()->diffInDays(\Carbon\Carbon::parse($warranty_expires['date']), false), 1) : '';
+    $eol_diff = round(\Carbon\Carbon::now()->diffInDays(\Carbon\Carbon::parse($asset->asset_eol_date), false),  1);
+    $icon = ($warranty_diff <= $threshold && $warranty_diff >= 0) ? '⚠️' : (($eol_diff <= $threshold && $eol_diff >= 0) ? '🚨' : 'ℹ️');
 @endphp
-@component('mail::table')
-|        |        |          |
-| ------------- | ------------- | ------------- |
 | {{ $icon }} **{{ trans('mail.name') }}** | <a href="{{ route('hardware.show', $asset->id) }}">{{ $asset->display_name }}</a> <br><small>{{trans('mail.serial').': '.$asset->serial}}</small> |
-| **{{ trans('mail.expires') }}** | {{ !is_null($expires) ? $expires['formatted'] : '' }} (<strong>{{ $diff }} {{ trans('mail.Days') }}</strong>) |
+@if ($warranty_expires)
+| **{{ trans('mail.expires') }}** | {{ !is_null($warranty_expires) ? $warranty_expires['formatted'] : '' }} (<strong>{{ $warranty_diff }} {{ trans('mail.Days') }}</strong>) |
+@endif
+@if ($eol_date)
+| **{{ trans('mail.eol') }}** | {{ !is_null($eol_date) ? $eol_date['formatted'] : '' }} (<strong>{{ $eol_diff }} {{ trans('mail.Days') }}</strong>) |
+@endif
 @if ($asset->supplier)
 | **{{ trans('mail.supplier') }}** | {{ ($asset->supplier ? e($asset->supplier->name) : '') }} |
 @endif
 @if ($asset->assignedTo)
 | **{{ trans('mail.assigned_to') }}** | {{ e($asset->assignedTo->present()->display_name) }} |
 @endif
-@endcomponent
+| <hr> | <hr> |
 @endforeach
+</x-mail::table>
+
 @endcomponent
-@endcomponent
+
diff --git a/tests/Feature/Notifications/Email/ExpiringAlertsNotificationTest.php b/tests/Feature/Notifications/Email/ExpiringAlertsNotificationTest.php
@@ -8,7 +8,6 @@
 use App\Models\Asset;
 use App\Models\License;
 use App\Models\Setting;
-use App\Models\User;
 use Illuminate\Support\Facades\Mail;
 use Tests\TestCase;
 
@@ -17,49 +16,62 @@ class ExpiringAlertsNotificationTest extends TestCase
 {
      public function testExpiringAssetsEmailNotification()
      {
-         $this->markIncompleteIfSqlite();
          Mail::fake();
 
          $this->settings->enableAlertEmail('admin@example.com');
          $this->settings->setAlertInterval(30);
 
          $alert_email = Setting::first()->alert_email;
 
-         $expiringAsset = Asset::factory()->create([
-             'purchase_date' => now()->subDays(350)->format('Y-m-d'),
+         $expiringWarrantyAsset = Asset::factory()->create([
+             'purchase_date' => now()->subDays(356)->format('Y-m-d'),
              'warranty_months' => 12,
              'archived' => 0,
-             'deleted_at' => null,
          ]);
 
-         $expiredAsset = Asset::factory()->create([
-             'purchase_date' => now()->subDays(370)->format('Y-m-d'),
+
+         $alreadyExpiredAsset = Asset::factory()->create([
+             'purchase_date' => now()->subDays(396)->format('Y-m-d'),
              'warranty_months' => 12,
              'archived' => 0,
-             'deleted_at' => null,
          ]);
 
+         // Asset has a manually entered EOL date that's coming up
+         $expiringEOLAsset = Asset::factory()->create([
+             'archived' => 0,
+         ]);
+
+         // We have to set this here because of the configure() method in the Asset factory :(
+         $expiringEOLAsset->asset_eol_date = now()->addDays(5)->format('Y-m-d');
+         $expiringEOLAsset->save();
+
          $notExpiringAsset = Asset::factory()->create([
-             'purchase_date' => now()->subDays(330)->format('Y-m-d'),
+             'purchase_date' => now()->addDays(330)->format('Y-m-d'),
              'warranty_months' => 12,
              'archived' => 0,
-             'deleted_at' => null,
          ]);
+         // We have to set this here because of the configure() method in the Asset factory :(
+         $notExpiringAsset->asset_eol_date = null;
+         $expiringEOLAsset->save();
+
 
          $this->artisan('snipeit:expiring-alerts')->assertExitCode(0);
 
-         Mail::assertSent(ExpiringAssetsMail::class, function($mail) use ($alert_email, $expiringAsset) {
-             return $mail->hasTo($alert_email) && $mail->assets->contains($expiringAsset);
+         Mail::assertSent(ExpiringAssetsMail::class, function($mail) use ($alert_email, $expiringWarrantyAsset) {
+             return $mail->hasTo($alert_email) && $mail->assets->contains($expiringWarrantyAsset);
+         });
+
+         Mail::assertSent(ExpiringAssetsMail::class, function($mail) use ($alert_email, $expiringEOLAsset) {
+             return $mail->hasTo($alert_email) && $mail->assets->contains($expiringEOLAsset);
          });
 
-         Mail::assertNotSent(ExpiringAssetsMail::class, function($mail) use ($expiredAsset, $notExpiringAsset) {
-             return $mail->assets->contains($expiredAsset) || $mail->assets->contains($notExpiringAsset);
+         Mail::assertNotSent(ExpiringAssetsMail::class, function($mail) use ($alert_email, $notExpiringAsset, $alreadyExpiredAsset) {
+             return $mail->assets->contains($alert_email) || ($mail->assets->contains($alreadyExpiredAsset) && ($mail->assets->contains($notExpiringAsset)));
          });
      }
 
      public function testExpiringLicensesEmailNotification()
      {
-         $this->markIncompleteIfSqlite();
          Mail::fake();
          $this->settings->enableAlertEmail('admin@example.com');
          $this->settings->setAlertInterval(60);
@@ -69,6 +81,7 @@ public function testExpiringLicensesEmailNotification()
          $expiringLicense = License::factory()->create([
              'expiration_date' => now()->addDays(30)->format('Y-m-d'),
              'deleted_at' => null,
+             'termination_date' => null,
          ]);
 
          $expiredLicense = License::factory()->create([
@@ -80,20 +93,43 @@ public function testExpiringLicensesEmailNotification()
              'deleted_at' => null,
          ]);
 
+         $expiringButTerminatedLicense = License::factory()->create([
+             'termination_date' => now()->subDays(10)->format('Y-m-d'),
+             'expiration_date' => now()->subDays(10)->format('Y-m-d'),
+             'deleted_at' => null,
+         ]);
+
+         $deletedExpiringLicense = License::factory()->create([
+             'expiration_date' => now()->addDays(30)->format('Y-m-d'),
+             'deleted_at' => now()->subDays(10)->format('Y-m-d'),
+         ]);
+
          $this->artisan('snipeit:expiring-alerts')->assertExitCode(0);
 
          Mail::assertSent(ExpiringLicenseMail::class, function($mail) use ($alert_email, $expiringLicense) {
              return $mail->hasTo($alert_email) && $mail->licenses->contains($expiringLicense);
          });
 
-         Mail::assertNotSent(ExpiringLicenseMail::class, function($mail) use ($expiredLicense, $notExpiringLicense) {
-             return $mail->licenses->contains($expiredLicense) || $mail->licenses->contains($notExpiringLicense);
+         Mail::assertNotSent(ExpiringLicenseMail::class, function($mail) use ($alert_email, $expiredLicense) {
+             return $mail->hasTo($alert_email) && $mail->licenses->contains($expiredLicense);
+         });
+
+         Mail::assertNotSent(ExpiringLicenseMail::class, function($mail) use ($alert_email, $notExpiringLicense) {
+             return $mail->licenses->contains($alert_email) || $mail->licenses->contains($notExpiringLicense);
+         });
+
+         Mail::assertNotSent(ExpiringLicenseMail::class, function($mail) use ($alert_email, $expiringButTerminatedLicense) {
+             return $mail->licenses->contains($alert_email) || $mail->licenses->contains($expiringButTerminatedLicense);
          });
+
+         Mail::assertNotSent(ExpiringLicenseMail::class, function($mail) use ($alert_email, $deletedExpiringLicense) {
+             return $mail->licenses->contains($alert_email) || $mail->licenses->contains($deletedExpiringLicense);
+         });
+
      }
 
      public function testAuditWarningThresholdEmailNotification()
      {
-         $this->markIncompleteIfSqlite();
          Mail::fake();
          $this->settings->enableAlertEmail('admin@example.com');
          $this->settings->setAuditWarningDays(15);
