Skip to content

Commit

Permalink
add when condition types to test assertions
Browse files Browse the repository at this point in the history
  • Loading branch information
@sbarker2
sbarker2 committed Nov 8, 2023
1 parent 8bc3a66 commit 8dd8b36
Show file tree
Hide file tree
Showing 4 changed files with 126 additions and 6 deletions.
106 changes: 105 additions & 1 deletion lib/src/main/java/graphql/nadel/schema/NadelDirectives.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,20 @@ import graphql.language.BooleanValue
import graphql.language.DirectiveDefinition.newDirectiveDefinition
import graphql.language.EnumTypeDefinition.newEnumTypeDefinition
import graphql.language.EnumValueDefinition.newEnumValueDefinition
import graphql.language.InputObjectTypeDefinition
import graphql.language.InputObjectTypeDefinition.newInputObjectDefinition
import graphql.language.ObjectField
import graphql.language.ObjectValue
import graphql.language.StringValue
import graphql.language.TypeName
import graphql.language.Value
import graphql.nadel.dsl.FieldMappingDefinition
import graphql.nadel.dsl.RemoteArgumentDefinition
import graphql.nadel.dsl.RemoteArgumentSource
import graphql.nadel.dsl.RemoteArgumentSource.SourceType
import graphql.nadel.dsl.TypeMappingDefinition
import graphql.nadel.dsl.UnderlyingServiceHydration
import graphql.nadel.engine.util.singleOfType
import graphql.nadel.util.IntValue
import graphql.nadel.util.description
import graphql.nadel.util.emptyArrayValue
Expand All @@ -34,13 +38,16 @@ import graphql.nadel.util.onInterface
import graphql.nadel.util.onObject
import graphql.nadel.util.onScalar
import graphql.nadel.util.onUnion
import graphql.parser.Parser
import graphql.schema.GraphQLAppliedDirective
import graphql.schema.GraphQLAppliedDirectiveArgument
import graphql.schema.GraphQLDirectiveContainer
import graphql.schema.GraphQLEnumType
import graphql.schema.GraphQLFieldDefinition
import graphql.schema.GraphQLSchema
import graphql.schema.GraphQLUnionType
import java.util.Locale
import java.util.Objects

