#126 - fix

app/Domain/Notifications/KeyHasBeenGivenNotification.php

@@ -7,6 +7,7 @@ namespace Toby\Domain\Notifications;
 use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Notification;
 use Toby\Eloquent\Models\User;
+use Toby\Infrastructure\Slack\Elements\SlackMessage;
 
 class KeyHasBeenGivenNotification extends Notification
 {
@@ -22,13 +23,14 @@ class KeyHasBeenGivenNotification extends Notification
         return [Channels::SLACK];
     }
 
-    public function toSlack(Notifiable $notifiable): string
+    public function toSlack(Notifiable $notifiable): SlackMessage
     {
-        return __(":sender gives key no :key to :recipient", [
-            "sender" => $this->getName($this->sender),
-            "recipient" => $this->getName($this->recipient),
-            "key" => $notifiable->id,
-        ]);
+        return (new SlackMessage())
+            ->text(__(":sender gives key no :key to :recipient", [
+                "sender" => $this->getName($this->sender),
+                "recipient" => $this->getName($this->recipient),
+                "key" => $notifiable->id,
+            ]));
     }
 
     protected function getName(User $user): string

app/Domain/Notifications/KeyHasBeenTakenNotification.php

@@ -7,6 +7,7 @@ namespace Toby\Domain\Notifications;
 use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Notification;
 use Toby\Eloquent\Models\User;
+use Toby\Infrastructure\Slack\Elements\SlackMessage;
 
 class KeyHasBeenTakenNotification extends Notification
 {
@@ -22,13 +23,14 @@ class KeyHasBeenTakenNotification extends Notification
         return [Channels::SLACK];
     }
 
-    public function toSlack(Notifiable $notifiable): string
+    public function toSlack(Notifiable $notifiable): SlackMessage
     {
-        return __(":recipient takes key no :key from :sender", [
-            "recipient" => $this->getName($this->recipient),
-            "sender" => $this->getName($this->sender),
-            "key" => $notifiable->id,
-        ]);
+        return (new SlackMessage())
+            ->text(__(":recipient takes key no :key from :sender", [
+                "recipient" => $this->getName($this->recipient),
+                "sender" => $this->getName($this->sender),
+                "key" => $notifiable->id,
+            ]));
     }
 
     protected function getName(User $user): string

app/Domain/Notifications/VacationRequestCreatedNotification.php

@@ -9,6 +9,7 @@ use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
 use InvalidArgumentException;
 use Toby\Eloquent\Models\VacationRequest;
+use Toby\Infrastructure\Slack\Elements\SlackMessage;
 
 class VacationRequestCreatedNotification extends Notification
 {
@@ -23,14 +24,12 @@ class VacationRequestCreatedNotification extends Notification
         return [Channels::MAIL, Channels::SLACK];
     }
 
-    public function toSlack(): string
+    public function toSlack(): SlackMessage
     {
         $url = route("vacation.requests.show", ["vacationRequest" => $this->vacationRequest->id]);
 
-        return implode("\n", [
-            $this->buildDescription(),
-            "<${url}|Zobacz szczegóły>",
-        ]);
+        return (new SlackMessage())
+            ->text("{$this->buildDescription()}\n <${url}|Zobacz szczegóły>");
     }
 
     /**
@@ -56,19 +55,25 @@ class VacationRequestCreatedNotification extends Notification
         $days = $this->vacationRequest->vacations()->count();
 
         return (new MailMessage())
-            ->greeting(__("Hi :user!", [
-                "user" => $user,
-            ]))
+            ->greeting(
+                __("Hi :user!", [
+                    "user" => $user,
+                ]),
+            )
             ->subject($this->buildSubject())
             ->line($this->buildDescription())
-            ->line(__("Vacation type: :type", [
-                "type" => $type,
-            ]))
-            ->line(__("From :from to :to (number of days: :days)", [
-                "from" => $from,
-                "to" => $to,
-                "days" => $days,
-            ]))
+            ->line(
+                __("Vacation type: :type", [
+                    "type" => $type,
+                ]),
+            )
+            ->line(
+                __("From :from to :to (number of days: :days)", [
+                    "from" => $from,
+                    "to" => $to,
+                    "days" => $days,
+                ]),
+            )
             ->action(__("Click here for details"), $url);
     }
 

app/Domain/Notifications/VacationRequestStatusChangedNotification.php

@@ -10,6 +10,7 @@ use Illuminate\Notifications\Notification;
 use InvalidArgumentException;
 use Toby\Eloquent\Models\User;
 use Toby\Eloquent\Models\VacationRequest;
+use Toby\Infrastructure\Slack\Elements\SlackMessage;
 
 class VacationRequestStatusChangedNotification extends Notification
 {
@@ -25,14 +26,12 @@ class VacationRequestStatusChangedNotification extends Notification
         return [Channels::MAIL, Channels::SLACK];
     }
 
-    public function toSlack(): string
+    public function toSlack(): SlackMessage
     {
         $url = route("vacation.requests.show", ["vacationRequest" => $this->vacationRequest->id]);
 
-        return implode("\n", [
-            $this->buildDescription(),
-            "<${url}|Zobacz szczegóły>",
-        ]);
+        return (new SlackMessage())
+            ->text("{$this->buildDescription()}\n <${url}|Zobacz szczegóły>");
     }
 
     /**

app/Domain/Notifications/VacationRequestWaitsForApprovalNotification.php

@@ -11,6 +11,7 @@ use InvalidArgumentException;
 use Toby\Domain\States\VacationRequest\WaitingForTechnical;
 use Toby\Eloquent\Models\User;
 use Toby\Eloquent\Models\VacationRequest;
+use Toby\Infrastructure\Slack\Elements\SlackMessage;
 
 class VacationRequestWaitsForApprovalNotification extends Notification
 {
@@ -26,14 +27,12 @@ class VacationRequestWaitsForApprovalNotification extends Notification
         return [Channels::MAIL, Channels::SLACK];
     }
 
-    public function toSlack(): string
+    public function toSlack(): SlackMessage
     {
         $url = route("vacation.requests.show", ["vacationRequest" => $this->vacationRequest->id]);
 
-        return implode("\n", [
-            $this->buildDescription(),
-            "<${url}|Zobacz szczegóły>",
-        ]);
+        return (new SlackMessage())
+            ->text("{$this->buildDescription()}\n <${url}|Zobacz szczegóły>");
     }
 
     /**

app/Domain/Notifications/VacationRequestsSummaryNotification.php

@@ -10,6 +10,8 @@ use Illuminate\Notifications\Notification;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Toby\Eloquent\Models\User;
+use Toby\Infrastructure\Slack\Elements\SlackMessage;
+use Toby\Infrastructure\Slack\Elements\VacationRequestsAttachment;
 
 class VacationRequestsSummaryNotification extends Notification
 {
@@ -22,7 +24,14 @@ class VacationRequestsSummaryNotification extends Notification
 
     public function via(): array
     {
-        return ["mail"];
+        return [Channels::MAIL, Channels::SLACK];
+    }
+
+    public function toSlack(): SlackMessage
+    {
+        return (new SlackMessage())
+            ->text("Lista wniosków oczekujących na Twoją akcję - stan na dzień {$this->day->toDisplayString()}:")
+            ->withAttachment(new VacationRequestsAttachment($this->vacationRequests));
     }
 
     public function toMail($notifiable): MailMessage