BUGFIX: Job::getId() returns JobId Object

Author: skurfuerst

Classes/Dto/Job.php

@@ -3,14 +3,15 @@
 
 namespace Flowpack\Prunner\Dto;
 
+use Flowpack\Prunner\ValueObject\JobId;
 use Neos\Flow\Annotations as Flow;
 
 /**
  * @Flow\Proxy(false)
  */
 class Job
 {
-    private string $id;
+    private JobId $id;
     /**
      * @var string Pipeline name
      */
@@ -26,7 +27,7 @@ class Job
     private array $variables;
     private string $user;
 
-    private function __construct(string $id, string $pipeline, TaskResults $taskResults, bool $completed, bool $canceled, bool $errored, \DateTimeImmutable $created, ?\DateTimeImmutable $start, ?\DateTimeImmutable $end, ?string $lastError, array $variables, string $user)
+    private function __construct(JobId $id, string $pipeline, TaskResults $taskResults, bool $completed, bool $canceled, bool $errored, \DateTimeImmutable $created, ?\DateTimeImmutable $start, ?\DateTimeImmutable $end, ?string $lastError, array $variables, string $user)
     {
         $this->id = $id;
         $this->pipeline = $pipeline;
@@ -46,7 +47,7 @@ private function __construct(string $id, string $pipeline, TaskResults $taskResu
     public static function fromJsonArray(array $in): self
     {
         return new self(
-            $in['id'],
+            JobId::create($in['id']),
             $in['pipeline'],
             TaskResults::fromJsonArray($in['tasks']),
             $in['completed'],
@@ -64,7 +65,7 @@ public static function fromJsonArray(array $in): self
     /**
      * @return string
      */
-    public function getId(): string
+    public function getId(): JobId
     {
         return $this->id;
     }

Classes/PrunnerApiService.php

@@ -81,7 +81,7 @@ public function schedulePipeline(PipelineName $pipeline, array $variables): JobI
 
     public function cancelJob(Job $job): void
     {
-        $response = $this->apiCall('POST', 'job/cancel?' . http_build_query(['id' => $job->getId()]), '');
+        $response = $this->apiCall('POST', 'job/cancel?' . http_build_query(['id' => $job->getId()->getId()]), '');
         if ($response->getStatusCode() !== 200) {
             throw new \RuntimeException('Cancelling a job should have returned status code 200, but got: ' . $response->getStatusCode());
         }