handle bad legacy data

transformstudios · Feb 20, 2024 · de0bc8a · de0bc8a
1 parent f0f7b30
commit de0bc8a
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 1 deletion.
diff --git a/src/Events.php b/src/Events.php
@@ -3,6 +3,7 @@
 namespace TransformStudios\Events;
 
 use Carbon\CarbonInterface;
+use Exception;
 use Illuminate\Support\Traits\Conditionable;
 use Statamic\Entries\Entry;
 use Statamic\Entries\EntryCollection;
@@ -165,7 +166,8 @@ private function entries(): self
     private function occurrences(callable $generator): EntryCollection
     {
         return $this->entries
-            // take each event and generate the occurences
+            // take each event and generate the occurrences
+            ->filter(fn (Entry $occurrence) => $this->hasStartDate($occurrence))
             ->flatMap(callback: $generator)
             ->reject(fn (Entry $occurrence) => collect($occurrence->exclude_dates)
                 ->filter(fn (Values $dateRow) => $dateRow->date)
@@ -174,6 +176,19 @@ private function occurrences(callable $generator): EntryCollection
             ->values();
     }
 
+    private function hasStartDate(Entry $occurrence): bool
+    {
+        if ($occurrence->multi_day || $occurrence->get('recurrence') === 'multi_day') {
+            try {
+                return collect($occurrence->days)->every(fn (Values $day) => $day->date);
+            } catch (Exception $e) {
+                return false;
+            }
+        }
+
+        return $occurrence->has('start_date');
+    }
+
     private function paginate(EntryCollection $occurrences): LengthAwarePaginator
     {
         return new LengthAwarePaginator(

diff --git a/tests/Unit/EventsTest.php b/tests/Unit/EventsTest.php
@@ -376,4 +376,34 @@ public function canHandleEmptyExcludeDates()
 
         $this->assertCount(4, $occurrences);
     }
+
+    /** @test */
+    public function canFilterOurEventsWithNoStartDate()
+    {
+        Carbon::setTestNow(now()->setTimeFromTimeString('10:00'));
+
+        Entry::make()
+            ->collection('events')
+            ->slug('single-event')
+            ->data([
+                'title' => 'Single Event',
+                'start_time' => '11:00',
+                'end_time' => '12:00',
+            ])->save();
+        Entry::make()
+            ->collection('events')
+            ->slug('legacy-multi-day-event')
+            ->data([
+                'title' => 'Legacy Multi-day Event',
+                'multi_day' => true,
+                'days' => [
+                    ['date' => 'bad-date'],
+                ],
+            ])->save();
+
+        $occurrences = Events::fromCollection(handle: 'events')
+            ->upcoming(5);
+
+        $this->assertEmpty($occurrences);
+    }
 }