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
55 changes: 48 additions & 7 deletions api/middleware/middleware.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,58 @@
const Users = require('../users/users-model');


function logger(req, res, next) {
// DO YOUR MAGIC
console.log(`Time Stamp: ${new Date().toISOString()}, Request Method: ${req.method}, Request URL: ${req.url}`);

next();
}

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

function validateUser(req, res, next) {
// DO YOUR MAGIC
async function validateUser(req, res, next) {
try {
const { name } = req.body;
if (!name) {
res.status(400).json({ message: "missing required name field"});
} else {
next();
}
} catch (err) {
res.status(500).json({ message: "Something went wrong" });
}
}

function validatePost(req, res, next) {
// DO YOUR MAGIC
async function validatePost(req, res, next) {
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: "Something went wrong" });
}
}

// do not forget to expose these functions to other modules


module.exports = {
logger,
validateUserId,
validateUser,
validatePost
}
7 changes: 6 additions & 1 deletion api/server.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
const express = require('express');
const userRouter = require('../api/users/users-router');
const { logger } = require('./middleware/middleware');

const server = express();

// 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(logger);

server.use('/api/users', userRouter)

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

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

const router = express.Router();

router.get('/', (req, res) => {
// RETURN AN ARRAY WITH ALL THE USERS
router.get('/', async (req, res) => {
try {
const users = await Users.get()
res.status(200).json(users)
} catch (err) {
res.status(500).json({ message: "something went wrong" })
}
});

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

router.post('/', (req, res) => {
// RETURN THE NEWLY CREATED USER OBJECT
// this needs a middleware to check that the request body is valid
router.post('/', validateUser, async (req, res) => {
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) => {
// 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
router.put('/:id', validateUserId, validateUser, async (req, res) => {
try {
const updatedUser = await Users.update(req.params.id, req.body);
res.status(200).json(updatedUser);
} catch (err) {
res.status(500).json({ message: "something went wrong" })
}
});

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

router.get('/:id/posts', (req, res) => {
// RETURN THE ARRAY OF USER POSTS
// this needs a middleware to verify user id
router.get('/:id/posts', validateUserId, async (req, res) => {
try {
const userPosts = await Users.getUserPosts(req.params.id);
res.status(200).json(userPosts);
} catch (err) {
res.status(500).json({ message: "something went wrong" })
}
});

router.post('/:id/posts', (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
router.post('/:id/posts', validateUserId, validatePost, async (req, res) => {
try {
const newPost = await Posts.insert({user_id: req.params.id, text: req.body.text});
res.status(201).json(newPost);
} catch (err) {
res.status(500).json({ message: "something went wrong" })
}
});

// do not forget to export the router


module.exports = router;
Binary file modified data/database.db3
Binary file not shown.
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.js');

server.listen(4000, () => {
console.log('Server Running On localhost:4000');
})
Loading