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

Pass context to AdapterInterface::newQuery()

This commit is contained in:
Toby Zerner 2021-05-05 14:17:24 +09:30
parent cda345d3ad
commit dbd3ceec9c
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Adapter/AdapterInterface.php
View File

@ -11,6 +11,7 @@
namespace Tobyz\JsonApiServer\Adapter; namespace Tobyz\JsonApiServer\Adapter;
use Tobyz\JsonApiServer\Context;
use Tobyz\JsonApiServer\Schema\Attribute; use Tobyz\JsonApiServer\Schema\Attribute;
use Tobyz\JsonApiServer\Schema\HasMany; use Tobyz\JsonApiServer\Schema\HasMany;
use Tobyz\JsonApiServer\Schema\HasOne; use Tobyz\JsonApiServer\Schema\HasOne;
@ -27,7 +28,7 @@ interface AdapterInterface
* *
* @return mixed * @return mixed
*/ */
public function newQuery(); public function newQuery(Context $context);
/** /**
* Manipulate the query to only include resources with the given IDs. * Manipulate the query to only include resources with the given IDs.

3
src/Adapter/EloquentAdapter.php
View File

@ -18,6 +18,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasOneThrough; use Illuminate\Database\Eloquent\Relations\HasOneThrough;
use Illuminate\Database\Eloquent\Relations\MorphOneOrMany; use Illuminate\Database\Eloquent\Relations\MorphOneOrMany;
use InvalidArgumentException; use InvalidArgumentException;
use Tobyz\JsonApiServer\Context;
use Tobyz\JsonApiServer\Schema\Attribute; use Tobyz\JsonApiServer\Schema\Attribute;
use Tobyz\JsonApiServer\Schema\HasMany; use Tobyz\JsonApiServer\Schema\HasMany;
use Tobyz\JsonApiServer\Schema\HasOne; use Tobyz\JsonApiServer\Schema\HasOne;
@ -49,7 +50,7 @@ class EloquentAdapter implements AdapterInterface
return $this->model->newInstance(); return $this->model->newInstance();
} }
public function newQuery() public function newQuery(Context $context)
{ {
return $this->model->query(); return $this->model->query();
} }

2
src/Endpoint/Concerns/FindsResources.php
View File

@ -26,7 +26,7 @@ trait FindsResources
private function findResource(ResourceType $resource, string $id, Context $context) private function findResource(ResourceType $resource, string $id, Context $context)
{ {
$adapter = $resource->getAdapter(); $adapter = $resource->getAdapter();
$query = $adapter->newQuery(); $query = $adapter->newQuery($context);
run_callbacks($resource->getSchema()->getListeners('scope'), [$query, $context]); run_callbacks($resource->getSchema()->getListeners('scope'), [$query, $context]);

2
src/Endpoint/Index.php
View File

@ -57,7 +57,7 @@ class Index
throw new ForbiddenException; throw new ForbiddenException;
} }
$query = $adapter->newQuery(); $query = $adapter->newQuery($context);
run_callbacks($schema->getListeners('listing'), [$query, $context]); run_callbacks($schema->getListeners('listing'), [$query, $context]);
run_callbacks($schema->getListeners('scope'), [$query, $context]); run_callbacks($schema->getListeners('scope'), [$query, $context]);