Skip to content
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

Fix bug where no instructions are found for a given object #505

Merged
merged 4 commits into from
Dec 21, 2023
Merged

Fix bug where no instructions are found for a given object #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5efbf08
Fix bug where no instructions are found for a given object
gnawf Dec 20, 2023
5679486
Add tests
gnawf Dec 20, 2023
9ccf8a4
Add some more tests
gnawf Dec 20, 2023
828b481
Add extra test
gnawf Dec 21, 2023
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
22 changes: 13 additions & 9 deletions lib/src/main/java/graphql/nadel/engine/transform/hydration/batch/NadelNewBatchHydrator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,23 +373,27 @@ internal class NadelNewBatchHydrator(
sourceObjects: List<JsonNode>,
): List<SourceObjectMetadata> {
return sourceObjects
.map { sourceObject ->
.mapNotNull { sourceObject ->
val instructions = instructionsByObjectTypeNames.getInstructionsForNode(
executionBlueprint = executionBlueprint,
service = sourceFieldService,
aliasHelper = aliasHelper,
parentNode = sourceObject,
)

val sourceIdsPairedWithInstructions = getInstructionParingForSourceIds(
sourceObject = sourceObject,
instructions = instructions,
)
if (instructions.isEmpty()) {
null
} else {
val sourceIdsPairedWithInstructions = getInstructionParingForSourceIds(
sourceObject = sourceObject,
instructions = instructions,
)

SourceObjectMetadata(
sourceObject,
sourceIdsPairedWithInstructions,
)
SourceObjectMetadata(
sourceObject,
sourceIdsPairedWithInstructions,
)
}
}
}

Expand Down
130 changes: 130 additions & 0 deletions ...ration/abstract types/new-no-object-fields-in-the-result-are-backed-a-batch-hydration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
name: "new no object fields in the result are backed a batch hydration"
enabled: true
# language=GraphQL
overallSchema:
activity: |
type Query {
activity: [IActivity]
}
interface IActivity {
user: User
}
type Activity implements IActivity {
id: ID!
user: User
@hydrated(
service: "users"
field: "usersByIds"
arguments: [{name: "ids" value: "$source.userId"}]
inputIdentifiedBy: [{sourceId: "userId" resultId: "id"}]
)
}
type SingleActivity implements IActivity {
id: ID!
user: User
}
users: |
type Query {
usersByIds(ids: [ID!]!): [User]
}
type User {
id: ID!
name: String
}
# language=GraphQL
underlyingSchema:
activity: |
type Query {
activity: [IActivity]
}
type User {
id: ID!
name: String
}
interface IActivity {
user: User
}
type Activity implements IActivity {
id: ID!
userId: ID
user: User @deprecated(reason: "Fake")
}
type SingleActivity implements IActivity {
id: ID!
user: User
}
users: |
type Query {
usersByIds(ids: [ID!]!): [User]
}
type User {
id: ID!
name: String
}
# language=GraphQL
query: |
{
activity {
user {
name
}
}
}
variables: { }
serviceCalls:
- serviceName: "activity"
request:
# language=GraphQL
query: |
{
activity {
... on Activity {
__typename__batch_hydration__user: __typename
batch_hydration__user__userId: userId
}
... on SingleActivity {
user {
name
}
}
}
}
variables: { }
# language=JSON
response: |-
{
"data": {
"activity": [
{
"user": {
"name": "John"
}
},
{
"user": {
"name": "Mayor"
}
}
]
},
"extensions": {}
}
# language=JSON
response: |
{
"data": {
"activity": [
{
"user": {
"name": "John"
}
},
{
"user": {
"name": "Mayor"
}
}
]
},
"errors": []
}
129 changes: 129 additions & 0 deletions ...ew hydration/abstract types/new-no-object-fields-in-the-result-are-backed-a-hydration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
name: "new no object fields in the result are backed a hydration"
enabled: true
# language=GraphQL
overallSchema:
activity: |
type Query {
activity: [IActivity]
}
interface IActivity {
user: User
}
type Activity implements IActivity {
id: ID!
user: User
@hydrated(
service: "users"
field: "userById"
arguments: [{name: "id" value: "$source.userId"}]
)
}
type SingleActivity implements IActivity {
id: ID!
user: User
}
users: |
type Query {
userById(id: ID!): User
}
type User {
id: ID!
name: String
}
# language=GraphQL
underlyingSchema:
activity: |
type Query {
activity: [IActivity]
}
type User {
id: ID!
name: String
}
interface IActivity {
user: User
}
type Activity implements IActivity {
id: ID!
userId: ID
user: User @deprecated(reason: "Fake")
}
type SingleActivity implements IActivity {
id: ID!
user: User
}
users: |
type Query {
userById(id: ID!): User
}
type User {
id: ID!
name: String
}
# language=GraphQL
query: |
{
activity {
user {
name
}
}
}
variables: { }
serviceCalls:
- serviceName: "activity"
request:
# language=GraphQL
query: |
{
activity {
... on Activity {
__typename__hydration__user: __typename
hydration__user__userId: userId
}
... on SingleActivity {
user {
name
}
}
}
}
variables: { }
# language=JSON
response: |-
{
"data": {
"activity": [
{
"user": {
"name": "John"
}
},
{
"user": {
"name": "Mayor"
}
}
]
},
"extensions": {}
}
# language=JSON
response: |
{
"data": {
"activity": [
{
"user": {
"name": "John"
}
},
{
"user": {
"name": "Mayor"
}
}
]
},
"errors": []
}
Loading
Loading