wip

src/Handler/Concerns/SavesData.php

@@ -132,12 +132,18 @@ trait SavesData
 
             $value = &$data[$field->location][$name];
 
+            if ($field instanceof Schema\Relationship) {
+                $value = $value['data'];
+
+                if ($value) {
                     if ($field instanceof Schema\HasOne) {
-                $value = $this->getModelForIdentifier($request, $value['data']);
+                        $value = $this->getModelForIdentifier($request, $value);
                     } elseif ($field instanceof Schema\HasMany) {
                         $value = array_map(function ($identifier) use ($request) {
                             return $this->getModelForIdentifier($request, $identifier);
-                }, $value['data']);
+                        }, $value);
+                    }
+                }
             }
         }
     }

src/Handler/Index.php

@@ -81,7 +81,7 @@ class Index implements RequestHandlerInterface
             $paginationLinks[] = new Link\PrevLink($this->buildUrl($request, $params));
         }
 
-        if ($schema->countable) {
+        if ($schema->countable && $schema->paginate) {
             $total = $adapter->count($query);
 
             $members[] = new Meta('total', $total);