JobInfo: getStart(), JobResult: getEnd() includes correct timezone (i…

…n main process, when using ProcessJobExecutor)

CHANGELOG.md

@@ -30,6 +30,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - `ListCommand`
 	- on invalid input option - writes error to output instead of throwing exception
+- `JobInfo`
+	- `getStart()` includes correct timezone (in main process, when using `ProcessJobExecutor`)
+- `JobResult`
+	- `getEnd()` includes correct timezone (in main process, when using `ProcessJobExecutor`)
 
 ## [2.0.0](https://github.com/orisai/scheduler/compare/1.0.0...2.0.0) - 2024-01-26
 

src/Command/BaseRunCommand.php

@@ -4,6 +4,7 @@
 
 use Orisai\Scheduler\Status\JobResultState;
 use Orisai\Scheduler\Status\JobSummary;
+use Psr\Clock\ClockInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Terminal;
@@ -19,6 +20,14 @@
 abstract class BaseRunCommand extends Command
 {
 
+	private ClockInterface $clock;
+
+	public function __construct(ClockInterface $clock)
+	{
+		parent::__construct();
+		$this->clock = $clock;
+	}
+
 	protected function getTerminalWidth(): int
 	{
 		return (new Terminal())->getWidth();
@@ -29,7 +38,8 @@ protected function renderJob(JobSummary $summary, int $terminalWidth, OutputInte
 		$info = $summary->getInfo();
 		$result = $summary->getResult();
 
-		$runStart = $info->getStart()->format('Y-m-d H:i:s');
+		$timezone = $this->clock->now()->getTimezone();
+		$runStart = $info->getStart()->setTimezone($timezone)->format('Y-m-d H:i:s');
 		$running = ' Running ';
 		$id = $info->getId();
 		$name = $info->getName();

src/Command/RunCommand.php

@@ -3,10 +3,12 @@
 namespace Orisai\Scheduler\Command;
 
 use Generator;
+use Orisai\Clock\SystemClock;
 use Orisai\Scheduler\Scheduler;
 use Orisai\Scheduler\Status\JobResultState;
 use Orisai\Scheduler\Status\JobSummary;
 use Orisai\Scheduler\Status\RunSummary;
+use Psr\Clock\ClockInterface;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -19,9 +21,9 @@ final class RunCommand extends BaseRunCommand
 
 	private Scheduler $scheduler;
 
-	public function __construct(Scheduler $scheduler)
+	public function __construct(Scheduler $scheduler, ?ClockInterface $clock = null)
 	{
-		parent::__construct();
+		parent::__construct($clock ?? new SystemClock());
 		$this->scheduler = $scheduler;
 	}
 

src/Command/RunJobCommand.php

@@ -2,10 +2,12 @@
 
 namespace Orisai\Scheduler\Command;
 
+use Orisai\Clock\SystemClock;
 use Orisai\Scheduler\Scheduler;
 use Orisai\Scheduler\Status\JobResultState;
 use Orisai\Scheduler\Status\JobSummary;
 use Orisai\Scheduler\Status\RunParameters;
+use Psr\Clock\ClockInterface;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -24,9 +26,9 @@ final class RunJobCommand extends BaseRunCommand
 
 	private Scheduler $scheduler;
 
-	public function __construct(Scheduler $scheduler)
+	public function __construct(Scheduler $scheduler, ?ClockInterface $clock = null)
 	{
-		parent::__construct();
+		parent::__construct($clock ?? new SystemClock());
 		$this->scheduler = $scheduler;
 	}
 

src/Executor/ProcessJobExecutor.php

@@ -181,11 +181,11 @@ private function createSummary(array $raw, CronExpression $cronExpression): JobS
 				$raw['info']['expression'],
 				$raw['info']['repeatAfterSeconds'],
 				$raw['info']['runSecond'],
-				DateTimeImmutable::createFromFormat('U.u', $raw['info']['start']),
+				DateTimeImmutable::createFromFormat('U.u e', $raw['info']['start']),
 			),
 			new JobResult(
 				$cronExpression,
-				DateTimeImmutable::createFromFormat('U.u', $raw['result']['end']),
+				DateTimeImmutable::createFromFormat('U.u e', $raw['result']['end']),
 				JobResultState::from($raw['result']['state']),
 			),
 		);

src/Status/JobInfo.php

@@ -108,7 +108,7 @@ public function toArray(): array
 			'expression' => $this->getExpression(),
 			'repeatAfterSeconds' => $this->getRepeatAfterSeconds(),
 			'runSecond' => $this->getRunSecond(),
-			'start' => $this->getStart()->format('U.u'),
+			'start' => $this->getStart()->format('U.u e'),
 		];
 	}
 

src/Status/JobResult.php

@@ -63,7 +63,7 @@ public function getNextRunDates(int $total): array
 	public function toArray(): array
 	{
 		return [
-			'end' => $this->getEnd()->format('U.u'),
+			'end' => $this->getEnd()->format('U.u e'),
 			'state' => $this->getState()->value,
 		];
 	}

tests/Unit/Command/RunCommandTest.php

@@ -59,9 +59,12 @@ public function testSuccess(): void
 		$scheduler->addJob(
 			new CallbackJob(Closure::fromCallable([$cbs, 'job2'])),
 			new CronExpression('* * * * *'),
+			null,
+			0,
+			new DateTimeZone('UTC'),
 		);
 
-		$command = new RunCommand($scheduler);
+		$command = new RunCommand($scheduler, $clock);
 		$tester = new CommandTester($command);
 
 		putenv('COLUMNS=80');
@@ -103,10 +106,10 @@ public function testSuccess(): void
             "expression": "* * * * *",
             "repeatAfterSeconds": 0,
             "runSecond": 0,
