Skip to content
Open
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
56 changes: 54 additions & 2 deletions api/middleware/middleware.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,69 @@
const User = require('../users/users-model')

function logger(req, res, next) {
// DO YOUR MAGIC
// DO YOUR MAGIC
const timeStamp = new Date().toLocaleString()
const method = req.method
const url = req.originalUrl
console.log(`[${timeStamp}] ${method} to ${url}`)
next()
}

function validateUserId(req, res, next) {
async function validateUserId(req, res, next) {
// DO YOUR MAGIC
// console.log('validateUserId middleware')
try{
const user = await User.getById(req.params.id)
if(!user){
res.status(404).json({
message: 'no such user',
})
}else{
req.user = user
next()

}
}catch(err){
res.status(500).json({
message: 'problem finding user',
})
}

}

function validateUser(req, res, next) {
// DO YOUR MAGIC
// console.log('validateUser middleware')
const { name } = req.body
if(!name || !name.trim()){
res.status(400).json({
message: 'missing required name field',
})
}else{
req.name= name.trim()
next()
}

}

function validatePost(req, res, next) {
// DO YOUR MAGIC
// console.log('validatePost middleware')
const { text } = req.body
if(!text || !text.trim()){
res.status(400).json({
message: 'missing required text field',
})
}else{
req.text= text.trim()
next()
}
}

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

const { logger } = require('./middleware/middleware');
const server = express();
const usersRouter = require('./users/users-router');

// remember express by default cannot parse JSON in request bodies
server.use(express.json())
server.use(logger)
server.use('/api/users', usersRouter);

// global middlewares and the user's router need to be connected here

Expand Down
47 changes: 39 additions & 8 deletions api/users/users-router.js
Original file line number Diff line number Diff line change
@@ -1,44 +1,75 @@
// The middleware functions also need to be required
const express = require('express');
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 User = require("./users-model")
const Post = require('../posts/posts-model')

const router = express.Router();

router.get('/', (req, res) => {
router.get('/', (req, res, next) => {
// RETURN AN ARRAY WITH ALL THE USERS
User.get()
.then(users=>{
res.json(users)
})
.catch(next)
});

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

router.post('/', (req, res) => {
router.post('/', validateUser,
(req, res) => {
// RETURN THE NEWLY CREATED USER OBJECT
// this needs a middleware to check that the request body is valid
console.log(req.name)
});

router.put('/:id', (req, res) => {
router.put('/:id', validateUserId, validateUser,
(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
console.log(req.user)
console.log(req.name)
});

router.delete('/:id', (req, res) => {
router.delete('/:id', validateUserId, (req, res) => {
// RETURN THE FRESHLY DELETED USER OBJECT
// this needs a middleware to verify user id
console.log(req.user)
});

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
console.log(req.user)
});

router.post('/:id/posts', (req, res) => {
router.post('/:id/posts', validateUserId, validatePost, (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
console.log(req.user)
console.log(req.text)
});

router.use((err, req, res, next) => {
res.status(err.status || 500).json({
customMessafe: 'something bad happened',
message: err.message,
stack: err.stack,
})
})

// do not forget to export the router
module.exports = router
6 changes: 6 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
// require your server and launch it
// console.log('Hello World!')
const server = require('./api/server')
const PORT = 5000
server.listen(PORT, () => {
console.log('listening on' , PORT)
})
7 changes: 5 additions & 2 deletions package-lock.json

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