From 676e7619d830d144c6ef7b2cea80bdc70fd924bd Mon Sep 17 00:00:00 2001 From: Nikola Bjelo Date: Fri, 19 Oct 2018 17:39:55 +0200 Subject: [PATCH] yet a bit more refactoring --- server/src/schema/mutations/AddRuleToCompetition.js | 10 +++++----- server/src/schema/mutations/HostCompetition.js | 12 ++++++------ server/src/schema/mutations/RegisterToCompetition.js | 10 +++++----- server/src/schema/queries/Competitions.js | 4 ++-- server/src/schema/queries/CompetitionsByDevTeam.js | 6 +++--- server/src/schema/queries/CompetitionsByHost.js | 6 +++--- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/server/src/schema/mutations/AddRuleToCompetition.js b/server/src/schema/mutations/AddRuleToCompetition.js index a165940df..1f843cf99 100644 --- a/server/src/schema/mutations/AddRuleToCompetition.js +++ b/server/src/schema/mutations/AddRuleToCompetition.js @@ -12,13 +12,13 @@ const args = { description: { type: new GraphQLNonNull(GraphQLString) } } -const resolve = (parent, args, context) => { +const resolve = (parent, { codeName, title, description }, context) => { // let authIdOnSession = context.user.sub return new Promise((resolve, reject) => { - Competition.findOne({ codeName: args.codeName }).exec((err, competition) => { + Competition.findOne({ codeName }).exec((err, competition) => { if (err) reject(err) else { - if (competition.rules.some(rule => rule.title === args.title)) { + if (competition.rules.some(rule => rule.title === title)) { // need to add an error message here TODO resolve(competition) } else { @@ -28,8 +28,8 @@ const resolve = (parent, args, context) => { } competition.rules.push({ number, - title: args.title, - description: args.description + title, + description }) competition.save((err) => { if (err) reject(err) diff --git a/server/src/schema/mutations/HostCompetition.js b/server/src/schema/mutations/HostCompetition.js index 78f2438d0..b590593dd 100644 --- a/server/src/schema/mutations/HostCompetition.js +++ b/server/src/schema/mutations/HostCompetition.js @@ -15,16 +15,16 @@ const args = { formula: { type: new GraphQLNonNull(GraphQLString) } } -const resolve = (parent, args, context) => { +const resolve = (parent, { displayName, description, startDatetime, finishDatetime, formula }, context) => { // let authIdOnSession = context.user.sub let authIdOnSession = 'some-id' let newCompetition = new Competition({ host: authIdOnSession, - displayName: args.displayName, - description: args.description, - startDatetime: args.startDatetime, - finishDatetime: args.finishDatetime, - formula: args.formula + displayName, + description, + startDatetime, + finishDatetime, + formula }) newCompetition.codeName = slugify(newCompetition.displayName) + '-' + newCompetition._id return new Promise((resolve, reject) => { diff --git a/server/src/schema/mutations/RegisterToCompetition.js b/server/src/schema/mutations/RegisterToCompetition.js index 2816187df..ecd72aa83 100644 --- a/server/src/schema/mutations/RegisterToCompetition.js +++ b/server/src/schema/mutations/RegisterToCompetition.js @@ -13,10 +13,10 @@ const args = { release: { type: new GraphQLNonNull(GraphQLString) } } -const resolve = (parent, args, context) => { +const resolve = (parent, { codeName, devTeam, bot, release }, context) => { // let authIdOnSession = context.user.sub return new Promise((resolve, reject) => { - Competition.findOne({ codeName: args.codeName }).exec((err, competition) => { + Competition.findOne({ codeName }).exec((err, competition) => { if (err) reject(err) else { if (competition.participants.some(participant => participant.devTeam === args.devTeam)) { @@ -24,9 +24,9 @@ const resolve = (parent, args, context) => { resolve(competition) } else { competition.participants.push({ - devTeam: args.devTeam, - bot: args.bot, - release: args.release + devTeam, + bot, + release }) competition.save((err) => { if (err) reject(err) diff --git a/server/src/schema/queries/Competitions.js b/server/src/schema/queries/Competitions.js index 3e40959e1..f27992984 100644 --- a/server/src/schema/queries/Competitions.js +++ b/server/src/schema/queries/Competitions.js @@ -10,11 +10,11 @@ const args = { includeOld: { type: GraphQLBoolean } } -const resolve = (parent, args, context) => { +const resolve = (parent, { includeOld }, context) => { return Competition.find( Object.assign( {}, - args.includeOld ? { finishDatetime: { $gt: epoch() } } : {} + includeOld ? { finishDatetime: { $gt: epoch() } } : {} )) } diff --git a/server/src/schema/queries/CompetitionsByDevTeam.js b/server/src/schema/queries/CompetitionsByDevTeam.js index 5be97bdcd..4d4d44bbf 100644 --- a/server/src/schema/queries/CompetitionsByDevTeam.js +++ b/server/src/schema/queries/CompetitionsByDevTeam.js @@ -13,13 +13,13 @@ const args = { includeOld: { type: GraphQLBoolean } } -const resolve = (parent, args, context) => { +const resolve = (parent, { devTeam, includeOld }, context) => { return Competition.find( Object.assign( { - participants: { $elemMatch: { devTeam: args.devTeam } } + participants: { $elemMatch: { devTeam } } }, - args.includeOld ? { finishDatetime: { $gt: epoch() } } : {} + includeOld ? { finishDatetime: { $gt: epoch() } } : {} ) ) } diff --git a/server/src/schema/queries/CompetitionsByHost.js b/server/src/schema/queries/CompetitionsByHost.js index 8ba72c897..b6b2fc819 100644 --- a/server/src/schema/queries/CompetitionsByHost.js +++ b/server/src/schema/queries/CompetitionsByHost.js @@ -13,13 +13,13 @@ const args = { includeOld: { type: GraphQLBoolean } } -const resolve = (parent, args, context) => { +const resolve = (parent, { host, includeOld }, context) => { return Competition.find( Object.assign( { - host: args.host + host }, - args.includeOld ? { finishDatetime: { $gt: epoch() } } : {} + includeOld ? { finishDatetime: { $gt: epoch() } } : {} ) ) }