Add @DefaultValue decorator

robak86 · Jan 6, 2018 · 4e40f5a · 4e40f5a
1 parent f7add96
commit 4e40f5a
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 16 deletions.
diff --git a/lib/decorators/fields.ts b/lib/decorators/fields.ts
@@ -29,6 +29,10 @@ export const params = (argsType:ArgsType):PropertyDecorator => createFieldDecora
     fieldConfig.setParamsType(argsType)
 });
 
+export const defaultValue = (val):PropertyDecorator => createFieldDecorator(fieldConfig => {
+    fieldConfig.setDefaultValue(val)
+});
+
 export const paramsThunk = (argsType:() => ArgsType):PropertyDecorator => createFieldDecorator(fieldConfig => {
     fieldConfig.setParamsThunk(argsType)
 });

diff --git a/spec/integration/buildingSchema.spec.ts b/spec/integration/buildingSchema.spec.ts
@@ -12,7 +12,7 @@ function createdSchemaFromDecoratedClasses():GraphQLSchema {
 
 function createSchemaFromDefinition():GraphQLSchema {
     const definition = `
-            """User search address params"""
+            # User search address params
             input UserSearchAddressParams {
                 street: String
             }
@@ -28,7 +28,7 @@ function createSchemaFromDefinition():GraphQLSchema {
                 firstNameUpperCase: String
                 address: Address
                 employers: [Company!]!
-                role: UserRole!
+                roles: [UserRole!]!
             }
             
             type Address {
@@ -47,7 +47,7 @@ function createSchemaFromDefinition():GraphQLSchema {
             }
 
             type Mutation {
-                createUser(firstName: String!, lastName: String!, address: CreateAddressParams): User
+                createUser(firstName: String!, lastName: String!, address: CreateAddressParams, roles: [UserRole] = []): User
                 createAddress(streetName: String, city: String): Address
                 createCompany(companyName: String): Company
                 createCompanyWrapped(input: CreateCompanyParams!): Company

diff --git a/spec/integration/queries.spec.ts b/spec/integration/queries.spec.ts
@@ -18,7 +18,7 @@ describe("root query", () => {
                         id
                         firstName
                         firstNameUpperCase
-                        role
+                        roles
                         employers {
                             id
                             name
@@ -33,7 +33,7 @@ describe("root query", () => {
                     id: '1',
                     firstName: 'Jane',
                     firstNameUpperCase: 'JANE',
-                    role: 'admin',
+                    roles: ['admin'],
                     employers: [
                         {
                             id: "1",
@@ -45,7 +45,7 @@ describe("root query", () => {
                     id: '2',
                     firstName: 'John',
                     firstNameUpperCase: 'JOHN',
-                    role: 'stuff',
+                    roles: ['stuff'],
                     employers: [
                         {
                             id: "2",
@@ -57,7 +57,7 @@ describe("root query", () => {
                     id: '3',
                     firstName: 'Adam',
                     firstNameUpperCase: 'ADAM',
-                    role: 'guest',
+                    roles: ['guest'],
                     employers: [
                         {
                             id: "3",

diff --git a/spec/integration/resolvers/data.ts b/spec/integration/resolvers/data.ts
@@ -2,7 +2,7 @@ import {Company} from "../types/Company";
 import {UserRole} from "../types/UserRole";
 
 export type CompanyEntity = { id:string; name:string; employeesIds:string[], type:'company' };
-export type UserEntity = { id:string; firstName:string; employersIds:string[], role:UserRole, type:'user' };
+export type UserEntity = { id:string; firstName:string; employersIds:string[], roles:UserRole[], type:'user' };
 
 export function getCompanyById(id:string):CompanyEntity {
     return getAllCompanies().filter(company => company.id === id)[0];
@@ -18,9 +18,9 @@ export function getAllCompanies():CompanyEntity[] {
 
 export function getAllUsers():UserEntity[] {
     return [
-        {id: '1', firstName: 'Jane', role: UserRole.admin, employersIds: ['1'], type: 'user'},
-        {id: '2', firstName: 'John', role: UserRole.stuff, employersIds: ['2'], type: 'user'},
-        {id: '3', firstName: 'Adam', role: UserRole.guest, employersIds: ['3'], type: 'user'},
+        {id: '1', firstName: 'Jane', roles: [UserRole.admin], employersIds: ['1'], type: 'user'},
+        {id: '2', firstName: 'John', roles: [UserRole.stuff], employersIds: ['2'], type: 'user'},
+        {id: '3', firstName: 'Adam', roles: [UserRole.guest], employersIds: ['3'], type: 'user'},
     ]
 }
 

diff --git a/spec/integration/types/CreateUserParams.ts b/spec/integration/types/CreateUserParams.ts
@@ -1,6 +1,7 @@
-import {field, input, nonNull} from "../../../lib";
+import {defaultValue, field, input, list, nonNull} from "../../../lib";
 import {GraphQLString} from "graphql";
 import {CreateAddressParams} from "./CreateAddressParams";
+import {UserRole} from "./UserRole";
 
 @input()
 export class CreateUserParams {
@@ -11,5 +12,8 @@ export class CreateUserParams {
     lastName:string;
 
     @field(CreateAddressParams)
-    address:CreateAddressParams
+    address:CreateAddressParams;
+
+    @list(UserRole) @defaultValue([])
+    roles: UserRole[];
 }
diff --git a/spec/integration/types/User.ts b/spec/integration/types/User.ts
@@ -1,7 +1,7 @@
 import {Company} from "./Company";
 import {field, id, listThunk, nonNull, nonNullItems, resolve} from "../../../lib/";
 import {GraphQLString} from "graphql";
-import {type} from "../../../lib";
+import {list, type} from "../../../lib";
 import {resolveEmployersForUser} from "../resolvers/queries";
 import {UserRole} from "./UserRole";
 import {Address} from "./Address";
@@ -25,6 +25,6 @@ export class User {
     @resolve(resolveEmployersForUser)
     employers:Company[];
 
-    @field(UserRole) @nonNull()
-    role:UserRole
+    @list(UserRole) @nonNull() @nonNullItems()
+    roles:UserRole[]
 }