From e9a40a231cf6218cc1c86405ea2af364315822e1 Mon Sep 17 00:00:00 2001 From: Sami Mazouz Date: Sat, 10 Feb 2024 11:43:07 +0100 Subject: [PATCH 1/3] feat: default include --- src/Endpoint/Concerns/IncludesData.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Endpoint/Concerns/IncludesData.php b/src/Endpoint/Concerns/IncludesData.php index 4428617..0c2fe98 100644 --- a/src/Endpoint/Concerns/IncludesData.php +++ b/src/Endpoint/Concerns/IncludesData.php @@ -4,13 +4,23 @@ use Tobyz\JsonApiServer\Context; use Tobyz\JsonApiServer\Exception\BadRequestException; +use Tobyz\JsonApiServer\Resource\Resource; use Tobyz\JsonApiServer\Schema\Field\Relationship; trait IncludesData { + protected ?array $defaultInclude = null; + + public function defaultInclude(array $include): static + { + $this->defaultInclude = $include; + + return $this; + } + private function getInclude(Context $context): array { - if ($includeString = $context->request->getQueryParams()['include'] ?? null) { + if ($includeString = $context->request->getQueryParams()['include'] ?? $this->defaultInclude) { $include = $this->parseInclude($includeString); $this->validateInclude( From 15739c99b8bcc9be9d32da27554b8721b9c0f6bd Mon Sep 17 00:00:00 2001 From: SychO9 Date: Sat, 10 Feb 2024 10:45:33 +0000 Subject: [PATCH 2/3] Run Prettier --- src/Endpoint/Concerns/IncludesData.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Endpoint/Concerns/IncludesData.php b/src/Endpoint/Concerns/IncludesData.php index 0c2fe98..9723ba8 100644 --- a/src/Endpoint/Concerns/IncludesData.php +++ b/src/Endpoint/Concerns/IncludesData.php @@ -20,7 +20,9 @@ public function defaultInclude(array $include): static private function getInclude(Context $context): array { - if ($includeString = $context->request->getQueryParams()['include'] ?? $this->defaultInclude) { + if ( + $includeString = $context->request->getQueryParams()['include'] ?? $this->defaultInclude + ) { $include = $this->parseInclude($includeString); $this->validateInclude( From 162b7441f9db1be2bfdaf45f71afbfc0fcef8f88 Mon Sep 17 00:00:00 2001 From: Sami Mazouz Date: Sat, 10 Feb 2024 11:54:10 +0100 Subject: [PATCH 3/3] chore: unnecessary import --- src/Endpoint/Concerns/IncludesData.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Endpoint/Concerns/IncludesData.php b/src/Endpoint/Concerns/IncludesData.php index 9723ba8..5571d8f 100644 --- a/src/Endpoint/Concerns/IncludesData.php +++ b/src/Endpoint/Concerns/IncludesData.php @@ -4,7 +4,6 @@ use Tobyz\JsonApiServer\Context; use Tobyz\JsonApiServer\Exception\BadRequestException; -use Tobyz\JsonApiServer\Resource\Resource; use Tobyz\JsonApiServer\Schema\Field\Relationship; trait IncludesData