Skip to content

fix: Resolve nested relations #66

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

Merged
merged 3 commits into from
Sep 18, 2025
Merged

fix: Resolve nested relations #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
066e47b
fix: Resolve nested relations
silasjoisten Jul 25, 2025
bb3250a
fix: uuid resolves itsself
silasjoisten Jul 25, 2025
3f09650
fix
silasjoisten Sep 18, 2025
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
28 changes: 17 additions & 11 deletions src/Resolver/StoryResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,30 @@ public function resolve(array $target, array $relations): array
$relationMap[$relation['uuid']] = $relation;
}

foreach ($target as &$value) {
if (\is_string($value) && \array_key_exists($value, $relationMap)) {
$value = $relationMap[$value];

continue;
}
// Resolve relations within the relation map first
$this->doResolve($relationMap, $relationMap);

if (\is_array($value) && \array_key_exists('id', $value) && \array_key_exists($value['id'], $relationMap)) {
$value = $relationMap[$value['id']];
// Then resolve relations in the main target
$this->doResolve($target, $relationMap);

return $target;
}

private function doResolve(array &$target, array &$relationMap): void
{
foreach ($target as $key => &$value) {
if ('uuid' === $key) {
continue;
}

if (\is_array($value)) {
$value = $this->resolve($value, $relations);
if (\is_string($value) && isset($relationMap[$value])) {
$value = $relationMap[$value];
} elseif (\is_array($value) && isset($value['id'], $relationMap[$value['id']])) {
$value = $relationMap[$value['id']];
} elseif (\is_array($value)) {
$this->doResolve($value, $relationMap);
}
}

return $target;
}
}
117 changes: 117 additions & 0 deletions tests/Unit/Resolver/StoryResolverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,4 +188,121 @@ public function resolveReplacesMultiLinkWithLinkPayload(): void

self::assertSame($expected, $resolver->resolve($story, $references));
}

#[Test]
public function resolveRecursive(): void
{
$resolver = new StoryResolver();

$faker = self::faker();

$story = [
'name' => $faker->word(),
'content' => [
'uuid' => $faker->uuid(),
'reference' => $cUuid = $faker->uuid(),
'some_field' => $faker->word(),
],
];

$references = [
$b = [
'uuid' => $bUuid = $faker->uuid(),
'name' => $faker->word(),
'another_field' => $faker->sentence(),
],
$c = [
'uuid' => $cUuid,
'name' => $faker->word(),
'some_field' => [
'test' => $bUuid,
],
],
];

$expected = $story;
$expected['content']['reference'] = $c;
$expected['content']['reference']['some_field']['test'] = $b;

self::assertSame($expected, $resolver->resolve($story, $references));
}

#[Test]
public function resolveWithManyNestedRels(): void
{
$resolver = new StoryResolver();

$faker = self::faker();

$story = [
'name' => $faker->word(),
'content' => [
'uuid' => $faker->uuid(),
'reference' => $cUuid = $faker->uuid(),
'some_field' => $faker->word(),
],
];

$references = [
$a = [
'uuid' => $aUuid = $faker->uuid(),
'name' => $faker->word(),
],
$b = [
'uuid' => $bUuid = $faker->uuid(),
'name' => $faker->word(),
'another_field' => $faker->sentence(),
'field' => $aUuid,
],
$c = [
'uuid' => $cUuid,
'name' => $faker->word(),
'some_field' => [
'test' => $bUuid,
],
],
];

$expected = $story;
$expected['content']['reference'] = $c;
$expected['content']['reference']['some_field']['test'] = $b;
$expected['content']['reference']['some_field']['test']['field'] = $a;

self::assertSame($expected, $resolver->resolve($story, $references));
}

#[Test]
public function resolveMustNeverResolveUuidOfStory(): void
{
$resolver = new StoryResolver();

$faker = self::faker();

$story = [
'name' => $faker->word(),
'content' => [
'uuid' => $uuid = $faker->uuid(),
'reference' => $referenceUuid = $faker->uuid(),
'some_field' => $faker->word(),
],
];

$references = [
$a = [
'uuid' => $referenceUuid,
'name' => $faker->word(),
'another_field' => $faker->sentence(),
],
$b = [
'uuid' => $uuid,
'name' => $faker->word(),
'another_field' => $faker->sentence(),
],
];

$expected = $story;
$expected['content']['reference'] = $a;

self::assertSame($expected, $resolver->resolve($story, $references));
}
}