first commit

api/middleware/middleware.js

@@ -1,17 +1,58 @@
+const Users = require("../users/users-model")
+
 function logger(req, res, next) {
-  // DO YOUR MAGIC
+  console.log(req.method, req.url, req.timestamp)
+  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 with id ${id} not found`})
+    } else {
+      req.user = user
+      next()
+    }
+  } catch (err) {
+    res.status(500).json({message: err.message})
+  }
 }
 
 function validateUser(req, res, next) {
   // DO YOUR MAGIC
+  try {
+    const user = req.body
+    if (!user.name) {
+      res.status(400).json({message:"name field is required"})
+    } else {
+      next()
+    }
+  }catch (err) {
+    res.status(500).json({message: err.message})
+  }
 }
 
 function validatePost(req, res, next) {
   // DO YOUR MAGIC
+  try {
+    const { postText } = req.body
+    if (!postText) {
+      res.status(400).json({message:"text is required"})
+    } else {
+      next()
+    }
+  }catch (err) {
+    res.status(500).json({message: err.message})
+  }
 }
 
 // do not forget to expose these functions to other modules
+
+module.export = {
+  logger,
+  validateUserId,
+  validateUser,
+  validatePost
+}

api/server.js

@@ -1,10 +1,18 @@
 const express = require('express');
+const morgan = require("morgan")
+const helmet = require("helmet")
+const {logger} = require("./middleware/middleware")
+const usersRouter = require("./users/users-router")
 
 const server = express();
-
 // remember express by default cannot parse JSON in request bodies
-
 // global middlewares and the user's router need to be connected here
+server.use(express.json())
+server.use(logger)
+server.use(helmet())
+server.use(morgan('dev'))
+
+server.use("/api/users",logger, usersRouter)
 
 server.get('/', (req, res) => {
   res.send(`<h2>Let's write some middleware!</h2>`);

api/users/users-router.js

@@ -1,44 +1,90 @@
 const express = require('express');
-
+const Users = require("./users-model")
+const Post = 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
+  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: err.message})
+  }
 });
 
-router.put('/:id', (req, res) => {
+router.put('/:id',validateUser, validatePost, 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 { id } = req.params
+  const changes = req.body
+
+  const updateUser = await Users.update(id, changes)
+  res.status(201).json(updateUser)
 });
 
-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
+  const { id } = req.params
+
+  const deletedUser = await Users.remove(id)
+  res.status(200).json(deletedUser)
+
 });
 
-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
+
+  Post.getById(id)
+    .then(post => {
+    res.status(200).json(post)
+    })
+    .catch(err => {
+      res.status(500).json({message: err.message})
+    })
 });
 
-router.post('/:id/posts', (req, res) => {
+router.post('/:id/posts',validateUserId, validatePost, async (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
+  try {
+    const newPost = Post.insert(req.body)
+    res.status(200).json(newPost)
+  }
+  catch (err){
+    res.status(500).json({message: err.message})
+  }
 });
 
 // do not forget to export the router
+module.exports = router;

index.js

@@ -1 +1,8 @@
 // require your server and launch it
+const server = require("./api/server")
+
+const port = 9000
+
+server.listen(port, () =>{
+	console.log(`Server is running on http://localhost:${port}`)
+})