Improve payload builder and add more feature test

.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 *.lock
 *.bak
 /.env

src/Builder/CommonPayloadBuilder.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace NorbyBaru\AwsTimestream\Builder;
+
+use Illuminate\Support\Carbon;
+use NorbyBaru\AwsTimestream\Enum\ValueTypeEnum;
+
+class CommonPayloadBuilder
+{
+    protected array $commonDimensions = [];
+    protected array $commonAttributes = [];
+
+    public static function make(): self
+    {
+        return new self();
+    }
+
+    public function setCommonDimensions(string $name, mixed $value): self
+    {
+        $this->commonDimensions[] = [
+            'Name' => $name,
+            'Value' => $value,
+            'DimensionValueType' => ValueTypeEnum::VARCHAR->value,
+        ];
+
+        return $this;
+    }
+
+    public function setCommonMeasureValueType(ValueTypeEnum $type): self
+    {
+        $this->commonAttributes['MeasureValueType'] = $type->value;
+
+        return $this;
+    }
+
+    public function setCommonTime(Carbon $time): self
+    {
+        $this->commonAttributes['Time'] = $this->getPreciseTime($time);
+
+        return $this;
+    }
+
+    public function setCommonVersion(int $version): self
+    {
+        $this->commonAttributes['Version'] = $version;
+
+        return $this;
+    }
+
+    public function toArray(): array
+    {
+        $common = [];
+        if ($this->commonDimensions) {
+            $common = [
+                'Dimensions' => $this->commonDimensions
+            ];
+        }
+
+        return [
+            ...$this->commonAttributes,
+            ...$common,
+        ];
+    }
+
+    private function getPreciseTime(Carbon $time): string
+    {
+        return (string) $time->getPreciseTimestamp(3);
+    }
+}

src/Builder/PayloadBuilder.php

@@ -4,16 +4,21 @@
 
 use Illuminate\Support\Carbon;
 use NorbyBaru\AwsTimestream\Contract\PayloadBuilderContract;
