SelectFields foreign key fix (#176)

Mikk Mihkel Nurges · web-flow · commit 46e04cb49d8f · 2019-01-22T21:35:00.000+02:00
diff --git a/src/Rebing/GraphQL/Support/SelectFields.php b/src/Rebing/GraphQL/Support/SelectFields.php
@@ -2,6 +2,7 @@
 
 namespace Rebing\GraphQL\Support;
 
+use function array_key_exists;
 use Closure;
 use GraphQL\Error\InvariantViolation;
 use GraphQL\Type\Definition\InterfaceType;
@@ -195,13 +196,10 @@ protected static function handleFields(array $requestedFields, $parentType, arra
                             }
                         }
                         // If 'HasMany', then add it in the 'with'
-                        elseif(is_a($relation, HasMany::class) || is_a($relation, MorphMany::class) || is_a($relation, HasOne::class))
+                        elseif((is_a($relation, HasMany::class) || is_a($relation, MorphMany::class) || is_a($relation, HasOne::class))
+                            && !array_key_exists($foreignKey, $field))
                         {
-                            $foreignKey = explode('.', $foreignKey)[2];
-                            if( ! array_key_exists($foreignKey, $field))
-                            {
-                                $field[$foreignKey] = self::FOREIGN_KEY;
-                            }
+                            $field[$foreignKey] = self::FOREIGN_KEY;
                         }
 
                         // New parent type, which is the relation

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Rebing\GraphQL\Support;`
`4`	`4`
	`5`	`+use function array_key_exists;`
`5`	`6`	`use Closure;`
`6`	`7`	`use GraphQL\Error\InvariantViolation;`
`7`	`8`	`use GraphQL\Type\Definition\InterfaceType;`
`@@ -195,13 +196,10 @@ protected static function handleFields(array $requestedFields, $parentType, arra`
`195`	`196`	`}`
`196`	`197`	`}`
`197`	`198`	`// If 'HasMany', then add it in the 'with'`
`198`		`- elseif(is_a($relation, HasMany::class) \|\| is_a($relation, MorphMany::class) \|\| is_a($relation, HasOne::class))`
	`199`	`+ elseif((is_a($relation, HasMany::class) \|\| is_a($relation, MorphMany::class) \|\| is_a($relation, HasOne::class))`
	`200`	`+ && !array_key_exists($foreignKey, $field))`
`199`	`201`	`{`
`200`		`- $foreignKey = explode('.', $foreignKey)[2];`
`201`		`- if( ! array_key_exists($foreignKey, $field))`
`202`		`- {`
`203`		`- $field[$foreignKey] = self::FOREIGN_KEY;`
`204`		`- }`
	`202`	`+ $field[$foreignKey] = self::FOREIGN_KEY;`
`205`	`203`	`}`
`206`	`204`
`207`	`205`	`// New parent type, which is the relation`