Fix status of schedules

cachethq · Oct 16, 2024 · 15ee7ed · 15ee7ed
1 parent af55fe4
commit 15ee7ed
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/database/factories/ScheduleFactory.php b/database/factories/ScheduleFactory.php
@@ -2,7 +2,6 @@
 
 namespace Cachet\Database\Factories;
 
-use Cachet\Enums\ScheduleStatusEnum;
 use Cachet\Models\Schedule;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
@@ -39,15 +38,15 @@ public function inProgress(): self
     {
         return $this->state([
             'scheduled_at' => now()->subMinutes(30),
-            'completed_at' => now()->addDays(14),
+            'completed_at' => null,
         ]);
     }
 
     public function inTheFuture(): self
     {
         return $this->state([
             'scheduled_at' => now()->addDays(30),
-            'completed_at' => now()->addDays(180),
+            'completed_at' => null,
         ]);
     }
 

diff --git a/src/Models/Schedule.php b/src/Models/Schedule.php
@@ -36,9 +36,9 @@ public function status(): Attribute
         return Attribute::get(function () {
             $now = Carbon::now();
 
-            return match(true) {
+            return match (true) {
                 $this->scheduled_at->gte($now) => ScheduleStatusEnum::upcoming,
-                $this->completed_at->gte($now) || $this->completed_at === null => ScheduleStatusEnum::in_progress,
+                $this->completed_at === null => ScheduleStatusEnum::in_progress,
                 default => ScheduleStatusEnum::complete,
             };
         });
@@ -68,8 +68,8 @@ public function formattedMessage(): string
      */
     public function scopeIncomplete(Builder $query): Builder
     {
-        return $query->whereDate('completed_at', '>=', Carbon::now())
-        ->orWhereNull('completed_at');
+        return $query->whereDate('scheduled_at', '>=', Carbon::now())
+            ->whereNull('completed_at');
     }
 
     /**
@@ -78,10 +78,10 @@ public function scopeIncomplete(Builder $query): Builder
     public function scopeInProgress(Builder $query): Builder
     {
         return $query->whereDate('scheduled_at', '<=', Carbon::now())
-        ->where(function (Builder $query) {
-            $query->whereDate('completed_at', '>=', Carbon::now())
-            ->orWhereNull('completed_at');
-        });
+            ->where(function (Builder $query) {
+                $query->whereDate('completed_at', '>=', Carbon::now())
+                    ->orWhereNull('completed_at');
+            });
     }
 
     /**

diff --git a/tests/Feature/Api/ScheduleTest.php b/tests/Feature/Api/ScheduleTest.php
@@ -1,6 +1,5 @@
 <?php
 
-use Cachet\Enums\ScheduleStatusEnum;
 use Cachet\Models\Component;
 use Cachet\Models\Schedule;
 
@@ -199,7 +198,7 @@
 
     $response = putJson('/status/api/schedules/'.$schedule->id, [
         'name' => 'Updated Scheduled Maintenance',
-        'message' => 'Something went wrong.'
+        'message' => 'Something went wrong.',
     ]);
 
     $response->assertOk();