Clientbase
/
json-api-server
mirror of https://github.com/basemaster/json-api-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wip

This commit is contained in:
Toby Zerner 2019-08-07 16:29:04 +00:00
parent 0d43544adc
commit 545277e425
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Handler/Concerns/SavesData.php
View File

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

2
src/Handler/Index.php
View File

@ -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);