wip

Author: tobyzerner

src/Handler/Concerns/IncludesData.php

@@ -116,6 +116,7 @@ private function loadRelationships(array $models, array $include, Request $reque
 
         foreach ($trails as $relationships) {
             if ($loader = end($relationships)->loader) {
+                // TODO: probably need to loop through relationships here
                 ($loader)($models, false);
             } else {
                 $adapter->load($models, $relationships);

src/Serializer.php

@@ -53,7 +53,13 @@ private function addToMap(ResourceType $resource, $model, array $include)
 
         ksort($fields);
 
+        $key = $data['type'].':'.$data['id'];
+
         foreach ($fields as $name => $field) {
+            if (isset($this->map[$key]['fields'][$name])) {
+                continue;
+            }
+
             if (! ($field->isVisible)($this->request, $model)) {
                 continue;
             }