Fix timezones even more (#68)

transformstudios · Oct 9, 2023 · 1b9c8dc · 1b9c8dc
1 parent b6d9fe3
commit 1b9c8dc
Show file tree

Hide file tree

Showing 8 changed files with 160 additions and 129 deletions.
diff --git a/resources/timezones.json b/resources/timezones.json
diff --git a/src/Day.php b/src/Day.php
@@ -17,9 +17,9 @@ class Day
 
     private CarbonImmutable $date;
 
-    public function __construct(array $data, bool $isAllDay = false)
+    public function __construct(array $data, string $timezone, bool $isAllDay = false)
     {
-        $this->date = CarbonImmutable::parse(Arr::get($data, 'date'));
+        $this->date = CarbonImmutable::parse(Arr::get($data, 'date'))->shiftTimezone($timezone);
         $this->startTime = Arr::get($data, 'start_time');
         $this->endTime = Arr::get($data, 'end_time');
 

diff --git a/src/Types/Event.php b/src/Types/Event.php
@@ -75,9 +75,17 @@ public function startTime(): string
     public function start(): CarbonImmutable
     {
         return CarbonImmutable::parse($this->start_date)
+            ->shiftTimezone($this->timezone['timezone'])
             ->setTimeFromTimeString($this->startTime());
     }
 
+    public function end(): CarbonImmutable
+    {
+        return CarbonImmutable::parse($this->start_date)
+            ->shiftTimezone($this->timezone['timezone'])
+            ->setTimeFromTimeString($this->endTime());
+    }
+
     public function toICalendarEvent(string|CarbonInterface $date): ?ICalendarEvent
     {
         if (! $this->occursOnDate($date)) {
@@ -87,6 +95,7 @@ public function toICalendarEvent(string|CarbonInterface $date): ?ICalendarEvent
         $immutableDate = $this->toCarbonImmutable($date);
 
         $iCalEvent = ICalendarEvent::create($this->event->title)
+            ->withoutTimezone()
             ->uniqueIdentifier($this->event->id())
             ->startsAt($immutableDate->setTimeFromTimeString($this->startTime()))
             ->endsAt($immutableDate->setTimeFromTimeString($this->endTime()));
@@ -120,13 +129,14 @@ protected function toCarbonImmutable(string|CarbonInterface $date): CarbonImmuta
     {
         $carbon = is_string($date) ? Carbon::parse($date) : $date;
 
-        return $carbon->timezone($this->timezone['timezone'])->toImmutable();
+        return $carbon->shiftTimezone($this->timezone['timezone'])->toImmutable();
     }
 
     private function collect(array $dates): Collection
     {
         return collect($dates)
-            ->map(fn (DateTimeInterface $date) => $this->supplement(date: CarbonImmutable::parse($date)))
-            ->filter();
+            ->map(fn (DateTimeInterface $date) => $this->supplement(
+                date: CarbonImmutable::parse($date, $this->timezone['timezone'])
+            ))->filter();
     }
 }
diff --git a/src/Types/MultiDayEvent.php b/src/Types/MultiDayEvent.php
@@ -22,7 +22,11 @@ public function __construct(Entry $event, private bool $collapseMultiDays)
         parent::__construct($event);
 
         $this->days = collect($this->event->days)
-            ->map(fn (Values $day) => new Day($day->all(), $this->isAllDay()));
+            ->map(fn (Values $day) => new Day(
+                $day->all(),
+                $this->timezone['timezone'],
+                $this->isAllDay()
+            ));
     }
 
     /**
@@ -76,7 +80,7 @@ protected function rule(bool $collapseDays = false): RRuleInterface
         if ($this->collapseMultiDays) {
             return new RRule([
                 'count' => 1,
-                'dtstart' => $this->end()->timezone($this->timezone['timezone']),
+                'dtstart' => $this->end(),
                 'freq' => RRule::DAILY,
             ]);
         }
@@ -85,7 +89,7 @@ protected function rule(bool $collapseDays = false): RRuleInterface
             new RSet(),
             fn (RSet $rset) => $this->days->each(fn (Day $day) => $rset->addRRule([
                 'count' => 1,
-                'dtstart' => $day->end()->subSecond()->timezone($this->timezone['timezone']),
+                'dtstart' => $day->end()->subSecond(),
                 'freq' => RRule::SECONDLY,
             ]))
         );

diff --git a/src/Types/RecurringEvent.php b/src/Types/RecurringEvent.php
@@ -2,7 +2,6 @@
 
 namespace TransformStudios\Events\Types;
 
-use Carbon\CarbonImmutable;
 use Illuminate\Support\Carbon;
 use RRule\RRule;
 use RRule\RRuleInterface;
@@ -27,16 +26,16 @@ public function toICalendarEvents(): array
         return [
             ICalendarEvent::create($this->event->title)
                 ->uniqueIdentifier($this->event->id())
-                ->startsAt($this->start()->timezone($timezone))
-                ->endsAt($this->end()->timezone($timezone))
+                ->startsAt($this->start())
+                ->endsAt($this->end())
                 ->rrule($this->spatieRule()),
         ];
     }
 
     protected function rule(): RRuleInterface
     {
         $rule = [
-            'dtstart' => $this->start()->setTimeFromTimeString($this->endTime()),
+            'dtstart' => $this->end(),
             'freq' => $this->frequency(),
             'interval' => $this->interval(),
         ];
@@ -48,12 +47,6 @@ protected function rule(): RRuleInterface
         return new RRule($rule);
     }
 
-    private function end(): CarbonImmutable
-    {
-        return CarbonImmutable::parse($this->start_date)
-            ->setTimeFromTimeString($this->endTime());
-    }
-
     private function frequency(): int
     {
         return match ($this->recurrence->value()) {

diff --git a/tests/Unit/DayTest.php b/tests/Unit/DayTest.php
@@ -16,10 +16,14 @@ public function canGetEndWhenNoEndTime()
             'start_time' => '19:00',
         ];
 
-        $day = new Day(data: $dayData);
+        $day = new Day(data: $dayData, timezone: 'America/Vancouver');
 
-        $this->assertEquals(Carbon::parse('2019-11-23')->endOfDay(), $day->end());
+        $this->assertEquals(
+            Carbon::parse('2019-11-23')->shiftTimezone('America/Vancouver')->endOfDay(),
+            $day->end()
+        );
     }
+
     /** @test */
     public function hasNoEndTimeWhenNoEndTime()
     {
@@ -28,7 +32,7 @@ public function hasNoEndTimeWhenNoEndTime()
             'start_time' => '19:00',
         ];
 
-        $day = new Day(data: $dayData);
+        $day = new Day(data: $dayData, timezone: 'America/Vancouver');
 
         $this->assertFalse($day->hasEndTime());
     }

diff --git a/tests/Unit/MultiDayEventsTest.php b/tests/Unit/MultiDayEventsTest.php
@@ -23,6 +23,9 @@ public function setUp(): void
     {
         parent::setUp();
 
+        Carbon::setTestNowAndTimezone(now(), 'America/Vancouver');
+
+
         $entry = Entry::make()
             ->slug('multi-day-event')
             ->collection('events')
@@ -45,6 +48,7 @@ public function setUp(): void
                         'end_time' => '15:00',
                     ],
                 ],
