Skip to content

fix(graphql): link relations requires the property #4931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
webda2l wants to merge 5 commits into from
Closed

fix(graphql): link relations requires the property #4931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8f367a3
fix(graphql): link relations requires the property
webda2l Sep 8, 2022
6ffb5df
fix(graphql): operation with disabled pagination
webda2l Sep 8, 2022
233275c
test(graphql): fixes
webda2l Sep 8, 2022
f759784
fix(graphql): operation with disabled pagination
webda2l Sep 8, 2022
683bed4
test(graphql): fixes
webda2l Sep 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/Doctrine/Common/State/LinksHandlerTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,13 @@ private function getLinks(string $resourceClass, Operation $operation, array $co
return $links;
}

$newLinks = [];
$newLink = null;
$linkProperty = $context['linkProperty'];

foreach ($links as $link) {
if ($linkClass === $link->getFromClass()) {
$newLinks[] = $link;
if (($linkClass === $link->getFromClass()) && ($linkProperty === $link->getFromProperty())) {
$newLink = $link;
break;
}
}

Expand All @@ -62,16 +64,17 @@ private function getLinks(string $resourceClass, Operation $operation, array $co
}

foreach ($this->getOperationLinks($linkedOperation ?? null) as $link) {
if ($resourceClass === $link->getToClass()) {
$newLinks[] = $link;
if (($resourceClass === $link->getToClass()) && ($linkProperty === $link->getFromProperty())) {
$newLink = $link;
break;
}
}

if (!$newLinks) {
if (null === $newLink) {
throw new RuntimeException(sprintf('The class "%s" cannot be retrieved from "%s".', $resourceClass, $linkClass));
}

return $newLinks;
return [$newLink];
}

private function getIdentifierValue(array &$identifiers, string $name = null)
Expand Down
1 change: 1 addition & 0 deletions src/GraphQl/Resolver/Stage/ReadStage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ public function __invoke(?string $resourceClass, ?string $rootClass, Operation $
if (isset($source[$info->fieldName], $source[ItemNormalizer::ITEM_IDENTIFIERS_KEY], $source[ItemNormalizer::ITEM_RESOURCE_CLASS_KEY])) {
$uriVariables = $source[ItemNormalizer::ITEM_IDENTIFIERS_KEY];
$normalizationContext['linkClass'] = $source[ItemNormalizer::ITEM_RESOURCE_CLASS_KEY];
$normalizationContext['linkProperty'] = $info->fieldName;
}

return $this->provider->provide($operation, $uriVariables, $normalizationContext);
Expand Down
14 changes: 9 additions & 5 deletions src/Metadata/Resource/Factory/LinkResourceMetadataCollectionFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,22 @@ private function mergeLinks(array $links, array $toMergeLinks): array
{
$classLinks = [];
foreach ($links as $link) {
$classLinks[$link->getToClass()] = $link;
$classLinks[$link->getToClass()][$link->getFromProperty()] = $link;
}

foreach ($toMergeLinks as $link) {
if (isset($classLinks[$link->getToClass()])) {
$classLinks[$link->getToClass()] = $classLinks[$link->getToClass()]->withLink($link);
if (null !== $prevLink = $classLinks[$link->getToClass()][$link->getFromProperty()] ?? null) {
$classLinks[$link->getToClass()][$link->getFromProperty()] = $prevLink->withLink($link);

continue;
}
$classLinks[$link->getToClass()] = $link;
$classLinks[$link->getToClass()][$link->getFromProperty()] = $link;
}

return array_values($classLinks);
// return array_values(array_merge(...array_values($classLinks))); (branch 3.0)

return array_reduce($classLinks, function (array $carry, array $item) {
return array_merge($carry, array_values($item));
}, []);
}
}
2 changes: 1 addition & 1 deletion tests/GraphQl/Resolver/Stage/ReadStageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ public function testApplyCollection(array $args, ?string $rootClass, ?array $sou
$this->serializerContextBuilderProphecy->create($resourceClass, $operation, $context, true)->shouldBeCalled()->willReturn($normalizationContext);

$this->providerProphecy->provide($operation, [], $normalizationContext + ['filters' => $expectedFilters])->willReturn([]);
$this->providerProphecy->provide($operation, ['id' => 3], $normalizationContext + ['filters' => $expectedFilters, 'linkClass' => 'myResource'])->willReturn(['subresource']);
$this->providerProphecy->provide($operation, ['id' => 3], $normalizationContext + ['filters' => $expectedFilters, 'linkClass' => 'myResource', 'linkProperty' => 'subresource'])->willReturn(['subresource']);

$result = ($this->readStage)($resourceClass, $rootClass, $operation, $context);

Expand Down
1 change: 1 addition & 0 deletions tests/Metadata/Resource/Factory/LinkResourceMetadataCollectionFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ class: AttributeResource::class,
class: AttributeResource::class,
graphQlOperations: [
'item_query' => (new Query(shortName: 'AttributeResource', class: AttributeResource::class))->withLinks([
(new Link())->withFromProperty('foo')->withFromClass(AttributeResource::class)->withToClass(Dummy::class)->withIdentifiers(['id']),
(new Link())->withFromProperty('foo2')->withFromClass(AttributeResource::class)->withToClass(Dummy::class)->withIdentifiers(['id']),
(new Link())->withFromProperty('bar')->withFromClass(AttributeResource::class)->withToClass(RelatedDummy::class)->withIdentifiers(['id']),
]),
Expand Down