Thank you,
The Aurthors Haven Team
Thank you,
The Authors Haven Team
"; /** diff --git a/src/helpers/index.js b/src/helpers/index.js index 7f3f334..424938a 100644 --- a/src/helpers/index.js +++ b/src/helpers/index.js @@ -1,5 +1,6 @@ import authHelper from './authHelper'; import responseHelper from './responseHelper'; +import responseMessage from './responseMessage'; import emailMessages from './emailMessages'; const { forgotPasswordMessage } = emailMessages; @@ -7,5 +8,6 @@ const { forgotPasswordMessage } = emailMessages; export default { authHelper, responseHelper, + responseMessage, forgotPasswordMessage }; diff --git a/src/helpers/responseMessage.js b/src/helpers/responseMessage.js new file mode 100644 index 0000000..31fbbd9 --- /dev/null +++ b/src/helpers/responseMessage.js @@ -0,0 +1,12 @@ +/** + * @description returns response message + * @param {object} response express response object + * @param {number} statusCode response status code + * @param {object} object object to be returned + * @returns {json} json + */ +const responseMessage = async (response, statusCode, object) => response.status(statusCode).json({ + ...object +}); + +export default responseMessage; diff --git a/src/index.js b/src/index.js index 32fde47..1e7b9e9 100644 --- a/src/index.js +++ b/src/index.js @@ -1,5 +1,4 @@ -import express from 'express'; -import { urlencoded, json } from 'body-parser'; +import express, { urlencoded, json } from 'express'; import cors from 'cors'; import errorhandler from 'errorhandler'; import debug from 'debug'; @@ -49,21 +48,20 @@ app.use('/docs', swaggerUi.serve, swaggerUi.setup(documentation)); app.use('/api/v1', routes); -// / catch 404 and forward to error handler +// catch 404 and forward to error handler app.use((req, res, next) => { const err = new Error('Not Found'); err.status = 404; next(err); }); -// / error handlers +// error handlers // development error handler // will print stacktrace if (!isProduction || !isTest) { app.use((err, req, res) => { log(err.stack); - res.status(err.status || 500); res.json({ @@ -77,12 +75,13 @@ if (!isProduction || !isTest) { // production error handler // no stacktraces leaked to user -app.use((err, req, res) => { +app.use((err, req, res, next) => { res.status(err.status || 500); + if (res.headersSent) next(err); res.json({ errors: { message: err.message, - error: {} + error: err } }); }); diff --git a/src/middlewares/userValidator.js b/src/middlewares/userValidator.js index c614e30..cf77b01 100644 --- a/src/middlewares/userValidator.js +++ b/src/middlewares/userValidator.js @@ -8,7 +8,7 @@ const { const { validatorError } = errorHandler; const userValidator = { - signUp: [ + signUpValidator: [ isValidEmail(), isValidName('firstName'), isValidName('lastName'), diff --git a/src/routes/user.js b/src/routes/user.js index 147ccb9..865d2eb 100644 --- a/src/routes/user.js +++ b/src/routes/user.js @@ -1,11 +1,15 @@ import express from 'express'; -import userValidator from '../middlewares/userValidator'; -import signUp from '../controllers/userController'; +import middlewares from '../middlewares'; +import userController from '../controllers/userController'; +const { userValidator: { signUpValidator } } = middlewares; +const { signUp, profile } = userController; const user = express.Router(); -const middlewares = [userValidator.signUp]; +// Route to sign up a user +user.post('/users', signUpValidator, signUp); -user.post('/users', middlewares, signUp); +// Route to get user profiles by username +user.get('/profiles/:username', profile); export default user; diff --git a/src/services/findUser.js b/src/services/findUser.js index 55d7a60..ba2fb83 100644 --- a/src/services/findUser.js +++ b/src/services/findUser.js @@ -1,25 +1,22 @@ +import Sequelize from 'sequelize'; +import helpers from '../helpers'; import models from '../database/models'; +const { Op } = Sequelize; +const { responseMessage } = helpers; const { User } = models; /** - * Finds a user from the database by email or id - * @name sendMail + * @description Finds a user from the database by id or username or email * @param {string} param * @param {string} response * @returns {object} a user object */ const findUser = async (param, response) => { - const field = (/^\d+$/g.test(param)) ? { id: param } : { email: param }; - const user = await User.findOne({ - where: field - }); - if (!user) { - return response.status(404).json({ - error: 'user not found' - }); - } + const field = (/^\d+$/g.test(param)) ? { id: param } : { [Op.or]: [{ email: param }, { username: param }] }; + const user = await User.findOne({ where: field }); + if (!user) return responseMessage(response, 404, { error: 'user not found' }); return user; }; diff --git a/tests/auth.spec.js b/tests/auth.spec.js index b882406..cfd0da4 100644 --- a/tests/auth.spec.js +++ b/tests/auth.spec.js @@ -104,6 +104,7 @@ describe('AUTH', () => { expect(response).to.have.status(500); expect(response.body).to.be.an('object'); expect(response.body.error).to.equal('error occured!'); + stub.restore(); done(); }); }); diff --git a/tests/index.spec.js b/tests/index.spec.js index 9204715..076fd38 100644 --- a/tests/index.spec.js +++ b/tests/index.spec.js @@ -1,6 +1,6 @@ import chai from 'chai'; import chaiHttp from 'chai-http'; -import app from '../src/index'; +import app from '../src'; chai.use(chaiHttp); diff --git a/tests/user.spec.js b/tests/user.spec.js new file mode 100644 index 0000000..7a83b39 --- /dev/null +++ b/tests/user.spec.js @@ -0,0 +1,45 @@ +import chaiHttp from 'chai-http'; +import chai, { expect } from 'chai'; +import app from '../src'; + +const API_VERSION = '/api/v1'; +const PROFILE_URL = `${API_VERSION}/profiles`; + +chai.use(chaiHttp); + +describe('USER ROUTES', () => { + describe('View user profile', () => { + it('should be able to view a user profile', (done) => { + chai.request(app) + .get(`${PROFILE_URL}/greensprings`) + .end((error, response) => { + expect(response).to.have.status(200); + expect(response.body).to.be.an('object'); + expect(response.body).to.have.property('profile'); + done(); + }); + }); + + it('should be able to view a user profile', (done) => { + chai.request(app) + .get(`${PROFILE_URL}/1`) + .end((error, response) => { + expect(response).to.have.status(200); + expect(response.body).to.be.an('object'); + expect(response.body).to.have.property('profile'); + done(); + }); + }); + + it('should not be able to view a user profile if the user does not exist in the database', (done) => { + chai.request(app) + .get(`${PROFILE_URL}/mklknjknljknklj`) + .end((error, response) => { + expect(response).to.have.status(404); + expect(response.body).to.be.an('object'); + expect(response.body.error).to.equal('user not found'); + done(); + }); + }); + }); +});