From 1af910e51f484c053feaa7e8b528e9f61d94893c Mon Sep 17 00:00:00 2001 From: Nikola Bjelo Date: Sat, 20 Oct 2018 04:35:25 +0200 Subject: [PATCH] refactoring a bit for shorter mutation names --- .../{AddPrizeToCompetition.js => AddPrize.js} | 8 ++++---- .../{AddRuleToCompetition.js => AddRule.js} | 8 ++++---- ...antOfCompetition.js => EditParticipant.js} | 8 ++++---- .../{EditRuleOfCompetition.js => EditRule.js} | 8 ++++---- server/src/schema/mutations/index.js | 20 +++++++++---------- 5 files changed, 26 insertions(+), 26 deletions(-) rename server/src/schema/mutations/{AddPrizeToCompetition.js => AddPrize.js} (79%) rename server/src/schema/mutations/{AddRuleToCompetition.js => AddRule.js} (81%) rename server/src/schema/mutations/{EditParticipantOfCompetition.js => EditParticipant.js} (81%) rename server/src/schema/mutations/{EditRuleOfCompetition.js => EditRule.js} (82%) diff --git a/server/src/schema/mutations/AddPrizeToCompetition.js b/server/src/schema/mutations/AddPrize.js similarity index 79% rename from server/src/schema/mutations/AddPrizeToCompetition.js rename to server/src/schema/mutations/AddPrize.js index 194141ea7..f7e5498f1 100644 --- a/server/src/schema/mutations/AddPrizeToCompetition.js +++ b/server/src/schema/mutations/AddPrize.js @@ -8,15 +8,15 @@ import { CompetitionType } from '../types' import Competition from '../../models/competition' const args = { - codeName: { type: new GraphQLNonNull(GraphQLID) }, + competitionCodeName: { type: new GraphQLNonNull(GraphQLID) }, position: { type: new GraphQLNonNull(GraphQLInt) }, algoPrize: { type: new GraphQLNonNull(GraphQLString) } } -const resolve = (parent, { codeName, position, algoPrize }, context) => { +const resolve = (parent, { competitionCodeName, position, algoPrize }, context) => { // let authIdOnSession = context.user.sub return new Promise((resolve, reject) => { - Competition.findOne({ codeName }).exec((err, competition) => { + Competition.findOne({ codeName: competitionCodeName }).exec((err, competition) => { if (err) reject(err) else { if (competition.prizes.some(prize => prize.position === position)) { @@ -40,7 +40,7 @@ const resolve = (parent, { codeName, position, algoPrize }, context) => { } const mutation = { - addPrizeToCompetition: { + addPrize: { type: CompetitionType, args, resolve diff --git a/server/src/schema/mutations/AddRuleToCompetition.js b/server/src/schema/mutations/AddRule.js similarity index 81% rename from server/src/schema/mutations/AddRuleToCompetition.js rename to server/src/schema/mutations/AddRule.js index 1f843cf99..23a144548 100644 --- a/server/src/schema/mutations/AddRuleToCompetition.js +++ b/server/src/schema/mutations/AddRule.js @@ -7,15 +7,15 @@ import { CompetitionType } from '../types' import Competition from '../../models/competition' const args = { - codeName: { type: new GraphQLNonNull(GraphQLID) }, + competitionCodeName: { type: new GraphQLNonNull(GraphQLID) }, title: { type: new GraphQLNonNull(GraphQLString) }, description: { type: new GraphQLNonNull(GraphQLString) } } -const resolve = (parent, { codeName, title, description }, context) => { +const resolve = (parent, { competitionCodeName, title, description }, context) => { // let authIdOnSession = context.user.sub return new Promise((resolve, reject) => { - Competition.findOne({ codeName }).exec((err, competition) => { + Competition.findOne({ codeName: competitionCodeName }).exec((err, competition) => { if (err) reject(err) else { if (competition.rules.some(rule => rule.title === title)) { @@ -44,7 +44,7 @@ const resolve = (parent, { codeName, title, description }, context) => { } const mutation = { - addRuleToCompetition: { + addRule: { type: CompetitionType, args, resolve diff --git a/server/src/schema/mutations/EditParticipantOfCompetition.js b/server/src/schema/mutations/EditParticipant.js similarity index 81% rename from server/src/schema/mutations/EditParticipantOfCompetition.js rename to server/src/schema/mutations/EditParticipant.js index 0cb37d749..1a1db28ad 100644 --- a/server/src/schema/mutations/EditParticipantOfCompetition.js +++ b/server/src/schema/mutations/EditParticipant.js @@ -7,16 +7,16 @@ import { CompetitionType } from '../types' import Competition from '../../models/competition' const args = { - codeName: { type: new GraphQLNonNull(GraphQLID) }, + competitionCodeName: { type: new GraphQLNonNull(GraphQLID) }, devTeam: { type: new GraphQLNonNull(GraphQLString) }, bot: { type: GraphQLString }, release: { type: GraphQLString } } -const resolve = (parent, { codeName, devTeam, bot, release }, context) => { +const resolve = (parent, { competitionCodeName, devTeam, bot, release }, context) => { // let authIdOnSession = context.user.sub return new Promise((resolve, reject) => { - Competition.findOne({ codeName }).exec((err, competition) => { + Competition.findOne({ codeName: competitionCodeName }).exec((err, competition) => { if (err) reject(err) else { let participantIndex @@ -41,7 +41,7 @@ const resolve = (parent, { codeName, devTeam, bot, release }, context) => { } const mutation = { - editParticipantOfCompetition: { + editParticipant: { type: CompetitionType, args, resolve diff --git a/server/src/schema/mutations/EditRuleOfCompetition.js b/server/src/schema/mutations/EditRule.js similarity index 82% rename from server/src/schema/mutations/EditRuleOfCompetition.js rename to server/src/schema/mutations/EditRule.js index 55cd5519c..660c7f0df 100644 --- a/server/src/schema/mutations/EditRuleOfCompetition.js +++ b/server/src/schema/mutations/EditRule.js @@ -7,16 +7,16 @@ import { CompetitionType } from '../types' import Competition from '../../models/competition' const args = { - codeName: { type: new GraphQLNonNull(GraphQLID) }, + competitionCodeName: { type: new GraphQLNonNull(GraphQLID) }, title: { type: new GraphQLNonNull(GraphQLString) }, newtitle: { type: GraphQLString }, description: { type: GraphQLString } } -const resolve = (parent, { codeName, title, newtitle, description }, context) => { +const resolve = (parent, { competitionCodeName, title, newtitle, description }, context) => { // let authIdOnSession = context.user.sub return new Promise((resolve, reject) => { - Competition.findOne({ codeName }).exec((err, competition) => { + Competition.findOne({ codeName: competitionCodeName }).exec((err, competition) => { if (err) reject(err) else { let ruleIndex @@ -46,7 +46,7 @@ const resolve = (parent, { codeName, title, newtitle, description }, context) => } const mutation = { - editRuleOfCompetition: { + editRule: { type: CompetitionType, args, resolve diff --git a/server/src/schema/mutations/index.js b/server/src/schema/mutations/index.js index fc37f8426..6fb93cdcf 100644 --- a/server/src/schema/mutations/index.js +++ b/server/src/schema/mutations/index.js @@ -4,22 +4,22 @@ import { import HostCompetitionMutation from './HostCompetition' import EditCompetitionMutation from './EditCompetition' -import RegisterToCompetitionMutation from './RegisterToCompetition' -import EditParticipantOfCompetitionMutation from './EditParticipantOfCompetition' -import AddRuleToCompetitionMutation from './AddRuleToCompetition' -import EditRuleOfCompetitionMutation from './EditRuleOfCompetition' -import AddPrizeToCompetitionMutation from './AddPrizeToCompetition' +import RegisterMutation from './Register' +import EditParticipantMutation from './EditParticipant' +import AddRuleMutation from './AddRule' +import EditRuleMutation from './EditRule' +import AddPrizeMutation from './AddPrize' const Mutation = new GraphQLObjectType({ name: 'Mutation', fields: Object.assign( HostCompetitionMutation, EditCompetitionMutation, - RegisterToCompetitionMutation, - EditParticipantOfCompetitionMutation, - AddRuleToCompetitionMutation, - EditRuleOfCompetitionMutation, - AddPrizeToCompetitionMutation + RegisterMutation, + EditParticipantMutation, + AddRuleMutation, + EditRuleMutation, + AddPrizeMutation ) })