user schema updated

Author: Code-Recursion

index.js

@@ -40,29 +40,41 @@ app.get('/api/users/:id', (request, response, next) => {
 
 app.delete('/api/users/:id', (request, response, next) => {
   const id = request.params.id
-  User.findByIdAndRemove(id)
+
+  User.findById(id)
     .then(user => {
-      response.status(204).end()
+      if (user) {
+        User.findByIdAndRemove(id)
+          .then(user => {
+            console.log("deleted user ->", user)
+            response.json({ "message": `user with id ${id} deleted successfully` })
+          }).catch(error => next(error))
+      }
+      else {
+        response.status(404).json({ "error": `user with id ${id} does'nt exists` }).end()
+      }
     }).catch(error => next(error))
 })
 
-app.post('/api/users/', (request, response) => {
+app.post('/api/users/', (request, response, next) => {
   const user = request.body
-
+  if (!user.fname || !user.lname || !user.role || !user.password || !user.email ) {
+    return response.status(400).json({ error: 'content missing' })
+  }
   const newUser = new User({
     "fname": user.fname,
     "lname": user.lname,
+    "email": user.email,
+    "role": user.role,
     "password": user.password
   })
- 
+
   newUser.save()
     .then(result => {
       response.json(newUser).status(200).end()
-    }).catch(error => {
-      response.json({error: error})
-      response.status(500).end()
     })
-})
+      .catch(error => next(error))
+}) 
 
 app.put('/api/users/:id', (request, response, next) => {
   const user = request.body
@@ -73,8 +85,8 @@ app.put('/api/users/:id', (request, response, next) => {
     "password": user.password
   }
 
-  // bydefault updatedUser returns old res, optional param "{new : true}" fixes it, returns updated data
-  User.findByIdAndUpdate(request.params.id, updatedUserData, {new : true})
+  // by default updatedUser returns old res, optional param "{new : true}" fixes it, returns updated data
+  User.findByIdAndUpdate(request.params.id, updatedUserData, { new: true })
     .then(updatedUser => {
       response.json(updatedUser)
     }).catch(error => next(error))
@@ -91,8 +103,9 @@ const errorHandler = (error, request, response, next) => {
 
   if (error.name === 'CastError') {
     return response.status(400).send({ error: 'malformatted id' })
-  } 
-
+  } else if (error.name === 'ValidationError') {
+    return response.status(400).json({ error: error.message })
+  }
   next(error)
 }
 

models/details.js

@@ -0,0 +1,29 @@
+const mongoose = require('mongoose')
+
+const url = process.env.MONGODB_URI
+
+console.log("connecting to", url);
+mongoose.connect(url, { useNewUrlParser: true, useUnifiedTopology: true, useFindAndModify: false, useCreateIndex: true })
+    .then(result => {
+        console.log("connected to mongodb", url);
+    }).catch(error => {
+        console.log("error while connecting to mongodb", error);
+    })
+
+const userSchema = new mongoose.Schema({
+    email: String,
+    fname: String,
+    lname: String,
+    password: String,
+})
+
+userSchema.set('toJSON', {
+    transform: (document, returnedObject) => {
+        returnedObject.id = returnedObject._id.toString()
+        delete returnedObject._id
+        delete returnedObject.__v
+        delete returnedObject.password
+    }
+})
+
+module.exports = mongoose.model('User', userSchema)

models/user.js

@@ -1,29 +1,53 @@
-const mongoose = require('mongoose')
+const mongoose = require("mongoose");
 
-const url = process.env.MONGODB_URI
+const url = process.env.MONGODB_URI;
 
 console.log("connecting to", url);
-mongoose.connect(url, { useNewUrlParser: true, useUnifiedTopology: true, useFindAndModify: false, useCreateIndex: true })
-    .then(result => {
-        console.log("connected to mongodb", url);
-    }).catch(error => {
-        console.log("error while connecting to mongodb", error);
-    })
+mongoose
+  .connect(url, {
+    useNewUrlParser: true,
+    useUnifiedTopology: true,
+    useFindAndModify: false,
+    useCreateIndex: true,
+  })
+  .then((result) => {
+    console.log("connected to mongodb", url);
+  })
+  .catch((error) => {
+    console.log("error while connecting to mongodb", error);
+  });
 
 const userSchema = new mongoose.Schema({
-    email: String,
-    fname: String,
-    lname: String,
-    password: String,
-})
+  email: {
+    type: "String",
+    required: true,
+  },
+  fname: {
+    type: "String",
+    required: true,
+  },
+  lname: {
+    type: "String",
+    required: true,
+  },
+  role: {
+    type: "String",
+    required: true,
+  },
+  password: {
+    type: "String",
+    required: true,
+    minlength:8
+  },
+});
 
-userSchema.set('toJSON', {
-    transform: (document, returnedObject) => {
-        returnedObject.id = returnedObject._id.toString()
-        delete returnedObject._id
-        delete returnedObject.__v
-        delete returnedObject.password
-    }
-})
+userSchema.set("toJSON", {
+  transform: (document, returnedObject) => {
+    returnedObject.id = returnedObject._id.toString();
+    delete returnedObject._id;
+    delete returnedObject.__v;
+    delete returnedObject.password;
+  },
+});
 
-module.exports = mongoose.model('User', userSchema)
+module.exports = mongoose.model("User", userSchema);

mongo.js

@@ -1,36 +1,36 @@
-const mongoose = require('mongoose')
+// const mongoose = require('mongoose')
 
-if (process.argv.length < 3) {
-    console.log('Please provide the password as an argument: node mongo.js <password>')
-    process.exit(1)
-}
+// if (process.argv.length < 3) {
+//     console.log('Please provide the password as an argument: node mongo.js <password>')
+//     process.exit(1)
+// }
 
-const url =
-    `mongodb+srv://seekersdb:[email protected]/users?retryWrites=true&w=majority`
+// const url =
+//     `mongodb+srv://seekersdb:[email protected]/users?retryWrites=true&w=majority`
 
-mongoose.connect(url, { useNewUrlParser: true, useUnifiedTopology: true, useFindAndModify: false, useCreateIndex: true })
+// mongoose.connect(url, { useNewUrlParser: true, useUnifiedTopology: true, useFindAndModify: false, useCreateIndex: true })
 
-const userSchema = new mongoose.Schema({
-    email: String,
-    password: String,
-})
+// const userSchema = new mongoose.Schema({
+//     email: String,
+//     password: String,
+// })
 
-User = mongoose.model('User', userSchema)
+// User = mongoose.model('User', userSchema)
 
-const user = new User({
-    email: '[email protected]',
-    password: 'changeme'
-})
+// const user = new User({
+//     email: '[email protected]',
+//     password: 'changeme'
+// })
 
-User.find({}).then(result => {
-    result.forEach(user => {
-      console.log(user)
-    })
-    mongoose.connection.close()
-})
+// User.find({}).then(result => {
+//     result.forEach(user => {
+//       console.log(user)
+//     })
+//     mongoose.connection.close()
+// })
 
 
-// user.save().then(result => {
-//     console.log('user details! are saved')
-//     mongoose.connection.close()
-// })
+// // user.save().then(result => {
+// //     console.log('user details! are saved')
+// //     mongoose.connection.close()
+// // })

requests/deleteUser.rest

@@ -1 +1 @@
-DELETE http://localhost:3001/api/users/6075bf35d385591fb0a1acb4
+DELETE http://localhost:3001/api/users/6075b1bd4ce1ad23c8b47ce2

requests/getUsers.rest

@@ -4,4 +4,4 @@ GET http://localhost:3001/api/users/
 ###
 
 # Get single user
-GET http://localhost:3001/api/users/6075bf35d385591fb0a1acb4
+GET http://localhost:3001/api/users/6075b1bd4ce1ad23c8b47ce2