edited route user and models

Author: iLaD08

.gitignore

@@ -1,4 +1,3 @@
 /node_modules
-/yarn.lock
-/package-lock.json
-/nodemon.json
+/nodemon.json
+/package-lock.json

api/models/post.js

@@ -5,7 +5,7 @@ const postSchema = mongoose.Schema({
  title: { type: String, required: true },
  description: { type: String, required: true },
  code: { type: String, required: true },
- createdBy: { type: String, required: true }
+ createdBy: {type: Map, of: String, required: true}
 });
 
 module.exports = mongoose.model('Post', postSchema);

api/models/user.js

@@ -9,7 +9,11 @@ const userSchema = mongoose.Schema({
  unique: true,
  match: /[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/
  },
- password: { type: String, required: true }
+ password: { type: String, required: true },
+ role: { type: String },
+ followers: [{type: Map, of: String}], 
+ following: [{type: Map, of: String}], 
+ bio: { type: String },
 });
 
 module.exports = mongoose.model('User', userSchema);

api/routes/post.js

@@ -5,7 +5,7 @@ const checkAuth = require('../middleware/check-auth.js');
 
 const Post = require('../models/post');
 
-router.get('/', (req, res, next) => {
+router.get('/', checkAuth, (req, res, next) => {
  Post.find()
  .select('_id title description code createdBy')
  .exec()
@@ -26,7 +26,7 @@ router.get('/', (req, res, next) => {
  })
  );
  })
- .catch()
+ .catch(err => res.status(500).json({ error: err }))
 });
 
 router.post('/', checkAuth, (req, res, next) => {
@@ -57,7 +57,7 @@ router.post('/', checkAuth, (req, res, next) => {
  .catch(err => res.status(500).json({ error: err }))
 });
 
-router.get('/:postId', (req, res, next) => {
+router.get('/:postId', checkAuth, (req, res, next) => {
  const id = req.params.postId;
  Post.findById(id)
  .select('_id title description code createdBy')
@@ -75,8 +75,28 @@ router.get('/:postId', (req, res, next) => {
  res.status(500).json({ error: err })
  })
 });
+
+router.patch('/:postId', checkAuth, (req, res, next) => {
+ const id = req.params.postId;
+ const updateOps = {};
+ for (const ops of req.body) {
+ updateOps[ops.propName] = ops.value;
+ }
+ Post.update({ _id: id }, { $set: updateOps })
+ .exec()
+ .then(result => {
+ res.status(200).json({
+ message: 'Product updated'
+ });
+ })
+ .catch(err => {
+ res.status(500).json({
+ error: err
+ })
+ })
+});
 
-router.delete('/:postId', (req, res, next) => {
+router.delete('/:postId', checkAuth, (req, res, next) => {
  const id = req.params.postId;
  Post.remove({ _id: id })
  .exec()

api/routes/user.js

@@ -3,8 +3,35 @@ const router = express.Router();
 const mongoose = require('mongoose');
 const bcrypt = require('bcrypt');
 const jwt = require('jsonwebtoken');
+const checkAuth = require('../middleware/check-auth.js');
 
 const User = require('../models/user');
+const Post = require('../models/post');
+const { json } = require('body-parser');
+
+router.get("/", checkAuth, (req, res, next) => {
+ var usersData = []
+
+ User.find()
+ .exec()
+ .then(async docs => {
+ const Posts = await Post.find();
+
+ await docs.forEach(async element => {
+ await usersData.push({
+ _id: element._id,
+ username: element.username,
+ role: element.role,
+ bio: element.bio,
+ followers: element.followers,
+ following: element.following,
+ posts: Posts.filter(Post => Post.createdBy.get('username') === element.username)
+ })
+ });
+ res.status(200).json(usersData);
+ })
+ .catch(err => res.status(500).json({ error: err }))
+});
 
 router.post("/signup", (req, res, next) => {
  User.find({ email: req.body.email })
@@ -25,7 +52,11 @@ router.post("/signup", (req, res, next) => {
  _id: new mongoose.Types.ObjectId(),
  username: req.body.username,
  email: req.body.email,
- password: hash
+ password: hash,
+ role: 'member',
+ bio: '',
+ followers: [],
+ following: []
  });
  user
  .save()
@@ -63,8 +94,9 @@ router.post("/login", (req, res, next) => {
  if (result) {
  const token = jwt.sign(
  {
+ userId: user[0]._id,
  username: user[0].username,
- userId: user[0]._id
+ role: user[0].role
  },
  process.env.PRIVATE_KEY,
  {
@@ -88,8 +120,71 @@ router.post("/login", (req, res, next) => {
  });
 });
 
+router.get('/:user', (req, res, next) => {
+ var user = req.params.user;
+
+ User.find({ username: user })
+ .select('_id username role bio followers following')
+ .exec()
+ .then(async doc => {
+ const Posts = await Post.find();
+
+ res.status(200).json({
+ _id: doc[0]._id,
+ username: doc[0].username,
+ role: doc[0].role,
+ bio: doc[0].bio,
+ followers: doc[0].followers,
+ following: doc[0].following,
+ posts: Posts.filter(Post => Post.createdBy.get('username') === user)
+ })
+ })
+ .catch(err => res.status(500).json({ err }))
+
+ // User.find({ username: user })
+ // .select('_id username role bio followers following')
+ // .exec()
+ // .then(async doc => {
+ // const Posts = await Post.find();
+ // const UserData = {
+ // _id: doc._id,
+ // username: doc.username,
+ // role: doc.role,
+ // bio: doc.bio,
+ // followers: doc.followers,
+ // following: doc.following,
+ // posts: Posts.filter(Post => Post.createdBy.get('username') === doc.username)
+ // }
+ // console.log(UserData)
+ // res.status(200)
+
+ // })
+ // .catch(err => {
+ // res.status(500).json({ error: err })
+ // })
+});
+
+router.patch('/:userId', checkAuth, (req, res, next) => {
+ const id = req.params.userId;
+ const updateOps = {};
+ for (const ops of req.body) {
+ updateOps[ops.propName] = ops.value;
+ }
+ User.update({ _id: id }, { $set: updateOps })
+ .exec()
+ .then(result => {
+ res.status(200).json({
+ message: 'User updated'
+ });
+ })
+ .catch(err => {
+ res.status(500).json({
+ error: err
+ })
+ })
+});
 
-router.delete('/:userId', (req, res, next) => {
+router.delete('/:userId', checkAuth, (req, res, next) => {
  User.remove({ _id: req.params.userId })
  .exec()
  .then(result => res.status(200).json({ message: 'User deleted' }))