Model: Fix duplicate response structures

Author: SMillerDev

src/PHPDraft/Model/HTTPResponse.php

@@ -90,7 +90,9 @@ public function parse(stdClass $object): self
             $this->parse_headers($object->attributes->headers);
         }
 
-        $this->parse_content($object);
+        foreach ($object->content as $value) {
+            $this->parse_content($value);
+        }
 
         return $this;
     }
@@ -119,49 +121,54 @@ protected function parse_headers(stdClass $object): void
     /**
      * Parse request content.
      *
-     * @param stdClass $object An object to parse for content
+     * @param stdClass $value An object to parse for content
      *
      * @return void
      */
-    protected function parse_content(stdClass $object): void
+    protected function parse_content(stdClass $value): void
     {
-        foreach ($object->content as $value) {
-            if ($value->element === 'copy') {
-                $this->description = $value->content;
-                continue;
-            }
-
-            if ($value->element === 'dataStructure') {
-                $data_content = is_array($value->content) ? $value->content : [$value->content];
-                $this->parse_structure($data_content);
-                continue;
-            }
+        if ($value->element === 'copy') {
+            $this->description = $value->content;
+            return;
+        }
 
+        if ($value->element === 'asset') {
             if (isset($value->attributes->contentType->content)) {
                 $this->content[$value->attributes->contentType->content] = $value->content;
             } elseif (isset($value->attributes->contentType)) {
                 $this->content[$value->attributes->contentType] = $value->content;
             }
+            return;
+        }
+
+        if ($value->element === 'dataStructure') {
+            foreach ($value->content->content as $object) {
+                $this->parse_structure($object);
+            }
+            return;
         }
     }
 
     /**
      * Parse structure of the content.
      *
-     * @param stdClass[] $objects Objects containing the structure
+     * @param stdClass $object Objects containing the structure
      *
      * @return void
      */
-    protected function parse_structure(array $objects): void
+    protected function parse_structure(stdClass $object): void
     {
-        foreach ($objects as $object) {
-            $deps   = [];
-            $struct = new ObjectStructureElement();
-            $struct->parse($object, $deps);
-            $struct->deps = $deps;
-
-            $this->structure[] = $struct;
+        $deps   = [];
+        $struct = new ObjectStructureElement();
+        $struct->parse($object, $deps);
+        $struct->deps = $deps;
+        foreach ($this->structure as $prev) {
+            if ($struct->__toString() === $prev->__toString()) {
+                return;
+            }
         }
+
+        $this->structure[] = $struct;
     }
 
     /**

src/PHPDraft/Model/Tests/HTTPResponseTest.php

@@ -145,7 +145,7 @@ public function testParseIsCalledStructContentEmpty(): void
     {
         $this->set_reflection_property_value('parent', $this->parent);
 
-        $obj = '{"content":[{"element":"dataStructure", "content":[]}]}';
+        $obj = '{"content":[{"element":"dataStructure", "content":{"content": {}}}]}';
 
         $this->class->parse(json_decode($obj));
 
@@ -160,7 +160,7 @@ public function testParseIsCalledStructContent(): void
     {
         $this->set_reflection_property_value('parent', $this->parent);
 
-        $obj = '{"content":[{"element":"dataStructure", "content":[{}]}]}';
+        $obj = '{"content":[{"element":"dataStructure", "content":{"content": [{}]}}]}';
 
         $this->class->parse(json_decode($obj));
 
@@ -175,12 +175,12 @@ public function testParseIsCalledStructContentHasAttr(): void
     {
         $this->set_reflection_property_value('parent', $this->parent);
 
-        $obj = '{"content":[{"content":"hello", "attributes":{"contentType":"content"}, "element":"hello"}]}';
+        $obj = '{"content":[{"content":"hello", "attributes":{"contentType":"content"}, "element":"asset"}]}';
 
         $this->class->parse(json_decode($obj));
-
-        $this->assertArrayHasKey('content', $this->get_reflection_property_value('content'));
-        $this->assertSame('hello', $this->get_reflection_property_value('content')['content']);
+        $prop = $this->get_reflection_property_value('content');
+        $this->assertArrayHasKey('content', $prop);
+        $this->assertSame('hello', $prop['content']);
     }
 
     /**

src/PHPDraft/Out/HTML/default/transition.twig

@@ -129,7 +129,9 @@
                 {% if response.structure|length > 0 %}
                 <h5>Data Structure</h5>
                 <div class="row">
+                    <table class="table table-striped mdl-data-table mdl-js-data-table">
                     {% for value in response.structure %}{{ value|raw }}{% endfor %}
+                    </table>
                 </div>
                 {% endif %}
                 {% for response_key,value in response.content %}