eventRepresentation fix

mauretto78 · Aug 25, 2017 · ea57a58 · ea57a58
1 parent cf94047
commit ea57a58
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/src/Infrastructure/DataTransformers/JsonEventDataTransformer.php b/src/Infrastructure/DataTransformers/JsonEventDataTransformer.php
@@ -41,7 +41,7 @@ public function transform($events, $eventsCount, $page, $maxPerPage)
                     '_links' => [
                         $this->calculateLinks($page, $numberOfPages)
                     ],
-                    'events' => $this->convertEventsDataToArray($events)
+                    'events' => (is_array($events)) ? $events : $this->convertEventsDataToArray($events)
                 ], 'json'),
             $this->getHttpStatusCode($pageCount),
             [],

diff --git a/src/Infrastructure/DataTransformers/Representations/EventObjectRepresentation.php b/src/Infrastructure/DataTransformers/Representations/EventObjectRepresentation.php
@@ -19,7 +19,26 @@ class EventObjectRepresentation
     private $body;
     private $occurred_on;
 
-    public function __construct(EventInterface $event)
+    public function __construct($event)
+    {
+        if(is_array($event)){
+            $this->fromArray($event);
+        }
+
+        if($event instanceof EventInterface){
+            $this->fromEventInterface($event);
+        }
+    }
+
+    private function fromArray(array $event)
+    {
+        $this->id = $event['id'];
+        $this->name = $event['name'];
+        $this->body = $event['body'];
+        $this->occurred_on = $event['occurred_on'];
+    }
+
+    private function fromEventInterface(EventInterface $event)
     {
         $this->id = $event->id();
         $this->name = $event->name();

diff --git a/src/Infrastructure/DataTransformers/YamlEventDataTransformer.php b/src/Infrastructure/DataTransformers/YamlEventDataTransformer.php
@@ -41,7 +41,7 @@ public function transform($events, $eventsCount, $page, $maxPerPage)
                     '_links' => [
                         $this->calculateLinks($page, $numberOfPages)
                     ],
-                    'events' => $this->convertEventsDataToArray($events)
+                    'events' => (is_array($events)) ? $events : $this->convertEventsDataToArray($events)
                 ], 'yml'),
             $this->getHttpStatusCode($pageCount)
         );