Integrate Mail, Nexmo and Slack notifications into Cachet

app/Bus/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php

@@ -13,19 +13,10 @@ namespace CachetHQ\Cachet\Bus\Handlers\Events\Incident;
 
 use CachetHQ\Cachet\Bus\Events\Incident\IncidentWasReportedEvent;
 use CachetHQ\Cachet\Models\Subscriber;
-use Illuminate\Contracts\Mail\MailQueue;
-use Illuminate\Mail\Message;
-use McCool\LaravelAutoPresenter\Facades\AutoPresenter;
+use CachetHQ\Cachet\Notifications\Incident\NewIncidentNotification;
 
 class SendIncidentEmailNotificationHandler
 {
-    /**
-     * The mailer instance.
-     *
-     * @var \Illuminate\Contracts\Mail\Mailer
-     */
-    protected $mailer;
-
     /**
      * The subscriber instance.
      *
@@ -36,14 +27,12 @@ class SendIncidentEmailNotificationHandler
     /**
      * Create a new send incident email notification handler.
      *
-     * @param \Illuminate\Contracts\Mail\Mailer  $mailer
      * @param \CachetHQ\Cachet\Models\Subscriber $subscriber
      *
      * @return void
      */
-    public function __construct(MailQueue $mailer, Subscriber $subscriber)
+    public function __construct(Subscriber $subscriber)
     {
-        $this->mailer = $mailer;
         $this->subscriber = $subscriber;
     }
 
@@ -56,23 +45,25 @@ class SendIncidentEmailNotificationHandler
      */
     public function handle(IncidentWasReportedEvent $event)
     {
-        if (!$event->incident->notify) {
+        $incident = $event->incident;
+
+        if (!$event->notify) {
             return false;
         }
 
         // Only send emails for public incidents.
-        if ($event->incident->visible === 0) {
+        if (!$incident->visible) {
             return;
         }
 
         // First notify all global subscribers.
         $globalSubscribers = $this->subscriber->isVerified()->isGlobal()->get();
 
-        foreach ($globalSubscribers as $subscriber) {
-            $this->notify($event, $subscriber);
-        }
+        $globalSubscribers->map(function ($subscriber) use ($incident) {
+            $subscriber->notify(new NewIncidentNotification($incident));
+        });
 
-        if (!$event->incident->component) {
+        if (!$incident->component) {
             return;
         }
 
@@ -81,53 +72,12 @@ class SendIncidentEmailNotificationHandler
         // Notify the remaining component specific subscribers.
         $componentSubscribers = $this->subscriber
             ->isVerified()
-            ->forComponent($event->incident->component->id)
+            ->forComponent($incident->component->id)
             ->get()
             ->reject(function ($subscriber) use ($notified) {
                 return in_array($subscriber->id, $notified);
+            })->map(function ($subscriber) use ($incident) {
+                $subscriber->notify(new NewIncidentNotification($incident));
             });
-
-        foreach ($componentSubscribers as $subscriber) {
-            $this->notify($event, $subscriber);
-        }
-    }
-
-    /**
-     * Send notification to subscriber.
-     *
-     * @param \CachetHQ\Cachet\Bus\Events\IncidentWasReportedEvent $event
-     * @param \CachetHQ\Cachet\Models\Subscriber                   $subscriber
-     *
-     * @return \Illuminate\Database\Eloquent\Collection
-     */
-    public function notify(IncidentWasReportedEvent $event, $subscriber)
-    {
-        $incident = AutoPresenter::decorate($event->incident);
-        $component = AutoPresenter::decorate($event->incident->component);
-
-        $mail = [
-            'email'   => $subscriber->email,
-            'subject' => trans('cachet.subscriber.email.incident.subject', [
-                'status' => $incident->human_status,
-                'name'   => $incident->name,
-            ]),
-            'has_component'    => ($event->incident->component) ? true : false,
-            'component_name'   => $component ? $component->name : null,
-            'name'             => $incident->name,
-            'timestamp'        => $incident->occurred_at_formatted,
-            'status'           => $incident->human_status,
-            'html_content'     => $incident->formatted_message,
-            'text_content'     => $incident->message,
-            'token'            => $subscriber->token,
-            'manage_link'      => cachet_route('subscribe.manage', [$subscriber->verify_code]),
-            'unsubscribe_link' => cachet_route('subscribe.unsubscribe', [$subscriber->verify_code]),
-        ];
-
-        $this->mailer->queue([
-            'html' => 'emails.incidents.new-html',
-            'text' => 'emails.incidents.new-text',
-        ], $mail, function (Message $message) use ($mail) {
-            $message->to($mail['email'])->subject($mail['subject']);
-        });
     }
 }