summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--package.json4
-rw-r--r--src/api/middlewares/errorMiddleware.js9
-rw-r--r--src/api/routes/alarmRoutes.js3
-rw-r--r--src/dto/AlarmDto.js4
4 files changed, 11 insertions, 9 deletions
diff --git a/package.json b/package.json

index 1f3b217..75b797d 100644 --- a/package.json +++ b/package.json
@@ -9,7 +9,9 @@ "test": "node --test", "test:watch": "node --test --watch", "coverage": "node --test --experimental-test-coverage --test-reporter=lcov --test-reporter-destination=lcov.info", - "build:http": "node src/api/routes.js | grep '^%' --line-buffered | sed -u 's/^% //g' > endpoints.http" + "build:http": "node src/api/routes.js | grep '^%' --line-buffered | sed -u 's/^% //g' > endpoints.http", + "dev": "node .", + "dev:watch": "npx -y nodemon" }, "repository": { "type": "git", diff --git a/src/api/middlewares/errorMiddleware.js b/src/api/middlewares/errorMiddleware.js
index 72b6166..d66c31d 100644 --- a/src/api/middlewares/errorMiddleware.js +++ b/src/api/middlewares/errorMiddleware.js
@@ -1,27 +1,24 @@ import { SafeNSoundError } from '#util/error.js'; import { MongoServerError } from 'mongodb'; -import * as joi from 'joi'; +import joi from 'joi'; export function handleErrors(err, req, res, _next) { if (err instanceof MongoServerError) { if (err.code === 11000) { // Duplicate key error - const newErr = new SafeNSoundError({ + err = new SafeNSoundError({ errCode: 'DUPLICATE_KEY_ERROR', message: 'A duplicate key error occurred.', key: Object.keys(err.keyPattern)[0], value: err.keyValue[Object.keys(err.keyValue)[0]] }); - - err = newErr; } } else if (err instanceof joi.ValidationError) { - const newErr = new SafeNSoundError({ + err = new SafeNSoundError({ errCode: 'JOI_VALIDATION_ERROR', message: err.message, validation_details: err.details }); - err = newErr; } if (err instanceof SafeNSoundError) { diff --git a/src/api/routes/alarmRoutes.js b/src/api/routes/alarmRoutes.js
index 07a97c2..939ca97 100644 --- a/src/api/routes/alarmRoutes.js +++ b/src/api/routes/alarmRoutes.js
@@ -79,7 +79,8 @@ export const alarmRoute = { middlewares: [requireUser], description: 'Raise an alarm', async method(req, res) { - req.user.alarm = AlarmDto.create(req.body); + console.log(req.body); + req.user.alarm = await AlarmDto.create(req.body); await req.user.save(); res.status(204).send(); } diff --git a/src/dto/AlarmDto.js b/src/dto/AlarmDto.js
index 281311d..bec4e18 100644 --- a/src/dto/AlarmDto.js +++ b/src/dto/AlarmDto.js
@@ -22,6 +22,8 @@ export class AlarmDto { } } - return await AlarmDto.schema.validateAsync(obj); + var res = await AlarmDto.schema.validateAsync(obj); + console.log({ res, obj }); + return res; } }