Skip to content

Commit be4bed6

Browse files
committed
fix(query-graphql): Fixed between and notBetween types not generated
1 parent 419d5b4 commit be4bed6

File tree

5 files changed

+263
-43
lines changed

5 files changed

+263
-43
lines changed

packages/query-graphql/__tests__/__fixtures__/test-resolver.dto.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { TestResolverAuthorizer } from './test-resolver.authorizer';
55
@ObjectType()
66
@Authorize(TestResolverAuthorizer)
77
export class TestResolverDTO {
8+
89
@FilterableField(() => ID)
910
id!: string;
1011

packages/query-graphql/__tests__/types/query/__snapshots__/filter.type.spec.ts.snap

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,110 @@ input TestAllowedComparisonStringFieldFilterComparison {
416416
417417
`;
418418

419+
exports[`filter types FilterType allowedComparisons option should only expose between/not between comparisons for allowed types 1`] = `
420+
type Query {
421+
test(input: TestBetweenComparisonDtoFilter!): Int!
422+
}
423+
424+
input TestBetweenComparisonDtoFilter {
425+
and: [TestBetweenComparisonFilter!]
426+
or: [TestBetweenComparisonFilter!]
427+
id: NumberFieldComparison
428+
boolField: TestBetweenComparisonBoolFieldFilterComparison
429+
dateField: TestBetweenComparisonDateFieldFilterComparison
430+
floatField: TestBetweenComparisonFloatFieldFilterComparison
431+
intField: TestBetweenComparisonIntFieldFilterComparison
432+
numberField: TestBetweenComparisonNumberFieldFilterComparison
433+
stringField: TestBetweenComparisonStringFieldFilterComparison
434+
}
435+
436+
input TestBetweenComparisonFilter {
437+
and: [TestBetweenComparisonFilter!]
438+
or: [TestBetweenComparisonFilter!]
439+
id: NumberFieldComparison
440+
boolField: TestBetweenComparisonBoolFieldFilterComparison
441+
dateField: TestBetweenComparisonDateFieldFilterComparison
442+
floatField: TestBetweenComparisonFloatFieldFilterComparison
443+
intField: TestBetweenComparisonIntFieldFilterComparison
444+
numberField: TestBetweenComparisonNumberFieldFilterComparison
445+
stringField: TestBetweenComparisonStringFieldFilterComparison
446+
}
447+
448+
input NumberFieldComparison {
449+
is: Boolean
450+
isNot: Boolean
451+
eq: Float
452+
neq: Float
453+
gt: Float
454+
gte: Float
455+
lt: Float
456+
lte: Float
457+
in: [Float!]
458+
notIn: [Float!]
459+
between: NumberFieldComparisonBetween
460+
notBetween: NumberFieldComparisonBetween
461+
}
462+
463+
input NumberFieldComparisonBetween {
464+
lower: Float!
465+
upper: Float!
466+
}
467+
468+
input TestBetweenComparisonBoolFieldFilterComparison {
469+
eq: Boolean
470+
}
471+
472+
input TestBetweenComparisonDateFieldFilterComparison {
473+
between: TestBetweenComparisonDateFieldFilterComparisonBetween
474+
notBetween: TestBetweenComparisonDateFieldFilterComparisonBetween
475+
}
476+
477+
input TestBetweenComparisonDateFieldFilterComparisonBetween {
478+
lower: DateTime!
479+
upper: DateTime!
480+
}
481+
482+
"""
483+
A date-time string at UTC, such as 2019-12-03T09:54:33Z, compliant with the date-time format.
484+
"""
485+
scalar DateTime
486+
487+
input TestBetweenComparisonFloatFieldFilterComparison {
488+
between: TestBetweenComparisonFloatFieldFilterComparisonBetween
489+
notBetween: TestBetweenComparisonFloatFieldFilterComparisonBetween
490+
}
491+
492+
input TestBetweenComparisonFloatFieldFilterComparisonBetween {
493+
lower: Float!
494+
upper: Float!
495+
}
496+
497+
input TestBetweenComparisonIntFieldFilterComparison {
498+
between: TestBetweenComparisonIntFieldFilterComparisonBetween
499+
notBetween: TestBetweenComparisonIntFieldFilterComparisonBetween
500+
}
501+
502+
input TestBetweenComparisonIntFieldFilterComparisonBetween {
503+
lower: Int!
504+
upper: Int!
505+
}
506+
507+
input TestBetweenComparisonNumberFieldFilterComparison {
508+
between: TestBetweenComparisonNumberFieldFilterComparisonBetween
509+
notBetween: TestBetweenComparisonNumberFieldFilterComparisonBetween
510+
}
511+
512+
input TestBetweenComparisonNumberFieldFilterComparisonBetween {
513+
lower: Float!
514+
upper: Float!
515+
}
516+
517+
input TestBetweenComparisonStringFieldFilterComparison {
518+
eq: String
519+
}
520+
521+
`;
522+
419523
exports[`filter types FilterType filterRequired option should only expose allowed comparisons 1`] = `
420524
type Query {
421525
test(input: TestComparisonDtoFilter!): Int!

0 commit comments

Comments
 (0)