From d2c99cbc8a169ffea0a12681284dc7491ea380b2 Mon Sep 17 00:00:00 2001 From: Nikola Bjelo Date: Sun, 28 Oct 2018 13:21:54 +0100 Subject: [PATCH] Finishing the errors cleanup --- server/src/schema/mutations/EditRule.js | 5 ++--- server/src/schema/mutations/RegisterToEvent.js | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/server/src/schema/mutations/EditRule.js b/server/src/schema/mutations/EditRule.js index 7dafe9829..acf83460b 100644 --- a/server/src/schema/mutations/EditRule.js +++ b/server/src/schema/mutations/EditRule.js @@ -3,7 +3,7 @@ import { GraphQLID, GraphQLString } from 'graphql' -import { AuthentificationError, DatabaseError } from '../../errors' +import { AuthentificationError, DatabaseError, WrongArgumentsError } from '../../errors' import { EventType } from '../types' import { Event } from '../../models' @@ -37,8 +37,7 @@ const resolve = (parent, { eventDesignator, title, newtitle, description }, cont } event.rules[ruleIndex].description = description || event.rules[ruleIndex].description if (event.rules.some(rule => rule.title === newtitle)) { - // need to add an error message here TODO - resolve(event) + reject(new WrongArgumentsError('There is already a rule using your new title')) } else { event.rules[ruleIndex].title = newtitle || event.rules[ruleIndex].title } diff --git a/server/src/schema/mutations/RegisterToEvent.js b/server/src/schema/mutations/RegisterToEvent.js index c34a29b57..138d7f9f5 100644 --- a/server/src/schema/mutations/RegisterToEvent.js +++ b/server/src/schema/mutations/RegisterToEvent.js @@ -3,7 +3,7 @@ import { GraphQLID, GraphQLString } from 'graphql' -import { AuthentificationError } from '../../errors' +import { AuthentificationError, WrongArgumentsError } from '../../errors' import { EventType } from '../types' import { Event } from '../../models' @@ -24,8 +24,7 @@ const resolve = (parent, { designator, teamId, botId, releaseId }, context) => { if (err) reject(err) else { if (event.participants.some(participant => participant.teamId === teamId)) { - // need to add an error message here TODO - resolve(event) + reject(new WrongArgumentsError('You are already registred')) } else { event.participants.push({ teamId,