/**
* If you update this file please add to NadelBuiltInTypes
Expand Down Expand Up @@ -79,6 +86,91 @@ object NadelDirectives {
)
.build()

// val nadelWhenConditionPredicateStartsWithDefinition = newInputObjectDefinition()
// .name("NadelWhenConditionPredicateStartsWith")
// .description("When condition predicate for startsWith")
// .inputValueDefinition(
// name = "startsWith",
// type = nonNull(GraphQLString),
// )
// .build()
//
// val nadelWhenConditionPredicateEqualsDefinition = newInputObjectDefinition()
// .name("NadelWhenConditionPredicateEquals")
// .description("When condition predicate for equals")
// .inputValueDefinition(
// name = "equals",
// type = nonNull(ExtendedScalars.Json),
// )
// .build()
//
// val nadelWhenConditionPredicateMatchesDefinition = newInputObjectDefinition()
// .name("NadelWhenConditionPredicateMatches")
// .description("When condition predicate for matches")
// .inputValueDefinition(
// name = "matches",
// type = nonNull(GraphQLString),
// )
// .build()
//
// val nadelWhenConditionPredicateUnion = GraphQLUnionType.newUnionType()
// .name("NadelWhenConditionPredicateUnion")
// .description("Union of when condition predicates")
// .possibleType(nadelWhenConditionPredicateStartsWithDefinition)
// .possibleType(nadelWhenConditionPredicateEqualsDefinition)
// .possibleType(nadelWhenConditionPredicateMatchesDefinition)
// .build()

// val nadelWhenConditionPredicateDefinition = newInputObjectDefinition()
// .name("NadelWhenConditionPredicate")
// .description("This allows you to specify a when condition to filter hydrations")
// .inputValueDefinition(
// name = "startsWith",
// type = nonNull(GraphQLString),
// )
// .inputValueDefinition(
// name = "equals",
// type = nonNull(ExtendedScalars.Json),
// )
// .inputValueDefinition(
// name = "matches",
// type = nonNull(GraphQLString),
// )
// .build()

val nadelWhenConditionPredicateDefinition = Parser.parse(
"""
input NadelWhenConditionPredicate @oneOf {
startsWith: String
equals: JSON
matches: String
}
""".trimIndent()
).definitions.singleOfType<InputObjectTypeDefinition>()

val nadelWhenConditionResultDefinition = newInputObjectDefinition()
.name("NadelWhenConditionResult")
.description("This allows you to specify a when condition to filter hydrations")
.inputValueDefinition(
name = "sourceField",
type = nonNull(GraphQLString),
)
.inputValueDefinition(
name = "predicate",
type = nonNull(nadelWhenConditionPredicateDefinition),
)
.build()

val nadelWhenConditionDefinition = newInputObjectDefinition()
.name("NadelWhenCondition")
.description("This allows you to specify a when condition to filter hydrations")
.inputValueDefinition(
name = "result",
type = nonNull(nadelWhenConditionResultDefinition),

)
.build()

val hydratedDirectiveDefinition = newDirectiveDefinition()
.name("hydrated")
.onFieldDefinition()
Expand Down Expand Up @@ -135,6 +227,13 @@ object NadelDirectives {
description = "The arguments to the hydrated field",
type = nonNull(list(nonNull(nadelHydrationArgumentDefinition))),
)
.inputValueDefinition(
name = "when",
description = "The arguments to the hydrated field",
type = TypeName.newTypeName()
.name(nadelWhenConditionDefinition.name)
.build()
)
.build()

val dynamicServiceDirectiveDefinition = newDirectiveDefinition()
Expand Down Expand Up @@ -482,6 +581,11 @@ object NadelDirectives {

private fun <T> resolveArgumentValue(graphQLArgument: GraphQLAppliedDirectiveArgument): T {
@Suppress("UNCHECKED_CAST") // Trust caller. Can't do much
return ValuesResolver.valueToInternalValue(graphQLArgument.argumentValue, graphQLArgument.type, GraphQLContext.getDefault(), Locale.getDefault()) as T
return ValuesResolver.valueToInternalValue(
graphQLArgument.argumentValue,
graphQLArgument.type,
GraphQLContext.getDefault(),
Locale.getDefault()
) as T
}
}
4 changes: 4 additions & 0 deletions lib/src/main/java/graphql/nadel/schema/OverallSchemaGenerator.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ internal class OverallSchemaGenerator {
addIfNotPresent(overallRegistry, allDefinitions, NadelDirectives.nadelHydrationTemplateEnumDefinition)
addIfNotPresent(overallRegistry, allDefinitions, NadelDirectives.hydratedFromDirectiveDefinition)
addIfNotPresent(overallRegistry, allDefinitions, NadelDirectives.hydratedTemplateDirectiveDefinition)
addIfNotPresent(overallRegistry, allDefinitions, NadelDirectives.nadelWhenConditionPredicateDefinition)
addIfNotPresent(overallRegistry, allDefinitions, NadelDirectives.nadelWhenConditionDefinition)
addIfNotPresent(overallRegistry, allDefinitions, NadelDirectives.nadelWhenConditionResultDefinition)

addIfNotPresent(overallRegistry, allDefinitions, newScalarTypeDefinition()
.name(ExtendedScalars.Json.name)
.build())
Expand Down
10 changes: 5 additions & 5 deletions lib/src/test/kotlin/graphql/nadel/NadelSchemasTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class NadelSchemasTest : DescribeSpec({
.build()

// then
assert(schemas.engineSchema.userTypeNames == setOf("World", "Echo", "Query", "JSON"))
assert(schemas.engineSchema.userTypeNames == setOf("World", "Echo", "Query", "JSON", "NadelWhenCondition", "NadelWhenConditionPredicate", "NadelWhenConditionResult"))
val testService = schemas.services.single()
assert(testService.underlyingSchema.userTypeNames == setOf("World", "Echo", "Query", "Food"))
}
Expand Down Expand Up @@ -149,7 +149,7 @@ class NadelSchemasTest : DescribeSpec({
.build()

// then
assert(schemas.engineSchema.userTypeNames == setOf("World", "Echo", "Query", "JSON"))
assert(schemas.engineSchema.userTypeNames == setOf("World", "Echo", "Query", "JSON", "NadelWhenCondition", "NadelWhenConditionPredicate", "NadelWhenConditionResult"))
val testService = schemas.services.single()
assert(testService.underlyingSchema.userTypeNames == setOf("World", "Echo", "Query", "Food"))
}
Expand Down Expand Up @@ -211,7 +211,7 @@ class NadelSchemasTest : DescribeSpec({
.build()

// then
assert(schemas.engineSchema.userTypeNames == setOf("World", "Echo", "Query", "Issue", "JSON"))
assert(schemas.engineSchema.userTypeNames == setOf("World", "Echo", "Query", "Issue", "JSON", "NadelWhenCondition", "NadelWhenConditionPredicate", "NadelWhenConditionResult"))

val issueService = schemas.services.single { it.name == "issue" }
assert(issueService.underlyingSchema.userTypeNames == setOf("Query", "Issue"))
Expand Down Expand Up @@ -272,7 +272,7 @@ class NadelSchemasTest : DescribeSpec({
.build()

// then
assert(schemas.engineSchema.userTypeNames == setOf("World", "Echo", "Query", "Issue", "JSON"))
assert(schemas.engineSchema.userTypeNames == setOf("World", "Echo", "Query", "Issue", "JSON", "NadelWhenCondition", "NadelWhenConditionPredicate", "NadelWhenConditionResult"))
}

it("does not validate the schemas") {
Expand Down Expand Up @@ -321,7 +321,7 @@ class NadelSchemasTest : DescribeSpec({
.build()

// then
assert(schemas.engineSchema.userTypeNames == setOf("Query", "World", "Echo", "Issue", "JSON"))
assert(schemas.engineSchema.userTypeNames == setOf("Query", "World", "Echo", "Issue", "JSON", "NadelWhenCondition", "NadelWhenConditionPredicate", "NadelWhenConditionResult"))

val testService = schemas.services.first { it.name == "test" }
assert(testService.definitionRegistry.typeNames == setOf("Query", "Echo", "World"))
Expand Down
12 changes: 12 additions & 0 deletions lib/src/test/kotlin/graphql/nadel/schema/NadelDirectivesTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import graphql.nadel.schema.NadelDirectives.nadelHydrationArgumentDefinition
import graphql.nadel.schema.NadelDirectives.nadelHydrationComplexIdentifiedBy
import graphql.nadel.schema.NadelDirectives.nadelHydrationFromArgumentDefinition
import graphql.nadel.schema.NadelDirectives.nadelHydrationTemplateEnumDefinition
import graphql.nadel.schema.NadelDirectives.nadelWhenConditionDefinition
import graphql.nadel.schema.NadelDirectives.nadelWhenConditionPredicateDefinition
import graphql.nadel.schema.NadelDirectives.nadelWhenConditionResultDefinition
import graphql.schema.GraphQLSchema
import graphql.schema.idl.MockedWiringFactory
import graphql.schema.idl.RuntimeWiring
Expand All @@ -30,6 +33,9 @@ class NadelDirectivesTest : DescribeSpec({
${AstPrinter.printAst(nadelHydrationTemplateEnumDefinition)}
${AstPrinter.printAst(hydratedFromDirectiveDefinition)}
${AstPrinter.printAst(hydratedTemplateDirectiveDefinition)}
${AstPrinter.printAst(nadelWhenConditionDefinition)}
${AstPrinter.printAst(nadelWhenConditionPredicateDefinition)}
${AstPrinter.printAst(nadelWhenConditionResultDefinition)}
scalar JSON
"""

Expand All @@ -55,6 +61,12 @@ class NadelDirectivesTest : DescribeSpec({
{name: "fieldVal" value: "$source.namespace.issueId"}
{name: "argVal" value: "$argument.cloudId"}
]
when: {
result: {
sourceField: "type"
predicate: { equals: "issue" }
}
}
)
}
""".trimIndent())
Expand Down

0 comments on commit 8dd8b36

Please sign in to comment.