Structure (#43)

src/models/token.js → src/database/models/token.js

@@ -2,7 +2,7 @@ const validator = require('validator')
 const mongoose = require('mongoose')
 const bcrypt = require('bcryptjs')
 const jwt = require('jsonwebtoken')
-const User = require('../models/user')
+const User = require('./user')
 
 const tokenSchema = new mongoose.Schema({
     token: {

src/models/user.js → src/database/models/user.js

@@ -1,8 +1,4 @@
-const validator = require('validator')
 const mongoose = require('mongoose')
-const bcrypt = require('bcryptjs')
-const jwt = require('jsonwebtoken')
-const ejwt = require('express-jwt')
 const Joi = require('joi')
 
 const userSchema = new mongoose.Schema({

src/endpoints/token.js

@@ -1,6 +1,4 @@
-const { Router } = require("express")
-const User = require("../models/token")
-const Token = require('../models/token')
+const Token = require('../database/models/token')
 const bcrypt = require('bcryptjs')
 
 const loginUser = async (req, res, next) => {

src/endpoints/user.js

@@ -1,6 +1,6 @@
 const bcrypt = require("bcryptjs/dist/bcrypt")
 const { Router } = require("express")
-const User = require("../models/user")
+const User = require("../database/models/user")
 
 const getUsers = async (req, res, next) => {
     try {
@@ -25,7 +25,7 @@ const getUser = async (req, res, next) => {
 
         return res.json(user)
     } catch (e) {
-        return res.status(404).send('User not found!')
+        next(e)
     }
 }
 
@@ -47,7 +47,7 @@ const createUser = async (req, res, next) => {
 
         return res.status(201).json(newUser)
     } catch (e) {
-        return res.status(500).send(e.message)
+        next(e)
     }
 }
 
@@ -76,7 +76,7 @@ const updateUser = async (req, res, next) => {
 
         return res.status(200).send('User updated successfully')
     } catch (e) {
-        return res.status(500).send(e.message)
+        next(e)
     }
 }
 
@@ -91,7 +91,7 @@ const updateUserContacts = async (req, res, next) => {
         }
         return res.status(200).send('user contacts updated successfully')
     } catch (e) {
-        return res.status(500).send(e.message)
+        next(e)
     }
 }
 
@@ -111,7 +111,7 @@ const deleteUser = async (req, res, next) => {
 
         return res.status(204).send('Deleting user with id of ' + id)
     } catch (e) {
-        return res.status(500).send(e.message)
+        next(e)
     }
 }
 

src/middleware/auth.js

@@ -1,5 +1,4 @@
 const jwt = require('jsonwebtoken')
-const User = require('../models/user')
 
 const auth = async (req, res, next) => {
     try {

src/routes/user.js

@@ -1,8 +1,6 @@
 const express = require('express')
-const User = require('../models/user')
 const endpoints = require('../endpoints/user')
 const router = new express.Router()
-const app = express()
 
 /**
  * @openapi

src/server.js

@@ -12,7 +12,8 @@ const requestLogging = require('./middleware/requestLogging.js')
 const cors = require('cors') //Cross-origin resource sharing
 const helmet = require('helmet') //Basic protection against attacks like XSS
 const config = require('config') //Default configuration file
-const { json } = require('express')
+
+//console.log(config.util.getEnv('NODE_ENV'))
 
 const swaggerOptions = {
     swaggerDefinition: {