-            "start": "1.000000"
+            "start": "1.000000 Europe\/Prague"
         },
         "result": {
-            "end": "1.000000",
+            "end": "1.000000 Europe\/Prague",
             "state": "done"
         }
     },
@@ -117,10 +120,10 @@ public function testSuccess(): void
             "expression": "* * * * *",
             "repeatAfterSeconds": 0,
             "runSecond": 0,
-            "start": "1.000000"
+            "start": "1.000000 UTC"
         },
         "result": {
-            "end": "1.000000",
+            "end": "1.000000 UTC",
             "state": "done"
         }
     }
@@ -150,7 +153,7 @@ public function testFailure(): void
 			new CronExpression('* * * * *'),
 		);
 
-		$command = new RunCommand($scheduler);
+		$command = new RunCommand($scheduler, $clock);
 		$tester = new CommandTester($command);
 
 		putenv('COLUMNS=80');
@@ -179,10 +182,10 @@ public function testFailure(): void
             "expression": "* * * * *",
             "repeatAfterSeconds": 0,
             "runSecond": 0,
-            "start": "1.000000"
+            "start": "1.000000 Europe\/Prague"
         },
         "result": {
-            "end": "1.000000",
+            "end": "1.000000 Europe\/Prague",
             "state": "done"
         }
     },
@@ -193,10 +196,10 @@ public function testFailure(): void
             "expression": "* * * * *",
             "repeatAfterSeconds": 0,
             "runSecond": 0,
-            "start": "1.000000"
+            "start": "1.000000 Europe\/Prague"
         },
         "result": {
-            "end": "1.000000",
+            "end": "1.000000 Europe\/Prague",
             "state": "fail"
         }
     }
@@ -226,7 +229,7 @@ public function testLock(): void
 		$lock = $lockFactory->createLock('Orisai.Scheduler.Job/0');
 		$lock->acquire();
 
-		$command = new RunCommand($scheduler);
+		$command = new RunCommand($scheduler, $clock);
 		$tester = new CommandTester($command);
 
 		putenv('COLUMNS=80');

tests/Unit/Command/RunJobCommandTest.php

@@ -61,7 +61,7 @@ public function testSuccess(): void
 			new CronExpression('* * * * *'),
 		);
 
-		$command = new RunJobCommand($scheduler);
+		$command = new RunJobCommand($scheduler, $clock);
 		$tester = new CommandTester($command);
 
 		putenv('COLUMNS=80');
@@ -107,7 +107,7 @@ public function testFailure(): void
 			new CronExpression('* * * * *'),
 		);
 
-		$command = new RunJobCommand($scheduler);
+		$command = new RunJobCommand($scheduler, $clock);
 		$tester = new CommandTester($command);
 
 		putenv('COLUMNS=80');
@@ -143,7 +143,7 @@ public function testLock(): void
 		$lock = $lockFactory->createLock('Orisai.Scheduler.Job/0');
 		$lock->acquire();
 
-		$command = new RunJobCommand($scheduler);
+		$command = new RunJobCommand($scheduler, $clock);
 		$tester = new CommandTester($command);
 
 		putenv('COLUMNS=80');
@@ -172,7 +172,7 @@ public function testNoForce(): void
 			new CronExpression('0 * * * *'),
 		);
 
-		$command = new RunJobCommand($scheduler);
+		$command = new RunJobCommand($scheduler, $clock);
 		$tester = new CommandTester($command);
 
 		putenv('COLUMNS=80');
@@ -217,7 +217,7 @@ public function testJson(): void
 			new CronExpression('1 * * * *'),
 		);
 
-		$command = new RunJobCommand($scheduler);
+		$command = new RunJobCommand($scheduler, $clock);
 		$tester = new CommandTester($command);
 
 		putenv('COLUMNS=80');
@@ -252,10 +252,10 @@ public function testJson(): void
         "expression": "1 * * * *",
         "repeatAfterSeconds": 0,
         "runSecond": 30,
-        "start": "61.000000"
+        "start": "61.000000 Europe\/Prague"
     },
     "result": {
-        "end": "61.000000",
+        "end": "61.000000 Europe\/Prague",
         "state": "done"
     },
     "stdout": ""
@@ -278,7 +278,7 @@ public function testEchoingJob(): void
 			new CronExpression('* * * * *'),
 		);
 
-		$command = new RunJobCommand($scheduler);
+		$command = new RunJobCommand($scheduler, $clock);
 		$tester = new CommandTester($command);
 
 		putenv('COLUMNS=80');
@@ -311,10 +311,10 @@ public function testEchoingJob(): void
         "expression": "* * * * *",
         "repeatAfterSeconds": 0,
         "runSecond": 0,
-        "start": "1.000000"
+        "start": "1.000000 Europe\/Prague"
     },
     "result": {
-        "end": "1.000000",
+        "end": "1.000000 Europe\/Prague",
         "state": "done"
     },
     "stdout": "output"

tests/Unit/Status/JobInfoTest.php

@@ -43,7 +43,7 @@ public function test(
 				'expression' => $expression,
 				'repeatAfterSeconds' => $repeatAfterSeconds,
 				'runSecond' => $runSecond,
-				'start' => $start->format('U.u'),
+				'start' => $start->format('U.u e'),
 			],
 			$info->toArray(),
 		);

tests/Unit/Status/JobResultTest.php

@@ -21,7 +21,7 @@ public function test(): void
 
 		self::assertSame(
 			[
-				'end' => $end->format('U.u'),
+				'end' => $end->format('U.u e'),
 				'state' => JobResultState::done()->value,
 			],
 			$result->toArray(),