From d4690f32955d5ae64b5901718bdfef7a630f5a09 Mon Sep 17 00:00:00 2001 From: Nikola Bjelo Date: Fri, 19 Oct 2018 14:51:00 +0200 Subject: [PATCH] adding epoch function and making date a number --- server/src/models/competition.js | 4 ++-- server/src/schema/mutations/HostCompetition.js | 5 +++-- server/src/schema/types/Competition.js | 5 +++-- server/src/utils/functions.js | 4 +++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/server/src/models/competition.js b/server/src/models/competition.js index a776da7ec..d6baa3918 100644 --- a/server/src/models/competition.js +++ b/server/src/models/competition.js @@ -5,8 +5,8 @@ const competitionSchema = new Schema({ displayName: String, host: String, description: String, - startDatetime: Date, - finishDatetime: Date, + startDatetime: Number, + finishDatetime: Number, formula: String, plotter: { codeName: String, diff --git a/server/src/schema/mutations/HostCompetition.js b/server/src/schema/mutations/HostCompetition.js index 81f28757b..bda90ee6a 100644 --- a/server/src/schema/mutations/HostCompetition.js +++ b/server/src/schema/mutations/HostCompetition.js @@ -1,5 +1,6 @@ import { GraphQLNonNull, + GraphQLInt, GraphQLString } from 'graphql' import { CompetitionType } from '../types' @@ -9,8 +10,8 @@ import { slugify } from '../../utils/functions' const args = { displayName: { type: new GraphQLNonNull(GraphQLString) }, description: { type: new GraphQLNonNull(GraphQLString) }, - startDatetime: { type: new GraphQLNonNull(GraphQLString) }, - finishDatetime: { type: new GraphQLNonNull(GraphQLString) }, + startDatetime: { type: new GraphQLNonNull(GraphQLInt) }, + finishDatetime: { type: new GraphQLNonNull(GraphQLInt) }, formula: { type: new GraphQLNonNull(GraphQLString) } } diff --git a/server/src/schema/types/Competition.js b/server/src/schema/types/Competition.js index 9b4f9728e..009cfe702 100644 --- a/server/src/schema/types/Competition.js +++ b/server/src/schema/types/Competition.js @@ -1,5 +1,6 @@ import { GraphQLObjectType, + GraphQLInt, GraphQLString, GraphQLList, GraphQLID @@ -18,8 +19,8 @@ const CompetitionType = new GraphQLObjectType({ displayName: { type: GraphQLString }, host: { type: GraphQLString }, description: { type: GraphQLString }, - startDatetime: { type: GraphQLString }, - finishDatetime: { type: GraphQLString }, + startDatetime: { type: GraphQLInt }, + finishDatetime: { type: GraphQLInt }, formula: { type: GraphQLString }, plotter: { type: PlotterType, diff --git a/server/src/utils/functions.js b/server/src/utils/functions.js index 148fefd5e..fe27e5dde 100644 --- a/server/src/utils/functions.js +++ b/server/src/utils/functions.js @@ -11,4 +11,6 @@ export const slugify = (text) => { .replace(/-+$/, '') } -export default { capitalize, slugify } +export const epoch = () => { + return Math.round(new Date().getTime() / 1000) +}