Merge branch 'main' into #39-generate-timesheet

# Conflicts:
#	composer.lock
#	resources/lang/pl.json

app/Domain/Enums/VacationRequestState.php

@@ -7,7 +7,7 @@ namespace Toby\Domain\Enums;
 enum VacationRequestState: string
 {
     case Created = "created";
-    case Canceled = "canceled";
+    case Cancelled = "cancelled";
     case Rejected = "rejected";
     case Approved = "approved";
     case WaitingForTechnical = "waiting_for_technical";
@@ -40,7 +40,7 @@ enum VacationRequestState: string
     {
         return [
             self::Rejected,
-            self::Canceled,
+            self::Cancelled,
         ];
     }
 

app/Domain/Events/VacationRequestCancelled.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Domain\Events;
+
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+use Toby\Eloquent\Models\VacationRequest;
+
+class VacationRequestCancelled
+{
+    use Dispatchable;
+    use SerializesModels;
+
+    public function __construct(
+        public VacationRequest $vacationRequest,
+    ) {
+    }
+}

app/Domain/Listeners/HandleApprovedVacationRequest.php

@@ -5,16 +5,10 @@ declare(strict_types=1);
 namespace Toby\Domain\Listeners;
 
 use Toby\Domain\Events\VacationRequestApproved;
-use Toby\Domain\VacationTypeConfigRetriever;
 use Toby\Infrastructure\Jobs\SendVacationRequestDaysToGoogleCalendar;
 
 class HandleApprovedVacationRequest
 {
-    public function __construct(
-        protected VacationTypeConfigRetriever $configRetriever,
-    ) {
-    }
-
     public function handle(VacationRequestApproved $event): void
     {
         SendVacationRequestDaysToGoogleCalendar::dispatch($event->vacationRequest);

app/Domain/Listeners/HandleCancelledVacationRequest.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Toby\Domain\Listeners;
+
+use Toby\Domain\Events\VacationRequestCancelled;
+use Toby\Infrastructure\Jobs\ClearVacationRequestDaysInGoogleCalendar;
+
+class HandleCancelledVacationRequest
+{
+    public function handle(VacationRequestCancelled $event): void
+    {
+        ClearVacationRequestDaysInGoogleCalendar::dispatch($event->vacationRequest);
+    }
+}

app/Domain/TimesheetPerUserSheet.php

@@ -21,7 +21,6 @@ use Maatwebsite\Excel\Events\AfterSheet;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Style\Alignment;
 use PhpOffice\PhpSpreadsheet\Style\Border;
-use PhpOffice\PhpSpreadsheet\Style\Color;
 use PhpOffice\PhpSpreadsheet\Style\Fill;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;

app/Domain/VacationRequestStateManager.php

@@ -10,6 +10,7 @@ use Toby\Domain\Enums\VacationRequestState;
 use Toby\Domain\Events\VacationRequestAcceptedByAdministrative;
 use Toby\Domain\Events\VacationRequestAcceptedByTechnical;
 use Toby\Domain\Events\VacationRequestApproved;
+use Toby\Domain\Events\VacationRequestCancelled;
 use Toby\Domain\Events\VacationRequestCreated;
 use Toby\Eloquent\Models\VacationRequest;
 
@@ -42,7 +43,9 @@ class VacationRequestStateManager
 
     public function cancel(VacationRequest $vacationRequest): void
     {
-        $this->changeState($vacationRequest, VacationRequestState::Canceled);
+        $this->changeState($vacationRequest, VacationRequestState::Cancelled);
+
+        $this->dispatcher->dispatch(new VacationRequestCancelled($vacationRequest));
     }
 
     public function acceptAsTechnical(VacationRequest $vacationRequest): void