kamilniemczycki/toby
1
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Activity

#126 - fix

Browse Source
This commit is contained in:
Adrian Hopek
2022-04-27 11:49:01 +02:00
parent e7d9cfe3d0
commit 29c06d625b
9 changed files with 145 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Domain/Notifications/KeyHasBeenGivenNotification.php
View File

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

14
app/Domain/Notifications/KeyHasBeenTakenNotification.php
View File

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

37
app/Domain/Notifications/VacationRequestCreatedNotification.php
View File

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

9
app/Domain/Notifications/VacationRequestStatusChangedNotification.php
View File

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

9
app/Domain/Notifications/VacationRequestWaitsForApprovalNotification.php
View File

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

11
app/Domain/Notifications/VacationRequestsSummaryNotification.php
View File

@@ -10,6 +10,8 @@ use Illuminate\Notifications\Notification;
use Illuminate\Support\Carbon; use Illuminate\Support\Carbon;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Toby\Eloquent\Models\User; use Toby\Eloquent\Models\User;
use Toby\Infrastructure\Slack\Elements\SlackMessage;
use Toby\Infrastructure\Slack\Elements\VacationRequestsAttachment;
class VacationRequestsSummaryNotification extends Notification class VacationRequestsSummaryNotification extends Notification
{ {
@@ -22,7 +24,14 @@ class VacationRequestsSummaryNotification extends Notification
public function via(): array 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 public function toMail($notifiable): MailMessage

7
app/Infrastructure/Slack/Channels/SlackApiChannel.php
View File

@@ -17,11 +17,12 @@ class SlackApiChannel
$url = "{$baseUrl}/chat.postMessage"; $url = "{$baseUrl}/chat.postMessage";
$channel = $notifiable->routeNotificationFor("slack", $notification); $channel = $notifiable->routeNotificationFor("slack", $notification);
$message = $notification->toSlack($notifiable);
return Http::withToken($this->getClientToken()) return Http::withToken($this->getClientToken())
->post($url, [ ->post($url, array_merge($message->getPayload(), [
"channel" => $channel, "channel" => $channel,
"text" => $notification->toSlack($notifiable), ]));
]);
} }
protected function getClientToken(): string protected function getClientToken(): string

53
app/Infrastructure/Slack/Elements/SlackMessage.php Normal file
View File

@@ -0,0 +1,53 @@
<?php
declare(strict_types=1);
namespace Toby\Infrastructure\Slack\Elements;
use Illuminate\Support\Collection;
class SlackMessage
{
protected string $text = "";
protected Collection $attachments;
public function __construct()
{
$this->attachments = new Collection();
}
public function text(string $text): static
{
$this->text = $text;
return $this;
}
public function withAttachment(Attachment $attachment): static
{
$this->attachments->push($attachment);
return $this;
}
public function withAttachments(Collection $attachments): static
{
foreach ($attachments as $attachment) {
$this->withAttachment($attachment);
}
return $this;
}
public function getPayload(): array
{
return [
"text" => $this->text,
"link_names" => true,
"unfurl_links" => true,
"unfurl_media" => true,
"mrkdwn" => true,
"attachments" => $this->attachments->toArray(),
];
}
}

33
app/Infrastructure/Slack/Elements/VacationRequestsAttachment.php Normal file
View File

@@ -0,0 +1,33 @@
<?php
declare(strict_types=1);
namespace Toby\Infrastructure\Slack\Elements;
use Illuminate\Support\Collection;
use Toby\Eloquent\Models\VacationRequest;
class VacationRequestsAttachment extends ListAttachment
{
public function __construct(Collection $vacationRequests)
{
parent::__construct();
$this
->setColor("#527aba")
->setItems($this->mapVacationRequests($vacationRequests));
}
protected function mapVacationRequests(Collection $vacationRequests): Collection
{
return $vacationRequests->map(function (VacationRequest $request): string {
$url = route("vacation.requests.show", ["vacationRequest" => $request->id]);
$date = $request->from->equalTo($request->to)
? "{$request->from->toDisplayString()}"
: "{$request->from->toDisplayString()} - {$request->to->toDisplayString()}";
return "<{$url}|Wniosek nr {$request->name}> użytkownika {$request->user->profile->full_name} ({$date})";
});
}
}