From b38776365c942d3b06f54c8d457cc7c419f09ad2 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Fri, 9 Aug 2019 02:53:24 +0200
Subject: [PATCH] wip

---
 src/Handler/Concerns/IncludesData.php | 1 +
 src/Serializer.php                    | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/src/Handler/Concerns/IncludesData.php b/src/Handler/Concerns/IncludesData.php
index 39a0b67..ca84673 100644
--- a/src/Handler/Concerns/IncludesData.php
+++ b/src/Handler/Concerns/IncludesData.php
@@ -116,6 +116,7 @@ trait IncludesData
 
         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);
diff --git a/src/Serializer.php b/src/Serializer.php
index 20ab907..d0c93bb 100644
--- a/src/Serializer.php
+++ b/src/Serializer.php
@@ -53,7 +53,13 @@ class Serializer
 
         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;
             }