Skip to content
Open

done #281

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 44 additions & 1 deletion api/middleware/middleware.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,60 @@
const Users = require('../users/users-model');

function logger(req, res, next) {
// DO YOUR MAGIC
console.log(req.url, req.method)
next()
}

function validateUserId(req, res, next) {
// DO YOUR MAGIC
const validateUserId = async (req, res, next) => {
try{
const {id} = req.params
const user = await Users.getById(id)
if(!user){
res.status(404).json({message: 'User not found'})
}else{
req.user = user
next()
}
}catch(err){
res.status(500).json({message: err})
}
}

function validateUser(req, res, next) {
// DO YOUR MAGIC
try{
const user = req.body
if(!user.name){
res.status(400).json({message: 'Missing required name field'})
}else{
next()
}
}catch(err){
console.log(err)
res.status(500).json({message: err})
}
}

function validatePost(req, res, next) {
// DO YOUR MAGIC
try{
const {text} = req.body
if(!text){
res.status(400).json({message: 'Missing required text field'})
}else{
next()
}
}catch(err){
res.status(500).json({message: err.message})
}
}

// do not forget to expose these functions to other modules
module.exports = {
logger,
validateUserId,
validateUser,
validatePost
}
14 changes: 11 additions & 3 deletions api/server.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
const express = require('express');

const server = express();

const morgan = require("morgan");
const helmet = require("helmet");
const {logger} = require('./middleware/middleware');
const userRouter = require('./users/users-router')
// remember express by default cannot parse JSON in request bodies

server.use(express.json());
// global middlewares and the user's router need to be connected here
server.use(morgan('dev'));
server.use(express.json());
server.use(helmet());
server.use(logger)
server.use('/api/users', logger, userRouter)


server.get('/', (req, res) => {
res.send(`<h2>Let's write some middleware!</h2>`);
Expand Down
52 changes: 45 additions & 7 deletions api/users/users-router.js
Original file line number Diff line number Diff line change
@@ -1,44 +1,82 @@
const express = require('express');

const Users = require('./users-model');
const {
validateUserId,
validateUser,
validatePost} = require('../middleware/middleware');
// You will need `users-model.js` and `posts-model.js` both
// The middleware functions also need to be required

const router = express.Router();

router.get('/', (req, res) => {
// RETURN AN ARRAY WITH ALL THE USERS
Users.get()
.then(user => {
res.status(200).json(user)
})
.catch(err => {
res.status(500).json({message: err.message})
})
});

router.get('/:id', (req, res) => {
router.get('/:id', validateUserId, (req, res) => {
// RETURN THE USER OBJECT
// this needs a middleware to verify user id
res.status(200).json(req.user)
});

router.post('/', (req, res) => {
router.post('/', validateUser, async (req, res) => {
// RETURN THE NEWLY CREATED USER OBJECT
// this needs a middleware to check that the request body is valid
try{
const newUser = await Users.insert(req.body)
res.status(201).json(newUser)
}catch (err){
res.status(500).json({message: 'Something went wrong'})
}
});

router.put('/:id', (req, res) => {
router.put('/:id', validateUser, validateUserId, async (req, res) => {
// RETURN THE FRESHLY UPDATED USER OBJECT
// this needs a middleware to verify user id
// and another middleware to check that the request body is valid
const changes = req.body
const {id} = req.params
const updatedUser = await Users.update(id, changes)
res.status(201).json(updatedUser)
});

router.delete('/:id', (req, res) => {
router.delete('/:id', validateUserId, async (req, res) => {
// RETURN THE FRESHLY DELETED USER OBJECT
// this needs a middleware to verify user id
try{
const user = await Users.getById(req.params.id)
res.status(200).json(user)
}catch(err){
res.status(500).json({message: 'something went wrong'})
}
});

router.get('/:id/posts', (req, res) => {
router.get('/:id/posts', validateUserId, (req, res) => {
// RETURN THE ARRAY OF USER POSTS
// this needs a middleware to verify user id
const {id} = req.params
Users.getUserPosts(id)
.then(messages => {
res.status(200).json(messages)
})
.catch(err => {
console.log(err)
res.status(500).json({message: 'Error getting the posts for the user'})
})
});

router.post('/:id/posts', (req, res) => {
router.post('/:id/posts', validateUserId, (req, res) => {
// RETURN THE NEWLY CREATED USER POST
// this needs a middleware to verify user id
// and another middleware to check that the request body is valid
});

// do not forget to export the router
module.exports = router;
5 changes: 5 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
// require your server and launch it
const server = require('./api/server')

server.listen(9000, () => {
console.log('*** Server listening on port 9000 ***')
})
116 changes: 115 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
},
"dependencies": {
"express": "^4.17.1",
"helmet": "^4.6.0",
"knex": "^0.95.14",
"morgan": "^1.10.0",
"sqlite3": "^5.0.2"
},
"devDependencies": {
Expand Down