Merge pull request #5535 from LibreSign/fix/make-possible-to-test-with-dates

fix: make possible to test with dates

Author: vitormattos

lib/Service/ReminderService.php

@@ -8,6 +8,7 @@
 
 namespace OCA\Libresign\Service;
 
+use DateMalformedStringException;
 use DateTime;
 use OCA\Libresign\AppInfo\Application;
 use OCA\Libresign\BackgroundJob\Reminder;
@@ -17,6 +18,7 @@
 use OCP\BackgroundJob\IJobList;
 use OCP\IAppConfig;
 use OCP\IDateTimeZone;
+use Psr\Log\LoggerInterface;
 
 class ReminderService {
 	public function __construct(
@@ -26,6 +28,7 @@ public function __construct(
 		protected ITimeFactory $time,
 		protected SignRequestMapper $signRequestMapper,
 		protected IdentifyMethodService $identifyMethodService,
+		protected LoggerInterface $logger,
 	) {
 	}
 
@@ -136,14 +139,22 @@ protected function scheduleJob(string $startTime): ?DateTime {
 	protected function getStartTime(string $startTime): ?\DateTime {
 		$timezone = $this->dateTimeZone->getTimeZone();
 
-		$dateTime = new \DateTime($startTime, $timezone);
-		$dateTime->setTimezone(new \DateTimeZone('UTC'));
+		$now = $this->time->getDateTime('now', new \DateTimeZone('UTC'));
+		$dateTime = clone $now;
 
-		$now = new \DateTime('now', new \DateTimeZone('UTC'));
-		if ($dateTime > $now) {
-			return $dateTime;
+		try {
+			$time = new \DateTime($startTime, $timezone);
+		} catch (DateMalformedStringException $e) {
+			$this->logger->error('Failed to parse reminder send time: ' . $e->getMessage());
+			return null;
+		}
+		// 'G' = 24-hour format hour (no leading zeros),
+		// 'i' = minutes with leading zeros
+		$dateTime->setTime((int)$time->format('G'), (int)$time->format('i'));
+		$dateTime->setTimezone(new \DateTimeZone('UTC'));
+		if ($dateTime <= $now) {
+			$dateTime->modify('+1 day');
 		}
-		$dateTime->modify('+1 day');
 
 		return $dateTime;
 	}

tests/php/Unit/Service/ReminderServiceTest.php

@@ -18,22 +18,25 @@
 use OCP\Server;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
 
 final class ReminderServiceTest extends \OCA\Libresign\Tests\Unit\TestCase {
 	protected IJobList|MockObject $jobList;
 	protected IAppConfig $appConfig;
 	protected IDateTimeZone $dateTimeZone;
-	protected ITimeFactory $time;
+	protected ITimeFactory|MockObject $time;
 	protected SignRequestMapper|MockObject $signRequestMapper;
 	protected IdentifyMethodService|MockObject $identifyMethodService;
+	protected LoggerInterface|MockObject $logger;
 
 	public function setUp(): void {
 		$this->jobList = $this->createMock(IJobList::class);
 		$this->appConfig = $this->getMockAppConfig();
 		$this->dateTimeZone = Server::get(IDateTimeZone::class);
-		$this->time = Server::get(ITimeFactory::class);
+		$this->time = $this->createMock(ITimeFactory::class);
 		$this->signRequestMapper = $this->createMock(SignRequestMapper::class);
 		$this->identifyMethodService = $this->createMock(IdentifyMethodService::class);
+		$this->logger = $this->createMock(LoggerInterface::class);
 	}
 
 	private function getService(array $methods = []): ReminderService|MockObject {
@@ -46,6 +49,7 @@ private function getService(array $methods = []): ReminderService|MockObject {
 					$this->time,
 					$this->signRequestMapper,
 					$this->identifyMethodService,
+					$this->logger,
 				])
 				->onlyMethods($methods)
 				->getMock();
@@ -57,6 +61,7 @@ private function getService(array $methods = []): ReminderService|MockObject {
 			$this->time,
 			$this->signRequestMapper,
 			$this->identifyMethodService,
+			$this->logger,
 		);
 	}
 
@@ -105,7 +110,7 @@ public function testWillNotify(array $summarized, \DateTime $now, int $daysBefor
 	}
 
 	public static function providerWillNotify(): array {
-		$now = (new DateTime())->setTime(12, 0);
+		$now = new DateTime('2025-10-09 12:00:00', new \DateTimeZone('UTC'));
 
 		return [
 			'no notifications, should not send with all zero and null' => [
@@ -327,6 +332,11 @@ public function testSave(
 		string $sendTimer,
 		array $expected,
 	): void {
+		// Setup fixed time for consistent testing
+		$fixedTime = new DateTime('2025-10-09 09:00:00', new \DateTimeZone('UTC'));
+		$this->time->method('getDateTime')
+			->willReturn($fixedTime);
+
 		$service = $this->getService();
 		$actual = $service->save($daysBefore, $daysBetween, $max, $sendTimer);
 		$this->assertEquals($expected, $actual);
@@ -347,7 +357,7 @@ public function testSave(
 	}
 
 	public static function providerSave(): array {
-		$now = (new DateTime());
+		$now = (new DateTime('2025-10-09 09:00:00', new \DateTimeZone('UTC')));
 		return [
 			[
 				'daysBefore' => 0, 'daysBetween' => 0, 'max' => 0, 'sendTimer' => '',
@@ -415,7 +425,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',
 				],
 			],
@@ -425,17 +435,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',
 				],
 			],