Merge branch 'develop' into feature/2

src/endpoints/user.js

@@ -0,0 +1,86 @@
+const { Router } = require("express")
+
+const getAll = async (req, res) => {
+    try {
+        if (Object.entries(req.params).length === 0) {
+            // const usersList = userService.GetAllUsers()
+            // return res.Status(200).sendJson(usersList)
+            return res.status(200).send('getting all users')
+        } else {
+            return res.status(400).send('unable to get all users, request was bad')
+        }
+    } catch (e) {
+        return res.status(500).send(e)
+    }
+}
+
+const getById = async (req, res, id) => {
+    try {
+        if (req.params.id) {
+            //get by Id
+            return res.status(200).send('sending user with id of ' + req.params.id)
+        } else {
+            return res.status(400).send('Bad request')
+        }
+    } catch (e) {
+        return res.status(500).send(e)
+    }
+}
+
+const create = async (req, res, userModel) => {
+    try {
+        if (Object.entries(userModel).length !== 0) {
+            //create user
+            return res.status(201).json(userModel)
+        } else {
+            return res.status(400).send('bad request')
+        }
+    } catch (e) {
+        return res.status(500).send(e)
+    }
+}
+
+const updateUser = async (req, res) => {
+    userFound = true
+    try {
+        if (Object.entries(req.body).length == 0) {
+            return res.status(400).send('invalid input parameters')
+        }
+        if (!userFound) {
+            return res.status(404).send('user not found')
+        }
+        return res.status(200).send('user updated successfully')
+    } catch (e) {
+        return res.status(500).send(e)
+    }
+}
+
+const updateUserContacts = async (req, res) => {
+    try {
+        userFound = true
+        if (!userFound) {
+            return res.status(404).send('user not found')
+        }
+        if (Object.entries(req.body).length == 0) {
+            return res.status(400).send('invalid input parameters')
+        }
+        return res.status(200).send('user contacts updated successfully')
+    } catch (e) {
+        return res.status(500).send(e)
+    }
+}
+
+const deleteUser = async (req, res) => {
+    try {
+        if (req.params.id) {
+            //get by Id
+            return res.status(204).send('deleting user with id of ' + req.params.id)
+        } else {
+            return res.status(400).send('Bad request')
+        }
+    } catch (e) {
+        return res.status(500).send(e)
+    }
+}
+
+module.exports = { getAll, getById, create, updateUser, updateUserContacts, deleteUser }

src/routes/user.js

@@ -1,112 +1,33 @@
 const express = require('express')
 const User = require('../models/user')
+const endpoints = require('../endpoints/user')
 const router = new express.Router()
 const app = express()
 const auth = require('../middleware/auth')
 
-// router.get('/users', async (req, res) => {
-//     try{
-//         console.log('Users hit successfully!')
-//         const allUsers = await User.find({})
-//         if(!allUsers) {
-//             res.status(404).send()
-//         }
-//         res.send(allUsers)
-
-//     } catch(e) {
-//         res.status(500).send(e)
-//     }
-// })
-
 router.get('/users', async (req, res) => {
-    try {
-        if (Object.entries(req.params).length === 0) {
-            const allUsers = await User.find({})
-            return res.send(allUsers)
-        }
-        else {
-            res.status(400).send('unable to get all users, request was bad')
-        }
-    } catch (e) {
-        res.status(500).send(e)
-    }
+    return await endpoints.getAll(req, res)
 })
 
-router.get('/users/:id', (req, res) => {
-    try {
-        if (req.params.id) {
-            //get by Id
-            res.status(200).send('sending user with id of ' + req.params.id)
-        }
-        else {
-            res.status(400).send('Bad request')
-        }
-    } catch (e) {
-        res.status(500).send(e)
-    }
+router.get('/users/:id', async (req, res) => {
+    return await endpoints.getById(req, res, req.params.id)
 })
 
 router.post('/users', async (req, res) => {
-    try {
-        if (Object.entries(req.body).length !== 0) {
-            
-            //create user
-
-            const createdUser = new User(req.body)
-            await createdUser.save()
-            return res.status(201).send(createdUser)
-        }
-        else {
-            return res.status(400).send('bad request')
-        }
-    } catch (e) {
-        return res.status(500).send(e)
-    }
+    return await endpoints.create(req, res, req.body)
 })
 
 
-router.put('/users', (req, res) => {
-    userFound = false
-    try {
-        if (Object.entries(req.body).length == 0) {
-            return res.status(400).send('invalid input parameters')
-        }
-        if (!userFound) {
-            return res.status(404).send('user not found')
-        }
-        return res.status(200).send('user updated successfully')
-    } catch (e) {
-        return res.status(500).send(e)
-    }
+router.put('/users', async (req, res) => {
+    return await endpoints.updateUser(req, res, req.body)
 })
 
-router.patch('/users/:id/contacts', (req, res) => {
-    try {
-        userFound = true
-        if (!userFound) {
-            return res.status(404).send('user not found')
-        }
-        if (Object.entries(req.body).length == 0) {
-            return res.status(400).send('invalid input parameters')
-        }
-        return res.status(200).send('user contacts updated successfully')
-    } catch (e) {
-        return res.status(500).send(e)
-    }
+router.patch('/users/:id/contacts', async (req, res) => {
+    return await endpoints.updateUserContacts(req, res, req.body)
 })
 
-router.delete('/users/:id', (req, res) => {
-    try {
-        if (req.params.id) {
-            //get by Id
-            res.status(204).send('deleting user with id of ' + req.params.id)
-        }
-        else {
-            res.status(400).send('Bad request')
-        }
-    } catch (e) {
-        res.status(500).send(e)
-    }
+router.delete('/users/:id', async (req, res) => {
+    return await endpoints.deleteUser(req, res, req.body)
 })
 
 module.exports = router