Update alert email (review)

Author: barryo

app/Console/Commands/Irrdb/UpdateDb.php

@@ -23,11 +23,9 @@
  * http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Mail;
 use IXP\Console\Commands\Command;
-use IXP\Events\User\UserWarning as UserWarningEvent;
-use IXP\Mail\User\UserWarning;
+use IXP\Mail\Alert;
 use IXP\Models\Customer;
 
 /**
@@ -158,9 +156,7 @@ protected function handleException( Customer $c, \Exception $e, string $type ):
         }
 
         Mail::to( [ [ 'name' => config( 'mail.alerts_recipient.name' ), 'email' => config( 'mail.alerts_recipient.address' ) ] ] )
-            ->send( new UserWarning(
-                new UserWarningEvent( "IRRDB {$type} update failed for {$c->name}/AS{$c->autsys}", $e->getMessage() )
-            ) );
+            ->send( new Alert("IRRDB {$type} update failed for {$c->name}/AS{$c->autsys}", $e ) );
 
         $this->info( "Alert email sent to " . config( 'mail.alerts_recipient.address' ) );
     }

app/Events/User/UserWarning.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace IXP\Mail\User;
+namespace IXP\Mail;
 
 /*
  * Copyright (C) 2009 - 2025 Internet Neutral Exchange Association Company Limited By Guarantee.
@@ -25,30 +25,27 @@
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
-use IXP\Events\User\UserWarning as UserWarningEvent;
 
 /**
- * Mailable for warning email User
+ * Mailable for alerts
  *
  * @author     Barry O'Donovan <[email protected]>
  * @author     Laszlo Kiss <[email protected]>
  * @category   User
- * @package    IXP\Mail\User
- * @copyright  Copyright (C) 2009 - 2020 Internet Neutral Exchange Association Company Limited By Guarantee
+ * @package    IXP\Mail
+ * @copyright  Copyright (C) 2009 - 2025 Internet Neutral Exchange Association Company Limited By Guarantee
  * @license    http://www.gnu.org/licenses/gpl-2.0.html GNU GPL V2.0
  */
-class UserWarning extends Mailable
+class Alert extends Mailable
 {
     use Queueable, SerializesModels;
 
     /**
      * Create a new message instance.
-     *
-     * @param UserWarningEvent $e
-     * @return void
-     */
+     **/
     public function __construct(
-        public UserWarningEvent $event
+        public string $alert,
+        public \Exception $exception,
     ) {}
 
     /**
@@ -58,7 +55,7 @@ public function __construct(
      */
     public function build(): self
     {
-        return $this->markdown( 'user.emails.warning' )
+        return $this->markdown( 'user.emails.alert' )
             ->subject( config('identity.sitename' ) . " - Alert" );
     }
 }

app/Mail/User/UserWarning.php renamed to app/Mail/Alert.php

@@ -58,6 +58,11 @@
       <code><![CDATA[public function handle(): int]]></code>
     </MissingDocblockType>
   </file>
+  <file src="app/Console/Commands/Irrdb/UpdateDb.php">
+    <InvalidOperand>
+      <code><![CDATA[config( 'mail.alerts_recipient.address' )]]></code>
+    </InvalidOperand>
+  </file>
   <file src="app/Console/Commands/Irrdb/UpdatePrefixDb.php">
     <MissingDocblockType>
       <code><![CDATA[public function handle(): int]]></code>
@@ -999,6 +1004,11 @@
       <code><![CDATA[$r = $am->atlasResult()]]></code>
     </RedundantCondition>
   </file>
+  <file src="app/Mail/Alert.php">
+    <InvalidOperand>
+      <code><![CDATA[config('identity.sitename' )]]></code>
+    </InvalidOperand>
+  </file>
   <file src="app/Mail/Auth/ForgotPassword.php">
     <InvalidOperand>
       <code><![CDATA[config('identity.sitename' )]]></code>

psalm-baseline.xml

@@ -22,6 +22,7 @@
         <directory name="database"/>
         <directory name="database/seeders"/>
         <ignoreFiles>
+            <file name="psalm-baseline.xml"/>
             <directory name="vendor"/>
         </ignoreFiles>
     </projectFiles>

psalm.xml

@@ -2,10 +2,10 @@
 
     ## {{ config('identity.sitename') }} Alert
 
-    {{ $event->warningTitle }}
+    {{ $alert }}
 
     @component('mail::panel')
-        {{ $event->errorMessage }}
+        {{ $exception->getMessage() }}
     @endcomponent