Merge pull request #525 from keboola/roman-pst-1973-store-final-result

PST-1973 (service-container): Store final job result

Author: romantmb

README.md

@@ -39,6 +39,7 @@ name_prefix = "${NAME_PREFIX}"
 EOF
 
 cat <<EOF > .env.local
+TEST_HOSTNAME_SUFFIX=keboola.com
 TEST_STORAGE_API_URL=https://connection.keboola.com
 TEST_STORAGE_API_TOKEN=
 TEST_STORAGE_API_TOKEN_MASTER=

provisioning/local/.terraform.lock.hcl

@@ -6,32 +6,25 @@
 
 use JsonSerializable;
 use Keboola\JobQueueInternalClient\Exception\ClientException;
-use Keboola\JobQueueInternalClient\JobFactory\Job;
+use Keboola\JobQueueInternalClient\Result\JobMetrics;
 use Keboola\JobQueueInternalClient\Result\JobResult;
 
 class JobPatchData implements JsonSerializable
 {
-    /** @var string */
-    private $status;
-
-    /** @var string */
-    private $desiredStatus;
-
-    /** @var JobResult|null */
-    private $result;
-
-    /** @var array */
-    private $usageData;
-
-    /** @var string|null */
-    private $runnerId;
+    private ?string $status = null;
+    private ?string $desiredStatus = null;
+    private ?JobResult $result = null;
+    private ?JobMetrics $metrics = null;
+    private ?array $usageData = null;
+    private ?string $runnerId = null;
 
     public function jsonSerialize(): array
     {
         return array_filter([
             'status' => $this->status,
             'desiredStatus' => $this->desiredStatus,
-            'result' => is_null($this->result) ? null : $this->result->jsonSerialize(),
+            'result' => $this->result?->jsonSerialize(),
+            'metrics' => $this->metrics?->jsonSerialize(),
             'usageData' => $this->usageData,
             'runnerId' => $this->runnerId,
         ]);
@@ -91,6 +84,17 @@ public function getResult(): ?JobResult
         return $this->result;
     }
 
+    public function setMetrics(?JobMetrics $metrics): JobPatchData
+    {
+        $this->metrics = $metrics;
+        return $this;
+    }
+
+    public function getMetrics(): ?JobMetrics
+    {
+        return $this->metrics;
+    }
+
     public function setUsageData(array $usageData): JobPatchData
     {
         $this->usageData = $usageData;

src/JobPatchData.php

@@ -5,9 +5,9 @@
 namespace Keboola\JobQueueInternalClient\Tests;
 
 use Keboola\JobQueueInternalClient\Exception\ClientException;
-use Keboola\JobQueueInternalClient\JobFactory\Job;
 use Keboola\JobQueueInternalClient\JobFactory\JobInterface;
 use Keboola\JobQueueInternalClient\JobPatchData;
+use Keboola\JobQueueInternalClient\Result\JobMetrics;
 use Keboola\JobQueueInternalClient\Result\JobResult;
 use PHPUnit\Framework\TestCase;
 
@@ -20,7 +20,9 @@ public function testAccessors(): void
             ->setStatus(JobInterface::STATUS_PROCESSING)
             ->setDesiredStatus(JobInterface::DESIRED_STATUS_PROCESSING)
             ->setResult((new JobResult())->setMessage('processing'))
-            ->setUsageData(['foo' => 'bar']);
+            ->setMetrics((new JobMetrics())->setBackendSize('large'))
+            ->setUsageData(['foo' => 'bar'])
+            ->setRunnerId('runner-id');
 
         $expectedResult = [
             'message' => 'processing',
@@ -33,19 +35,33 @@ public function testAccessors(): void
                 'tables' => [],
             ],
         ];
+        $expectedMetrics = [
+            'storage' => [
+                'inputTablesBytesSum' => null,
+                'outputTablesBytesSum' => null,
+            ],
+            'backend' => [
+                'size' => 'large',
+                'containerSize' => null,
+                'context' => null,
+            ],
+        ];
         self::assertSame(JobInterface::STATUS_PROCESSING, $jobPatchData->getStatus());
         self::assertSame(JobInterface::DESIRED_STATUS_PROCESSING, $jobPatchData->getDesiredStatus());
-        $result = is_null($jobPatchData->getResult()) ?: $jobPatchData->getResult()->jsonSerialize();
-        self::assertSame($expectedResult, $result);
+        self::assertSame($expectedResult, $jobPatchData->getResult()?->jsonSerialize());
+        self::assertSame($expectedMetrics, $jobPatchData->getMetrics()?->jsonSerialize());
         self::assertSame(['foo' => 'bar'], $jobPatchData->getUsageData());
+        self::assertSame('runner-id', $jobPatchData->getRunnerId());
         self::assertSame(
             [
                 'status' => JobInterface::STATUS_PROCESSING,
                 'desiredStatus' => JobInterface::DESIRED_STATUS_PROCESSING,
                 'result' => $expectedResult,
+                'metrics' => $expectedMetrics,
                 'usageData' => [
                     'foo' => 'bar',
                 ],
+                'runnerId' => 'runner-id',
             ],
             $jobPatchData->jsonSerialize(),
         );