From 793b52e1d7380fe6ba51f036091a8ecf48814d9e Mon Sep 17 00:00:00 2001 From: Nikola Bjelo Date: Tue, 6 Nov 2018 06:43:38 +0100 Subject: [PATCH] Renaming from status to state --- client/src/GraphQL/Fragments/event.js | 4 ++-- .../enums/{EventStatus.js => EventState.js} | 4 ++-- server/src/models/event.js | 8 ++++---- ...angeEventStatus.js => ChangeEventState.js} | 10 +++++----- server/src/schema/mutations/index.js | 4 ++-- server/src/schema/queries/Events.js | 4 ++-- server/src/schema/queries/EventsByHost.js | 4 ++-- server/src/schema/queries/EventsByTeam.js | 4 ++-- server/src/schema/types/Event.js | 4 ++-- server/src/schema/types/enum/EventState.js | 19 +++++++++++++++++++ server/src/schema/types/enum/EventStatus.js | 19 ------------------- 11 files changed, 42 insertions(+), 42 deletions(-) rename server/src/enums/{EventStatus.js => EventState.js} (84%) rename server/src/schema/mutations/{ChangeEventStatus.js => ChangeEventState.js} (65%) create mode 100644 server/src/schema/types/enum/EventState.js delete mode 100644 server/src/schema/types/enum/EventStatus.js diff --git a/client/src/GraphQL/Fragments/event.js b/client/src/GraphQL/Fragments/event.js index cd72463a7..96be79f08 100644 --- a/client/src/GraphQL/Fragments/event.js +++ b/client/src/GraphQL/Fragments/event.js @@ -3,7 +3,7 @@ import gql from 'graphql-tag'; export const eventMinimalInfo = gql` fragment EventMinimalInfo on events_Event { id - status + state name startDatetime finishDatetime @@ -19,7 +19,7 @@ export const eventMinimalInfo = gql` export const eventFullInfo = gql` fragment EventFullInfo on events_Event { id - status + state name host{ alias diff --git a/server/src/enums/EventStatus.js b/server/src/enums/EventState.js similarity index 84% rename from server/src/enums/EventStatus.js rename to server/src/enums/EventState.js index 025c28fca..4541a47ef 100644 --- a/server/src/enums/EventStatus.js +++ b/server/src/enums/EventState.js @@ -6,7 +6,7 @@ export const INTERRUPTED = 'INTERRUPTED'; export const FINISHED = 'FINISHED'; export const ARCHIVED = 'ARCHIVED'; -export const EventStatusEnum = [ +export const EventStateEnum = [ UNPUBLISHED, PUBLISHED, CANCELLED, @@ -16,4 +16,4 @@ export const EventStatusEnum = [ ARCHIVED, ]; -export default EventStatusEnum; +export default EventStateEnum; diff --git a/server/src/models/event.js b/server/src/models/event.js index 87d495ccd..c95ef5744 100644 --- a/server/src/models/event.js +++ b/server/src/models/event.js @@ -3,15 +3,15 @@ import Plotter from './plotter'; import Formula from './formula'; import { UNPUBLISHED, - EventStatusEnum, -} from '../enums/EventStatus'; + EventStateEnum, +} from '../enums/EventState'; const { ObjectId } = Schema.Types; const eventSchema = new Schema({ - status: { + state: { type: String, - enum: EventStatusEnum, + enum: EventStateEnum, default: UNPUBLISHED, }, name: { diff --git a/server/src/schema/mutations/ChangeEventStatus.js b/server/src/schema/mutations/ChangeEventState.js similarity index 65% rename from server/src/schema/mutations/ChangeEventStatus.js rename to server/src/schema/mutations/ChangeEventState.js index 8e95007b0..ada9367b8 100644 --- a/server/src/schema/mutations/ChangeEventStatus.js +++ b/server/src/schema/mutations/ChangeEventState.js @@ -5,20 +5,20 @@ import { import { AuthentificationError } from '../../errors'; import { EventType } from '../types'; import { Event } from '../../models'; -import EventStatusEnum from '../types/enum/EventStatus'; +import EventStateEnum from '../types/enum/EventState'; const args = { eventId: { type: new GraphQLNonNull(GraphQLID) }, - status: { type: EventStatusEnum }, + state: { type: EventStateEnum }, }; -const resolve = (parent, { eventId: _id, status }, { userId: hostId }) => { +const resolve = (parent, { eventId: _id, state }, { userId: hostId }) => { if (!hostId) { throw new AuthentificationError(); } return new Promise((res, rej) => { - Event.findOneAndUpdate({ _id, hostId }, { status }, { new: true }, (err, modifiedEvent) => { + Event.findOneAndUpdate({ _id, hostId }, { state }, { new: true }, (err, modifiedEvent) => { if (err) { rej(err); return; @@ -29,7 +29,7 @@ const resolve = (parent, { eventId: _id, status }, { userId: hostId }) => { }; const mutation = { - changeEventStatus: { + changeEventState: { type: EventType, args, resolve, diff --git a/server/src/schema/mutations/index.js b/server/src/schema/mutations/index.js index 5aa9b2354..2bd29dc34 100644 --- a/server/src/schema/mutations/index.js +++ b/server/src/schema/mutations/index.js @@ -8,7 +8,7 @@ import RegisterToEventMutation from './RegisterToEvent'; import EditParticipantMutation from './EditParticipant'; import CreateFormulaMutation from './CreateFormula'; import CreatePlotterMutation from './CreatePlotter'; -import ChangeEventStatusMutation from './ChangeEventStatus'; +import ChangeEventStateMutation from './ChangeEventState'; const Mutation = new GraphQLObjectType({ name: 'Mutation', @@ -19,7 +19,7 @@ const Mutation = new GraphQLObjectType({ EditParticipantMutation, CreateFormulaMutation, CreatePlotterMutation, - ChangeEventStatusMutation, + ChangeEventStateMutation, ), }); diff --git a/server/src/schema/queries/Events.js b/server/src/schema/queries/Events.js index e8d0bcfef..fae289a5b 100644 --- a/server/src/schema/queries/Events.js +++ b/server/src/schema/queries/Events.js @@ -4,7 +4,7 @@ import { } from 'graphql'; import { EventType } from '../types'; import { Event } from '../../models'; -import { UNPUBLISHED, ARCHIVED } from '../../enums/EventStatus'; +import { UNPUBLISHED, ARCHIVED } from '../../enums/EventState'; const args = { minDate: { type: GraphQLInt }, @@ -13,7 +13,7 @@ const args = { const resolve = (parent, { minDate, maxDate }) => Event.find( Object.assign( - { status: { $nin: [UNPUBLISHED, ARCHIVED] } }, + { state: { $nin: [UNPUBLISHED, ARCHIVED] } }, minDate || maxDate ? { startDatetime: diff --git a/server/src/schema/queries/EventsByHost.js b/server/src/schema/queries/EventsByHost.js index 449314cb1..6941570d4 100644 --- a/server/src/schema/queries/EventsByHost.js +++ b/server/src/schema/queries/EventsByHost.js @@ -5,7 +5,7 @@ import { } from 'graphql'; import { EventType } from '../types'; import { Event } from '../../models'; -import { UNPUBLISHED, ARCHIVED } from '../../enums/EventStatus'; +import { UNPUBLISHED, ARCHIVED } from '../../enums/EventState'; const args = { hostId: { type: GraphQLString }, @@ -15,7 +15,7 @@ const args = { const resolve = (parent, { hostId, minDate, maxDate }, context) => Event.find( Object.assign( - hostId ? { hostId, status: { $nin: [UNPUBLISHED, ARCHIVED] } } : { hostId: context.userId }, + hostId ? { hostId, state: { $nin: [UNPUBLISHED, ARCHIVED] } } : { hostId: context.userId }, minDate || maxDate ? { startDatetime: diff --git a/server/src/schema/queries/EventsByTeam.js b/server/src/schema/queries/EventsByTeam.js index 7816ff347..e9147e9b9 100644 --- a/server/src/schema/queries/EventsByTeam.js +++ b/server/src/schema/queries/EventsByTeam.js @@ -6,7 +6,7 @@ import { } from 'graphql'; import { EventType } from '../types'; import { Event } from '../../models'; -import { UNPUBLISHED, ARCHIVED } from '../../enums/EventStatus'; +import { UNPUBLISHED, ARCHIVED } from '../../enums/EventState'; const args = { teamId: { type: new GraphQLNonNull(GraphQLString) }, @@ -18,7 +18,7 @@ const resolve = (parent, { teamId, minDate, maxDate }) => Event.find( Object.assign( { participants: { $elemMatch: { teamId } }, - status: { $nin: [UNPUBLISHED, ARCHIVED] }, + state: { $nin: [UNPUBLISHED, ARCHIVED] }, }, minDate || maxDate diff --git a/server/src/schema/types/Event.js b/server/src/schema/types/Event.js index a53041cb4..e4582e346 100644 --- a/server/src/schema/types/Event.js +++ b/server/src/schema/types/Event.js @@ -12,14 +12,14 @@ import { ParticipantType, PrizeType, } from './index'; -import EventStatusEnumType from './enum/EventStatus'; +import EventStateEnumType from './enum/EventState'; const EventType = new GraphQLObjectType({ name: 'Event', description: 'Everything you need to know about an event', fields: () => ({ id: { type: GraphQLID }, - status: { type: EventStatusEnumType }, + state: { type: EventStateEnumType }, name: { type: GraphQLString }, hostId: { type: GraphQLString }, description: { type: GraphQLString }, diff --git a/server/src/schema/types/enum/EventState.js b/server/src/schema/types/enum/EventState.js new file mode 100644 index 000000000..d4ef1304f --- /dev/null +++ b/server/src/schema/types/enum/EventState.js @@ -0,0 +1,19 @@ +import { + GraphQLEnumType, +} from 'graphql'; + +import { EventStateEnum } from '../../../enums/EventState'; + +const values = {}; +EventStateEnum.forEach((EventState) => { + values[EventState] = { value: EventState }; +}); + +const EventStateEnumType = new GraphQLEnumType({ + name: 'EventStateEnum', + values, +}); + +export { + EventStateEnumType as default, +}; diff --git a/server/src/schema/types/enum/EventStatus.js b/server/src/schema/types/enum/EventStatus.js deleted file mode 100644 index 372abd92f..000000000 --- a/server/src/schema/types/enum/EventStatus.js +++ /dev/null @@ -1,19 +0,0 @@ -import { - GraphQLEnumType, -} from 'graphql'; - -import { EventStatusEnum } from '../../../enums/EventStatus'; - -const values = {}; -EventStatusEnum.forEach((EventStatus) => { - values[EventStatus] = { value: EventStatus }; -}); - -const EventStatusEnumType = new GraphQLEnumType({ - name: 'EventStatusEnum', - values, -}); - -export { - EventStatusEnumType as default, -};