+use NorbyBaru\AwsTimestream\Enum\ValueTypeEnum;
 
 final class PayloadBuilder implements PayloadBuilderContract
 {
-    protected array $dimensions;
+    protected array $commonDimensions = [];
+    protected array $commonAttributes = [];
+    protected array $dimensions = [];
+    protected array $measureValues = [];
+    protected ?int $version = null;
 
     public function __construct(
         protected string $measureName,
-        protected $measureValue,
-        protected Carbon $time,
-        protected string $measureValueType = 'DOUBLE',
+        protected mixed $measureValue = null,
+        protected ?Carbon $time = null,
+        protected ?ValueTypeEnum $measureValueType = null,
         array $dimensions = []
     ) {
         if ($dimensions) {
@@ -23,12 +28,57 @@ public function __construct(
 
     public static function make(
         string $measureName,
-        $measureValue,
-        Carbon $time,
-        string $measureValueType = 'DOUBLE',
+        mixed $measureValue = null,
+        ?Carbon $time = null,
+        ?string $measureValueType = null,
         array $dimensions = []
     ): self {
-        return new self($measureName, $measureValue, $time, $measureValueType, $dimensions);
+        return new self(
+            measureName: $measureName,
+            measureValue: $measureValue,
+            time: $time,
+            measureValueType: $measureValueType ? ValueTypeEnum::from($measureValueType) : null,
+            dimensions: $dimensions
+        );
+    }
+
+    public function setMeasureName(string $measureName): self
+    {
+        $this->measureName = $measureName;
+
+        return $this;
+    }
+
+    public function setMeasureValue(mixed $value): self
+    {
+        $this->measureValue = $value;
+
+        return $this;
+    }
+
+    public function setMeasureValueType(ValueTypeEnum $type): self
+    {
+        $this->measureValueType = $type;
+
+        return $this;
+    }
+
+    public function setVersion(int $version): self
+    {
+        $this->version = $version;
+
+        return $this;
+    }
+
+    public function setMultiMeasuresValues(string $name, mixed $value, ValueTypeEnum $type = ValueTypeEnum::VARCHAR): self
+    {
+        $this->measureValues[] = [
+            'Name' => $name,
+            'Value' => $value,
+            'Type' => $type->value
+        ];
+
+        return $this;
     }
 
     private function buildDimensions(string $name, $value)
@@ -39,6 +89,23 @@ private function buildDimensions(string $name, $value)
         ];
     }
 
+    public function setDimensions(string $name, mixed $value): self
+    {
+        $this->dimensions[] = [
+            'Name' => $name,
+            'Value' => $value,
+        ];
+
+        return $this;
+    }
+
+    public function setTime(Carbon $carbon): self
+    {
+        $this->time = $carbon;
+
+        return $this;
+    }
+
     public static function buildCommonAttributes(array $attributes): array
     {
         $metrics = collect($attributes)
@@ -57,16 +124,45 @@ public static function buildCommonAttributes(array $attributes): array
         ];
     }
 
+    private function getPreciseTime(Carbon $time): string
+    {
+        return (string) $time->getPreciseTimestamp(3);
+    }
+
+    public function getRecords(bool $batch = false): array
+    {
+        return $this->toArray($batch);
+    }
+
     public function toArray(bool $batch = false): array
     {
         $metric = [
-            'Dimensions' => $this->dimensions,
             'MeasureName' => $this->measureName,
             'MeasureValue' => (string) $this->measureValue,
-            'MeasureValueType' => $this->measureValueType,
-            'Time' => (string) $this->time->getPreciseTimestamp(3),
         ];
 
+        if ($this->measureValueType) {
+            $metric['MeasureValueType'] = $this->measureValueType->value;
+        }
+
+        if ($this->time) {
+            $metric['Time'] = $this->getPreciseTime($this->time);
+        }
+
+        if ($this->measureValues) {
+            $metric['MeasureValues'] = $this->measureValues;
+            $metric['MeasureValueType'] = 'MULTI';
+            unset($metric['MeasureValue']);
+        }
+
+        if ($this->dimensions) {
+            $metric['Dimensions'] = $this->dimensions;
+        }
+
+        if ($this->version) {
+            $metric['Version'] = $this->version;
+        }
+
         if (!$batch) {
             return [$metric];
         }

src/Contract/PayloadBuilderContract.php

@@ -6,7 +6,7 @@
 
 interface PayloadBuilderContract
 {
-    public static function make(string $measureName, $measureValue, Carbon $time, string $measureValueType = 'DOUBLE', array $dimensions = []): self;
+    public static function make(string $measureName): self;
 
     public static function buildCommonAttributes(array $attributes): array;
 

src/TimestreamBuilder.php

@@ -20,7 +20,7 @@ public static function batchPayload(array $metrics): array
                     $metric['measure_value'],
                     $metric['time'],
                     $metric['measure_value_type'] ?? 'VARCHAR',
-                    $metric['dimensions']
+                    $metric['dimensions'] ?? []
                 )->toArray(true)
             )->all();
     }

src/TimestreamService.php

@@ -71,24 +71,23 @@ private function ingest(array $payload): \Aws\Result
 
     public function query(TimestreamReaderDto $timestreamReader): Collection
     {
-        return $this->runQuery($timestreamReader);
+        return $this->runQuery($timestreamReader->toArray());
     }
 
-    private function runQuery(TimestreamReaderDto $timestreamReader, string $nextToken = null): Collection
+    private function runQuery(array $params): Collection
     {
-        $params = $timestreamReader->toArray();
-        if ($nextToken) {
-            $params['NextToken'] = $nextToken;
-        }
-
         try {
             if ($this->shouldDebugQuery()) {
                 Log::debug('=== Timestream Query ===', $params);
             }
 
             $result = $this->reader->query($params);
-            if ($token = $result->get('NextToken')) {
-                return $this->runQuery($timestreamReader, $token);
+
+            // fetch everything recursively until the limit has been reached or there is no more data
+            if ($nextToken = $result->get('NextToken')) {
+                $parsedRows = $this->parseQueryResult($result);
+                $params['NextToken'] = $nextToken;
+                return $this->runQuery($params)->merge($parsedRows);
             }
         } catch (TimestreamQueryException $e) {
             throw new FailTimestreamQueryException($e, $params);

src/enum/ValueTypeEnum.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace NorbyBaru\AwsTimestream\Enum;
+
+enum ValueTypeEnum: string
+{
+    case DOUBLE = 'DOUBLE';
+    case BIGINT = 'BIGINT';
+    case VARCHAR = 'VARCHAR';
+    case BOOLEAN = 'BOOLEAN';
+    case TIMESTAMP = 'TIMESTAMP';
+}