From 4e114f8de48645165f315142cdf8e56e471aa79b Mon Sep 17 00:00:00 2001 From: Ben Ramey Date: Thu, 20 Sep 2018 06:46:02 -0500 Subject: [PATCH] move files around --- handlers/courses/post.js | 2 +- validators/schemas.js => handlers/courses/schema.js | 12 +++++------- dynamoClient.js => services/db/dynamoClient.js | 0 services/{db.js => db/index.js} | 2 +- validators/index.js | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) rename validators/schemas.js => handlers/courses/schema.js (68%) rename dynamoClient.js => services/db/dynamoClient.js (100%) rename services/{db.js => db/index.js} (96%) diff --git a/handlers/courses/post.js b/handlers/courses/post.js index c4de9f7..51ea121 100644 --- a/handlers/courses/post.js +++ b/handlers/courses/post.js @@ -1,6 +1,6 @@ const {createResponse} = require('../../helpers'); const {parseAndValidateBody} = require('../../validators'); -const {courseSchema} = require('../../validators/schemas'); +const courseSchema = require('./schema'); const {COURSES_TABLE} = require('../../constants'); const db = require('../../services/db'); diff --git a/validators/schemas.js b/handlers/courses/schema.js similarity index 68% rename from validators/schemas.js rename to handlers/courses/schema.js index af99c76..799d570 100644 --- a/validators/schemas.js +++ b/handlers/courses/schema.js @@ -1,15 +1,13 @@ -const courseSchema = { +module.exports.default = { "type": "object", "properties": { "name": {"type": "string"}, "num_tests": {"type": "number"}, "num_questions_per_test": {"type": "number"}, - "answers": {"type": "array"} + "answers": { + "type": "array", + "items": { "type": "string" } + } }, "required": ["name", "num_tests", "num_questions_per_test", "answers"] }; - -module.exports = { - courseSchema -}; - diff --git a/dynamoClient.js b/services/db/dynamoClient.js similarity index 100% rename from dynamoClient.js rename to services/db/dynamoClient.js diff --git a/services/db.js b/services/db/index.js similarity index 96% rename from services/db.js rename to services/db/index.js index 9da86b5..717e980 100644 --- a/services/db.js +++ b/services/db/index.js @@ -1,4 +1,4 @@ -const dynamoClient = require('../dynamoClient'); +const dynamoClient = require('./dynamoClient'); const create = async (tableName, item) => { const fullItem = {...item, created_at: Date.now()}; diff --git a/validators/index.js b/validators/index.js index f0bbebb..a5eb3d6 100644 --- a/validators/index.js +++ b/validators/index.js @@ -20,7 +20,7 @@ const parseAndValidateBody = async (schema, body) => { }; const validateBody = (schema, body) => { - const ajv = new Ajv(); + const ajv = new Ajv({$data: true}); const validate = ajv.compile(schema); const isValid = validate(body);