Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mvp #286

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

mvp #286

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
50 changes: 49 additions & 1 deletion api/middleware/middleware.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,65 @@
const User = require('../users/users-model')

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

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

function validateUser(req, res, next) {
// DO YOUR MAGIC
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
const { text } = req.body
if(!text || text.trim()) {
res.status(400).json({
message: 'missing required text field'
})
}else {
req.name = text.trim()
next()
}
}

// do not forget to expose these functions to other modules
module.exports = {
logger,
validateUserId,
validateUser,
validatePost
}
7 changes: 5 additions & 2 deletions api/server.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
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())
server.use('/api/users', userRouter)
server.use(logger)
// global middlewares and the user's router need to be connected here

server.get('/', (req, res) => {
Expand Down
69 changes: 62 additions & 7 deletions api/users/users-router.js
Original file line number Diff line number Diff line change
@@ -1,44 +1,99 @@
const express = require('express');

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

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
res.json(req.user)

});

router.post('/', (req, res) => {
router.post('/', validateUser, (req, res, next) => {
// RETURN THE NEWLY CREATED USER OBJECT
// this needs a middleware to check that the request body is valid
User.insert({ name: req.name })
.then(newUser => {
res.status(201).json(newUser)
})
.catch(next)
});

router.put('/:id', (req, res) => {
router.put('/:id', validateUserId, validateUser,(req, res, next ) => {
// 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
User.update(req.params.id, { name: req.name })
.then(() => {
return User.getById(req.params.id)
})
.then(user => {
res.status(201).json(user)
})
.catch(next)
});

router.delete('/:id', (req, res) => {
router.delete('/:id', validateUserId, async (req, res, next) => {
// RETURN THE FRESHLY DELETED USER OBJECT
// this needs a middleware to verify user id
try{
await User.remove(req.params.id)
res.json(req.user)
}catch(err){
next(err)
}
});

router.get('/:id/posts', (req, res) => {
router.get('/:id/posts', validateUserId, async (req, res, next) => {
// RETURN THE ARRAY OF USER POSTS
// this needs a middleware to verify user id
try{
const posts = await User.getUserPosts(req.params.id)
res.json(posts)
}catch(err){
next(err)
}

});

router.post('/:id/posts', (req, res) => {
router.post('/:id/posts', validateUserId, validatePost, async (req, res, next) => {
// 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
try{
const result = await Post.insert({
...req.body,
user_id: req.params.id,
text: req.text,
})
res.status(201).json(result)
} catch (err) {
next(err)
}
});

router.use((err, req, res) => {
res.status(err.status || 500).json({
customMessage: 'something went wrong',
errorMessage: err.message,
stack: err.stack
})
})

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

require('colors')

const port = 9000

server.listen(port, () => {
console.log(`Server listening on port ${port}`);
})
14 changes: 14 additions & 0 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"url": "git+https://github.com/BloomInstituteOfTechnology/node-api3-project.git"
},
"dependencies": {
"colors": "^1.4.0",
"express": "^4.17.1",
"knex": "^0.95.14",
"sqlite3": "^5.0.2"
Expand Down