From c58d982f985e3439a0081307daa43977282b4e64 Mon Sep 17 00:00:00 2001
From: Adrian Hopek <adrian.hopek@blumilk.pl>
Date: Thu, 7 Apr 2022 14:04:51 +0200
Subject: [PATCH] fix

---
 ...ionRequestWaitsForApprovalNotification.php | 45 ++++---------------
 1 file changed, 9 insertions(+), 36 deletions(-)

diff --git a/app/Domain/Notifications/VacationRequestWaitsForApprovalNotification.php b/app/Domain/Notifications/VacationRequestWaitsForApprovalNotification.php
index a737a81..4e9199c 100644
--- a/app/Domain/Notifications/VacationRequestWaitsForApprovalNotification.php
+++ b/app/Domain/Notifications/VacationRequestWaitsForApprovalNotification.php
@@ -8,7 +8,6 @@ use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
 use InvalidArgumentException;
-use Toby\Domain\States\VacationRequest\WaitingForTechnical;
 use Toby\Eloquent\Models\User;
 use Toby\Eloquent\Models\VacationRequest;
 
@@ -44,6 +43,8 @@ class VacationRequestWaitsForApprovalNotification extends Notification
     protected function buildMailMessage(string $url): MailMessage
     {
         $user = $this->user->first_name;
+        $requester = $this->vacationRequest->user->fullName;
+        $title = $this->vacationRequest->name;
         $type = $this->vacationRequest->type->label();
         $from = $this->vacationRequest->from->toDisplayString();
         $to = $this->vacationRequest->to->toDisplayString();
@@ -53,8 +54,13 @@ class VacationRequestWaitsForApprovalNotification extends Notification
             ->greeting(__("Hi :user!", [
                 "user" => $user,
             ]))
-            ->subject($this->buildSubject())
-            ->line($this->buildDescription())
+            ->subject(__("Vacation request :title is waiting for your approval", [
+                "title" => $title,
+            ]))
+            ->line(__("The vacation request :title from user: :requester is waiting for your approval.", [
+                "title" => $title,
+                "requester" => $requester,
+            ]))
             ->line(__("Vacation type: :type", [
                 "type" => $type,
             ]))
@@ -65,37 +71,4 @@ class VacationRequestWaitsForApprovalNotification extends Notification
             ]))
             ->action(__("Click here for details"), $url);
     }
-
-    protected function buildSubject(): string
-    {
-        $title = $this->vacationRequest->name;
-
-        if ($this->vacationRequest->state->equals(WaitingForTechnical::class)) {
-            return __("Vacation request :title is waiting for your technical approval", [
-                "title" => $title,
-            ]);
-        }
-
-        return __("Vacation request :title is waiting for your administrative approval", [
-            "title" => $title,
-        ]);
-    }
-
-    protected function buildDescription(): string
-    {
-        $title = $this->vacationRequest->name;
-        $requester = $this->vacationRequest->user->name;
-
-        if ($this->vacationRequest->state->equals(WaitingForTechnical::class)) {
-            return __("The vacation request :title from user: :requester is waiting for your technical approval.", [
-                "title" => $title,
-                "requester" => $requester,
-            ]);
-        }
-
-        return __("The vacation request :title from user: :requester is waiting for your administrative approval.", [
-            "title" => $title,
-            "requester" => $requester,
-        ]);
-    }
 }