- actions and notifications refactor (#88)

* wip

* fix

* fix

* fix

* add test

* fix

* wip

* fix

* fix translations

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>

tests/Feature/VacationRequestTest.php

@@ -6,14 +6,11 @@ namespace Tests\Feature;
 
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Bus;
+use Illuminate\Support\Facades\Notification;
 use Inertia\Testing\AssertableInertia as Assert;
 use Tests\FeatureTestCase;
 use Toby\Domain\Enums\VacationType;
-use Toby\Domain\Events\VacationRequestAcceptedByAdministrative;
-use Toby\Domain\Events\VacationRequestAcceptedByTechnical;
-use Toby\Domain\Events\VacationRequestApproved;
-use Toby\Domain\Events\VacationRequestRejected;
 use Toby\Domain\PolishHolidaysRetriever;
 use Toby\Domain\States\VacationRequest\Approved;
 use Toby\Domain\States\VacationRequest\Rejected;
@@ -34,6 +31,9 @@ class VacationRequestTest extends FeatureTestCase
     {
         parent::setUp();
 
+        Bus::fake();
+        Notification::fake();
+
         $this->polishHolidaysRetriever = $this->app->make(PolishHolidaysRetriever::class);
     }
 
@@ -130,8 +130,6 @@ class VacationRequestTest extends FeatureTestCase
 
     public function testUserCanCreateVacationRequestOnEmployeeBehalfAndSkipAcceptanceFlow(): void
     {
-        Event::fake(VacationRequestApproved::class);
-
         $creator = User::factory()->admin()->createQuietly();
         $user = User::factory()->createQuietly();
 
@@ -169,8 +167,6 @@ class VacationRequestTest extends FeatureTestCase
 
     public function testTechnicalApproverCanApproveVacationRequest(): void
     {
-        Event::fake(VacationRequestAcceptedByTechnical::class);
-
         $user = User::factory()->createQuietly();
         $technicalApprover = User::factory()->technicalApprover()->createQuietly();
         $currentYearPeriod = YearPeriod::current();
@@ -187,13 +183,13 @@ class VacationRequestTest extends FeatureTestCase
             ->post("/vacation-requests/{$vacationRequest->id}/accept-as-technical")
             ->assertSessionHasNoErrors();
 
-        Event::assertDispatched(VacationRequestAcceptedByTechnical::class);
+        $vacationRequest->refresh();
+
+        $this->assertTrue($vacationRequest->state->equals(WaitingForAdministrative::class));
     }
 
     public function testAdministrativeApproverCanApproveVacationRequest(): void
     {
-        Event::fake(VacationRequestAcceptedByAdministrative::class);
-
         $user = User::factory()->createQuietly();
         $administrativeApprover = User::factory()->administrativeApprover()->createQuietly();
 
@@ -210,13 +206,13 @@ class VacationRequestTest extends FeatureTestCase
             ->post("/vacation-requests/{$vacationRequest->id}/accept-as-administrative")
             ->assertSessionHasNoErrors();
 
-        Event::assertDispatched(VacationRequestAcceptedByAdministrative::class);
+        $vacationRequest->refresh();
+
+        $this->assertTrue($vacationRequest->state->equals(Approved::class));
     }
 
     public function testTechnicalApproverCanRejectVacationRequest(): void
     {
-        Event::fake(VacationRequestRejected::class);
-
         $user = User::factory()->createQuietly();
         $technicalApprover = User::factory()->technicalApprover()->createQuietly();
         $currentYearPeriod = YearPeriod::current();
@@ -228,6 +224,7 @@ class VacationRequestTest extends FeatureTestCase
             ->for($currentYearPeriod)
             ->create();
 
+        /** @var VacationRequest $vacationRequest */
         $vacationRequest = VacationRequest::factory([
             "state" => WaitingForTechnical::class,
             "type" => VacationType::Vacation,
@@ -240,10 +237,9 @@ class VacationRequestTest extends FeatureTestCase
             ->post("/vacation-requests/{$vacationRequest->id}/reject")
             ->assertSessionHasNoErrors();
 
-        Event::assertDispatched(VacationRequestRejected::class);
-        $this->assertDatabaseHas("vacation_requests", [
-            "state" => Rejected::$name,
-        ]);
+        $vacationRequest->refresh();
+
+        $this->assertTrue($vacationRequest->state->equals(Rejected::class));
     }
 
     public function testUserCannotCreateVacationRequestIfHeExceedsHisVacationLimit(): void

tests/Unit/VacationRequestNotificationTest.php

@@ -9,11 +9,14 @@ use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Notification;
 use Tests\TestCase;
 use Tests\Traits\InteractsWithYearPeriods;
+use Toby\Domain\Actions\VacationRequest\RejectAction;
+use Toby\Domain\Actions\VacationRequest\WaitForTechApprovalAction;
 use Toby\Domain\Enums\Role;
 use Toby\Domain\Enums\VacationType;
-use Toby\Domain\Notifications\VacationRequestWaitsForTechApprovalNotification;
+use Toby\Domain\Notifications\VacationRequestStatusChangedNotification;
+use Toby\Domain\Notifications\VacationRequestWaitsForApprovalNotification;
 use Toby\Domain\States\VacationRequest\Created;
-use Toby\Domain\VacationRequestStateManager;
+use Toby\Domain\States\VacationRequest\WaitingForTechnical;
 use Toby\Eloquent\Models\User;
 use Toby\Eloquent\Models\VacationRequest;
 use Toby\Eloquent\Models\YearPeriod;
@@ -23,14 +26,10 @@ class VacationRequestNotificationTest extends TestCase
     use DatabaseMigrations;
     use InteractsWithYearPeriods;
 
-    protected VacationRequestStateManager $stateManager;
-
     protected function setUp(): void
     {
         parent::setUp();
 
-        $this->stateManager = $this->app->make(VacationRequestStateManager::class);
-
         $this->createCurrentYearPeriod();
     }
 
@@ -47,6 +46,9 @@ class VacationRequestNotificationTest extends TestCase
         $administrativeApprover = User::factory([
             "role" => Role::AdministrativeApprover,
         ])->createQuietly();
+        $admin = User::factory([
+            "role" => Role::Administrator,
+        ])->createQuietly();
 
         $currentYearPeriod = YearPeriod::current();
 
@@ -62,9 +64,47 @@ class VacationRequestNotificationTest extends TestCase
             ->for($currentYearPeriod)
             ->create();
 
-        $this->stateManager->waitForTechnical($vacationRequest);
+        $waitForTechApprovalAction = $this->app->make(WaitForTechApprovalAction::class);
 
-        Notification::assertSentTo($technicalApprover, VacationRequestWaitsForTechApprovalNotification::class);
-        Notification::assertNotSentTo([$user, $administrativeApprover], VacationRequestWaitsForTechApprovalNotification::class);
+        $waitForTechApprovalAction->execute($vacationRequest);
+
+        Notification::assertSentTo([$technicalApprover, $admin], VacationRequestWaitsForApprovalNotification::class);
+        Notification::assertNotSentTo([$user, $administrativeApprover], VacationRequestWaitsForApprovalNotification::class);
+    }
+
+    public function testNotificationIsSentOnceToUser(): void
+    {
+        Notification::fake();
+
+        $technicalApprover = User::factory([
+            "role" => Role::TechnicalApprover,
+        ])->createQuietly();
+        $administrativeApprover = User::factory([
+            "role" => Role::AdministrativeApprover,
+        ])->createQuietly();
+        $admin = User::factory([
+            "role" => Role::Administrator,
+        ])->createQuietly();
+
+        $currentYearPeriod = YearPeriod::current();
+
+        /** @var VacationRequest $vacationRequest */
+        $vacationRequest = VacationRequest::factory([
+            "type" => VacationType::Vacation->value,
+            "state" => WaitingForTechnical::class,
+            "from" => Carbon::create($currentYearPeriod->year, 2, 1)->toDateString(),
+            "to" => Carbon::create($currentYearPeriod->year, 2, 4)->toDateString(),
+            "comment" => "Comment for the vacation request.",
+        ])
+            ->for($administrativeApprover)
+            ->for($currentYearPeriod)
+            ->create();
+
+        $rejectAction = $this->app->make(RejectAction::class);
+
+        $rejectAction->execute($vacationRequest, $technicalApprover);
+
+        Notification::assertSentTo([$technicalApprover, $admin, $administrativeApprover], VacationRequestStatusChangedNotification::class);
+        Notification::assertTimesSent(3, VacationRequestStatusChangedNotification::class);
     }
 }