+                'timezone' => 'America/Vancouver',
             ]);
 
         $this->event = EventFactory::createFromEntry($entry);
@@ -64,6 +68,7 @@ public function setUp(): void
                         'start_time' => '15:00',
                     ],
                 ],
+                'timezone' => 'America/Vancouver',
             ]);
 
         $this->noEndTimeEvent = EventFactory::createFromEntry($noEndTimeEntry);
@@ -80,6 +85,7 @@ public function setUp(): void
                         'date' => '2019-11-21',
                     ],
                 ],
+                'timezone' => 'America/Vancouver',
             ]);
         $this->allDayEvent = EventFactory::createFromEntry($allDayEntry);
     }
@@ -98,8 +104,18 @@ public function canCreateMultiDayEvent()
     /** @test */
     public function canGetStart()
     {
-        $this->assertEquals(Carbon::parse('2019-11-23 19:00'), $this->event->start());
-        $this->assertEquals(Carbon::parse('2019-11-20 0:00'), $this->allDayEvent->start());
+        $this->assertEquals(
+            Carbon::parse('2019-11-23 19:00')->shiftTimezone('America/Vancouver'),
+            $this->event->start()
+        );
+        $this->assertEquals(
+            Carbon::parse('2019-11-20 0:00')->shiftTimezone('America/Vancouver'),
+            $this->allDayEvent->start()
+        );
+        $this->assertEquals(
+            Carbon::parse('2019-11-20 0:00')->shiftTimezone('America/Vancouver')->timezone,
+            $this->event->start()->timezone
+        );
     }
 
     /** @test */
@@ -112,7 +128,7 @@ public function noOccurrencesIfNowAfterEndDate()
     /** @test */
     public function canGenerateNextOccurrenceIfBefore()
     {
-        Carbon::setTestNow('2019-11-22');
+        Carbon::setTestNowAndTimezone('2019-11-22', 'America/Vancouver');
 
         $this->assertEquals(
             Carbon::parse('2019-11-23')->setTimeFromTimeString('19:00:00'),
@@ -127,7 +143,7 @@ public function canGenerateNextOccurrenceIfBefore()
     /** @test */
     public function canGenerateNextOccurrenceIfDuring()
     {
-        Carbon::setTestNow('2019-11-24 10:00');
+        Carbon::setTestNowAndTimezone('2019-11-24 10:00', 'America/Vancouver');
         $this->assertEquals(
             Carbon::parse('2019-11-24')->setTimeFromTimeString('11:00:00'),
             $this->event->nextOccurrences()[0]->start

diff --git a/tests/Unit/SingleDayEventsTest.php b/tests/Unit/SingleDayEventsTest.php
@@ -4,6 +4,7 @@
 
 use Carbon\Carbon;
 use Carbon\CarbonImmutable;
+use Carbon\CarbonTimeZone;
 use Statamic\Facades\Entry;
 use TransformStudios\Events\EventFactory;
 use TransformStudios\Events\Tests\TestCase;
@@ -20,6 +21,7 @@ public function canCreateSingleEvent()
                 'start_date' => Carbon::now()->toDateString(),
                 'start_time' => '11:00',
                 'end_time' => '12:00',
+                'timezone' => 'America/Vancouver',
             ]);
 
         $event = EventFactory::createFromEntry($entry);
@@ -28,6 +30,8 @@ public function canCreateSingleEvent()
         $this->assertFalse($event->isRecurring());
         $this->assertFalse($event->isMultiDay());
         $this->assertTrue($event->hasEndTime());
+        $this->assertEquals(new CarbonTimeZone('America/Vancouver'), $event->start()->timezone);
+        $this->assertEquals(new CarbonTimeZone('America/Vancouver'), $event->end()->timezone);
     }
 
     /** @test */