From 39f3071d2d8ae274eb266e469c38ff078eb6b1c5 Mon Sep 17 00:00:00 2001 From: nikolabjelo Date: Tue, 21 May 2019 18:05:31 +0200 Subject: [PATCH] Correcting bugs and linting --- src/db.js | 2 +- src/errors/index.js | 4 ++++ src/models/TradingSystem.js | 2 +- src/schema/mutations/EditTradingSystem.js | 4 ++-- src/schema/types/TradingSystem.js | 6 +++--- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/db.js b/src/db.js index e08de13f5..8f7d6a6cd 100644 --- a/src/db.js +++ b/src/db.js @@ -1,7 +1,7 @@ import 'dotenv/config'; import mongoose from 'mongoose'; -mongoose.connect(process.env.MONGO_URL, { useNewUrlParser: true }) +mongoose.connect(process.env.MONGO_URL, { useNewUrlParser: true }); mongoose.set('useCreateIndex', true); mongoose.set('useFindAndModify', false); mongoose.Promise = global.Promise; diff --git a/src/errors/index.js b/src/errors/index.js index 3cf8868b4..d97fc3ec5 100644 --- a/src/errors/index.js +++ b/src/errors/index.js @@ -1,19 +1,23 @@ export class AuthentificationError extends Error { code = 401 + message = 'Autentification not found, you have to be authentificated to perform this action' } export class DatabaseError extends Error { code = 404 + message = `Ressource not found : ${this.message}` } export class WrongArgumentsError extends Error { code = 400 + message = `Wrong arguments : ${this.message}` } export class ServiceUnavailableError extends Error { code = 503 + message = `At least one service is unresponding ${this.message}` } diff --git a/src/models/TradingSystem.js b/src/models/TradingSystem.js index f6741e1a1..88be8294d 100644 --- a/src/models/TradingSystem.js +++ b/src/models/TradingSystem.js @@ -49,6 +49,6 @@ const tradingSystemSchema = new Schema( }, ); -const TradingSystem = mongoose.model('Signal', tradingSystemSchema); +const TradingSystem = mongoose.model('TradingSystem', tradingSystemSchema); export default TradingSystem; diff --git a/src/schema/mutations/EditTradingSystem.js b/src/schema/mutations/EditTradingSystem.js index bb9b2235b..e9c03de06 100644 --- a/src/schema/mutations/EditTradingSystem.js +++ b/src/schema/mutations/EditTradingSystem.js @@ -19,9 +19,9 @@ const resolve = (parent, { id: _id, tradingSystem: editedTradingSystem }) => new } tradingSystem.history.push({ updatedAt: tradingSystem.updatedAt, - subStrategies: tradingSystem.subStrategies, + strategies: tradingSystem.strategies, }); - tradingSystem.subStrategies = editedTradingSystem.subStrategies; + tradingSystem.strategies = editedTradingSystem.strategies; tradingSystem.save((error) => { if (error) { rej(error); diff --git a/src/schema/types/TradingSystem.js b/src/schema/types/TradingSystem.js index 1c8d8a632..18d843c74 100644 --- a/src/schema/types/TradingSystem.js +++ b/src/schema/types/TradingSystem.js @@ -15,14 +15,14 @@ const Type = new GraphQLObjectType({ fields: () => ({ id: { type: GraphQLID }, fbSlug: { type: GraphQLString }, - Strategies: { + strategies: { args: { activeOnly: { type: GraphQLBoolean } }, type: new GraphQLList(StrategyType), resolve(parent, { activeOnly }) { if (activeOnly) { - return parent.Strategies.filter(Strategy => Strategy.active); + return parent.strategies.filter(strategy => strategy.active); } - return parent.Strategies; + return parent.strategies; }, }, }),