fix: time > now, today; time < now , tomorrow

Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>

Author: vitormattos

lib/Service/ReminderService.php

@@ -138,18 +138,20 @@ protected function getStartTime(string $startTime): ?\DateTime {
 		$timezone = $this->dateTimeZone->getTimeZone();
 
 		$now = $this->time->getDateTime('now', new \DateTimeZone('UTC'));
-		$tomorrow = clone $now;
-		$tomorrow->modify('+1 day');
+		$dateTime = clone $now;
 
 		try {
 			$time = new \DateTime($startTime, $timezone);
 		} catch (DateMalformedStringException) {
 			return null;
 		}
-		$tomorrow->setTime((int)$time->format('G'), (int)$time->format('i'));
-		$tomorrow->setTimezone(new \DateTimeZone('UTC'));
+		$dateTime->setTime((int)$time->format('G'), (int)$time->format('i'));
+		$dateTime->setTimezone(new \DateTimeZone('UTC'));
+		if ($dateTime <= $now) {
+			$dateTime->modify('+1 day');
+		}
 
-		return $tomorrow;
+		return $dateTime;
 	}
 
 	public function sendReminders(): void {

tests/php/Unit/Service/ReminderServiceTest.php

@@ -420,7 +420,7 @@ public static function providerSave(): array {
 					'days_before' => 1,
 					'days_between' => 1,
 					'max' => 1,
-					'next_run' => (clone $now)->modify('+1 day')->setTime(10, 0),
+					'next_run' => (clone $now)->setTime(10, 0),
 					'send_timer' => '10:00',
 				],
 			],
@@ -430,17 +430,27 @@ public static function providerSave(): array {
 					'days_before' => 1,
 					'days_between' => 1,
 					'max' => 1,
-					'next_run' => (clone $now)->modify('+1 day')->setTime(10, 0),
+					'next_run' => (clone $now)->setTime(10, 0),
 					'send_timer' => '10:00',
 				],
 			],
+			[
+				'daysBefore' => 1, 'daysBetween' => 1, 'max' => 1, 'sendTimer' => '08:05',
+				'expected' => [
+					'days_before' => 1,
+					'days_between' => 1,
+					'max' => 1,
+					'next_run' => (clone $now)->modify('+1 day')->setTime(8, 5),
+					'send_timer' => '08:05',
+				],
+			],
 			[
 				'daysBefore' => 1, 'daysBetween' => 1, 'max' => 1, 'sendTimer' => '11:05',
 				'expected' => [
 					'days_before' => 1,
 					'days_between' => 1,
 					'max' => 1,
-					'next_run' => (clone $now)->modify('+1 day')->setTime(11, 5),
+					'next_run' => (clone $now)->setTime(11, 5),
 					'send_timer' => '11:05',
 				],
 			],