hotfix: filter out projects with invalid dates (#406)

* fix: apply HasValidDates scope to Project and BCRProject queries

* chore: rename for readability

fix

Author: ancarofl

app/Http/Controllers/HomeController.php

@@ -29,6 +29,7 @@ public function index()
 
             'projects' => ProjectCardResource::collection(
                 Project::whereIsOpen()
+                    ->whereHasValidDates('start','end')
                     ->latest()
                     ->limit(12)
                     ->get()
@@ -37,6 +38,7 @@ public function index()
             'bcr_projects' => BCRProjectCardResource::collection(
                 BCRProject::query()
                     ->where('status', ProjectStatus::approved)
+                    ->whereHasValidDates()
                     ->latest()
                     ->with('county')
                     ->limit(12)

app/Http/Controllers/ProjectController.php

@@ -62,7 +62,8 @@ protected function projectList(Request $request, string $view): Response
                 AllowedSort::custom('donations_count', new ProjectDonationsCountSort),
             ])
             ->defaultSort('-id')
-            ->whereIsPublished();
+            ->whereIsPublished()
+            ->whereHasValidDates('start', 'end');
 
         return Inertia::render('Public/Projects/Index', [
             'view' => $view,

app/Models/BCRProject.php

@@ -8,6 +8,7 @@
 use App\Concerns\HasSlug;
 use App\Enums\ProjectStatus;
 use App\Traits\HasProjectStatus;
+use App\Traits\HasValidDates;
 use Embed\Embed;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -23,6 +24,7 @@ class BCRProject extends Model implements HasMedia
 {
     use HasFactory;
     use HasLocation;
+    use HasValidDates;
     use InteractsWithMedia;
     use HasProjectStatus;
     use HasSlug;
@@ -90,12 +92,12 @@ public function getEmbeddedVideosAttribute(): array
     {
         return collect($this->videos)
             ->pluck('link')
-            ->filter(fn ($video) => ! blank($video))
+            ->filter(fn($video) => ! blank($video))
             ->map(
-                fn (string $videoUrl) => Cache::remember(
+                fn(string $videoUrl) => Cache::remember(
                     'video-' . hash('sha256', $videoUrl),
                     MONTH_IN_SECONDS,
-                    fn () => rescue(fn () => (new Embed)->get($videoUrl)->code, '', false)
+                    fn() => rescue(fn() => (new Embed)->get($videoUrl)->code, '', false)
                 )
             )
             ->filter()

app/Models/Project.php

@@ -11,6 +11,7 @@
 use App\Enums\EuPlatescStatus;
 use App\Enums\ProjectStatus;
 use App\Traits\HasProjectStatus;
+use App\Traits\HasValidDates;
 use Embed\Embed;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -39,6 +40,7 @@ class Project extends Model implements HasMedia
     use HasVolunteers;
     use InteractsWithMedia;
     use HasProjectStatus;
+    use HasValidDates;
     use HasSlug;
     use LogsActivity;
     use LogsActivityForApproval;
@@ -192,14 +194,14 @@ public function getIsDraftAttribute(): bool
 
     public function getIsPeriodActiveAttribute(): bool
     {
-        return $this->start->isPast() && $this->end->isFuture();
+        return $this->start?->isPast() && $this->end?->isFuture();
     }
 
     public function getIsActiveAttribute(): bool
     {
         return $this->status == ProjectStatus::approved
-            && $this->start->isPast()
-            && $this->end->isFuture();
+            && $this->start?->isPast()
+            && $this->end?->isFuture();
     }
 
     public function getCanBeArchivedAttribute(): bool
@@ -249,7 +251,7 @@ public function markAsApproved(): bool
             $slug .= '-' . ($count + 1);
         }
 
-        $this->activities->map(fn (Activity $activity) => $activity->approve());
+        $this->activities->map(fn(Activity $activity) => $activity->approve());
 
         return $this->update([
             'status' => ProjectStatus::approved,
@@ -280,10 +282,10 @@ public function getEmbeddedVideosAttribute(): array
             ->pluck('url')
             ->filter()
             ->map(
-                fn (string $videoUrl) => Cache::remember(
+                fn(string $videoUrl) => Cache::remember(
                     'video-' . hash('sha256', $videoUrl),
                     MONTH_IN_SECONDS,
-                    fn () => rescue(fn () => (new Embed)->get($videoUrl)->code, report: false)
+                    fn() => rescue(fn() => (new Embed)->get($videoUrl)->code, report: false)
                 )
             )
             ->filter()

app/Traits/HasValidDates.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Traits;
+
+use Illuminate\Database\Eloquent\Builder;
+
+trait HasValidDates
+{
+    public function scopeWhereHasValidDates(Builder $query, string $startColumn = 'start_date', string $endColumn = 'end_date'): Builder
+    {
+        return $query
+            ->whereNotNull($startColumn)
+            ->whereNotNull($endColumn)
+            ->whereColumn($startColumn, '<=', $endColumn);
+    }
+}