fix: allow organisations without protocols

code4romania · Jan 23, 2024 · 72cec02 · 72cec02
1 parent b70ca76
commit 72cec02
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 9 deletions.
diff --git a/app/Console/Commands/ProcessProtocolsCommand.php b/app/Console/Commands/ProcessProtocolsCommand.php
@@ -90,9 +90,9 @@ private function handleExpiringProtocols(): void
 
         $this->organisations
             ->filter(
-                fn (Organisation $organisation) => $organisation
+                fn (Organisation $organisation) => (bool) $organisation
                     ->last_protocol_expires_at
-                    ?->isSameDay($checkDate) ?? true
+                    ?->isSameDay($checkDate)
             )
             ->each(function (Organisation $organisation) {
                 $this->sendNotification(ExpiringProtocol::class, $organisation);
@@ -119,9 +119,9 @@ private function handleExpiredProtocols(): void
 
         $this->organisations
             ->filter(
-                fn (Organisation $organisation) => $organisation
+                fn (Organisation $organisation) => (bool) $organisation
                     ->last_protocol_expires_at
-                    ?->lte($checkDate) ?? true
+                    ?->lte($checkDate)
             )
             ->each(function (Organisation $organisation) {
                 $organisation->setInactive();

diff --git a/tests/Feature/ProtocolsTest.php b/tests/Feature/ProtocolsTest.php
@@ -7,6 +7,7 @@
 use App\Console\Commands\ProcessProtocolsCommand;
 use App\Enum\UserRole;
 use App\Models\Document;
+use App\Models\Organisation;
 use App\Models\User;
 use App\Notifications\ExpiredProtocol;
 use App\Notifications\ExpiringProtocol;
@@ -35,6 +36,14 @@ protected function setUp(): void
             ->create();
     }
 
+    protected function getPlatformAdmins(): Collection
+    {
+        return User::query()
+            ->withoutGlobalScopes()
+            ->role(UserRole::PLATFORM_ADMIN)
+            ->get();
+    }
+
     /** @test */
     public function it_does_not_send_notifications_for_protocols_expiring_in_less_than_30_days(): void
     {
@@ -190,11 +199,30 @@ public function it_sends_notifications_for_protocols_that_have_expired_in_the_pa
         );
     }
 
-    private function getPlatformAdmins(): Collection
+    /** @test */
+    public function it_does_not_send_notifications_for_organisations_without_protocols(): void
     {
-        return User::query()
-            ->withoutGlobalScopes()
-            ->role(UserRole::PLATFORM_ADMIN)
-            ->get();
+        $organisation = Organisation::factory()
+            ->create();
+
+        $this->artisan(ProcessProtocolsCommand::class)
+            ->assertSuccessful();
+
+        Notification::assertNotSentTo(
+            $organisation,
+            ExpiringProtocol::class
+        );
+
+        Notification::assertNotSentTo(
+            $organisation
+                ->users
+                ->where('role', UserRole::ORG_ADMIN),
+            ExpiringProtocol::class
+        );
+
+        Notification::assertNotSentTo(
+            $this->getPlatformAdmins(),
+            SummaryExpiringProtocols::class
+        );
     }
 }