Skip to content

Commit b9584f5

Browse files
committed
changed relation field defaults to "from" and "to" like neo4j-graphql-js
1 parent acdca95 commit b9584f5

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

src/main/kotlin/org/neo4j/graphql/Translator.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ class Translator(val schema: GraphQLSchema) {
189189
"OUT" -> true
190190
else -> throw IllegalStateException("Unknown direction ${relDirective.argumentString("direction")}")
191191
}
192-
val endField = if (outgoing == true) relDirective.argumentString("end")
193-
else relDirective.argumentString("end")
192+
val endField = if (outgoing == true) relDirective.argumentString("to")
193+
else relDirective.argumentString("from")
194194
return Triple(relType, outgoing, endField)
195195
}
196196

@@ -290,8 +290,8 @@ object SchemaBuilder {
290290
EnumSet.of(Introspection.DirectiveLocation.FIELD,Introspection.DirectiveLocation.OBJECT),
291291
listOf(GraphQLArgument("name",Scalars.GraphQLString),
292292
GraphQLArgument("direction","relationship direction",Scalars.GraphQLString,"OUT"),
293-
GraphQLArgument("start","start field name",Scalars.GraphQLString,"start"),
294-
GraphQLArgument("end","end field name",Scalars.GraphQLString,"end")),false,false,true))
293+
GraphQLArgument("from","from field name",Scalars.GraphQLString,"from"),
294+
GraphQLArgument("to","to field name",Scalars.GraphQLString,"to")),false,false,true))
295295
return schemaGenerator.makeExecutableSchema(typeDefinitionRegistry, runtimeWiring).transform { bc -> bc.additionalDirectives(directives).build() }
296296
}
297297
}

src/test/kotlin/org/neo4j/graphql/TranslatorTest.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ class TranslatorTest {
1818
died : Death
1919
}
2020
type Birth @relation(name:"BORN") {
21-
start: Person
22-
end: Location
21+
from: Person
22+
to: Location
2323
date: String
2424
}
25-
type Death @relation(name:"DIED",start:"who",end:"where") {
25+
type Death @relation(name:"DIED",from:"who",to:"where") {
2626
who: Person
2727
where: Location
2828
date: String
@@ -69,8 +69,8 @@ class TranslatorTest {
6969

7070
@Test
7171
fun richRelationship() {
72-
val query = " { person { name born { date end { name } } } } "
73-
assertQuery(query, "MATCH (person:Person) RETURN person { .name,born:[(person)-[personBorn:BORN]->(personBornEnd:Location) | personBorn { .date,end:personBornEnd { .name } }][0] } AS person")
72+
val query = " { person { name born { date to { name } } } } "
73+
assertQuery(query, "MATCH (person:Person) RETURN person { .name,born:[(person)-[personBorn:BORN]->(personBornTo:Location) | personBorn { .date,to:personBornTo { .name } }][0] } AS person")
7474
}
7575

7676
@Test
@@ -81,13 +81,13 @@ class TranslatorTest {
8181

8282
@Test
8383
fun richRelationship2ndHop() {
84-
val query = " { person { name born { date end { name founded { name } } } } } "
85-
assertQuery(query, "MATCH (person:Person) RETURN person { .name,born:[(person)-[personBorn:BORN]->(personBornEnd:Location) | personBorn { .date,end:personBornEnd { .name,founded:[(personBornEnd)<-[:FOUNDED]-(personBornEndFounded:Person) | personBornEndFounded { .name }][0] } }][0] } AS person")
84+
val query = " { person { name born { date to { name founded { name } } } } } "
85+
assertQuery(query, "MATCH (person:Person) RETURN person { .name,born:[(person)-[personBorn:BORN]->(personBornTo:Location) | personBorn { .date,to:personBornTo { .name,founded:[(personBornTo)<-[:FOUNDED]-(personBornToFounded:Person) | personBornToFounded { .name }][0] } }][0] } AS person")
8686
}
8787
@Test
8888
fun richRelationship3rdHop() {
89-
val query = " { person { name born { date end { name founded { name born { date end { name } } } } } } } "
90-
assertQuery(query, "MATCH (person:Person) RETURN person { .name,born:[(person)-[personBorn:BORN]->(personBornEnd:Location) | personBorn { .date,end:personBornEnd { .name,founded:[(personBornEnd)<-[:FOUNDED]-(personBornEndFounded:Person) | personBornEndFounded { .name,born:[(personBornEndFounded)-[personBornEndFoundedBorn:BORN]->(personBornEndFoundedBornEnd:Location) | personBornEndFoundedBorn { .date,end:personBornEndFoundedBornEnd { .name } }][0] }][0] } }][0] } AS person")
89+
val query = " { person { name born { date to { name founded { name born { date to { name } } } } } } } "
90+
assertQuery(query, "MATCH (person:Person) RETURN person { .name,born:[(person)-[personBorn:BORN]->(personBornTo:Location) | personBorn { .date,to:personBornTo { .name,founded:[(personBornTo)<-[:FOUNDED]-(personBornToFounded:Person) | personBornToFounded { .name,born:[(personBornToFounded)-[personBornToFoundedBorn:BORN]->(personBornToFoundedBornTo:Location) | personBornToFoundedBorn { .date,to:personBornToFoundedBornTo { .name } }][0] }][0] } }][0] } AS person")
9191
}
9292

9393
@Test

0 commit comments

Comments
 (0)