ScheduleElement: Sync start time & the first recurrence of a rule

Icinga · Apr 28, 2023 · 6d20102 · 6d20102
1 parent b86723b
commit 6d20102
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/src/FormElement/ScheduleElement.php b/src/FormElement/ScheduleElement.php
@@ -307,6 +307,12 @@ public function getValue($name = null, $default = null)
             $rule->endAt(parent::getValue('end'));
         }
 
+        // Sync the start time and first recurrence of the rule
+        if (! $this->hasCronExpression() && $this->getFrequency() !== static::NO_REPEAT) {
+            $nextDue = $rule->getNextRecurrences($start)->current() ?? $start;
+            $rule->startAt($nextDue);
+        }
+
         return $rule;
     }
 

diff --git a/tests/ScheduleElementTest.php b/tests/ScheduleElementTest.php
@@ -322,7 +322,7 @@ public function testCustomDailyFrequencyWithEnd()
 
     public function testCustomWeeklyFrequency()
     {
-        $start = new DateTime('2023-02-07T15:17:07');
+        $start = new DateTime('2023-02-08T15:17:07');
         $frequency = (new RRule('FREQ=WEEKLY;INTERVAL=4;BYDAY=WE'))->startAt($start);
         $element = $this->assembleElement(['value' => $frequency]);
 
@@ -346,7 +346,7 @@ public function testCustomWeeklyFrequency()
 
     public function testCustomWeeklyFrequencyWithEnd()
     {
-        $start = new DateTime('2023-02-07T15:17:07');
+        $start = new DateTime('2023-02-08T15:17:07');
         $end = new DateTime('2023-02-10T18:00:00');
         $frequency = (new RRule('FREQ=WEEKLY;INTERVAL=4;BYDAY=WE'))
             ->startAt($start)
@@ -374,7 +374,7 @@ public function testCustomWeeklyFrequencyWithEnd()
 
     public function testCustomMonthlyFrequency()
     {
-        $start = new DateTime('2023-02-07T15:17:07');
+        $start = new DateTime('2023-02-08T15:17:07');
         $frequency = (new RRule('FREQ=MONTHLY;INTERVAL=1;BYMONTHDAY=8,17,18,27'))->startAt($start);
         $element = $this->assembleElement(['value' => $frequency]);
 
@@ -422,7 +422,7 @@ public function testCustomMonthlyFrequency()
 
     public function testCustomMonthlyFrequencyWithEnd()
     {
-        $start = new DateTime('2023-02-07T15:17:07');
+        $start = new DateTime('2023-02-08T15:17:07');
         $end = new DateTime('2023-02-10T18:00:00');
         $frequency = (new RRule('FREQ=MONTHLY;INTERVAL=1;BYMONTHDAY=8,17,18,27'))
             ->startAt($start)
@@ -474,7 +474,7 @@ public function testCustomMonthlyFrequencyWithEnd()
 
     public function testCustomOnTheEachMonthFrequency()
     {
-        $start = new DateTime('2023-02-07T15:17:07');
+        $start = new DateTime('2023-02-08T15:17:07');
         $end = new DateTime('2023-02-10T18:00:00');
         $frequency = (new RRule('FREQ=MONTHLY;INTERVAL=1;BYDAY=2WE'))
             ->startAt($start)
@@ -591,4 +591,16 @@ public function testCustomOnTheEachYearFrequencyWithEnd()
 
         $this->assertEquals($frequency, $element->getValue());
     }
+
+    public function testRecurrenceStartIsSyncedCorrectly()
+    {
+        $start = new DateTime('2023-04-27T11:00:00');
+        $frequency = (new RRule('FREQ=WEEKLY;INTERVAL=2;BYDAY=SA,SU'))->startAt($start);
+
+        $value = $this->assembleElement(['value' => $frequency])->getValue();
+
+        // The initial start date is April 27, but the frequency only triggers on Saturday/Sunday,
+        // so the first recurrence is on April 29 and the start date should've been synced.
+        $this->assertEquals(new DateTime('2023-04-29T11:00:00'), $value->getStart());
+    }
 }