feat: add validators

doug-martin · Feb 21, 2020 · 9620cf1 · 9620cf1
1 parent edc9d2d
commit 9620cf1
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 5 deletions.
diff --git a/packages/query-graphql/src/types/create-many-args.type.ts b/packages/query-graphql/src/types/create-many-args.type.ts
@@ -1,5 +1,7 @@
 import { Class } from '@nestjs-query/core';
-import { Field, ArgsType } from 'type-graphql';
+import { Type } from 'class-transformer';
+import { ValidateNested } from 'class-validator';
+import { ArgsType, Field } from 'type-graphql';
 
 export interface CreateManyArgsType<C> {
   input: C[];
@@ -8,6 +10,8 @@ export interface CreateManyArgsType<C> {
 export function CreateManyArgsType<C>(ItemClass: Class<C>): Class<CreateManyArgsType<C>> {
   @ArgsType()
   class CreateManyArgs implements CreateManyArgsType<C> {
+    @Type(() => ItemClass)
+    @ValidateNested({ each: true })
     @Field(() => [ItemClass], { description: 'Array of records to create' })
     input!: C[];
   }

diff --git a/packages/query-graphql/src/types/create-one-args.type.ts b/packages/query-graphql/src/types/create-one-args.type.ts
@@ -1,5 +1,7 @@
 import { Class } from '@nestjs-query/core';
-import { Field, ArgsType } from 'type-graphql';
+import { Type } from 'class-transformer';
+import { ValidateNested } from 'class-validator';
+import { ArgsType, Field } from 'type-graphql';
 
 export interface CreateOneArgsType<C> {
   input: C;
@@ -8,6 +10,8 @@ export interface CreateOneArgsType<C> {
 export function CreateOneArgsType<C>(ItemClass: Class<C>): Class<CreateOneArgsType<C>> {
   @ArgsType()
   class CreateOneArgs implements CreateOneArgsType<C> {
+    @Type(() => ItemClass)
+    @ValidateNested()
     @Field(() => ItemClass, { description: 'The record to create' })
     input!: C;
   }

diff --git a/packages/query-graphql/src/types/delete-many-args.type.ts b/packages/query-graphql/src/types/delete-many-args.type.ts
@@ -9,8 +9,8 @@ export interface DeleteManyArgsType<T> {
 export function DeleteManyArgsType<T>(FilterType: Class<Filter<T>>): Class<DeleteManyArgsType<T>> {
   @ArgsType()
   class DeleteManyArgs implements DeleteManyArgsType<T> {
-    @Field(() => FilterType, { description: 'Filter to find records to delete' })
     @IsNotEmptyObject()
+    @Field(() => FilterType, { description: 'Filter to find records to delete' })
     input!: Filter<T>;
   }
   return DeleteManyArgs;

diff --git a/packages/query-graphql/src/types/delete-one-args.type.ts b/packages/query-graphql/src/types/delete-one-args.type.ts
@@ -1,5 +1,6 @@
 import { Class } from '@nestjs-query/core';
 import { Field, ID, ArgsType } from 'type-graphql';
+import { IsNotEmpty } from 'class-validator';
 
 export interface DeleteOneArgsType {
   id: string | number;
@@ -13,6 +14,7 @@ export function DeleteOneArgsType(): Class<DeleteOneArgsType> {
   }
   @ArgsType()
   class DeleteOneArgs implements DeleteOneArgsType {
+    @IsNotEmpty()
     @Field(() => ID, { description: 'The id of the record to delete.' })
     id!: string | number;
   }

diff --git a/packages/query-graphql/src/types/update-many-args.type.ts b/packages/query-graphql/src/types/update-many-args.type.ts
@@ -1,6 +1,7 @@
 import { DeepPartial, Filter, Class } from '@nestjs-query/core';
 import { Field, ArgsType } from 'type-graphql';
-import { IsNotEmptyObject } from 'class-validator';
+import { IsNotEmptyObject, ValidateNested } from 'class-validator';
+import { Type } from 'class-transformer';
 
 export interface UpdateManyArgsType<T, U extends DeepPartial<T>> {
   filter: Filter<T>;
@@ -13,10 +14,12 @@ export function UpdateManyArgsType<T, U extends DeepPartial<T>>(
 ): Class<UpdateManyArgsType<T, U>> {
   @ArgsType()
   class UpdateManyArgs implements UpdateManyArgsType<T, U> {
-    @Field(() => FilterType, { description: 'Filter used to find fields to update' })
     @IsNotEmptyObject()
+    @Field(() => FilterType, { description: 'Filter used to find fields to update' })
     filter!: Filter<T>;
 
+    @Type(() => UpdateType)
+    @ValidateNested()
     @Field(() => UpdateType, { description: 'The update to apply to all records found using the filter' })
     input!: U;
   }

diff --git a/packages/query-graphql/src/types/update-one-args.type.ts b/packages/query-graphql/src/types/update-one-args.type.ts
@@ -1,5 +1,7 @@
 import { DeepPartial, Class } from '@nestjs-query/core';
 import { Field, ID, ArgsType } from 'type-graphql';
+import { IsNotEmpty, ValidateNested } from 'class-validator';
+import { Type } from 'class-transformer';
 
 export interface UpdateOneArgsType<DTO, U extends DeepPartial<DTO>> {
   id: string | number;
@@ -9,9 +11,12 @@ export interface UpdateOneArgsType<DTO, U extends DeepPartial<DTO>> {
 export function UpdateOneArgsType<T, U extends DeepPartial<T>>(UpdateType: Class<U>): Class<UpdateOneArgsType<T, U>> {
   @ArgsType()
   class UpdateOneArgs implements UpdateOneArgsType<T, U> {
+    @IsNotEmpty()
     @Field(() => ID, { description: 'The id of the record to update' })
     id!: string | number;
 
+    @Type(() => UpdateType)
+    @ValidateNested()
     @Field(() => UpdateType, { description: 'The update to apply.' })
     input!: U;
   }