New StraightKeyParser

Author: Mateusz Gostanski

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to `api-client` will be documented in this file
 
+## 3.1.2 - 2021-03-30
+
+- New StraightKeyParser
+
 ## 3.1.1 - 2021-03-09
 
 - Bugs fixed

src/Data/StraightKeyParser.php

@@ -2,39 +2,63 @@
 
 namespace Grixu\ApiClient\Data;
 
+use ErrorException;
 use Grixu\ApiClient\Contracts\ResponseParser;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
+use ReflectionClass;
+use ReflectionProperty;
 
 class StraightKeyParser implements ResponseParser
 {
+    private $fields;
+
     public function __construct(private string $dtoClass)
-    {}
+    {
+        $reflection = new ReflectionClass($this->dtoClass);
+        $this->fields = collect($reflection->getProperties(ReflectionProperty::IS_PUBLIC));
+    }
 
-    public function parse(Collection $inputData): Collection
+    public function parse(Collection $inputCollection): Collection
     {
         $parsed = collect();
 
-        foreach ($inputData as $data) {
-            if (!is_array($data)) {
+        foreach ($inputCollection as $inputData) {
+            if (!is_array($inputData)) {
                 continue;
             }
 
-            foreach ($data as $key => $value) {
-                try {
-                    if (is_string($value) && strlen($value) >= 27 && Carbon::createFromTimeString($value) == true) {
-                        $data[$key] = Carbon::createFromTimeString($value);
-                    }
-                } catch (\Exception $exception) {
-                    continue;
-                }
-            }
-
-            $dto = new $this->dtoClass($data);
+            $preparedData = $this->parseElement($inputData);
+            $dto = new $this->dtoClass($preparedData);
 
             $parsed->push($dto);
         }
 
         return $parsed;
     }
+
+    protected function parseElement(array $input): array
+    {
+        $data = [];
+
+        foreach ($this->fields as $field) {
+            /** @var ReflectionProperty $field */
+            $type = $field->getType()->getName();
+            $fieldName = $field->getName();
+
+            try {
+                if (str_contains($type, 'Enum')) {
+                    $data[$fieldName] = new $type($input[$fieldName]);
+                } elseif ($type === 'Illuminate\Support\Carbon') {
+                    $data[$fieldName] = Carbon::createFromTimeString($input[$fieldName]);
+                } else {
+                    $data[$fieldName] = $input[$fieldName];
+                }
+            } catch (ErrorException) {
+                $data[$fieldName] = null;
+            }
+        }
+
+        return $data;
+    }
 }

tests/Data/StraightKeyParserTest.php

@@ -118,14 +118,15 @@ public function it_do_not_replace_some_numeric_strings_to_carbon()
     }
 
     /** @test */
-    public function it_safely_handles_strings_longer_than_27_charaters()
+    public function it_replaces_enums()
     {
         $inputData = collect(
             [
                 [
                     'first' => 'first entry is very long it could literally over 27 characters',
                     'second' => 'second entry',
                     'third' => '568845115895',
+                    'enum' => 'hello'
                 ],
             ]
         );

tests/Helpers/ExampleDto.php

@@ -11,5 +11,6 @@ class ExampleDto extends DataTransferObject
     public string $second;
     public string $third;
     public ?Carbon $date;
+    public ?FakeEnum $enum;
     public ?int $id;
 }

tests/Helpers/FakeEnum.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Grixu\ApiClient\Tests\Helpers;
+
+class FakeEnum
+{
+    public function __construct(public string $value)
+    {
+    }
+}